Skip to content

修复坩埚配方冲突 #26

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

Merged
Ol925 merged 1 commit into from
Jun 20, 2026
Merged

修复坩埚配方冲突 #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 33 additions & 33 deletions src/main/java/com/OL925/ThinkTech/Recipe/MachineRecipePool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ public void loadRecipes(){
GTValues.RA.stdBuilder()
.itemInputs(Materials.Cinnabar.getDust(1))
.fluidOutputs(Materials.Mercury.getFluid(1000))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

Expand All @@ -553,51 +553,51 @@ public void loadRecipes(){
GTValues.RA.stdBuilder()
.itemInputs(Materials.Magnetite.getDust(1))
.fluidOutputs(Materials.Iron.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

GTValues.RA.stdBuilder()
.itemInputs(Materials.BandedIron.getDust(1))
.fluidOutputs(Materials.Iron.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

GTValues.RA.stdBuilder()
.itemInputs(Materials.BrownLimonite.getDust(1))
.fluidOutputs(Materials.Iron.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

GTValues.RA.stdBuilder()
.itemInputs(Materials.YellowLimonite.getDust(1))
.fluidOutputs(Materials.Iron.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

GTValues.RA.stdBuilder()
.itemInputs(Materials.Pyrite.getDust(1))
.fluidOutputs(Materials.Iron.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

// 孔雀石
GTValues.RA.stdBuilder()
.itemInputs(Materials.Malachite.getDust(1))
.fluidOutputs(Materials.Copper.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

// 黄铜矿
GTValues.RA.stdBuilder()
.itemInputs(Materials.Chalcopyrite.getDust(2))
.fluidOutputs(Materials.Copper.getMolten(144), Materials.Iron.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

Expand Down Expand Up @@ -638,7 +638,7 @@ public void loadRecipes(){
.itemOutputs(Materials.Gallium.getDust(1))
.outputChances(800)
.fluidOutputs(Materials.Zinc.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

Expand All @@ -647,68 +647,68 @@ public void loadRecipes(){
.itemInputs(Materials.Tetrahedrite.getDust(8))
.fluidOutputs(Materials.Copper.getMolten(432), Materials.Iron.getMolten(144),
Materials.Antimony.getMolten(144))
.eut(30).duration(150)
.eut(30).duration(150).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

// 辉锑矿
GTValues.RA.stdBuilder()
.itemInputs(Materials.Stibnite.getDust(1))
.fluidOutputs(Materials.Antimony.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

// 锡石矿/锡石矿砂
GTValues.RA.stdBuilder()
.itemInputs(Materials.Cassiterite.getDust(1))
.fluidOutputs(Materials.Tin.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

GTValues.RA.stdBuilder()
.itemInputs(Materials.CassiteriteSand.getDust(1))
.fluidOutputs(Materials.Tin.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

// 锡粉/金粉
GTValues.RA.stdBuilder()
.itemInputs(Materials.Tin.getDust(1))
.fluidOutputs(Materials.Tin.getMolten(144))
.eut(16).duration(50)
.eut(16).duration(50).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

GTValues.RA.stdBuilder()
.itemInputs(Materials.Gold.getDust(1))
.fluidOutputs(Materials.Gold.getMolten(144))
.eut(16).duration(50)
.eut(16).duration(50).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

// 镍黄铁矿
GTValues.RA.stdBuilder()
.itemInputs(Materials.Pentlandite.getDust(17))
.fluidOutputs(Materials.Nickel.getMolten(1296))
.eut(30).duration(200)
.eut(30).duration(200).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

// 花岗岩矿砂/玄武岩矿砂
GTValues.RA.stdBuilder()
.itemInputs(Materials.GraniticMineralSand.getDust(1))
.fluidOutputs(Materials.Iron.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

GTValues.RA.stdBuilder()
.itemInputs(Materials.BasalticMineralSand.getDust(1))
.fluidOutputs(Materials.Iron.getMolten(144))
.eut(30).duration(100)
.eut(30).duration(100).circuit(1)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

Expand Down Expand Up @@ -817,15 +817,15 @@ public void loadRecipes(){
GTValues.RA.stdBuilder()
.itemInputs(Materials.Brass.getDust(7), Materials.Cobalt.getDust(1), Materials.Tin.getDust(1))
.fluidOutputs(Materials.CobaltBrass.getMolten(1296))
.eut(30).duration(100).circuit(1)
.eut(30).duration(100).circuit(3)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

// 镁铝合金 Magnalium: 1镁 + 2铝 → 3×144 = 432L
GTValues.RA.stdBuilder()
.itemInputs(Materials.Magnesium.getDust(1), Materials.Aluminium.getDust(2))
.fluidOutputs(Materials.Magnalium.getMolten(432))
.eut(30).duration(100).circuit(1)
.eut(30).duration(100).circuit(2)
.specialValue(1)
.addTo(ThTRecipeMap.Crucible);

Expand Down Expand Up @@ -860,7 +860,7 @@ public void loadRecipes(){
.itemInputs(GTModHandler.getModItem("minecraft", "soul_sand", 1, 0),
Materials.Gold.getDust(1), Materials.Ash.getDust(1))
.fluidOutputs(Materials.Soularium.getMolten(432))
.eut(60).duration(200)
.eut(60).duration(200).circuit(2)
.specialValue(2)
.addTo(ThTRecipeMap.Crucible);

Expand Down Expand Up @@ -903,30 +903,30 @@ public void loadRecipes(){
GTValues.RA.stdBuilder()
.itemInputs(Materials.Tantalum.getDust(1))
.fluidOutputs(Materials.Tantalum.getMolten(144))
.eut(30).duration(300).specialValue(2)
.eut(30).duration(300).specialValue(2).circuit(1)
.addTo(ThTRecipeMap.Crucible);

// 红石合金+铁+银 → 导电铁
GTValues.RA.stdBuilder()
.itemInputs(Materials.RedstoneAlloy.getDust(1), Materials.Iron.getDust(1),
Materials.Silver.getDust(1))
.fluidOutputs(Materials.ConductiveIron.getMolten(432))
.eut(30).duration(300).circuit(2).specialValue(2)
.eut(30).duration(300).circuit(3).specialValue(2)
.addTo(ThTRecipeMap.Crucible);

// 铜+琥珀金 → 黑铜
GTValues.RA.stdBuilder()
.itemInputs(Materials.Copper.getDust(3), Materials.Electrum.getDust(2))
.fluidOutputs(Materials.BlackBronze.getMolten(720))
.eut(30).duration(300).circuit(1).specialValue(2)
.eut(30).duration(300).circuit(2).specialValue(2)
.addTo(ThTRecipeMap.Crucible);

// 黑铜+银+钢 → 黑钢
GTValues.RA.stdBuilder()
.itemInputs(Materials.BlackBronze.getDust(1), Materials.Silver.getDust(1),
Materials.Steel.getDust(3))
.fluidOutputs(Materials.BlackSteel.getMolten(720))
.eut(30).duration(300).circuit(1).specialValue(2)
.eut(30).duration(300).circuit(3).specialValue(2)
.addTo(ThTRecipeMap.Crucible);

// ---- specialValue(3) ----
Expand All @@ -935,29 +935,29 @@ public void loadRecipes(){
GTValues.RA.stdBuilder()
.itemInputs(Materials.Aluminium.getDust(1))
.fluidOutputs(Materials.Aluminium.getMolten(144))
.eut(30).duration(400).specialValue(3)
.eut(30).duration(400).specialValue(3).circuit(1)
.addTo(ThTRecipeMap.Crucible);

// 熔融铁+铝+铬 → 坎塔尔合金
GTValues.RA.stdBuilder()
.fluidInputs(Materials.Iron.getMolten(144), Materials.Aluminium.getMolten(144),
Materials.Chrome.getMolten(144))
.fluidOutputs(Materials.Kanthal.getMolten(432))
.eut(30).duration(400).circuit(2).specialValue(3)
.eut(30).duration(400).circuit(3).specialValue(3)
.addTo(ThTRecipeMap.Crucible);

// 铬粉 → 熔融铬
GTValues.RA.stdBuilder()
.itemInputs(Materials.Chrome.getDust(1))
.fluidOutputs(Materials.Chrome.getMolten(144))
.eut(30).duration(400).specialValue(3)
.eut(30).duration(400).specialValue(3).circuit(1)
.addTo(ThTRecipeMap.Crucible);

// 铂金属粉 → 熔融铂
GTValues.RA.stdBuilder()
.itemInputs(Materials.Platinum.getDust(9))
.fluidOutputs(Materials.Platinum.getMolten(144))
.eut(30).duration(400).specialValue(3)
.eut(30).duration(400).specialValue(3).circuit(1)
.addTo(ThTRecipeMap.Crucible);

// 银+蓝石 → 蓝色合金
Expand All @@ -973,15 +973,15 @@ public void loadRecipes(){
GTValues.RA.stdBuilder()
.fluidInputs(Materials.Nickel.getMolten(576), Materials.Chrome.getMolten(144))
.fluidOutputs(Materials.Nichrome.getMolten(144))
.eut(30).duration(500).circuit(1).specialValue(4)
.eut(30).duration(500).circuit(2).specialValue(4)
.addTo(ThTRecipeMap.Crucible);

// 铁+镍+锰+铬 → 不锈钢
GTValues.RA.stdBuilder()
.itemInputs(Materials.Iron.getDust(6), Materials.Nickel.getDust(1),
Materials.Manganese.getDust(1), Materials.Chrome.getDust(1))
.fluidOutputs(Materials.StainlessSteel.getMolten(1296))
.eut(30).duration(500).circuit(2).specialValue(4)
.eut(30).duration(500).circuit(6).specialValue(4)
.addTo(ThTRecipeMap.Crucible);

// ---- specialValue(5) ----
Expand All @@ -990,7 +990,7 @@ public void loadRecipes(){
GTValues.RA.stdBuilder()
.itemInputs(Materials.Titanium.getDust(1))
.fluidOutputs(Materials.Titanium.getMolten(144))
.eut(30).duration(600).specialValue(5)
.eut(30).duration(600).specialValue(5).circuit(1)
.addTo(ThTRecipeMap.Crucible);

// 金红石+碳 → 钛
Expand All @@ -1004,7 +1004,7 @@ public void loadRecipes(){
GTValues.RA.stdBuilder()
.itemInputs(Materials.Tungsten.getDust(1))
.fluidOutputs(Materials.Tungsten.getMolten(144))
.eut(30).duration(600).specialValue(5)
.eut(30).duration(600).specialValue(5).circuit(1)
.addTo(ThTRecipeMap.Crucible);

// 钨+钢 → 钨钢
Expand Down