From 77e671c7406a4aec51cff0531f8f65f662d238b7 Mon Sep 17 00:00:00 2001 From: reobf <2215595288@qq.com> Date: Mon, 10 Feb 2025 20:28:02 +0800 Subject: [PATCH] update --- dependencies.gradle | 2 +- .../gt/metatileentity/BufferedDualInputHatch.java | 1 + .../gt/metatileentity/PatternDualInputHatch.java | 2 ++ ...atternDualInputHatchInventoryMappingSlave.java | 2 ++ src/main/java/reobf/proghatches/main/MyMod.java | 15 ++++++++++----- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 4819573..7223a8e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,7 +34,7 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.121:dev'){ transitive = false } + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.123-pre:dev'){ transitive = false } api("com.github.GTNewHorizons:StructureLib:1.4.0:dev") api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java b/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java index 785fd16..955eddc 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java @@ -2790,6 +2790,7 @@ public void resetMulti() { } public void recordRecipe(DualInvBuffer thiz) { + if (thiz==null) return; if (thiz.PID > 0) return; if (useNewGTPatternCache == false) { return; diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/PatternDualInputHatch.java b/src/main/java/reobf/proghatches/gt/metatileentity/PatternDualInputHatch.java index b5ea6ea..956853f 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/PatternDualInputHatch.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/PatternDualInputHatch.java @@ -658,6 +658,7 @@ public boolean pushPattern(ICraftingPatternDetails patternDetails, InventoryCraf */ DualInvBuffer theBuffer = /* ((BufferedDualInputHatch) master). */classifyForce(); + if(theBuffer!=null) recordRecipe(theBuffer); justHadNewItems = true; @@ -1053,6 +1054,7 @@ public int pushPatternMulti(ICraftingPatternDetails patternDetails, InventoryCra */ DualInvBuffer theBuffer = /* ((BufferedDualInputHatch) master). */classifyForce(); + if(theBuffer!=null) recordRecipe(theBuffer); // if(theBuffer!=null){ diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/PatternDualInputHatchInventoryMappingSlave.java b/src/main/java/reobf/proghatches/gt/metatileentity/PatternDualInputHatchInventoryMappingSlave.java index e62f574..19d44f8 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/PatternDualInputHatchInventoryMappingSlave.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/PatternDualInputHatchInventoryMappingSlave.java @@ -873,6 +873,7 @@ public boolean pushPattern(ICraftingPatternDetails patternDetails, InventoryCraf BufferedDualInputHatch m = (BufferedDualInputHatch) master; DualInvBuffer theBuffer = ((BufferedDualInputHatch) master).classifyForce(); + if(theBuffer!=null) ((BufferedDualInputHatch) master).recordRecipe(theBuffer); // ((BufferedDualInputHatch) master).classifyForce(); } @@ -1124,6 +1125,7 @@ public int pushPatternMulti(ICraftingPatternDetails patternDetails, InventoryCra */ DualInvBuffer theBuffer = ((BufferedDualInputHatch) master).classifyForce(); + if(theBuffer!=null) m.recordRecipe(theBuffer); // DualInvBuffer theBuffer=((BufferedDualInputHatch) master).classifyForce(); diff --git a/src/main/java/reobf/proghatches/main/MyMod.java b/src/main/java/reobf/proghatches/main/MyMod.java index 6ad7ce2..6605d59 100644 --- a/src/main/java/reobf/proghatches/main/MyMod.java +++ b/src/main/java/reobf/proghatches/main/MyMod.java @@ -1,5 +1,10 @@ package reobf.proghatches.main; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.util.ArrayDeque; import java.util.ArrayList; @@ -34,6 +39,7 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -95,6 +101,7 @@ import reobf.proghatches.item.ItemBookTutorial; import reobf.proghatches.keybinding.KeyBindings; import reobf.proghatches.lang.LangManager; +import reobf.proghatches.main.asm.repack.objectwebasm.ClassWriter; import reobf.proghatches.main.registration.Registration; import reobf.proghatches.net.ConnectionModeMessage; import reobf.proghatches.net.MAFXMessage; @@ -379,15 +386,13 @@ public void join(PlayerLoggedInEvent e) { public static Achievement achievement; - /** - * @param event - */ + @Mod.EventHandler public void postInit(FMLPostInitializationEvent event) { proxy.postInit(event); - // KeyBindings - + +OreDictionary.registerOre("ph:circuit", new ItemStack( progcircuit,1,OreDictionary.WILDCARD_VALUE)); { AchievementPage page = new AchievementPage( MODID,