From 8c4a74d0f5896a5b007b2f7c3152098c69952649 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 4 Mar 2023 03:25:24 +0800 Subject: [PATCH] Update to 1.19.4-pre3 --- .../architectury/hooks/item/ItemStackHooks.java | 2 +- .../hooks/level/biome/SpawnProperties.java | 2 +- .../main/resources/architectury.accessWidener | 16 ++++++++++------ fabric/build.gradle | 5 +++-- .../mixin/fabric/MixinFarmBlock.java | 9 +++++---- .../biome/fabric/BiomeModificationsImpl.java | 6 +++--- .../registry/menu/fabric/MenuRegistryImpl.java | 3 ++- .../biome/forge/BiomeModificationsImpl.java | 6 +++--- gradle.properties | 8 ++++---- .../dev/architectury/test/entity/TestEntity.java | 4 +++- 10 files changed, 35 insertions(+), 26 deletions(-) diff --git a/common/src/main/java/dev/architectury/hooks/item/ItemStackHooks.java b/common/src/main/java/dev/architectury/hooks/item/ItemStackHooks.java index d5d6b37c..3a62a319 100644 --- a/common/src/main/java/dev/architectury/hooks/item/ItemStackHooks.java +++ b/common/src/main/java/dev/architectury/hooks/item/ItemStackHooks.java @@ -50,7 +50,7 @@ public final class ItemStackHooks { var entity = player.drop(stack, false); if (entity != null) { entity.setNoPickUpDelay(); - entity.setOwner(player.getUUID()); + entity.setTarget(player.getUUID()); } } } diff --git a/common/src/main/java/dev/architectury/hooks/level/biome/SpawnProperties.java b/common/src/main/java/dev/architectury/hooks/level/biome/SpawnProperties.java index e9a4f5ce..cf2ad156 100644 --- a/common/src/main/java/dev/architectury/hooks/level/biome/SpawnProperties.java +++ b/common/src/main/java/dev/architectury/hooks/level/biome/SpawnProperties.java @@ -43,7 +43,7 @@ public interface SpawnProperties { Mutable setSpawnCost(EntityType entityType, MobSpawnSettings.MobSpawnCost cost); - Mutable setSpawnCost(EntityType entityType, double mass, double gravityLimit); + Mutable setSpawnCost(EntityType entityType, double charge, double energyBudget); Mutable clearSpawnCost(EntityType entityType); } diff --git a/common/src/main/resources/architectury.accessWidener b/common/src/main/resources/architectury.accessWidener index 2be094ec..9038956c 100644 --- a/common/src/main/resources/architectury.accessWidener +++ b/common/src/main/resources/architectury.accessWidener @@ -53,7 +53,7 @@ mutable field net/minecraft/world/level/block/state/BlockBehaviour$Properties dy accessible method net/minecraft/world/level/block/state/BlockBehaviour$Properties (Lnet/minecraft/world/level/material/Material;Ljava/util/function/Function;)V transitive-accessible method net/minecraft/world/entity/player/Player closeContainer ()V transitive-accessible method net/minecraft/advancements/CriteriaTriggers register (Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger; -transitive-accessible method net/minecraft/world/inventory/MenuType (Lnet/minecraft/world/inventory/MenuType$MenuSupplier;)V +transitive-accessible method net/minecraft/world/inventory/MenuType (Lnet/minecraft/world/inventory/MenuType$MenuSupplier;Lnet/minecraft/world/flag/FeatureFlagSet;)V transitive-accessible class net/minecraft/world/inventory/MenuType$MenuSupplier accessible method net/minecraft/world/entity/Entity getEncodeId ()Ljava/lang/String; transitive-accessible method net/minecraft/world/entity/Entity getEncodeId ()Ljava/lang/String; @@ -164,7 +164,7 @@ transitive-accessible method net/minecraft/world/level/block/BigDripleafBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/BlastFurnaceBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/BushBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V -transitive-accessible method net/minecraft/world/level/block/ButtonBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;IZLnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundEvent;)V +transitive-accessible method net/minecraft/world/level/block/ButtonBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/world/level/block/state/properties/BlockSetType;IZ)V transitive-accessible method net/minecraft/world/level/block/CactusBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/CakeBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/CandleCakeBlock (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V @@ -180,9 +180,10 @@ transitive-accessible method net/minecraft/world/level/block/CraftingTableBlock transitive-accessible method net/minecraft/world/level/block/CropBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/CrossCollisionBlock (FFFFFLnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/DeadBushBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V +transitive-accessible method net/minecraft/world/level/block/DecoratedPotBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/DirtPathBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/DispenserBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V -transitive-accessible method net/minecraft/world/level/block/DoorBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundEvent;)V +transitive-accessible method net/minecraft/world/level/block/DoorBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/world/level/block/state/properties/BlockSetType;)V transitive-accessible method net/minecraft/world/level/block/EnchantmentTableBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/EndGatewayBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/EndPortalBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V @@ -210,11 +211,12 @@ transitive-accessible method net/minecraft/world/level/block/MangroveRootsBlock transitive-accessible method net/minecraft/world/level/block/MelonBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/NetherWartBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/NyliumBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V +transitive-accessible method net/minecraft/world/level/block/PinkPetalsBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/PipeBlock (FLnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/PlayerHeadBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/PlayerWallHeadBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/PoweredRailBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V -transitive-accessible method net/minecraft/world/level/block/PressurePlateBlock (Lnet/minecraft/world/level/block/PressurePlateBlock$Sensitivity;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundEvent;)V +transitive-accessible method net/minecraft/world/level/block/PressurePlateBlock (Lnet/minecraft/world/level/block/PressurePlateBlock$Sensitivity;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/world/level/block/state/properties/BlockSetType;)V transitive-accessible method net/minecraft/world/level/block/PumpkinBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/RailBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/RedstoneTorchBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V @@ -240,11 +242,11 @@ transitive-accessible method net/minecraft/world/level/block/StructureVoidBlock transitive-accessible method net/minecraft/world/level/block/SugarCaneBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/TallGrassBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/TorchBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/core/particles/ParticleOptions;)V -transitive-accessible method net/minecraft/world/level/block/TrapDoorBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundEvent;)V +transitive-accessible method net/minecraft/world/level/block/TrapDoorBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/world/level/block/state/properties/BlockSetType;)V transitive-accessible method net/minecraft/world/level/block/WallSkullBlock (Lnet/minecraft/world/level/block/SkullBlock$Type;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/WallTorchBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/core/particles/ParticleOptions;)V transitive-accessible method net/minecraft/world/level/block/WaterlilyBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V -transitive-accessible method net/minecraft/world/level/block/WeightedPressurePlateBlock (ILnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundEvent;)V +transitive-accessible method net/minecraft/world/level/block/WeightedPressurePlateBlock (ILnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/world/level/block/state/properties/BlockSetType;)V transitive-accessible method net/minecraft/world/level/block/WetSpongeBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/WitherSkullBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/WitherWallSkullBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V @@ -302,8 +304,10 @@ transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDE transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDERTYPE_ENTITY_GLINT_DIRECT_SHADER Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDERTYPE_CRUMBLING_SHADER Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDERTYPE_TEXT_SHADER Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard; +transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDERTYPE_TEXT_BACKGROUND_SHADER Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDERTYPE_TEXT_INTENSITY_SHADER Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDERTYPE_TEXT_SEE_THROUGH_SHADER Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard; +transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDERTYPE_TEXT_BACKGROUND_SEE_THROUGH_SHADER Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDERTYPE_TEXT_INTENSITY_SEE_THROUGH_SHADER Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDERTYPE_LIGHTNING_SHADER Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard RENDERTYPE_TRIPWIRE_SHADER Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard; diff --git a/fabric/build.gradle b/fabric/build.gradle index 3506c632..bd709158 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -113,7 +113,7 @@ unifiedPublishing { displayName = "[Fabric $rootProject.supported_version] v$project.version" releaseType = "$rootProject.artifact_type" changelog = releaseChangelog() - gameVersions = ["1.19.3"] + gameVersions = [] gameLoaders = ["fabric", "quilt"] mainPublication renameJarForPublication relations { @@ -128,7 +128,7 @@ unifiedPublishing { curseforge { token = CURSE_API_KEY id = rootProject.curseforge_id - gameVersions.addAll "Java 17" + gameVersions.addAll "Java 17", "1.19-Snapshot" } } @@ -138,6 +138,7 @@ unifiedPublishing { token = MODRINTH_TOKEN id = rootProject.modrinth_id version = "$project.version+$project.name" + gameVersions.addAll project.minecraft_version } } } diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinFarmBlock.java b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinFarmBlock.java index 153d1391..22b8b167 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinFarmBlock.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinFarmBlock.java @@ -26,6 +26,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.FarmBlock; import net.minecraft.world.level.block.state.BlockState; import org.apache.commons.lang3.tuple.Triple; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -41,7 +42,7 @@ public abstract class MixinFarmBlock { method = "fallOn", at = @At( value = "INVOKE", - target = "Lnet/minecraft/world/level/block/FarmBlock;turnToDirt(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V" + target = "Lnet/minecraft/world/level/block/FarmBlock;turnToDirt(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V" ) ) private void fallOn(Level level, BlockState blockState, BlockPos blockPos, Entity entity, float f, CallbackInfo ci) { @@ -49,11 +50,11 @@ public abstract class MixinFarmBlock { } @Inject(method = "turnToDirt", at = @At("HEAD"), cancellable = true) - private static void turnToDirt(BlockState state, Level level, BlockPos pos, CallbackInfo ci) { + private static void turnToDirt(@Nullable Entity entity, BlockState state, Level level, BlockPos pos, CallbackInfo ci) { var triple = turnToDirtLocal.get(); turnToDirtLocal.remove(); - if (triple != null && triple.getLeft() == pos.asLong()) { - if (InteractionEvent.FARMLAND_TRAMPLE.invoker().trample(level, pos, state, triple.getMiddle(), triple.getRight()).value() != null) { + if (triple != null && triple.getLeft() == pos.asLong() && triple.getRight() == entity) { + if (InteractionEvent.FARMLAND_TRAMPLE.invoker().trample(level, pos, state, triple.getMiddle(), entity).value() != null) { ci.cancel(); } } diff --git a/fabric/src/main/java/dev/architectury/registry/level/biome/fabric/BiomeModificationsImpl.java b/fabric/src/main/java/dev/architectury/registry/level/biome/fabric/BiomeModificationsImpl.java index 271b8da8..5dc144bb 100644 --- a/fabric/src/main/java/dev/architectury/registry/level/biome/fabric/BiomeModificationsImpl.java +++ b/fabric/src/main/java/dev/architectury/registry/level/biome/fabric/BiomeModificationsImpl.java @@ -210,13 +210,13 @@ public class BiomeModificationsImpl { @Override public Mutable setSpawnCost(EntityType entityType, MobSpawnSettings.MobSpawnCost cost) { - context.setSpawnCost(entityType, cost.getCharge(), cost.getEnergyBudget()); + context.setSpawnCost(entityType, cost.charge(), cost.energyBudget()); return this; } @Override - public Mutable setSpawnCost(EntityType entityType, double mass, double gravityLimit) { - context.setSpawnCost(entityType, mass, gravityLimit); + public Mutable setSpawnCost(EntityType entityType, double charge, double energyBudget) { + context.setSpawnCost(entityType, charge, energyBudget); return this; } diff --git a/fabric/src/main/java/dev/architectury/registry/menu/fabric/MenuRegistryImpl.java b/fabric/src/main/java/dev/architectury/registry/menu/fabric/MenuRegistryImpl.java index 57490db7..3bf8b15f 100644 --- a/fabric/src/main/java/dev/architectury/registry/menu/fabric/MenuRegistryImpl.java +++ b/fabric/src/main/java/dev/architectury/registry/menu/fabric/MenuRegistryImpl.java @@ -35,6 +35,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; import org.jetbrains.annotations.Nullable; @@ -61,7 +62,7 @@ public class MenuRegistryImpl { } public static MenuType of(SimpleMenuTypeFactory factory) { - return new MenuType<>(factory::create); + return new MenuType<>(factory::create, FeatureFlags.VANILLA_SET); } public static MenuType ofExtended(ExtendedMenuTypeFactory factory) { diff --git a/forge/src/main/java/dev/architectury/registry/level/biome/forge/BiomeModificationsImpl.java b/forge/src/main/java/dev/architectury/registry/level/biome/forge/BiomeModificationsImpl.java index 1dead934..a1d14d56 100644 --- a/forge/src/main/java/dev/architectury/registry/level/biome/forge/BiomeModificationsImpl.java +++ b/forge/src/main/java/dev/architectury/registry/level/biome/forge/BiomeModificationsImpl.java @@ -568,13 +568,13 @@ public class BiomeModificationsImpl { @Override public Mutable setSpawnCost(EntityType entityType, MobSpawnSettings.MobSpawnCost cost) { - builder.addMobCharge(entityType, cost.getCharge(), cost.getEnergyBudget()); + builder.addMobCharge(entityType, cost.charge(), cost.energyBudget()); return this; } @Override - public Mutable setSpawnCost(EntityType entityType, double mass, double gravityLimit) { - builder.addMobCharge(entityType, mass, gravityLimit); + public Mutable setSpawnCost(EntityType entityType, double charge, double energyBudget) { + builder.addMobCharge(entityType, charge, energyBudget); return this; } diff --git a/gradle.properties b/gradle.properties index efe2e289..5107c7fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.daemon=false platforms=fabric -minecraft_version=23w03a -supported_version=1.19.4 (23w03a) +minecraft_version=1.19.4-pre3 +supported_version=1.19.4-pre3 artifact_type=beta @@ -13,8 +13,8 @@ archives_base_name_snapshot=architectury-snapshot base_version=8.1 maven_group=dev.architectury -fabric_loader_version=0.14.13 -fabric_api_version=0.72.1+1.19.4 +fabric_loader_version=0.14.17 +fabric_api_version=0.75.2+1.19.4 mod_menu_version=5.0.2 forge_version=44.0.6 diff --git a/testmod-common/src/main/java/dev/architectury/test/entity/TestEntity.java b/testmod-common/src/main/java/dev/architectury/test/entity/TestEntity.java index b136c0ba..367d3230 100644 --- a/testmod-common/src/main/java/dev/architectury/test/entity/TestEntity.java +++ b/testmod-common/src/main/java/dev/architectury/test/entity/TestEntity.java @@ -40,6 +40,8 @@ public class TestEntity extends Cow { @Override public Packet getAddEntityPacket() { - return NetworkManager.createAddEntityPacket(this); + // Custom packets broken in BundlePacket + // return NetworkManager.createAddEntityPacket(this); + return super.getAddEntityPacket(); } }