mirror of
https://github.com/FabricMC/fabric.git
synced 2025-04-20 19:04:44 -04:00
23w44a
This commit is contained in:
modmuss50
parent
022302724c
commit
f31bf881a9
9 changed files with 47 additions and 38 deletions
fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client
fabric-data-generation-api-v1/src/main/resources
fabric-game-rule-api-v1/src/main/java/net/fabricmc/fabric/impl/gamerule/rule
fabric-networking-api-v1/src/client/java/net/fabricmc/fabric
impl/networking/client
mixin/networking/client/accessor
fabric-resource-loader-v0/src/client/java/net/fabricmc/fabric/mixin/resource/loader/client
fabric-screen-api-v1/src/client/java/net/fabricmc/fabric/mixin/screen
fabric-transitive-access-wideners-v1/src/main/resources
gradle.properties|
|
@ -26,10 +26,10 @@ import java.util.function.Predicate;
|
|||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.Drawable;
|
||||
import net.minecraft.client.gui.screen.GameMenuScreen;
|
||||
import net.minecraft.client.gui.screen.LevelLoadingScreen;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
|
||||
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
|
||||
import net.minecraft.client.gui.screen.world.LevelLoadingScreen;
|
||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import net.minecraft.client.gui.widget.ClickableWidget;
|
||||
import net.minecraft.client.gui.widget.CyclingButtonWidget;
|
||||
|
|
|
|||
|
|
@ -125,8 +125,8 @@ transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider off
|
|||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider generateCookingRecipes (Lnet/minecraft/data/server/recipe/RecipeExporter;Ljava/lang/String;Lnet/minecraft/recipe/RecipeSerializer;I)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerFoodCookingRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Ljava/lang/String;Lnet/minecraft/recipe/RecipeSerializer;ILnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;F)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerWaxingRecipes (Lnet/minecraft/data/server/recipe/RecipeExporter;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider method_54829 (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider method_54830 (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerGrateRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerBulbRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider generateFamily (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/data/family/BlockFamily;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider getVariantRecipeInput (Lnet/minecraft/data/family/BlockFamily;Lnet/minecraft/data/family/BlockFamily$Variant;)Lnet/minecraft/block/Block;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider requireEnteringFluid (Lnet/minecraft/block/Block;)Lnet/minecraft/advancement/AdvancementCriterion;
|
||||
|
|
@ -185,10 +185,10 @@ transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator
|
|||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerSingleton (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TextureMap;Lnet/minecraft/data/client/Model;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCubeAllModelTexturePool (Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/BlockStateModelGenerator$BlockTexturePool;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerDoor (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_54823 (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerParentedDoor (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerOrientableTrapdoor (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTrapdoor (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_54824 (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerParentedTrapdoor (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerLog (Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/BlockStateModelGenerator$LogTexturePool;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerSimpleState (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerStateWithModelReference (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
|
|
@ -229,9 +229,9 @@ transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator
|
|||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCubeWithCustomTextures (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Ljava/util/function/BiFunction;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerNorthDefaultHorizontalRotatable (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TextureMap;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerDispenserLikeOrientable (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_54826 (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_54822 (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_54825 (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCopperBulb (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createCopperBulbBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerWaxedCopperBulb (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerAmethyst (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getDripstoneVariant (Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/enums/Thickness;)Lnet/minecraft/data/client/BlockStateVariant;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerNetherrackBottomCustomTop (Lnet/minecraft/block/Block;)V
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public final class BoundedIntRule extends GameRules.IntRule {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean validate(String input) {
|
||||
public boolean validateAndSet(String input) {
|
||||
try {
|
||||
int value = Integer.parseInt(input);
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import java.util.Objects;
|
|||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.screen.ConnectScreen;
|
||||
import net.minecraft.client.gui.screen.multiplayer.ConnectScreen;
|
||||
import net.minecraft.client.network.ClientConfigurationNetworkHandler;
|
||||
import net.minecraft.client.network.ClientLoginNetworkHandler;
|
||||
import net.minecraft.client.network.ClientPlayNetworkHandler;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ package net.fabricmc.fabric.mixin.networking.client.accessor;
|
|||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
import net.minecraft.client.gui.screen.ConnectScreen;
|
||||
import net.minecraft.client.gui.screen.multiplayer.ConnectScreen;
|
||||
import net.minecraft.network.ClientConnection;
|
||||
|
||||
@Mixin(ConnectScreen.class)
|
||||
|
|
|
|||
|
|
@ -16,8 +16,9 @@
|
|||
|
||||
package net.fabricmc.fabric.mixin.resource.loader.client;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashSet;
|
||||
|
|
@ -64,16 +65,20 @@ public class GameOptionsMixin {
|
|||
// - If there is a value without matching pack id (e.g. because the mod is removed),
|
||||
// remove it from the tracker file so that it would be enabled again if added back later.
|
||||
|
||||
File dataDir = FabricLoader.getInstance().getGameDir().resolve("data").toFile();
|
||||
Path dataDir = FabricLoader.getInstance().getGameDir().resolve("data");
|
||||
|
||||
if (!dataDir.exists() && !dataDir.mkdirs()) {
|
||||
LOGGER.warn("[Fabric Resource Loader] Could not create data directory: " + dataDir.getAbsolutePath());
|
||||
if (Files.notExists(dataDir)) {
|
||||
try {
|
||||
Files.createDirectories(dataDir);
|
||||
} catch (IOException e) {
|
||||
LOGGER.warn("[Fabric Resource Loader] Could not create data directory: " + dataDir.toAbsolutePath());
|
||||
}
|
||||
}
|
||||
|
||||
File trackerFile = new File(dataDir, "fabricDefaultResourcePacks.dat");
|
||||
Path trackerFile = dataDir.resolve("fabricDefaultResourcePacks.dat");
|
||||
Set<String> trackedPacks = new HashSet<>();
|
||||
|
||||
if (trackerFile.exists()) {
|
||||
if (Files.exists(trackerFile)) {
|
||||
try {
|
||||
NbtCompound data = NbtIo.readCompressed(trackerFile, NbtTagSizeTracker.ofUnlimitedBytes());
|
||||
NbtList values = data.getList("values", NbtElement.STRING_TYPE);
|
||||
|
|
@ -82,7 +87,7 @@ public class GameOptionsMixin {
|
|||
trackedPacks.add(values.getString(i));
|
||||
}
|
||||
} catch (IOException e) {
|
||||
LOGGER.warn("[Fabric Resource Loader] Could not read " + trackerFile.getAbsolutePath(), e);
|
||||
LOGGER.warn("[Fabric Resource Loader] Could not read " + trackerFile.toAbsolutePath(), e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -123,7 +128,7 @@ public class GameOptionsMixin {
|
|||
nbt.put("values", values);
|
||||
NbtIo.writeCompressed(nbt, trackerFile);
|
||||
} catch (IOException e) {
|
||||
LOGGER.warn("[Fabric Resource Loader] Could not write to " + trackerFile.getAbsolutePath(), e);
|
||||
LOGGER.warn("[Fabric Resource Loader] Could not write to " + trackerFile.toAbsolutePath(), e);
|
||||
}
|
||||
|
||||
this.resourcePacks = new ArrayList<>(resourcePacks);
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ abstract class MinecraftClientMixin {
|
|||
|
||||
// The LevelLoadingScreen is the odd screen that isn't ticked by the main tick loop, so we fire events for this screen.
|
||||
// We Coerce the package-private inner class representing the world load action so we don't need an access widener.
|
||||
@Inject(method = "startIntegratedServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/LevelLoadingScreen;tick()V"))
|
||||
@Inject(method = "startIntegratedServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/world/LevelLoadingScreen;tick()V"))
|
||||
private void beforeLoadingScreenTick(CallbackInfo ci) {
|
||||
// Store the screen in a variable in case someone tries to change the screen during this before tick event.
|
||||
// If someone changes the screen, the after tick event will likely have class cast exceptions or throw a NPE.
|
||||
|
|
|
|||
|
|
@ -203,6 +203,9 @@ transitive-accessible method net/minecraft/block/LoomBlock <init> (Lnet/minecraf
|
|||
transitive-accessible method net/minecraft/block/MangroveRootsBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/NetherWartBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/NyliumBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/OxidizableDoorBlock <init> (Lnet/minecraft/block/BlockSetType;Lnet/minecraft/block/Oxidizable$OxidationLevel;Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/OxidizableGrateBlock <init> (Lnet/minecraft/block/Oxidizable$OxidationLevel;Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/OxidizableTrapdoorBlock <init> (Lnet/minecraft/block/BlockSetType;Lnet/minecraft/block/Oxidizable$OxidationLevel;Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/PaneBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/PlayerSkullBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/PoweredRailBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
|
|
@ -229,6 +232,7 @@ transitive-accessible method net/minecraft/block/StructureBlock <init> (Lnet/min
|
|||
transitive-accessible method net/minecraft/block/StructureVoidBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/SugarCaneBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/TorchBlock <init> (Lnet/minecraft/particle/DefaultParticleType;Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/TranslucentBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/TransparentBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/TrapdoorBlock <init> (Lnet/minecraft/block/BlockSetType;Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
transitive-accessible method net/minecraft/block/WallPlayerSkullBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx2560M
|
|||
org.gradle.parallel=true
|
||||
fabric.loom.multiProjectOptimisation=true
|
||||
|
||||
version=0.90.5
|
||||
minecraft_version=23w43a
|
||||
version=0.90.6
|
||||
minecraft_version=23w44a
|
||||
yarn_version=+build.1
|
||||
loader_version=0.14.23
|
||||
installer_version=0.11.1
|
||||
|
|
@ -21,31 +21,31 @@ fabric-blockrenderlayer-v1-version=1.1.44
|
|||
fabric-command-api-v1-version=1.2.38
|
||||
fabric-command-api-v2-version=2.2.17
|
||||
fabric-commands-v0-version=0.2.55
|
||||
fabric-containers-v0-version=0.1.74
|
||||
fabric-content-registries-v0-version=5.0.7
|
||||
fabric-containers-v0-version=0.1.75
|
||||
fabric-content-registries-v0-version=5.0.8
|
||||
fabric-crash-report-info-v1-version=0.2.21
|
||||
fabric-data-generation-api-v1-version=13.1.7
|
||||
fabric-data-generation-api-v1-version=13.1.8
|
||||
fabric-dimensions-v1-version=2.1.57
|
||||
fabric-entity-events-v1-version=1.5.26
|
||||
fabric-events-interaction-v0-version=0.6.13
|
||||
fabric-events-lifecycle-v0-version=0.2.70
|
||||
fabric-game-rule-api-v1-version=1.0.41
|
||||
fabric-gametest-api-v1-version=1.2.17
|
||||
fabric-game-rule-api-v1-version=1.0.42
|
||||
fabric-gametest-api-v1-version=1.2.18
|
||||
fabric-item-api-v1-version=2.1.33
|
||||
fabric-item-group-api-v1-version=4.0.16
|
||||
fabric-item-group-api-v1-version=4.0.17
|
||||
fabric-key-binding-api-v1-version=1.0.39
|
||||
fabric-keybindings-v0-version=0.2.37
|
||||
fabric-lifecycle-events-v1-version=2.2.28
|
||||
fabric-loot-api-v2-version=2.1.2
|
||||
fabric-loot-api-v2-version=2.1.3
|
||||
fabric-message-api-v1-version=6.0.3
|
||||
fabric-mining-level-api-v1-version=2.1.57
|
||||
fabric-mining-level-api-v1-version=2.1.58
|
||||
fabric-model-loading-api-v1-version=1.0.6
|
||||
fabric-models-v0-version=0.4.5
|
||||
fabric-networking-api-v1-version=3.0.10
|
||||
fabric-object-builder-api-v1-version=13.0.3
|
||||
fabric-networking-api-v1-version=3.0.11
|
||||
fabric-object-builder-api-v1-version=13.0.4
|
||||
fabric-particles-v1-version=1.1.5
|
||||
fabric-recipe-api-v1-version=2.0.7
|
||||
fabric-registry-sync-v0-version=4.0.6
|
||||
fabric-recipe-api-v1-version=2.0.8
|
||||
fabric-registry-sync-v0-version=4.0.7
|
||||
fabric-renderer-api-v1-version=3.2.2
|
||||
fabric-renderer-indigo-version=1.5.2
|
||||
fabric-renderer-registries-v1-version=3.2.49
|
||||
|
|
@ -54,11 +54,11 @@ fabric-rendering-fluids-v1-version=3.0.31
|
|||
fabric-rendering-v0-version=1.1.52
|
||||
fabric-rendering-v1-version=3.0.11
|
||||
fabric-resource-conditions-api-v1-version=2.3.11
|
||||
fabric-resource-loader-v0-version=0.11.13
|
||||
fabric-screen-api-v1-version=2.0.13
|
||||
fabric-screen-handler-api-v1-version=1.3.43
|
||||
fabric-resource-loader-v0-version=0.11.14
|
||||
fabric-screen-api-v1-version=2.0.14
|
||||
fabric-screen-handler-api-v1-version=1.3.44
|
||||
fabric-sound-api-v1-version=1.0.15
|
||||
fabric-transfer-api-v1-version=4.0.2
|
||||
fabric-transitive-access-wideners-v1-version=5.0.8
|
||||
fabric-transitive-access-wideners-v1-version=5.0.9
|
||||
fabric-convention-tags-v1-version=1.5.8
|
||||
fabric-client-tags-api-v1-version=1.1.5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue