Completely removed one probe helmet crafting

Just not workable anymore since a separate helmet item would be required
TeamPneumatic · Aug 26, 2024 · 340a3ae · 340a3ae
1 parent 71634d7
commit 340a3ae
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 114 deletions.
diff --git a/src/generated/resources/data/pneumaticcraft/recipe/one_probe_crafting.json b/src/generated/resources/data/pneumaticcraft/recipe/one_probe_crafting.json
diff --git a/src/main/java/me/desht/pneumaticcraft/common/recipes/special/OneProbeCrafting.java b/src/main/java/me/desht/pneumaticcraft/common/recipes/special/OneProbeCrafting.java
diff --git a/src/main/java/me/desht/pneumaticcraft/common/registry/ModRecipeSerializers.java b/src/main/java/me/desht/pneumaticcraft/common/registry/ModRecipeSerializers.java
@@ -86,8 +86,6 @@ public class ModRecipeSerializers {
             = RECIPE_SERIALIZERS.register(PneumaticCraftRecipeTypes.HEAT_PROPERTIES,
             () -> new HeatPropertiesRecipeImpl.Serializer<>(HeatPropertiesRecipeImpl::new));
 
-    public static final Supplier<SimpleCraftingRecipeSerializer<OneProbeCrafting>> ONE_PROBE_HELMET_CRAFTING
-            = RECIPE_SERIALIZERS.register("one_probe_helmet_crafting", () -> new SimpleCraftingRecipeSerializer<>(OneProbeCrafting::new));
     public static final Supplier<SimpleCraftingRecipeSerializer<GunAmmoPotionCrafting>> GUN_AMMO_POTION_CRAFTING
             = RECIPE_SERIALIZERS.register("gun_ammo_potion_crafting", () -> new SimpleCraftingRecipeSerializer<>(GunAmmoPotionCrafting::new));
     public static final Supplier<SimpleCraftingRecipeSerializer<DroneUpgradeCrafting>> DRONE_UPGRADE_CRAFTING

diff --git a/src/main/java/me/desht/pneumaticcraft/common/thirdparty/theoneprobe/ProbeHelmet.java b/src/main/java/me/desht/pneumaticcraft/common/thirdparty/theoneprobe/ProbeHelmet.java
diff --git a/src/main/java/me/desht/pneumaticcraft/common/thirdparty/theoneprobe/TheOneProbe.java b/src/main/java/me/desht/pneumaticcraft/common/thirdparty/theoneprobe/TheOneProbe.java
@@ -27,14 +27,12 @@ public class TheOneProbe implements IThirdParty {
     public static boolean oneProbeEnabled = false;
 
     public static boolean isProbeEnabled(ItemStack stack) {
-        return oneProbeEnabled && stack.getItem() == ProbeHelmet.PNEUMATIC_HELMET_PROBE.get();
+        return false;
     }
 
     @Override
     public void preInit(IEventBus modBus) {
         oneProbeEnabled = true;
-
-        ProbeHelmet.init();
     }
 
     @Override

diff --git a/src/main/java/me/desht/pneumaticcraft/datagen/ModRecipeProvider.java b/src/main/java/me/desht/pneumaticcraft/datagen/ModRecipeProvider.java
@@ -15,7 +15,6 @@
 import me.desht.pneumaticcraft.common.recipes.special.DroneColorCrafting;
 import me.desht.pneumaticcraft.common.recipes.special.DroneUpgradeCrafting;
 import me.desht.pneumaticcraft.common.recipes.special.GunAmmoPotionCrafting;
-import me.desht.pneumaticcraft.common.recipes.special.OneProbeCrafting;
 import me.desht.pneumaticcraft.common.registry.ModBlocks;
 import me.desht.pneumaticcraft.common.registry.ModFluids;
 import me.desht.pneumaticcraft.common.registry.ModItems;
@@ -1306,8 +1305,6 @@ protected void buildRecipes(RecipeOutput consumer) {
                 .save(consumer, getId("drone_upgrade"));
         SpecialRecipeBuilder.special(GunAmmoPotionCrafting::new)
                 .save(consumer, getId("gun_ammo_potion_crafting"));
-        SpecialRecipeBuilder.special(OneProbeCrafting::new)
-                .save(consumer.withConditions(new ModLoadedCondition(ModIds.THE_ONE_PROBE)), getId("one_probe_crafting"));
 
         SpecialRecipeBuilder.special(PressureEnchantingRecipe::new)
                 .save(consumer, getId("pressure_chamber/pressure_chamber_enchanting"));