From 789f04d8ee7732a6310b35eabb31c9de42ee5f03 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Wed, 12 Jun 2024 21:53:30 -0400 Subject: [PATCH] consolidated a couple more expect platform methods into AntimatterPlatformUtils --- .../muramasa/antimatter/tool/ToolUtils.java | 18 --------------- .../tool/armor/AntimatterArmorType.java | 1 - .../tool/behaviour/BehaviourBlockTilling.java | 5 +++-- .../tool/behaviour/BehaviourLogStripping.java | 3 ++- .../tool/behaviour/BehaviourUtil.java | 21 ------------------ .../behaviour/BehaviourVanillaShovel.java | 5 +++-- .../util/AntimatterPlatformUtils.java | 11 ++++++++++ .../behaviour/fabric/BehaviourUtilImpl.java | 19 ---------------- .../fabric/AntimatterPlatformUtilsImpl.java | 10 +++++++++ .../behaviour/forge/BehaviourUtilImpl.java | 22 ------------------- .../forge/AntimatterPlatformUtilsImpl.java | 11 ++++++++++ 11 files changed, 40 insertions(+), 86 deletions(-) delete mode 100644 common/src/main/java/muramasa/antimatter/tool/ToolUtils.java delete mode 100644 common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourUtil.java delete mode 100644 fabric/src/main/java/muramasa/antimatter/tool/behaviour/fabric/BehaviourUtilImpl.java delete mode 100644 forge/src/main/java/muramasa/antimatter/tool/behaviour/forge/BehaviourUtilImpl.java diff --git a/common/src/main/java/muramasa/antimatter/tool/ToolUtils.java b/common/src/main/java/muramasa/antimatter/tool/ToolUtils.java deleted file mode 100644 index 751da6cd5..000000000 --- a/common/src/main/java/muramasa/antimatter/tool/ToolUtils.java +++ /dev/null @@ -1,18 +0,0 @@ -package muramasa.antimatter.tool; - -import dev.architectury.injectables.annotations.ExpectPlatform; -import muramasa.antimatter.util.AntimatterPlatformUtils; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Tier; -import net.minecraft.world.level.block.state.BlockState; - -public class ToolUtils { - public static Item.Properties getToolProperties(CreativeModeTab group, boolean repairable){ - return AntimatterPlatformUtils.getToolProperties(group, repairable); - } - - public static boolean isCorrectTierForDrops(Tier tier, BlockState state){ - return AntimatterPlatformUtils.isCorrectTierForDrops(tier, state); - } -} diff --git a/common/src/main/java/muramasa/antimatter/tool/armor/AntimatterArmorType.java b/common/src/main/java/muramasa/antimatter/tool/armor/AntimatterArmorType.java index e04a99276..77fe15622 100644 --- a/common/src/main/java/muramasa/antimatter/tool/armor/AntimatterArmorType.java +++ b/common/src/main/java/muramasa/antimatter/tool/armor/AntimatterArmorType.java @@ -8,7 +8,6 @@ import muramasa.antimatter.material.MaterialTags; import muramasa.antimatter.registration.ISharedAntimatterObject; import muramasa.antimatter.tool.IAntimatterArmor; -import muramasa.antimatter.tool.ToolUtils; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.Utils; import net.minecraft.network.chat.Component; diff --git a/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourBlockTilling.java b/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourBlockTilling.java index aa76db2cc..279ed5f3e 100644 --- a/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourBlockTilling.java +++ b/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourBlockTilling.java @@ -6,6 +6,7 @@ import muramasa.antimatter.behaviour.IItemUse; import muramasa.antimatter.tool.IAntimatterTool; import muramasa.antimatter.tool.IBasicAntimatterTool; +import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.Utils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -42,7 +43,7 @@ public InteractionResult onItemUse(IBasicAntimatterTool instance, UseOnContext c if (c.getClickedFace() != Direction.DOWN && c.getLevel().isEmptyBlock(c.getClickedPos().above())) { BlockState blockstate = getToolModifiedState(c.getLevel().getBlockState(c.getClickedPos()), c, "hoe_dig"); if (blockstate == null) return InteractionResult.PASS; - if (BehaviourUtil.onUseHoe(c)) return InteractionResult.PASS; + if (AntimatterPlatformUtils.onUseHoe(c)) return InteractionResult.PASS; Utils.damageStack(c.getItemInHand(), c.getPlayer()); SoundEvent soundEvent = instance.getAntimatterToolType().getUseSound() == null ? SoundEvents.HOE_TILL : instance.getAntimatterToolType().getUseSound(); c.getLevel().playSound(c.getPlayer(), c.getClickedPos(), soundEvent, SoundSource.BLOCKS, 1.0F, 1.0F); @@ -53,7 +54,7 @@ public InteractionResult onItemUse(IBasicAntimatterTool instance, UseOnContext c } private BlockState getToolModifiedState(BlockState originalState, UseOnContext context, String action) { - BlockState eventState = BehaviourUtil.onToolUse(originalState, context, action); + BlockState eventState = AntimatterPlatformUtils.onToolUse(originalState, context, action); return eventState != originalState ? eventState : TILLING_MAP.get(originalState); } diff --git a/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourLogStripping.java b/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourLogStripping.java index 1368919e7..c418fbc4d 100644 --- a/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourLogStripping.java +++ b/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourLogStripping.java @@ -5,6 +5,7 @@ import muramasa.antimatter.behaviour.IItemUse; import muramasa.antimatter.tool.IAntimatterTool; import muramasa.antimatter.tool.IBasicAntimatterTool; +import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.Utils; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; @@ -56,7 +57,7 @@ public InteractionResult onItemUse(IBasicAntimatterTool instance, UseOnContext c } private BlockState getToolModifiedState(BlockState originalState, UseOnContext context, String action) { - BlockState eventState = BehaviourUtil.onToolUse(originalState, context, action); + BlockState eventState = AntimatterPlatformUtils.onToolUse(originalState, context, action); if (eventState != originalState) return eventState; Block stripped = STRIPPING_MAP.get(originalState.getBlock()); if (stripped == null) return null; diff --git a/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourUtil.java b/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourUtil.java deleted file mode 100644 index cf9ce78db..000000000 --- a/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -package muramasa.antimatter.tool.behaviour; - -import dev.architectury.injectables.annotations.ExpectPlatform; -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -public class BehaviourUtil { - @ExpectPlatform - public static BlockState onToolUse(BlockState originalState, UseOnContext context, String action){ - throw new AssertionError(); - } - - @ExpectPlatform - public static boolean onUseHoe(UseOnContext context){ - throw new AssertionError(); - } -} diff --git a/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourVanillaShovel.java b/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourVanillaShovel.java index 3ac8d5a6a..60c298079 100644 --- a/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourVanillaShovel.java +++ b/common/src/main/java/muramasa/antimatter/tool/behaviour/BehaviourVanillaShovel.java @@ -4,6 +4,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import muramasa.antimatter.behaviour.IItemUse; import muramasa.antimatter.tool.IBasicAntimatterTool; +import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.Utils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -66,7 +67,7 @@ public InteractionResult onItemUse(IBasicAntimatterTool instance, UseOnContext c } private BlockState getToolModifiedState(BlockState originalState, UseOnContext context, String action) { - BlockState eventState = BehaviourUtil.onToolUse(originalState, context, action); + BlockState eventState = AntimatterPlatformUtils.onToolUse(originalState, context, action); if (eventState != originalState) return eventState; Block flattened = FLATTENING_MAP.get(originalState.getBlock()); if (flattened == null) return null; @@ -80,7 +81,7 @@ private BlockState getToolModifiedState(BlockState originalState, UseOnContext c } private BlockState getFireModifiedState(BlockState originalState, BlockState changedState, UseOnContext context, String action) { - BlockState eventState = BehaviourUtil.onToolUse(originalState, context, action); + BlockState eventState = AntimatterPlatformUtils.onToolUse(originalState, context, action); return eventState != originalState ? eventState : changedState; } diff --git a/common/src/main/java/muramasa/antimatter/util/AntimatterPlatformUtils.java b/common/src/main/java/muramasa/antimatter/util/AntimatterPlatformUtils.java index 21e03dc88..835ff579d 100644 --- a/common/src/main/java/muramasa/antimatter/util/AntimatterPlatformUtils.java +++ b/common/src/main/java/muramasa/antimatter/util/AntimatterPlatformUtils.java @@ -34,6 +34,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; +import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; @@ -309,4 +310,14 @@ public static Item.Properties getToolProperties(CreativeModeTab group, boolean r public static boolean isCorrectTierForDrops(Tier tier, BlockState state){ throw new AssertionError(); } + + @ExpectPlatform + public static BlockState onToolUse(BlockState originalState, UseOnContext context, String action){ + throw new AssertionError(); + } + + @ExpectPlatform + public static boolean onUseHoe(UseOnContext context){ + throw new AssertionError(); + } } diff --git a/fabric/src/main/java/muramasa/antimatter/tool/behaviour/fabric/BehaviourUtilImpl.java b/fabric/src/main/java/muramasa/antimatter/tool/behaviour/fabric/BehaviourUtilImpl.java deleted file mode 100644 index e3ac08659..000000000 --- a/fabric/src/main/java/muramasa/antimatter/tool/behaviour/fabric/BehaviourUtilImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package muramasa.antimatter.tool.behaviour.fabric; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -public class BehaviourUtilImpl { - //TODO make this use fabric events, if they exist - public static BlockState onToolUse(BlockState originalState, UseOnContext context, String action){ - return originalState; - } - - public static boolean onUseHoe(UseOnContext context){ - return false; - } -} diff --git a/fabric/src/main/java/muramasa/antimatter/util/fabric/AntimatterPlatformUtilsImpl.java b/fabric/src/main/java/muramasa/antimatter/util/fabric/AntimatterPlatformUtilsImpl.java index ca69b842d..1e3caa62c 100644 --- a/fabric/src/main/java/muramasa/antimatter/util/fabric/AntimatterPlatformUtilsImpl.java +++ b/fabric/src/main/java/muramasa/antimatter/util/fabric/AntimatterPlatformUtilsImpl.java @@ -45,6 +45,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; +import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; @@ -252,4 +253,13 @@ public static Item.Properties getToolProperties(CreativeModeTab group, boolean r public static boolean isCorrectTierForDrops(Tier tier, BlockState state){ return TierSortingRegistry.isCorrectTierForDrops(tier, state); } + + //TODO make this use fabric events, if they exist + public static BlockState onToolUse(BlockState originalState, UseOnContext context, String action){ + return originalState; + } + + public static boolean onUseHoe(UseOnContext context){ + return false; + } } diff --git a/forge/src/main/java/muramasa/antimatter/tool/behaviour/forge/BehaviourUtilImpl.java b/forge/src/main/java/muramasa/antimatter/tool/behaviour/forge/BehaviourUtilImpl.java deleted file mode 100644 index 422bd1b34..000000000 --- a/forge/src/main/java/muramasa/antimatter/tool/behaviour/forge/BehaviourUtilImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package muramasa.antimatter.tool.behaviour.forge; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.ToolAction; -import net.minecraftforge.event.ForgeEventFactory; -import net.minecraftforge.event.entity.player.UseHoeEvent; - -public class BehaviourUtilImpl { - public static BlockState onToolUse(BlockState originalState, UseOnContext context, String action){ - return ForgeEventFactory.onToolUse(originalState, context, ToolAction.get(action), false); - } - - public static boolean onUseHoe(UseOnContext context){ - return MinecraftForge.EVENT_BUS.post(new UseHoeEvent(context)); - } -} diff --git a/forge/src/main/java/muramasa/antimatter/util/forge/AntimatterPlatformUtilsImpl.java b/forge/src/main/java/muramasa/antimatter/util/forge/AntimatterPlatformUtilsImpl.java index e23cd6f0f..4b26c2dbb 100644 --- a/forge/src/main/java/muramasa/antimatter/util/forge/AntimatterPlatformUtilsImpl.java +++ b/forge/src/main/java/muramasa/antimatter/util/forge/AntimatterPlatformUtilsImpl.java @@ -43,6 +43,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; +import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; @@ -55,8 +56,10 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.TierSortingRegistry; +import net.minecraftforge.common.ToolAction; import net.minecraftforge.common.extensions.IForgeMenuType; import net.minecraftforge.event.ForgeEventFactory; +import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.ModLoader; @@ -305,4 +308,12 @@ public static Item.Properties getToolProperties(CreativeModeTab group, boolean r public static boolean isCorrectTierForDrops(Tier tier, BlockState state){ return TierSortingRegistry.isCorrectTierForDrops(tier, state); } + + public static BlockState onToolUse(BlockState originalState, UseOnContext context, String action){ + return ForgeEventFactory.onToolUse(originalState, context, ToolAction.get(action), false); + } + + public static boolean onUseHoe(UseOnContext context){ + return MinecraftForge.EVENT_BUS.post(new UseHoeEvent(context)); + } }