From 6560bae89f023a81a3c6e0fc4aa362fc8f4b8fde Mon Sep 17 00:00:00 2001 From: luomolhx <2932965369@qq.com> Date: Wed, 1 Oct 2025 23:08:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ADM=E7=A0=94=E7=A9=B6=E5=8E=9F=E5=9E=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E5=A4=A7=E6=BF=80=E5=85=89;?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E5=B7=B2=E5=BC=83=E7=94=A8?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boxplusplus/common/loader/RecipeLoader.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java b/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java index 3e471ac..07b1815 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java @@ -3,7 +3,6 @@ import static gregtech.api.enums.Mods.*; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; -import static gregtech.api.util.GTRecipeBuilder.*; import static gregtech.api.util.GTRecipeConstants.*; import net.minecraft.item.ItemStack; @@ -173,8 +172,8 @@ public static void addRingRecipe() { GTOreDictUnificator.get("ringAstralTitanium", 64), GTOreDictUnificator.get("ringAstralTitanium", 64), GTOreDictUnificator.get("ringAstralTitanium", 64), GTOreDictUnificator.get("plateDenseAstralTitanium", 64), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 32 }, - GTOreDictUnificator.get("batteryUMV", 4), ItemList.Field_Generator_UEV.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 32 }, GTOreDictUnificator.get("batteryUMV", 4), + ItemList.Field_Generator_UEV.get(4), GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), @@ -554,7 +553,7 @@ public static void addUpgradeModuleRecipe() { new Object[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1132), ItemList.Electric_Motor_UEV.get(32), ItemList.Electric_Piston_UEV.get(8), ItemList.Electric_Pump_UEV.get(16), ItemList.Conveyor_Module_UEV.get(8), ItemList.Robot_Arm_UEV.get(8), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4 }, GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1), GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Titanium, 32), GTOreDictUnificator.get("rotorAstralTitanium", 16), new ItemStack(BlockRegister.BoxRing2, 16), }, @@ -732,7 +731,7 @@ public static void addModuleResearchRecipe() { // AMD 晶圆厂技术资料（基础） GTValues.RA.stdBuilder() .itemOutputs(new ItemStack(ItemRegister.bmResearchItem, 1, 0)) - .itemInputs(GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 860)) + .itemInputs(GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 21076)) .eut(TierEU.RECIPE_LuV) .duration(1200) .addTo(assemblerRecipes); From 54d7941367638913c9cf6aaba367bc7080a35df4 Mon Sep 17 00:00:00 2001 From: luomolhx <2932965369@qq.com> Date: Wed, 1 Oct 2025 23:15:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E6=BF=80?= =?UTF-8?q?=E5=85=89meta=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/silvermoon/boxplusplus/common/loader/RecipeLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java b/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java index 07b1815..c8e0c71 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java @@ -731,7 +731,7 @@ public static void addModuleResearchRecipe() { // AMD 晶圆厂技术资料（基础） GTValues.RA.stdBuilder() .itemOutputs(new ItemStack(ItemRegister.bmResearchItem, 1, 0)) - .itemInputs(GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 21076)) + .itemInputs(GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 3004)) .eut(TierEU.RECIPE_LuV) .duration(1200) .addTo(assemblerRecipes); From 40e87fea9055093fb65b21ce714c613b77ae9f9c Mon Sep 17 00:00:00 2001 From: luomolhx <2932965369@qq.com> Date: Tue, 21 Oct 2025 21:52:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=85=8D=E6=96=B9=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=88=B6?= =?UTF-8?q?=E4=BD=9C=E6=96=B9=E5=BC=8F=E7=9A=84=E6=9D=90=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 - .../com/silvermoon/boxplusplus/common/loader/RecipeLoader.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 476088c..9f44a82 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,6 @@ minecraft { dependencies { compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' - implementation 'org.ow2.asm:asm-commons:9.2' } tasks.withType(JavaCompile) { diff --git a/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java b/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java index c8e0c71..90ce9d8 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java @@ -571,7 +571,7 @@ public static void addUpgradeModuleRecipe() { new ItemStack[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 10501), GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12712), GTOreDictUnificator.get("blockGlassUEV", 64), GTOreDictUnificator.get("slabWood", 1), - GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12718), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12713), GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 4, 26), new ItemStack(BlockRegister.BoxRing2, 16), }, new FluidStack[] { FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 128000),