mirror of
https://github.com/FabricMC/fabric.git
synced 2025-04-15 00:14:28 -04:00
23w33a
This commit is contained in:
modmuss50
parent
839aeb4e2c
commit
f091af96c5
8 changed files with 54 additions and 54 deletions
fabric-api-base/src/testmodClient/java/net/fabricmc/fabric/test/base/client
fabric-data-generation-api-v1/src/main
java/net/fabricmc/fabric/impl/datagen/loot
resources
fabric-networking-api-v1/src/main/java/net/fabricmc/fabric
impl/networking/server
mixin/networking
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync
fabric-transfer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/transfer/ingame/client
gradle.properties|
|
@ -143,7 +143,7 @@ public final class FabricClientTestHelper {
|
|||
|
||||
public static void enableDebugHud() {
|
||||
submitAndWait(client -> {
|
||||
client.options.debugEnabled = true;
|
||||
client.inGameHud.method_53531().method_53539();
|
||||
return null;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ public final class FabricLootTableProviderImpl {
|
|||
final List<CompletableFuture<?>> futures = new ArrayList<>();
|
||||
|
||||
for (Map.Entry<Identifier, LootTable> entry : builders.entrySet()) {
|
||||
JsonObject tableJson = (JsonObject) Util.getResult(LootTable.field_45796.encodeStart(JsonOps.INSTANCE, entry.getValue()), IllegalStateException::new);
|
||||
JsonObject tableJson = (JsonObject) Util.getResult(LootTable.CODEC.encodeStart(JsonOps.INSTANCE, entry.getValue()), IllegalStateException::new);
|
||||
ConditionJsonProvider.write(tableJson, conditionMap.remove(entry.getKey()));
|
||||
|
||||
futures.add(DataProvider.writeToPath(writer, tableJson, getOutputPath(fabricDataOutput, entry.getKey())));
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider req
|
|||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider conditionsFromItem (Lnet/minecraft/predicate/NumberRange$IntRange;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/advancement/criterion/InventoryChangedCriterion$Conditions;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider conditionsFromItem (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/advancement/criterion/InventoryChangedCriterion$Conditions;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider conditionsFromTag (Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/advancement/criterion/InventoryChangedCriterion$Conditions;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider method_53499 ([Lnet/minecraft/predicate/item/ItemPredicate$Builder;)Lnet/minecraft/advancement/criterion/InventoryChangedCriterion$Conditions;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider conditionsFromPredicates ([Lnet/minecraft/predicate/item/ItemPredicate$Builder;)Lnet/minecraft/advancement/criterion/InventoryChangedCriterion$Conditions;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider conditionsFromItemPredicates ([Lnet/minecraft/predicate/item/ItemPredicate;)Lnet/minecraft/advancement/criterion/InventoryChangedCriterion$Conditions;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider hasItem (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider getItemPath (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import net.minecraft.network.NetworkState;
|
|||
import net.minecraft.network.PacketByteBuf;
|
||||
import net.minecraft.network.PacketCallbacks;
|
||||
import net.minecraft.network.packet.Packet;
|
||||
import net.minecraft.network.packet.s2c.common.PlayPingS2CPacket;
|
||||
import net.minecraft.network.packet.s2c.common.CommonPingS2CPacket;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.network.ServerConfigurationNetworkHandler;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
|
@ -76,7 +76,7 @@ public final class ServerConfigurationNetworkAddon extends AbstractChanneledNetw
|
|||
if (this.registerState == RegisterState.NOT_SENT) {
|
||||
// Send the registration packet, followed by a ping
|
||||
this.sendInitialChannelRegistrationPacket();
|
||||
this.sendPacket(new PlayPingS2CPacket(0xFAB71C));
|
||||
this.sendPacket(new CommonPingS2CPacket(0xFAB71C));
|
||||
|
||||
this.registerState = RegisterState.SENT;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
|
|||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket;
|
||||
import net.minecraft.network.packet.c2s.common.PlayPongC2SPacket;
|
||||
import net.minecraft.network.packet.c2s.common.CommonPongC2SPacket;
|
||||
import net.minecraft.server.network.ServerCommonNetworkHandler;
|
||||
|
||||
import net.fabricmc.fabric.impl.networking.NetworkHandlerExtensions;
|
||||
|
|
@ -53,8 +53,8 @@ public abstract class ServerCommonNetworkHandlerMixin implements NetworkHandlerE
|
|||
}
|
||||
}
|
||||
|
||||
@Inject(method = "onPlayPong", at = @At("HEAD"))
|
||||
private void onPlayPong(PlayPongC2SPacket packet, CallbackInfo ci) {
|
||||
@Inject(method = "onPong", at = @At("HEAD"))
|
||||
private void onPlayPong(CommonPongC2SPacket packet, CallbackInfo ci) {
|
||||
if (getAddon() instanceof ServerConfigurationNetworkAddon addon) {
|
||||
addon.onPong(packet.getParameter());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ public abstract class SimpleRegistryMixin<T> implements MutableRegistry<T>, Rema
|
|||
onChange(registryKey);
|
||||
}
|
||||
|
||||
@Inject(method = "method_46744", at = @At("RETURN"))
|
||||
@Inject(method = "set", at = @At("RETURN"))
|
||||
private <V extends T> void set(int rawId, RegistryKey<Registry<T>> registryKey, V entry, Lifecycle lifecycle, CallbackInfoReturnable<RegistryEntry<T>> info) {
|
||||
// We need to restore the 1.19 behavior of binding the value to references immediately.
|
||||
// Unfrozen registries cannot be interacted with otherwise, because the references would throw when
|
||||
|
|
@ -179,7 +179,7 @@ public abstract class SimpleRegistryMixin<T> implements MutableRegistry<T>, Rema
|
|||
}
|
||||
}
|
||||
|
||||
@Inject(method = "method_46744", at = @At("HEAD"))
|
||||
@Inject(method = "set", at = @At("HEAD"))
|
||||
public void setPre(int id, RegistryKey<T> registryId, T object, Lifecycle lifecycle, CallbackInfoReturnable<RegistryEntry<T>> info) {
|
||||
int indexedEntriesId = entryToRawId.getInt(object);
|
||||
|
||||
|
|
@ -207,7 +207,7 @@ public abstract class SimpleRegistryMixin<T> implements MutableRegistry<T>, Rema
|
|||
}
|
||||
}
|
||||
|
||||
@Inject(method = "method_46744", at = @At("RETURN"))
|
||||
@Inject(method = "set", at = @At("RETURN"))
|
||||
public void setPost(int id, RegistryKey<T> registryId, T object, Lifecycle lifecycle, CallbackInfoReturnable<RegistryEntry<T>> info) {
|
||||
if (fabric_isObjectNew) {
|
||||
fabric_addObjectEvent.invoker().onEntryAdded(id, registryId.getValue(), object);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public class FluidVariantRenderTest implements ClientModInitializer {
|
|||
PlayerEntity player = MinecraftClient.getInstance().player;
|
||||
if (player == null) return;
|
||||
|
||||
if (MinecraftClient.getInstance().options.debugEnabled) return;
|
||||
if (MinecraftClient.getInstance().inGameHud.method_53531().method_53536()) return;
|
||||
|
||||
int renderY = 0;
|
||||
List<FluidVariant> variants = List.of(FluidVariant.of(Fluids.WATER), FluidVariant.of(Fluids.LAVA));
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx2560M
|
|||
org.gradle.parallel=true
|
||||
fabric.loom.multiProjectOptimisation=true
|
||||
|
||||
version=0.87.0
|
||||
minecraft_version=23w32a
|
||||
yarn_version=+build.2
|
||||
version=0.87.1
|
||||
minecraft_version=23w33a
|
||||
yarn_version=+build.1
|
||||
loader_version=0.14.22
|
||||
installer_version=0.11.1
|
||||
|
||||
|
|
@ -12,52 +12,52 @@ prerelease=true
|
|||
curseforge_minecraft_version=1.20.2-Snapshot
|
||||
|
||||
# Do not manually update, use the bumpversions task:
|
||||
fabric-api-base-version=0.4.31
|
||||
fabric-api-lookup-api-v1-version=1.6.36
|
||||
fabric-api-base-version=0.4.32
|
||||
fabric-api-lookup-api-v1-version=1.6.37
|
||||
fabric-biome-api-v1-version=13.0.11
|
||||
fabric-block-api-v1-version=1.0.10
|
||||
fabric-blockrenderlayer-v1-version=1.1.41
|
||||
fabric-command-api-v1-version=1.2.34
|
||||
fabric-command-api-v2-version=2.2.13
|
||||
fabric-commands-v0-version=0.2.51
|
||||
fabric-containers-v0-version=0.1.65
|
||||
fabric-content-registries-v0-version=5.0.0
|
||||
fabric-blockrenderlayer-v1-version=1.1.42
|
||||
fabric-command-api-v1-version=1.2.35
|
||||
fabric-command-api-v2-version=2.2.14
|
||||
fabric-commands-v0-version=0.2.52
|
||||
fabric-containers-v0-version=0.1.66
|
||||
fabric-content-registries-v0-version=5.0.1
|
||||
fabric-crash-report-info-v1-version=0.2.19
|
||||
fabric-data-generation-api-v1-version=12.2.5
|
||||
fabric-dimensions-v1-version=2.1.54
|
||||
fabric-entity-events-v1-version=1.5.23
|
||||
fabric-events-interaction-v0-version=0.6.3
|
||||
fabric-events-lifecycle-v0-version=0.2.63
|
||||
fabric-data-generation-api-v1-version=12.2.6
|
||||
fabric-dimensions-v1-version=2.1.55
|
||||
fabric-entity-events-v1-version=1.5.24
|
||||
fabric-events-interaction-v0-version=0.6.4
|
||||
fabric-events-lifecycle-v0-version=0.2.64
|
||||
fabric-game-rule-api-v1-version=1.0.39
|
||||
fabric-gametest-api-v1-version=1.2.13
|
||||
fabric-item-api-v1-version=2.1.28
|
||||
fabric-item-group-api-v1-version=4.0.11
|
||||
fabric-gametest-api-v1-version=1.2.14
|
||||
fabric-item-api-v1-version=2.1.29
|
||||
fabric-item-group-api-v1-version=4.0.12
|
||||
fabric-key-binding-api-v1-version=1.0.37
|
||||
fabric-keybindings-v0-version=0.2.35
|
||||
fabric-lifecycle-events-v1-version=2.2.22
|
||||
fabric-loot-api-v2-version=2.0.0
|
||||
fabric-message-api-v1-version=5.1.8
|
||||
fabric-mining-level-api-v1-version=2.1.50
|
||||
fabric-model-loading-api-v1-version=1.0.3
|
||||
fabric-models-v0-version=0.4.2
|
||||
fabric-networking-api-v1-version=3.0.1
|
||||
fabric-object-builder-api-v1-version=11.1.2
|
||||
fabric-particles-v1-version=1.1.2
|
||||
fabric-recipe-api-v1-version=1.0.22
|
||||
fabric-registry-sync-v0-version=3.0.2
|
||||
fabric-renderer-api-v1-version=3.1.3
|
||||
fabric-renderer-indigo-version=1.4.3
|
||||
fabric-renderer-registries-v1-version=3.2.46
|
||||
fabric-rendering-data-attachment-v1-version=0.3.35
|
||||
fabric-rendering-fluids-v1-version=3.0.28
|
||||
fabric-rendering-v0-version=1.1.49
|
||||
fabric-rendering-v1-version=3.0.8
|
||||
fabric-lifecycle-events-v1-version=2.2.23
|
||||
fabric-loot-api-v2-version=2.0.1
|
||||
fabric-message-api-v1-version=5.1.9
|
||||
fabric-mining-level-api-v1-version=2.1.51
|
||||
fabric-model-loading-api-v1-version=1.0.4
|
||||
fabric-models-v0-version=0.4.3
|
||||
fabric-networking-api-v1-version=3.0.2
|
||||
fabric-object-builder-api-v1-version=11.1.3
|
||||
fabric-particles-v1-version=1.1.3
|
||||
fabric-recipe-api-v1-version=1.0.23
|
||||
fabric-registry-sync-v0-version=3.0.3
|
||||
fabric-renderer-api-v1-version=3.1.4
|
||||
fabric-renderer-indigo-version=1.4.4
|
||||
fabric-renderer-registries-v1-version=3.2.47
|
||||
fabric-rendering-data-attachment-v1-version=0.3.36
|
||||
fabric-rendering-fluids-v1-version=3.0.29
|
||||
fabric-rendering-v0-version=1.1.50
|
||||
fabric-rendering-v1-version=3.0.9
|
||||
fabric-resource-conditions-api-v1-version=2.3.6
|
||||
fabric-resource-loader-v0-version=0.11.10
|
||||
fabric-screen-api-v1-version=2.0.9
|
||||
fabric-screen-handler-api-v1-version=1.3.31
|
||||
fabric-screen-api-v1-version=2.0.10
|
||||
fabric-screen-handler-api-v1-version=1.3.32
|
||||
fabric-sound-api-v1-version=1.0.13
|
||||
fabric-transfer-api-v1-version=3.3.1
|
||||
fabric-transfer-api-v1-version=3.3.2
|
||||
fabric-transitive-access-wideners-v1-version=5.0.1
|
||||
fabric-convention-tags-v1-version=1.5.5
|
||||
fabric-client-tags-api-v1-version=1.1.2
|
||||
fabric-convention-tags-v1-version=1.5.6
|
||||
fabric-client-tags-api-v1-version=1.1.3
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue