Handle some deprecated for removal methods

The two copper blocks just override both methods now, bit redundant but not too much work The two JEI ones were just missed in the JEI update
SlimeKnights · May 1, 2022 · 92f1a27 · 92f1a27
1 parent 531defd
commit 92f1a27
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/src/main/java/slimeknights/tconstruct/plugin/jei/entity/SeveringCategory.java b/src/main/java/slimeknights/tconstruct/plugin/jei/entity/SeveringCategory.java
@@ -38,6 +38,7 @@ public ResourceLocation getUid() {
     return TConstructJEIConstants.SEVERING.getUid();
   }
 
+  @SuppressWarnings("removal")
   @Override
   public Class<? extends SeveringRecipe> getRecipeClass() {
     return SeveringRecipe.class;

diff --git a/src/main/java/slimeknights/tconstruct/plugin/jei/transfer/TinkerStationTransferInfo.java b/src/main/java/slimeknights/tconstruct/plugin/jei/transfer/TinkerStationTransferInfo.java
@@ -17,11 +17,13 @@ public Class<TinkerStationContainerMenu> getContainerClass() {
     return TinkerStationContainerMenu.class;
   }
 
+  @SuppressWarnings("removal")
   @Override
   public Class<IDisplayModifierRecipe> getRecipeClass() {
     return IDisplayModifierRecipe.class;
   }
 
+  @SuppressWarnings("removal")
   @Override
   public ResourceLocation getRecipeCategoryUid() {
     return TConstructJEIConstants.MODIFIERS.getUid();

diff --git a/src/main/java/slimeknights/tconstruct/shared/block/WaxedPlatformBlock.java b/src/main/java/slimeknights/tconstruct/shared/block/WaxedPlatformBlock.java
@@ -3,11 +3,13 @@
 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.WeatheringCopper.WeatherState;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.ToolAction;
 import net.minecraftforge.common.ToolActions;
+import org.jetbrains.annotations.Nullable;
 import slimeknights.tconstruct.common.TinkerTags;
 import slimeknights.tconstruct.shared.TinkerCommons;
 
@@ -23,6 +25,17 @@ protected boolean verticalConnect(BlockState state) {
     return state.is(TinkerTags.Blocks.COPPER_PLATFORMS);
   }
 
+  @Nullable
+  @Override
+  public BlockState getToolModifiedState(BlockState state, UseOnContext context, ToolAction toolAction, boolean simulate) {
+    if (ToolActions.AXE_WAX_OFF.equals(toolAction)) {
+      return TinkerCommons.copperPlatform.get(age).withPropertiesOf(state);
+    }
+    return null;
+  }
+
+  @Deprecated
+  @SuppressWarnings("removal")
   @Override
   public BlockState getToolModifiedState(BlockState state, Level world, BlockPos pos, Player player, ItemStack stack, ToolAction toolAction) {
     if (ToolActions.AXE_WAX_OFF.equals(toolAction)) {

diff --git a/src/main/java/slimeknights/tconstruct/shared/block/WeatheringPlatformBlock.java b/src/main/java/slimeknights/tconstruct/shared/block/WeatheringPlatformBlock.java
@@ -10,6 +10,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.WeatheringCopper;
 import net.minecraft.world.level.block.state.BlockState;
@@ -74,6 +75,20 @@ private static WeatherState getPrevious(WeatherState original) {
     };
   }
 
+  @org.jetbrains.annotations.Nullable
+  @Override
+  public BlockState getToolModifiedState(BlockState state, UseOnContext context, ToolAction toolAction, boolean simulate) {
+    if (ToolActions.AXE_SCRAPE.equals(toolAction)) {
+      WeatherState prev = getPrevious(age);
+      if (prev != null) {
+        return TinkerCommons.copperPlatform.get(prev).withPropertiesOf(state);
+      }
+    }
+    return null;
+  }
+
+  @Deprecated
+  @SuppressWarnings("removal")
   @Override
   public BlockState getToolModifiedState(BlockState state, Level world, BlockPos pos, Player player, ItemStack stack, ToolAction toolAction) {
     if (ToolActions.AXE_SCRAPE.equals(toolAction)) {