From 62b122e334cb4a9ae3211030eacdcb686e9a1a74 Mon Sep 17 00:00:00 2001 From: Vos Date: Sun, 15 Mar 2026 22:33:21 -0500 Subject: [PATCH] Update to 1.21.9 THANK FUCKING GOD --- gradle.properties | 6 +++--- .../java/com/acethewildfire/acesbs/KNOWN_ISSUES | 4 +++- .../acesbs/block/custom/EntropicEntangler.java | 2 +- .../block/custom/EntropicEviscerator.java | 2 +- .../acesbs/block/custom/EntropicStabilizer.java | 2 +- .../entity/custom/EntropicEntanglerEntity.java | 2 +- .../custom/EntropicEvisceratorEntity.java | 2 +- .../entity/custom/EntropicStabilizerEntity.java | 2 +- .../acesbs/effect/BrickedUpEffect.java | 4 ++-- .../acesbs/effect/CigaretteEffect.java | 4 ++-- .../acesbs/effect/InfernalFireEffect.java | 2 +- .../acesbs/effect/JitteryEffect.java | 2 +- .../acesbs/entity/ModEntities.java | 2 +- .../entity/client/CombustibleLemonRenderer.java | 17 +++++++++-------- .../acesbs/entity/client/FrenRenderer.java | 9 +++++---- .../entity/custom/CombustibleLemonEntity.java | 8 ++++---- .../acesbs/entity/custom/FrenEntity.java | 2 +- .../acethewildfire/acesbs/item/ModItems.java | 17 +++++++++-------- .../acesbs/item/custom/BubblePipe.java | 6 +++--- .../acesbs/item/custom/Cigarette.java | 6 +++--- .../acesbs/item/custom/CigaretteFunny.java | 8 ++++---- .../acesbs/item/custom/CigaretteLemon.java | 6 +++--- .../acesbs/item/custom/CombustibleLemon.java | 2 +- .../acesbs/item/custom/CommandCore.java | 4 ++-- .../acethewildfire/acesbs/item/custom/Wand.java | 3 ++- .../acesbs/mixin/CreeperInteractMixin.java | 4 ++-- .../acesbs/mixin/CreeperTickMixin.java | 4 ++-- .../acesbs/particle/GreenFlame.java | 11 +++++------ .../acesbs/particle/PurpleFlame.java | 11 +++++------ .../custom/EntropicEntanglerScreenHandler.java | 2 +- .../EntropicEvisceratorScreenHandler.java | 2 +- .../custom/EntropicStabilizerScreenHandler.java | 2 +- .../acesbs/util/ConversionManager.java | 2 +- .../acethewildfire/acesbs/util/ModStats.java | 2 +- src/main/resources/fabric.mod.json | 5 +---- 35 files changed, 85 insertions(+), 84 deletions(-) diff --git a/gradle.properties b/gradle.properties index 36f4cb5..dee6080 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,13 +4,13 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.6 -yarn_mappings=1.21.6+build.1 +minecraft_version=1.21.9 +yarn_mappings=1.21.9+build.1 loader_version=0.18.4 loom_version=1.15-SNAPSHOT # Fabric API -fabric_version=0.128.2+1.21.6 +fabric_version=0.134.1+1.21.9 # Mod Properties mod_version=2.0.0 diff --git a/src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES b/src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES index 7e6b515..8cf3a24 100644 --- a/src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES +++ b/src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES @@ -7,4 +7,6 @@ Wildfire Particles missing Particles not on server??? -Fren is broken \ No newline at end of file +Fren is broken + +Combustible LEmon will not render \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicEntangler.java b/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicEntangler.java index 4362288..0d5967b 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicEntangler.java +++ b/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicEntangler.java @@ -51,7 +51,7 @@ public class EntropicEntangler extends BlockWithEntity implements BlockEntityPro @Override protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - if (!world.isClient) { + if (!world.isClient()) { NamedScreenHandlerFactory screenHandlerFactory = ((EntropicEntanglerEntity) world.getBlockEntity(pos)); if (screenHandlerFactory != null) { player.openHandledScreen(screenHandlerFactory); diff --git a/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicEviscerator.java b/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicEviscerator.java index b2b35dd..668f7ca 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicEviscerator.java +++ b/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicEviscerator.java @@ -51,7 +51,7 @@ public class EntropicEviscerator extends BlockWithEntity implements BlockEntityP @Override protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - if (!world.isClient) { + if (!world.isClient()) { NamedScreenHandlerFactory screenHandlerFactory = ((EntropicEvisceratorEntity) world.getBlockEntity(pos)); if (screenHandlerFactory != null) { player.openHandledScreen(screenHandlerFactory); diff --git a/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicStabilizer.java b/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicStabilizer.java index d9a58d8..78da212 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicStabilizer.java +++ b/src/main/java/com/acethewildfire/acesbs/block/custom/EntropicStabilizer.java @@ -50,7 +50,7 @@ public class EntropicStabilizer extends BlockWithEntity implements BlockEntityPr @Override protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - if (!world.isClient) { + if (!world.isClient()) { NamedScreenHandlerFactory screenHandlerFactory = ((EntropicStabilizerEntity) world.getBlockEntity(pos)); if (screenHandlerFactory != null) { player.openHandledScreen(screenHandlerFactory); diff --git a/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEntanglerEntity.java b/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEntanglerEntity.java index ca180c0..64efe31 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEntanglerEntity.java +++ b/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEntanglerEntity.java @@ -96,7 +96,7 @@ public class EntropicEntanglerEntity extends BlockEntity implements EntanglerInv public void setFacing(Direction newFacing) { this.facing = newFacing; // sync to blockstate for rendering - if (world != null && !world.isClient) { + if (world != null && !world.isClient()) { world.setBlockState(pos, getCachedState().with(EntropicEntangler.FACING, newFacing), 3); markDirty(); } diff --git a/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEvisceratorEntity.java b/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEvisceratorEntity.java index dab2ae6..5206af8 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEvisceratorEntity.java +++ b/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicEvisceratorEntity.java @@ -96,7 +96,7 @@ public class EntropicEvisceratorEntity extends BlockEntity implements Implemente public void setFacing(Direction newFacing) { this.facing = newFacing; // sync to blockstate for rendering - if (world != null && !world.isClient) { + if (world != null && !world.isClient()) { world.setBlockState(pos, getCachedState().with(EntropicEviscerator.FACING, newFacing), 3); markDirty(); } diff --git a/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicStabilizerEntity.java b/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicStabilizerEntity.java index cd426ce..550b11e 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicStabilizerEntity.java +++ b/src/main/java/com/acethewildfire/acesbs/block/entity/custom/EntropicStabilizerEntity.java @@ -96,7 +96,7 @@ public class EntropicStabilizerEntity extends BlockEntity implements Implemented public void setFacing(Direction newFacing) { this.facing = newFacing; // sync to blockstate for rendering - if (world != null && !world.isClient) { + if (world != null && !world.isClient()) { world.setBlockState(pos, getCachedState().with(EntropicStabilizer.FACING, newFacing), 3); markDirty(); } diff --git a/src/main/java/com/acethewildfire/acesbs/effect/BrickedUpEffect.java b/src/main/java/com/acethewildfire/acesbs/effect/BrickedUpEffect.java index fddfdde..524a202 100644 --- a/src/main/java/com/acethewildfire/acesbs/effect/BrickedUpEffect.java +++ b/src/main/java/com/acethewildfire/acesbs/effect/BrickedUpEffect.java @@ -25,7 +25,7 @@ public class BrickedUpEffect extends StatusEffect { world.playSound(entity, entity.getBlockPos(), ModSounds.BRICKED_UP, SoundCategory.PLAYERS, 2f, 1f); } else if(durationLeft > idealLen - 120){ - float p = entity.getWorld().getBlockState(entity.getBlockPos()).getBlock().getSlipperiness(); + float p = world.getBlockState(entity.getBlockPos()).getBlock().getSlipperiness(); float f = entity.isOnGround() ? p * 0.91F : 0.91F; entity.travel(entity.getMovement()); Vec3d vec3d6 = entity.getVelocity(); @@ -51,7 +51,7 @@ public class BrickedUpEffect extends StatusEffect { // world.playSound(entity, entity.getBlockPos(), ModSounds.FART, SoundCategory.PLAYERS, 5f, 1f); // } else { - float p = entity.getWorld().getBlockState(entity.getBlockPos()).getBlock().getSlipperiness(); + float p = world.getBlockState(entity.getBlockPos()).getBlock().getSlipperiness(); float f = entity.isOnGround() ? p * 0.91F : 0.91F; entity.travel(entity.getMovement()); Vec3d vec3d6 = entity.getVelocity();; diff --git a/src/main/java/com/acethewildfire/acesbs/effect/CigaretteEffect.java b/src/main/java/com/acethewildfire/acesbs/effect/CigaretteEffect.java index 1671369..05d5ccc 100644 --- a/src/main/java/com/acethewildfire/acesbs/effect/CigaretteEffect.java +++ b/src/main/java/com/acethewildfire/acesbs/effect/CigaretteEffect.java @@ -18,7 +18,7 @@ public class CigaretteEffect extends StatusEffect { if (effect == null) return true; // When 1 tick remains, it's about to end - if (effect.getDuration() <= 1 && !entity.getWorld().isClient()) { + if (effect.getDuration() <= 1 && !world.isClient()) { // Apply new effect entity.addStatusEffect(new StatusEffectInstance( @@ -27,7 +27,7 @@ public class CigaretteEffect extends StatusEffect { 0 // amplifier )); } else { - if (!entity.getWorld().isClient()) { + if (!world.isClient()) { entity.removeStatusEffect(ModEffects.JITTERY); entity.removeStatusEffect(ModEffects.WITHDRAWAL); } diff --git a/src/main/java/com/acethewildfire/acesbs/effect/InfernalFireEffect.java b/src/main/java/com/acethewildfire/acesbs/effect/InfernalFireEffect.java index 6fdf43d..149d7dd 100644 --- a/src/main/java/com/acethewildfire/acesbs/effect/InfernalFireEffect.java +++ b/src/main/java/com/acethewildfire/acesbs/effect/InfernalFireEffect.java @@ -25,7 +25,7 @@ public class InfernalFireEffect extends StatusEffect { // double randomVelocityY = r.nextDouble(0.5, 1.0); // double randomVelocityZ = r.nextDouble(-0.5, 0.5); - if (!world.isClient) { + if (!world.isClient()) { ((ServerWorld) world).spawnParticles( ParticleTypes.CAMPFIRE_COSY_SMOKE, entity.getX(), diff --git a/src/main/java/com/acethewildfire/acesbs/effect/JitteryEffect.java b/src/main/java/com/acethewildfire/acesbs/effect/JitteryEffect.java index c3bb452..478d232 100644 --- a/src/main/java/com/acethewildfire/acesbs/effect/JitteryEffect.java +++ b/src/main/java/com/acethewildfire/acesbs/effect/JitteryEffect.java @@ -51,7 +51,7 @@ public class JitteryEffect extends StatusEffect { } // When 1 tick remains, it's about to end - if (effect.getDuration() == 1 && !entity.getWorld().isClient()) { + if (effect.getDuration() == 1 && !world.isClient()) { // Apply new effect entity.addStatusEffect(new StatusEffectInstance( diff --git a/src/main/java/com/acethewildfire/acesbs/entity/ModEntities.java b/src/main/java/com/acethewildfire/acesbs/entity/ModEntities.java index 4182026..2146ff5 100644 --- a/src/main/java/com/acethewildfire/acesbs/entity/ModEntities.java +++ b/src/main/java/com/acethewildfire/acesbs/entity/ModEntities.java @@ -52,7 +52,7 @@ public class ModEntities { UseEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> { - if (world.isClient) return ActionResult.PASS; + if (world.isClient()) return ActionResult.PASS; if (!(entity instanceof SkeletonEntity skeleton)) return ActionResult.PASS; diff --git a/src/main/java/com/acethewildfire/acesbs/entity/client/CombustibleLemonRenderer.java b/src/main/java/com/acethewildfire/acesbs/entity/client/CombustibleLemonRenderer.java index f5bdb38..e54bd69 100644 --- a/src/main/java/com/acethewildfire/acesbs/entity/client/CombustibleLemonRenderer.java +++ b/src/main/java/com/acethewildfire/acesbs/entity/client/CombustibleLemonRenderer.java @@ -5,10 +5,12 @@ import com.acethewildfire.acesbs.entity.custom.CombustibleLemonEntity; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.command.OrderedRenderCommandQueue; import net.minecraft.client.render.entity.EntityRenderer; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.state.EntityRenderState; import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.render.state.CameraRenderState; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; @@ -28,9 +30,8 @@ public class CombustibleLemonRenderer extends EntityRenderer new Item(setting) { @Override public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent displayComponent, Consumer textConsumer, TooltipType type) { - if(!Screen.hasShiftDown()){ + if(!MinecraftClient.getInstance().isShiftPressed()){ textConsumer.accept(Text.translatable("tooltip.acesbs.generic.shift_up")); } else { @@ -116,7 +117,7 @@ public class ModItems { @Override public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent displayComponent, Consumer textConsumer, TooltipType type) { - if(!Screen.hasShiftDown()){ + if(!MinecraftClient.getInstance().isShiftPressed()){ textConsumer.accept(Text.translatable("tooltip.acesbs.generic.shift_up")); } else { @@ -154,7 +155,7 @@ public class ModItems { .build())){ @Override public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent displayComponent, Consumer textConsumer, TooltipType type) { - if(!Screen.hasShiftDown()){ + if(!MinecraftClient.getInstance().isShiftPressed()){ textConsumer.accept(Text.translatable("tooltip.acesbs.berserkers_pauldron_desc")); textConsumer.accept(Text.translatable("tooltip.acesbs.generic.shift_more")); } @@ -173,7 +174,7 @@ public class ModItems { .maxDamage(6)){ @Override public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent displayComponent, Consumer textConsumer, TooltipType type) { - if(!Screen.hasShiftDown()){ + if(!MinecraftClient.getInstance().isShiftPressed()){ textConsumer.accept(Text.translatable("tooltip.acesbs.sovs_plate_carrier_desc")); textConsumer.accept(Text.translatable("tooltip.acesbs.generic.shift_more")); } @@ -192,7 +193,7 @@ public class ModItems { .maxDamage(EquipmentType.BOOTS.getMaxDamage(15))){ @Override public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent displayComponent, Consumer textConsumer, TooltipType type) { - if(!Screen.hasShiftDown()){ + if(!MinecraftClient.getInstance().isShiftPressed()){ textConsumer.accept(Text.translatable("tooltip.acesbs.wildfire_boots_desc")); textConsumer.accept(Text.translatable("tooltip.acesbs.generic.shift_more")); } @@ -216,9 +217,9 @@ public class ModItems { public static final Item AQUARIUM_GRAVEL = registerItem("aquarium_gravel", setting -> new AquariumGravel(setting.maxCount(1))); public static final Item FREN_SPAWN_EGG = registerItem("fren_spawn_egg", - setting -> new SpawnEggItem(ModEntities.FREN, setting)); + setting -> new SpawnEggItem(setting.spawnEgg(ModEntities.FREN))); public static final Item VULGAR_BONES_SPAWN_EGG = registerItem("vulgar_bones_spawn_egg", - setting -> new SpawnEggItem(ModEntities.VULGAR_BONES, setting)); + setting -> new SpawnEggItem(setting.spawnEgg(ModEntities.VULGAR_BONES))); @@ -235,7 +236,7 @@ public class ModItems { AttackEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> { // To you who reads this now, weep, as I did when I created this monster whom I have become - if (!world.isClient && entity instanceof LivingEntity target) { + if (!world.isClient() && entity instanceof LivingEntity target) { for (ItemStack stack : player.getInventory().getMainStacks()) { if (stack.isOf(ModItems.COMMAND_CORE)) { if (Boolean.TRUE.equals(stack.get(ModDataComponentTypes.COMMAND_ACTIVE))){ diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/BubblePipe.java b/src/main/java/com/acethewildfire/acesbs/item/custom/BubblePipe.java index a9da9f1..427e46a 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/BubblePipe.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/BubblePipe.java @@ -58,7 +58,7 @@ public class BubblePipe extends Item { public void usageTick(World world, LivingEntity user, ItemStack stack, int remainingUseTicks) { super.usageTick(world, user, stack, remainingUseTicks); - if (world.isClient) { + if (world.isClient()) { // Direction player is looking Vec3d look = user.getRotationVec(1.0f); @@ -83,7 +83,7 @@ public class BubblePipe extends Item { } // Serverside code - if (!world.isClient){ + if (!world.isClient()){ if (remainingUseTicks % 40 == 0) { world.playSound( null, @@ -111,7 +111,7 @@ public class BubblePipe extends Item { player.getItemCooldownManager().set(stack, 2400); stack.decrement(1); - if (!world.isClient) { + if (!world.isClient()) { player.incrementStat(ModStats.CIGARETTES_USED); } } diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/Cigarette.java b/src/main/java/com/acethewildfire/acesbs/item/custom/Cigarette.java index b431034..58f992a 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/Cigarette.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/Cigarette.java @@ -59,7 +59,7 @@ public class Cigarette extends Item { public void usageTick(World world, LivingEntity user, ItemStack stack, int remainingUseTicks) { super.usageTick(world, user, stack, remainingUseTicks); - if (world.isClient) { + if (world.isClient()) { // Direction player is looking Vec3d look = user.getRotationVec(1.0f); @@ -87,7 +87,7 @@ public class Cigarette extends Item { } // Serverside code - if (!world.isClient){ + if (!world.isClient()){ if (remainingUseTicks % 40 == 0) { world.playSound( null, @@ -116,7 +116,7 @@ public class Cigarette extends Item { player.getItemCooldownManager().set(stack, 2400); stack.decrement(1); - if (!world.isClient) { + if (!world.isClient()) { player.incrementStat(ModStats.CIGARETTES_USED); player.incrementStat(Stats.USED.getOrCreateStat(ModItems.CIGARETTE)); if (player instanceof ServerPlayerEntity s_player){ diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/CigaretteFunny.java b/src/main/java/com/acethewildfire/acesbs/item/custom/CigaretteFunny.java index 0db6c32..2f69b55 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/CigaretteFunny.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/CigaretteFunny.java @@ -54,7 +54,7 @@ public class CigaretteFunny extends Item { } if (user instanceof PlayerEntity player) { - if (!world.isClient) { + if (!world.isClient()) { player.incrementStat(ModStats.CIGARETTES_USED); player.incrementStat(Stats.USED.getOrCreateStat(ModItems.CIGARETTE_FUNNY)); if (player instanceof ServerPlayerEntity s_player){ @@ -86,7 +86,7 @@ public class CigaretteFunny extends Item { public void usageTick(World world, LivingEntity user, ItemStack stack, int remainingUseTicks) { super.usageTick(world, user, stack, remainingUseTicks); - if (world.isClient) { + if (world.isClient()) { if (activeSound == null) { activeSound = new PlayerAttachedSound( @@ -121,7 +121,7 @@ public class CigaretteFunny extends Item { } // Serverside code - if (!world.isClient) { + if (!world.isClient()) { // if (remainingUseTicks % 40 == 0) { // world.playSound( // null, @@ -149,7 +149,7 @@ public class CigaretteFunny extends Item { player.getItemCooldownManager().set(stack, 2400); stack.decrement(1); - if (!world.isClient) { + if (!world.isClient()) { player.incrementStat(ModStats.CIGARETTES_USED); } } diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/CigaretteLemon.java b/src/main/java/com/acethewildfire/acesbs/item/custom/CigaretteLemon.java index da34666..906f764 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/CigaretteLemon.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/CigaretteLemon.java @@ -59,7 +59,7 @@ public class CigaretteLemon extends Item { public void usageTick(World world, LivingEntity user, ItemStack stack, int remainingUseTicks) { super.usageTick(world, user, stack, remainingUseTicks); - if (world.isClient) { + if (world.isClient()) { // Direction player is looking Vec3d look = user.getRotationVec(1.0f); @@ -87,7 +87,7 @@ public class CigaretteLemon extends Item { } // Serverside code - if (!world.isClient){ + if (!world.isClient()){ if (remainingUseTicks % 40 == 0) { world.playSound( null, @@ -146,7 +146,7 @@ public class CigaretteLemon extends Item { player.getItemCooldownManager().set(stack, 2400); stack.decrement(1); - if (!world.isClient) { + if (!world.isClient()) { player.incrementStat(ModStats.CIGARETTES_USED); player.incrementStat(Stats.USED.getOrCreateStat(ModItems.CIGARETTE_LEMON)); } diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/CombustibleLemon.java b/src/main/java/com/acethewildfire/acesbs/item/custom/CombustibleLemon.java index 9482594..da23f7f 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/CombustibleLemon.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/CombustibleLemon.java @@ -20,7 +20,7 @@ public class CombustibleLemon extends Item { public ActionResult use(World world, PlayerEntity user, Hand hand) { ItemStack itemStack = user.getStackInHand(hand); world.playSound(null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5f, 0.4f / (world.getRandom().nextFloat() * 0.4f + 0.8f)); - if (!world.isClient) { + if (!world.isClient()) { CombustibleLemonEntity c_lemon = new CombustibleLemonEntity(world, user); c_lemon.setVelocity(user, user.getPitch(), user.getYaw(), 0.0f, 1.5f, 0f); world.spawnEntity(c_lemon); diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/CommandCore.java b/src/main/java/com/acethewildfire/acesbs/item/custom/CommandCore.java index 6f07f96..3422fae 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/CommandCore.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/CommandCore.java @@ -43,7 +43,7 @@ public class CommandCore extends Item { itemStack.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true); } } else { - if (world.isClient) { + if (world.isClient()) { // Open the selection screen client-side MinecraftClient.getInstance().setScreen( new CommandCoreScreen(itemStack) @@ -57,7 +57,7 @@ public class CommandCore extends Item { @Override public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent displayComponent, Consumer textConsumer, TooltipType type) { - if(!Screen.hasShiftDown()){ + if(!MinecraftClient.getInstance().isShiftPressed()){ textConsumer.accept(Text.translatable("tooltip.acesbs.generic.shift_up")); } else { textConsumer.accept(Text.translatable("tooltip.acesbs.command_core")); diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/Wand.java b/src/main/java/com/acethewildfire/acesbs/item/custom/Wand.java index 928c862..a642583 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/Wand.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/Wand.java @@ -4,6 +4,7 @@ import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.component.ModDataComponentTypes; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.component.type.TooltipDisplayComponent; import net.minecraft.entity.EquipmentSlot; @@ -59,7 +60,7 @@ public class Wand extends Item { @Override public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent displayComponent, Consumer textConsumer, TooltipType type) { - if(!Screen.hasShiftDown()){ + if(!MinecraftClient.getInstance().isShiftPressed()){ textConsumer.accept(Text.translatable("tooltip.acesbs.generic.shift_up")); } else { textConsumer.accept(Text.translatable("tooltip.acesbs.wand")); diff --git a/src/main/java/com/acethewildfire/acesbs/mixin/CreeperInteractMixin.java b/src/main/java/com/acethewildfire/acesbs/mixin/CreeperInteractMixin.java index f560c60..6053b31 100644 --- a/src/main/java/com/acethewildfire/acesbs/mixin/CreeperInteractMixin.java +++ b/src/main/java/com/acethewildfire/acesbs/mixin/CreeperInteractMixin.java @@ -23,9 +23,9 @@ public abstract class CreeperInteractMixin { // === Here is the item check === if (itemStack.isOf(ModItems.STABLE_ENTROPY)) { CreeperEntity creeper = (CreeperEntity) (Object) this; - World world = creeper.getWorld(); + World world = creeper.getEntityWorld(); - if (!world.isClient) { + if (!world.isClient()) { CreeperTransformAccess access = (CreeperTransformAccess) creeper; diff --git a/src/main/java/com/acethewildfire/acesbs/mixin/CreeperTickMixin.java b/src/main/java/com/acethewildfire/acesbs/mixin/CreeperTickMixin.java index b45dc08..4cf6c39 100644 --- a/src/main/java/com/acethewildfire/acesbs/mixin/CreeperTickMixin.java +++ b/src/main/java/com/acethewildfire/acesbs/mixin/CreeperTickMixin.java @@ -25,7 +25,7 @@ public class CreeperTickMixin { if (!access.aces_bravo_sierra_template_1_21$isTransforming()) return; - World world = creeper.getWorld(); + World world = creeper.getEntityWorld(); ((ServerWorld) world).spawnParticles( ParticleTypes.ENCHANT, @@ -43,7 +43,7 @@ public class CreeperTickMixin { int t = access.aces_bravo_sierra_template_1_21$getTransformTimer() + 1; access.aces_bravo_sierra_template_1_21$setTransformTimer(t); - if (t >= 20 && !world.isClient) { + if (t >= 20 && !world.isClient()) { world.playSound(null, creeper.getBlockPos(), SoundEvents.ENTITY_ZOMBIE_VILLAGER_CURE, diff --git a/src/main/java/com/acethewildfire/acesbs/particle/GreenFlame.java b/src/main/java/com/acethewildfire/acesbs/particle/GreenFlame.java index 5cf1d6f..89f49c1 100644 --- a/src/main/java/com/acethewildfire/acesbs/particle/GreenFlame.java +++ b/src/main/java/com/acethewildfire/acesbs/particle/GreenFlame.java @@ -3,19 +3,18 @@ package com.acethewildfire.acesbs.particle; import net.minecraft.client.particle.*; import net.minecraft.client.world.ClientWorld; import net.minecraft.particle.SimpleParticleType; +import net.minecraft.util.math.random.Random; import org.jetbrains.annotations.Nullable; public class GreenFlame extends AbstractSlowingParticle { public GreenFlame(ClientWorld clientWorld, double x, double y, double z, SpriteProvider spriteProvider, double xSpeed, double ySpeed, double zSpeed) { - super(clientWorld, x, y, z, xSpeed, ySpeed, zSpeed); - - this.setSpriteForAge(spriteProvider); + super(clientWorld, x, y, z, xSpeed, ySpeed, zSpeed, spriteProvider.getFirst()); } @Override - public ParticleTextureSheet getType() { - return ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT; + protected RenderType getRenderType() { + return RenderType.PARTICLE_ATLAS_TRANSLUCENT; } public static class Factory implements ParticleFactory { @@ -27,7 +26,7 @@ public class GreenFlame extends AbstractSlowingParticle { @Override public @Nullable Particle createParticle(SimpleParticleType parameters, ClientWorld world, - double x, double y, double z, double velocityX, double velocityY, double velocityZ) { + double x, double y, double z, double velocityX, double velocityY, double velocityZ, Random random) { return new GreenFlame(world, x, y, z, this.spriteProvider, velocityX, velocityY, velocityZ); } } diff --git a/src/main/java/com/acethewildfire/acesbs/particle/PurpleFlame.java b/src/main/java/com/acethewildfire/acesbs/particle/PurpleFlame.java index 8584d5e..fbf5f58 100644 --- a/src/main/java/com/acethewildfire/acesbs/particle/PurpleFlame.java +++ b/src/main/java/com/acethewildfire/acesbs/particle/PurpleFlame.java @@ -3,19 +3,18 @@ package com.acethewildfire.acesbs.particle; import net.minecraft.client.particle.*; import net.minecraft.client.world.ClientWorld; import net.minecraft.particle.SimpleParticleType; +import net.minecraft.util.math.random.Random; import org.jetbrains.annotations.Nullable; public class PurpleFlame extends AbstractSlowingParticle { public PurpleFlame(ClientWorld clientWorld, double x, double y, double z, SpriteProvider spriteProvider, double xSpeed, double ySpeed, double zSpeed) { - super(clientWorld, x, y, z, xSpeed, ySpeed, zSpeed); - - this.setSpriteForAge(spriteProvider); + super(clientWorld, x, y, z, xSpeed, ySpeed, zSpeed, spriteProvider.getFirst()); } @Override - public ParticleTextureSheet getType() { - return ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT; + protected RenderType getRenderType() { + return RenderType.PARTICLE_ATLAS_TRANSLUCENT; } public static class Factory implements ParticleFactory { @@ -27,7 +26,7 @@ public class PurpleFlame extends AbstractSlowingParticle { @Override public @Nullable Particle createParticle(SimpleParticleType parameters, ClientWorld world, - double x, double y, double z, double velocityX, double velocityY, double velocityZ) { + double x, double y, double z, double velocityX, double velocityY, double velocityZ, Random random) { return new PurpleFlame(world, x, y, z, this.spriteProvider, velocityX, velocityY, velocityZ); } } diff --git a/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEntanglerScreenHandler.java b/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEntanglerScreenHandler.java index fc81381..d543944 100644 --- a/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEntanglerScreenHandler.java +++ b/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEntanglerScreenHandler.java @@ -19,7 +19,7 @@ public class EntropicEntanglerScreenHandler extends ScreenHandler { public final EntropicEntanglerEntity blockEntity; public EntropicEntanglerScreenHandler(int syncId, PlayerInventory playerInventory, BlockPos pos) { - this(syncId, playerInventory, playerInventory.player.getWorld().getBlockEntity(pos), new ArrayPropertyDelegate(4)); + this(syncId, playerInventory, playerInventory.player.getEntityWorld().getBlockEntity(pos), new ArrayPropertyDelegate(4)); } public EntropicEntanglerScreenHandler(int syncId, PlayerInventory playerInventory, BlockEntity blockEntity, PropertyDelegate arrayPropertyDelegate) { diff --git a/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEvisceratorScreenHandler.java b/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEvisceratorScreenHandler.java index fac7dac..a27998e 100644 --- a/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEvisceratorScreenHandler.java +++ b/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicEvisceratorScreenHandler.java @@ -20,7 +20,7 @@ public class EntropicEvisceratorScreenHandler extends ScreenHandler { public final EntropicEvisceratorEntity blockEntity; public EntropicEvisceratorScreenHandler(int syncId, PlayerInventory playerInventory, BlockPos pos) { - this(syncId, playerInventory, playerInventory.player.getWorld().getBlockEntity(pos), new ArrayPropertyDelegate(4)); + this(syncId, playerInventory, playerInventory.player.getEntityWorld().getBlockEntity(pos), new ArrayPropertyDelegate(4)); } public EntropicEvisceratorScreenHandler(int syncId, PlayerInventory playerInventory, BlockEntity blockEntity, PropertyDelegate arrayPropertyDelegate) { diff --git a/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicStabilizerScreenHandler.java b/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicStabilizerScreenHandler.java index 1f6790e..1e09e9b 100644 --- a/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicStabilizerScreenHandler.java +++ b/src/main/java/com/acethewildfire/acesbs/screen/custom/EntropicStabilizerScreenHandler.java @@ -21,7 +21,7 @@ public class EntropicStabilizerScreenHandler extends ScreenHandler { public final EntropicStabilizerEntity blockEntity; public EntropicStabilizerScreenHandler(int syncId, PlayerInventory playerInventory, BlockPos pos) { - this(syncId, playerInventory, playerInventory.player.getWorld().getBlockEntity(pos), new ArrayPropertyDelegate(4)); + this(syncId, playerInventory, playerInventory.player.getEntityWorld().getBlockEntity(pos), new ArrayPropertyDelegate(4)); } public EntropicStabilizerScreenHandler(int syncId, PlayerInventory playerInventory, BlockEntity blockEntity, PropertyDelegate arrayPropertyDelegate) { diff --git a/src/main/java/com/acethewildfire/acesbs/util/ConversionManager.java b/src/main/java/com/acethewildfire/acesbs/util/ConversionManager.java index 7facf3a..2ad9c6a 100644 --- a/src/main/java/com/acethewildfire/acesbs/util/ConversionManager.java +++ b/src/main/java/com/acethewildfire/acesbs/util/ConversionManager.java @@ -36,7 +36,7 @@ public class ConversionManager { conversions.add(new ConversionEntry( skeleton.getUuid(), - skeleton.getWorld().getRegistryKey(), + skeleton.getEntityWorld().getRegistryKey(), ticks )); } diff --git a/src/main/java/com/acethewildfire/acesbs/util/ModStats.java b/src/main/java/com/acethewildfire/acesbs/util/ModStats.java index ed7856c..e7012c3 100644 --- a/src/main/java/com/acethewildfire/acesbs/util/ModStats.java +++ b/src/main/java/com/acethewildfire/acesbs/util/ModStats.java @@ -28,7 +28,7 @@ public class ModStats { public static void grantAdvancement(ServerPlayerEntity player, String id) { AdvancementEntry advancement = - Objects.requireNonNull(player.getServer()).getAdvancementLoader().get(Identifier.ofVanilla(id)); + Objects.requireNonNull(player.getEntityWorld().getServer()).getAdvancementLoader().get(Identifier.ofVanilla(id)); if (advancement == null) { AcesBS.LOGGER.info("Granting null"); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1a9a8ff..9763d6e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,9 +24,6 @@ ], "client": [ "com.acethewildfire.acesbs.AcesBSClient" - ], - "rei_client": [ - "com.acethewildfire.acesbs.compat.AcesBSREIClient" ] }, "mixins": [ @@ -34,7 +31,7 @@ ], "depends": { "fabricloader": ">=0.18.4", - "minecraft": "~1.21.3", + "minecraft": "~1.21.9", "java": ">=21", "fabric-api": "*" }