Skip to content

fix 掉一些配方问题 #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ny3a wants to merge 5 commits into from
Closed

fix 掉一些配方问题 #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e492de5
max+-dirty-fix-test
ny3a Jul 4, 2026
acca849
pull
ny3a Jul 4, 2026
4968735
pull
ny3a Jul 4, 2026
e42f5a3
circuit_oredict_fix
ny3a Jul 4, 2026
2d6a175
Fix_gtmachines_id
ny3a Jul 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/java/com/newmaa/othtech/recipe/RecipesMAXs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void loadRecipes() {
GTModHandler.getModItem("GoodGenerator", "compactFusionCoil", 16, 2),
GTModHandler.getModItem("gregtech", "gt.blockmachines", 1, 15300),
GTModHandler.getModItem("tectech", "gt.blockcasingsTT", 16), getUN(64, OrePrefixes.wireFine),
getMC(4, OrePrefixes.plateDense), new Object[] { OrePrefixes.circuit.get(Materials.MAX), 64 },
getMC(4, OrePrefixes.plateDense), new Object[] { OrePrefixes.circuit.get(Materials.MAX), 16 },
getNanites(4, Materials.Eternity), ItemList.Circuit_Chip_QPIC.get(32), ItemList.UHV_Coil.get(64),
ItemList.Electric_Pump_MAX.get(1), ItemList.Reactor_Coolant_Sp_6.get(1),
ItemList.Reactor_Coolant_Sp_6.get(1), ItemList.Reactor_Coolant_Sp_6.get(1),
Expand Down Expand Up @@ -301,9 +301,9 @@ public void loadRecipes() {
GTModHandler.getModItem("tectech", "gt.time_acceleration_field_generator", 2, 8),
GTModHandler.getModItem("tectech", "gt.stabilisation_field_generator", 2, 8),
ItemList.Electric_Motor_MAX.get(2), ItemList.Electric_Piston_MAX.get(1),
new Object[] { OrePrefixes.circuit.get(Materials.TranscendentMetal), 2 },
new Object[] { OrePrefixes.circuit.get(Materials.MAX), 2 },
new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.MAX), 8 },
new Object[] { OrePrefixes.circuit.get(Materials.UMV), 8 },
GTModHandler.getModItem("gregtech", "gt.blockcasings5", 8, 13),
GTModHandler.getModItem("gregtech", "gt.metaitem.03", 4, 4139),
GTModHandler.getModItem("gregtech", "gt.metaitem.03", 4, 4585),
Expand All @@ -330,7 +330,7 @@ public void loadRecipes() {
ItemList.Electric_Motor_MAX.get(1), GTModHandler.getModItem("gregtech", "gt.metaitem.01", 16, 17143),
GTModHandler.getModItem("tectech", "gt.stabilisation_field_generator", 2, 8),
OTHItemList.glassSingularityM.get(4), GTModHandler.getModItem("dreamcraft", "ChromaticLens", 64),
new Object[] { OrePrefixes.circuit.get(Materials.TranscendentMetal), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.MAX), 4 },
GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29143),
GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29143),
GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29139),
Expand Down Expand Up @@ -361,7 +361,7 @@ public void loadRecipes() {
ItemList.Electric_Motor_MAX.get(1), GTModHandler.getModItem("gregtech", "gt.metaitem.01", 16, 23143),
GTModHandler.getModItem("tectech", "gt.stabilisation_field_generator", 2, 8),
OTHItemList.glassSingularityM.get(4), GTModHandler.getModItem("dreamcraft", "ChromaticLens", 64),
new Object[] { OrePrefixes.circuit.get(Materials.TranscendentMetal), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.MAX), 4 },
GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29143),
GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29143),
GTModHandler.getModItem("gregtech", "gt.metaitem.01", 64, 29139),
Expand Down Expand Up @@ -392,7 +392,7 @@ public void loadRecipes() {
getAstralArray(1), GTModHandler.getModItem("gregtech", "gt.metaitem.01", 12, 17143),
OTHItemList.machineSingularityM.get(4), OTHItemList.glassSingularityM.get(4),
GTModHandler.getModItem("eternalsingularity", "eternal_singularity", 4), ItemList.Emitter_MAX.get(4),
new Object[] { OrePrefixes.circuit.get(Materials.TranscendentMetal), 8 },
new Object[] { OrePrefixes.circuit.get(Materials.MAX), 8 },
GTModHandler.getModItem("gregtech", "gt.metaitem.02", 64, 19143),
GTModHandler.getModItem("gregtech", "gt.metaitem.02", 64, 19143),
GTModHandler.getModItem("gregtech", "gt.metaitem.02", 64, 19143),
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/newmaa/othtech/recipe/RecipesMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public void loadRecipes() {
.itemInputs(
GTModHandler.getModItem("miscutils", "MU-metaitem.01", 0, 32140),
getGM(31027, 64),
getGM(31028, 64),
getGM(15560, 64),
getNanites(4, Materials.WhiteDwarfMatter),
getNanites(4, Materials.BlackDwarfMatter),
getNanites(4, Materials.Universium))
Expand Down Expand Up @@ -210,7 +210,7 @@ public void loadRecipes() {
.itemInputs(
OTHItemList.SteamNeinInOne.get(64),
getGM(31027, 64),
getGM(31028, 64),
getGM(15560, 64),
getGM(995, 64),
ItemList.Robot_Arm_LuV.get(16),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 64))
Expand Down Expand Up @@ -391,8 +391,8 @@ public void loadRecipes() {
new Object[] { getGM(23520, 64), getGM(23527, 64), getGM(23528, 64), getGM(10886, 64),
OTHItemList.itemEnqingM.get(64), OTHItemList.itemEnqingM.get(64), OTHItemList.itemEnqingM.get(64),
OTHItemList.itemEnqingM.get(64), ItemList.Robot_Arm_UMV.get(64),
new Object[] { OrePrefixes.circuit.get(Materials.MAX), 64 },
new Object[] { OrePrefixes.circuit.get(Materials.MAX), 64 }, ItemList.Field_Generator_UMV.get(64),
new Object[] { OrePrefixes.circuit.get(Materials.UXV), 64 },
new Object[] { OrePrefixes.circuit.get(Materials.UXV), 64 }, ItemList.Field_Generator_UMV.get(64),
new ItemStack(Items.bread, 64), new ItemStack(Items.nether_star, 64), getGM(15297, 64),
getGM(15197, 64),

Expand Down Expand Up @@ -596,9 +596,9 @@ public void loadRecipes() {
RecipeBuilder.builder()
.itemInputs(
GTModHandler.getModItem("gregtech", "gt.blockmachines", 64, 31027),
GTModHandler.getModItem("gregtech", "gt.blockmachines", 64, 31028),
GTModHandler.getModItem("gregtech", "gt.blockmachines", 64, 15560),
GTModHandler.getModItem("gregtech", "gt.blockmachines", 64, 995),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MAX, 64))
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 64))
.itemOutputs(GTModHandler.getModItem("gregtech", "gt.blockmachines", 1, IDs + 24))
.fluidInputs(FluidRegistry.getFluidStack("advancedglue", 262144))
.duration(114514)
Expand Down Expand Up @@ -1116,9 +1116,9 @@ public void loadRecipes() {
ItemList.EnergisedTesseract.get(16),
OTHItemList.UEVA.get(4),
OTHItemList.UEVB.get(4),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MAX, 64),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 64),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 64),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 64),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 64),
GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 64))
.fluidInputs(
Materials.SuperCoolant.getFluid(123123),
Expand Down Expand Up @@ -1256,8 +1256,8 @@ public void loadRecipes() {
.itemInputs(
GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12735),
OTHItemList.LCA.get(64),
new Object[] { OrePrefixes.circuit.get(Materials.MAX), 64 },
new Object[] { OrePrefixes.circuit.get(Materials.MAX), 64 },
new Object[] { OrePrefixes.circuit.get(Materials.UHV), 64 },
new Object[] { OrePrefixes.circuit.get(Materials.UHV), 64 },
ItemList.Robot_Arm_UV.get(16),
ItemList.Electric_Motor_UV.get(64),
ItemList.Electric_Pump_UV.get(32),
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/newmaa/othtech/recipe/RecipesMegaISAForge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public void loadRecipes() {
.addTo(ISA);
GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem("gregtech", "gt.blockmachines", 0, 31028),
GTModHandler.getModItem("gregtech", "gt.blockmachines", 0, 15560),
OTHItemList.beeISAM.get(1),
GTModHandler.getModItem("gregtech", "gt.metaitem.03", 16, 4139),
ItemList.Field_Generator_UMV.get(4))
Expand Down Expand Up @@ -265,9 +265,9 @@ public void loadRecipes() {
.itemInputs(
GTUtility.getIntegratedCircuit(13),
GTModHandler.getModItem("eternalsingularity", "eternal_singularity", 0),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 64),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 64),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 64),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 64),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MAX, 64),
ItemList.Robot_Arm_UIV.get(64),
ItemList.Robot_Arm_UEV.get(64),
ItemList.Robot_Arm_UHV.get(64))
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/newmaa/othtech/recipe/RecipesQFTRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void loadRecipes() {
.metadata(QFT_FOCUS_TIER, 2)
.itemInputs(
GTModHandler.getModItem("gregtech", "gt.blockmachines", 0, 31027),
GTModHandler.getModItem("gregtech", "gt.blockmachines", 0, 31028))
GTModHandler.getModItem("gregtech", "gt.blockmachines", 0, 15560))
.fluidInputs(new FluidStack(songyou, 123), new FluidStack(laoda, 24))
.itemOutputs(
GTModHandler.getModItem("miscutils", "itemDustRhenium", 16),
Expand Down
Loading