Port to 1.20.5

realguyman · May 23, 2024 · ba171af · ba171af
1 parent ef6e6f2
commit ba171af
Show file tree

Hide file tree

Showing 36 changed files with 117 additions and 160 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,8 +31,8 @@ dependencies {
 
     // Local dependencies
     modLocalRuntime "com.terraformersmc:modmenu:${project.mod_menu}"
-    modLocalRuntime "maven.modrinth:lithium:${project.lithium}"
-    modLocalRuntime "dev.lambdaurora:lambdynamiclights:${project.lambdynamiclights}"
+//    modLocalRuntime "maven.modrinth:lithium:${project.lithium}"
+//    modLocalRuntime "dev.lambdaurora:lambdynamiclights:${project.lambdynamiclights}"
 //    modLocalRuntime "vazkii.patchouli:Patchouli:${project.patchouli}"
 //    modLocalRuntime "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei}"
 //    modLocalRuntime "dev.emi:emi:${project.emi}"
@@ -66,8 +66,8 @@ loom {
 java {
     withSourcesJar()
 
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
@@ -85,7 +85,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    it.options.release = 17
+    it.options.release = 21
 }
 
 modrinth {

diff --git a/gradle.properties b/gradle.properties
@@ -1,21 +1,21 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Required dependencies
-minecraft=1.20.4
-mappings=1.20.4+build.3
-fabric_loader=0.15.9
-fabric_api=0.96.11+1.20.4
-owo_lib=0.12.6+1.20.3
+minecraft=1.20.5
+mappings=1.20.5+build.1
+fabric_loader=0.15.11
+fabric_api=0.97.8+1.20.5
+owo_lib=0.12.8+1.20.5
 
 # Local dependencies
-mod_menu=9.0.0
+mod_menu=10.0.0-beta.1
 lithium=mc1.20.4-0.12.1
 lambdynamiclights=2.3.4+1.20.4-local
 patchouli=1.20.1-83-FABRIC
 rei=13.0.678
 emi=1.0.24+1.20.2+fabric
 
 # Project details
-mod_version=0.13.6+1.20.4
+mod_version=0.14.0+1.20.5
 maven_group=io.github.realguyman
 archives_base_name=totally_lit
diff --git a/src/main/java/io/github/realguyman/totally_lit/TotallyLit.java b/src/main/java/io/github/realguyman/totally_lit/TotallyLit.java
@@ -14,6 +14,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.enchantment.Enchantments;
+import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.Item;
@@ -250,7 +251,7 @@ private ActionResult igniteUnlitBlock(
             TagKey<Item> igniters
     ) {
         final ItemStack stack = player.getStackInHand(hand);
-        final boolean stackHasFireAspect = EnchantmentHelper.get(stack).containsKey(Enchantments.FIRE_ASPECT);
+        final boolean stackHasFireAspect = EnchantmentHelper.getEnchantments(stack).getEnchantments().contains(Enchantments.FIRE_ASPECT);
 
         if ((!stack.isIn(igniters) && !stackHasFireAspect) || player.isSneaking()) {
             return ActionResult.PASS;
@@ -271,7 +272,7 @@ private ActionResult igniteUnlitBlock(
                 return ActionResult.FAIL;
             }
 
-            stack.damage(1, player, playerInScope -> playerInScope.sendToolBreakStatus(hand));
+            stack.damage(1, player, EquipmentSlot.fromTypeIndex(EquipmentSlot.Type.HAND, hand.ordinal()));
             world.playSound(null, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 0.125F, world.getRandom().nextFloat() * 0.5F + 0.125F);
             return ActionResult.SUCCESS;
         }

diff --git a/src/main/java/io/github/realguyman/totally_lit/datagen/BlockLootTableDatagen.java b/src/main/java/io/github/realguyman/totally_lit/datagen/BlockLootTableDatagen.java
@@ -4,10 +4,13 @@
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
 import net.minecraft.block.Block;
+import net.minecraft.registry.RegistryWrapper;
+
+import java.util.concurrent.CompletableFuture;
 
 public class BlockLootTableDatagen extends FabricBlockLootTableProvider {
-    public BlockLootTableDatagen(FabricDataOutput dataOutput) {
-        super(dataOutput);
+    public BlockLootTableDatagen(FabricDataOutput dataOutput, CompletableFuture<RegistryWrapper.WrapperLookup> registryLookup) {
+        super(dataOutput, registryLookup);
     }
 
     @Override

diff --git a/...mixin/campfire/ExtinguishInRainMixin.java → ...it/mixin/campfire/AbstractBlockMixin.java b/...mixin/campfire/ExtinguishInRainMixin.java → ...it/mixin/campfire/AbstractBlockMixin.java
@@ -21,9 +21,15 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(AbstractBlock.class)
-public abstract class ExtinguishInRainMixin {
+public abstract class AbstractBlockMixin {
+    @Inject(method = "hasRandomTicks", at = @At("HEAD"), cancellable = true)
+    private void hasRandomTicks(BlockState state, CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(true);
+    }
+
     @Inject(method = "randomTick", at = @At("HEAD"))
     private void extinguish(BlockState state, ServerWorld world, BlockPos pos, Random random, CallbackInfo ci) {
         if (state.isIn(BlockTags.CAMPFIRES)) {

diff --git a/...xin/campfire/TrackTicksBurntForMixin.java → ...in/campfire/CampfireBlockEntityMixin.java b/...xin/campfire/TrackTicksBurntForMixin.java → ...in/campfire/CampfireBlockEntityMixin.java
@@ -9,6 +9,7 @@
 import net.minecraft.entity.passive.VillagerEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.predicate.entity.EntityPredicates;
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.property.Properties;
@@ -23,7 +24,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(CampfireBlockEntity.class)
-public abstract class TrackTicksBurntForMixin implements CampfireBlockEntityAccess {
+public abstract class CampfireBlockEntityMixin implements CampfireBlockEntityAccess {
     @Unique
     private int ticksBurntFor = 0;
 
@@ -36,14 +37,14 @@ public abstract class TrackTicksBurntForMixin implements CampfireBlockEntityAcce
     }
 
     @Inject(method = "readNbt", at = @At("RETURN"))
-    private void readBurnDurationFromNbt(NbtCompound nbt, CallbackInfo ci) {
+    private void readBurnDurationFromNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup, CallbackInfo ci) {
         if (nbt.contains("ticksBurntFor")) {
             ticksBurntFor = nbt.getInt("ticksBurntFor");
         }
     }
 
     @Inject(method = "writeNbt", at = @At("RETURN"))
-    private void writeTicksBurntForToNbt(NbtCompound nbt, CallbackInfo ci) {
+    private void writeTicksBurntForToNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup, CallbackInfo ci) {
         nbt.putInt("ticksBurntFor", ticksBurntFor);
     }
 

diff --git a/...ampfire/DefaultStateAndIgnitionMixin.java → ...it/mixin/campfire/CampfireBlockMixin.java b/...ampfire/DefaultStateAndIgnitionMixin.java → ...it/mixin/campfire/CampfireBlockMixin.java
@@ -8,55 +8,49 @@
 import net.minecraft.block.CampfireBlock;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.enchantment.Enchantments;
+import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
-import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
+import net.minecraft.util.ItemActionResult;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(CampfireBlock.class)
-public abstract class DefaultStateAndIgnitionMixin extends BlockWithEntity {
-    protected DefaultStateAndIgnitionMixin(Settings settings) {
+public abstract class CampfireBlockMixin extends BlockWithEntity {
+    protected CampfireBlockMixin(Settings settings) {
         super(settings);
     }
 
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void litStateWhenInitialized(boolean emitsParticles, int fireDamage, Settings settings, CallbackInfo ci) {
-        setDefaultState(getDefaultState().with(CampfireBlock.LIT, TotallyLit.CONFIG.campfires.defaultLitStateWhenPlaced()));
-    }
-
     @ModifyReturnValue(method = "getPlacementState", at = @At("RETURN"))
     private BlockState litStateWhenPlaced(BlockState original) {
         return original.with(CampfireBlock.LIT, TotallyLit.CONFIG.campfires.defaultLitStateWhenPlaced());
     }
 
-    @Inject(method = "onUse", at = @At("HEAD"), cancellable = true)
-    private void ignite(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable<ActionResult> cir) {
-        final ItemStack stack = player.getStackInHand(hand);
+    @Inject(method = "onUseWithItem", at = @At("HEAD"), cancellable = true)
+    private void ignite(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable<ItemActionResult> cir) {
         final boolean canBeIgnited = CampfireBlock.canBeLit(state);
-        final boolean stackHasFireAspect = EnchantmentHelper.get(stack).containsKey(Enchantments.FIRE_ASPECT);
+        final boolean stackHasFireAspect = EnchantmentHelper.getEnchantments(stack).getEnchantments().contains(Enchantments.FIRE_ASPECT);
 
         if ((!stack.isIn(TagRegistry.CAMPFIRE_IGNITER_ITEMS) && !stackHasFireAspect) || !canBeIgnited) {
             return;
         }
 
         if (!world.setBlockState(pos, state.with(CampfireBlock.LIT, true))) {
-            cir.setReturnValue(ActionResult.FAIL);
+            cir.setReturnValue(ItemActionResult.FAIL);
         }
 
-        stack.damage(1, player, playerInScope -> playerInScope.sendToolBreakStatus(hand));
+        stack.damage(1, player, EquipmentSlot.fromTypeIndex(EquipmentSlot.Type.HAND, hand.ordinal()));
         world.playSound(null, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 0.125F, world.getRandom().nextFloat() * 0.5F + 0.125F);
         player.incrementStat(Stats.INTERACT_WITH_CAMPFIRE);
-        cir.setReturnValue(ActionResult.SUCCESS);
+        cir.setReturnValue(ItemActionResult.SUCCESS);
     }
 }
diff --git a/src/main/java/io/github/realguyman/totally_lit/mixin/campfire/CanExtinguishInRainMixin.java b/src/main/java/io/github/realguyman/totally_lit/mixin/campfire/CanExtinguishInRainMixin.java
diff --git a/...tally_lit/mixin/candle/ScheduleMixin.java → ..._lit/mixin/candle/AbstractBlockMixin.java b/...tally_lit/mixin/candle/ScheduleMixin.java → ..._lit/mixin/candle/AbstractBlockMixin.java
@@ -16,10 +16,16 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(AbstractBlock.class)
-public abstract class ScheduleMixin {
-    @Shadow public abstract void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random);
+public abstract class AbstractBlockMixin {
+    @Shadow protected abstract void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random);
+
+    @Inject(method = "hasRandomTicks", at = @At("HEAD"), cancellable = true)
+    private void canSchedule(BlockState state, CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(true);
+    }
 
     @Inject(method = "randomTick", at = @At("HEAD"))
     private void schedule(BlockState state, ServerWorld world, BlockPos pos, Random random, CallbackInfo ci) {

diff --git a/...ixin/candle/ClearAndCanScheduleMixin.java → .../totally_lit/mixin/candle/BlockMixin.java b/...ixin/candle/ClearAndCanScheduleMixin.java → .../totally_lit/mixin/candle/BlockMixin.java
@@ -1,6 +1,5 @@
 package io.github.realguyman.totally_lit.mixin.candle;
 
-import io.github.realguyman.totally_lit.TotallyLit;
 import net.minecraft.block.*;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.world.ServerWorld;
@@ -13,21 +12,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Block.class)
-public abstract class ClearAndCanScheduleMixin {
-    @Inject(method = "hasRandomTicks", at = @At("HEAD"), cancellable = true)
-    private void canSchedule(BlockState state, CallbackInfoReturnable<Boolean> cir) {
-        if (!AbstractCandleBlock.isLitCandle(state)) {
-            return;
-        }
-
-        boolean extinguishOverTime = TotallyLit.CONFIG.candles.extinguishOverTime();
-        boolean extinguishInRain = TotallyLit.CONFIG.candles.extinguishInRainChance() > 0F;
-
-        if (extinguishOverTime || extinguishInRain) {
-            cir.setReturnValue(true);
-        }
-    }
-
+public abstract class BlockMixin {
     @Inject(method = "onBreak", at = @At("HEAD"))
     private void clearNextScheduledExtinguish(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfoReturnable<BlockState> cir) {
         if (!world.isClient() && AbstractCandleBlock.isLitCandle(state)) {

diff --git a/...t/mixin/jack_o_lantern/ScheduleMixin.java → ...in/jack_o_lantern/AbstractBlockMixin.java b/...t/mixin/jack_o_lantern/ScheduleMixin.java → ...in/jack_o_lantern/AbstractBlockMixin.java
@@ -17,10 +17,16 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(AbstractBlock.class)
-public abstract class ScheduleMixin {
-    @Shadow public abstract void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, net.minecraft.util.math.random.Random random);
+public abstract class AbstractBlockMixin {
+    @Shadow protected abstract void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, net.minecraft.util.math.random.Random random);
+
+    @Inject(method = "hasRandomTicks", at = @At("HEAD"), cancellable = true)
+    private void canSchedule(BlockState state, CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(true);
+    }
 
     @Inject(method = "randomTick", at = @At("HEAD"))
     private void schedule(BlockState state, ServerWorld world, BlockPos pos, Random random, CallbackInfo ci) {

diff --git a/...k_o_lantern/ClearAndCanScheduleMixin.java → ..._lit/mixin/jack_o_lantern/BlockMixin.java b/...k_o_lantern/ClearAndCanScheduleMixin.java → ..._lit/mixin/jack_o_lantern/BlockMixin.java
@@ -13,21 +13,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Block.class)
-public abstract class ClearAndCanScheduleMixin {
-    @Inject(method = "hasRandomTicks", at = @At("HEAD"), cancellable = true)
-    private void canSchedule(BlockState state, CallbackInfoReturnable<Boolean> cir) {
-        if (!TotallyLit.JACK_O_LANTERN_MAP.containsKey(state.getBlock())) {
-            return;
-        }
-
-        final boolean canExtinguishOverTime = TotallyLit.CONFIG.jackOLanterns.extinguishOverTime();
-        final boolean canExtinguishInRain = TotallyLit.CONFIG.jackOLanterns.extinguishInRainChance() > 0F;
-
-        if (canExtinguishOverTime || canExtinguishInRain) {
-            cir.setReturnValue(true);
-        }
-    }
-
+public abstract class BlockMixin {
     @Inject(method = "onBreak", at = @At("HEAD"))
     private void clearNextScheduledExtinguish(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfoReturnable<BlockState> cir) {
         if (!world.isClient() && TotallyLit.JACK_O_LANTERN_MAP.containsKey(state.getBlock())) {

diff --git a/...ally_lit/mixin/lantern/ScheduleMixin.java → ...lit/mixin/lantern/AbstractBlockMixin.java b/...ally_lit/mixin/lantern/ScheduleMixin.java → ...lit/mixin/lantern/AbstractBlockMixin.java
@@ -3,10 +3,8 @@
 import io.github.realguyman.totally_lit.TotallyLit;
 import io.github.realguyman.totally_lit.registry.TagRegistry;
 import net.minecraft.block.*;
-import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.VillagerEntity;
 import net.minecraft.predicate.entity.EntityPredicates;
-import net.minecraft.registry.tag.EntityTypeTags;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
@@ -20,10 +18,16 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(AbstractBlock.class)
-public abstract class ScheduleMixin {
-    @Shadow public abstract void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, net.minecraft.util.math.random.Random random);
+public abstract class AbstractBlockMixin {
+    @Shadow protected abstract void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, net.minecraft.util.math.random.Random random);
+
+    @Inject(method = "hasRandomTicks", at = @At("HEAD"), cancellable = true)
+    private void canSchedule(BlockState state, CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(true);
+    }
 
     @Inject(method = "randomTick", at = @At("HEAD"))
     private void schedule(BlockState state, ServerWorld world, BlockPos pos, Random random, CallbackInfo ci) {

diff --git a/...xin/lantern/ClearAndCanScheduleMixin.java → ...totally_lit/mixin/lantern/BlockMixin.java b/...xin/lantern/ClearAndCanScheduleMixin.java → ...totally_lit/mixin/lantern/BlockMixin.java
@@ -21,21 +21,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Block.class)
-public abstract class ClearAndCanScheduleMixin {
-    @Inject(method = "hasRandomTicks", at = @At("HEAD"), cancellable = true)
-    private void canSchedule(BlockState state, CallbackInfoReturnable<Boolean> cir) {
-        if (!TotallyLit.LANTERN_MAP.containsKey(state.getBlock())) {
-            return;
-        }
-
-        final boolean canExtinguishInRain = TotallyLit.CONFIG.lanterns.extinguishInRainChance() > 0F;
-        final boolean canExtinguishOverTime = TotallyLit.CONFIG.lanterns.extinguishOverTime();
-
-        if (canExtinguishOverTime || canExtinguishInRain) {
-            cir.setReturnValue(true);
-        }
-    }
-
+public abstract class BlockMixin {
     @Inject(method = "onPlaced", at = @At("HEAD"))
     private void extinguishWhenPlacedInWater(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack, CallbackInfo ci) {
         if (world.isClient() || !state.contains(Properties.WATERLOGGED) || !state.get(Properties.WATERLOGGED)) {