build with NF 20.4.233

fixed deprecated getBurnTime() calls
TeamPneumatic · Apr 25, 2024 · 7e42e06 · 7e42e06
1 parent 612bf58
commit 7e42e06
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ org.gradle.daemon=false
 #########################################################
 minecraft_version=1.20.4
 minecraft_version_range=[1.20.4,)
-neo_version=20.4.212
+neo_version=20.4.233
 neo_version_range=[20.4.190,)
 loader_version_range=[1,)
 mappings_version=1.20.4-2023.10.22

diff --git a/src/generated/resources/data/pneumaticcraft/recipes/chunkloader_upgrade.json b/src/generated/resources/data/pneumaticcraft/recipes/chunkloader_upgrade.json
@@ -1,14 +1,15 @@
 {
   "type": "minecraft:crafting_shaped",
+  "category": "misc",
   "key": {
     "C": {
       "item": "pneumaticcraft:printed_circuit_board"
     },
-    "L": {
-      "tag": "pneumaticcraft:upgrade_components"
-    },
     "E": {
       "item": "minecraft:ender_eye"
+    },
+    "L": {
+      "tag": "pneumaticcraft:upgrade_components"
     }
   },
   "pattern": [

diff --git a/...java/me/desht/pneumaticcraft/common/block/entity/compressor/AirCompressorBlockEntity.java b/...java/me/desht/pneumaticcraft/common/block/entity/compressor/AirCompressorBlockEntity.java
@@ -99,7 +99,8 @@ public void tickServer() {
 
         if (rsController.shouldRun() && burnTime < curFuelUsage) {
             ItemStack fuelStack = itemHandler.getStackInSlot(FUEL_SLOT);
-            int itemBurnTime = CommonHooks.getBurnTime(fuelStack, RecipeType.SMELTING);
+            int itemBurnTime = fuelStack.getBurnTime(RecipeType.SMELTING);
+//            int itemBurnTime = CommonHooks.getBurnTime(fuelStack, RecipeType.SMELTING);
             if (itemBurnTime > 0) {
                 burnTime += itemBurnTime;
                 maxBurnTime = burnTime;
@@ -222,7 +223,7 @@ private class AirCompressorFuelHandler extends BaseItemStackHandler {
         @Override
         public boolean isItemValid(int slot, ItemStack itemStack) {
             return slot == FUEL_SLOT &&
-                    (itemStack.isEmpty() || CommonHooks.getBurnTime(itemStack, RecipeType.SMELTING) > 0 && FluidUtil.getFluidContained(itemStack).isEmpty());
+                    (itemStack.isEmpty() || itemStack.getBurnTime(RecipeType.SMELTING) > 0 && FluidUtil.getFluidContained(itemStack).isEmpty());
         }
     }
 

diff --git a/src/main/java/me/desht/pneumaticcraft/common/item/ClassifyFilterItem.java b/src/main/java/me/desht/pneumaticcraft/common/item/ClassifyFilterItem.java
@@ -123,7 +123,7 @@ public boolean test(ItemStack stack) {
     }
 
     public enum FilterCondition implements ITranslatableEnum, Predicate<ItemStack> {
-        FUEL_ITEM(Items.COAL, s -> CommonHooks.getBurnTime(s, RecipeType.SMELTING) > 0),
+        FUEL_ITEM(Items.COAL, s -> s.getBurnTime(RecipeType.SMELTING) > 0),
         EDIBLE(Items.BREAD, ItemStack::isEdible),
         PLACEABLE(Items.STONE, s -> s.getItem() instanceof BlockItem),
         FLUID_CONTAINER(Items.BUCKET, s -> IOHelper.getFluidHandlerForItem(s).isPresent()),