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 3e471ac..90ce9d8 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), }, @@ -572,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), @@ -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, 3004)) .eut(TierEU.RECIPE_LuV) .duration(1200) .addTo(assemblerRecipes);