Skip to content

Commit

Permalink
Merge branch 'master' into TG-Removal
Browse files Browse the repository at this point in the history
Dream-Master authored Jan 26, 2025
2 parents 673fa83 + 9231f88 commit 71dd6de
Showing 55 changed files with 2,089 additions and 2,759 deletions.
18 changes: 9 additions & 9 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.67:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.99:dev")
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")

implementation("com.github.GTNewHorizons:GTNHLib:0.6.1:dev")
implementation("com.github.GTNewHorizons:GTNHLib:0.6.5:dev")

compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.18:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.4:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.29:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.8-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
compileOnly("com.github.GTNewHorizons:Chisel:2.16.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.5:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
compileOnly("com.github.GTNewHorizons:amunra:0.8.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.4-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev")

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.31'
}


3 changes: 3 additions & 0 deletions src/main/java/com/dreammaster/gthandler/CustomItemList.java
Original file line number Diff line number Diff line change
@@ -385,6 +385,9 @@ public enum CustomItemList implements IItemContainer {
BioBall,
PotassiumHydroxideDust,
ChromaticLens,
ChromaticGem,
ChromaticGemFlawless,
ChromaticGemExquisite,
RadoxPolymerLens,
NanoCircuitOrigin,
ChevronOrigin,
Original file line number Diff line number Diff line change
@@ -262,25 +262,25 @@ public void run() {
bits,
new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_LV, 'G',
OrePrefixes.plate.get(Materials.PulsatingIron), 'D', OrePrefixes.circuit.get(Materials.LV), 'P',
OrePrefixes.plateDense.get(Materials.Iron) });
OrePrefixes.plateQuadruple.get(Materials.Iron) });
GTModHandler.addCraftingRecipe(
ItemList.Super_Chest_MV.get(1L),
bits,
new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_MV, 'G',
OrePrefixes.plate.get(Materials.VibrantAlloy), 'D', OrePrefixes.circuit.get(Materials.MV), 'P',
OrePrefixes.plateDense.get(Materials.Steel) });
OrePrefixes.plateQuadruple.get(Materials.Steel) });
GTModHandler.addCraftingRecipe(
ItemList.Super_Chest_HV.get(1L),
bits,
new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_HV, 'G',
ItemList.Field_Generator_LV, 'D', OrePrefixes.circuit.get(Materials.HV), 'P',
OrePrefixes.plateQuintuple.get(Materials.Aluminium) });
OrePrefixes.plateQuadruple.get(Materials.Aluminium) });
GTModHandler.addCraftingRecipe(
ItemList.Super_Chest_EV.get(1L),
bits,
new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_EV, 'G',
ItemList.Field_Generator_MV, 'D', OrePrefixes.circuit.get(Materials.EV), 'P',
OrePrefixes.plateQuintuple.get(Materials.StainlessSteel) });
OrePrefixes.plateQuadruple.get(Materials.StainlessSteel) });
GTModHandler.addCraftingRecipe(
ItemList.Super_Chest_IV.get(1L),
bits,
@@ -299,25 +299,25 @@ public void run() {
bits,
new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_ZPM, 'G',
ItemList.Field_Generator_IV, 'D', OrePrefixes.circuit.get(Materials.ZPM), 'P',
OrePrefixes.plateTriple.get(Materials.HSSG) });
OrePrefixes.plateQuadruple.get(Materials.HSSG) });
GTModHandler.addCraftingRecipe(
ItemList.Quantum_Chest_HV.get(1L),
bits,
new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_UV, 'G',
ItemList.Field_Generator_LuV, 'D', OrePrefixes.circuit.get(Materials.UV), 'P',
OrePrefixes.plateTriple.get(Materials.HSSS) });
OrePrefixes.plateQuadruple.get(Materials.HSSS) });
GTModHandler.addCraftingRecipe(
ItemList.Quantum_Chest_EV.get(1L),
bits,
new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_UHV, 'G',
ItemList.Field_Generator_ZPM, 'D', OrePrefixes.circuit.get(Materials.UHV), 'P',
OrePrefixes.plateDouble.get(Materials.Europium) });
OrePrefixes.plateQuadruple.get(Materials.Europium) });
GTModHandler.addCraftingRecipe(
ItemList.Quantum_Chest_IV.get(1L),
bits,
new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_UEV, 'G',
ItemList.Field_Generator_UV, 'D', OrePrefixes.circuit.get(Materials.UEV), 'P',
OrePrefixes.plate.get(Materials.Americium) });
OrePrefixes.plateQuadruple.get(Materials.Americium) });

// Hermetic casings
GTModHandler.addCraftingRecipe(
@@ -532,7 +532,8 @@ public void run() {
GTModHandler.addCraftingRecipe(
ItemList.Circuit_Good.get(1, o),
new Object[] { "PAP", "CBC", "DCD", 'D', ItemList.Circuit_Parts_Diode.get(1, o), 'C',
Ic2Items.electronicCircuit, 'A', ItemList.IC2_Item_Casing_Steel.get(1, o), 'P',
Ic2Items.electronicCircuit, 'A',
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Steel, 1), 'P',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1), 'B',
ItemList.Circuit_Board_Phenolic_Good.get(1, o) });
GTModHandler.addCraftingRecipe(
3 changes: 3 additions & 0 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java
Original file line number Diff line number Diff line change
@@ -427,6 +427,9 @@ private void registerItems() {
CustomItemList.PotassiumHydroxideDust.set(NHItemList.PotassiumHydroxideDust.getIS());
CustomItemList.RadoxPolymerLens.set(NHItemList.RadoxPolymerLens.getIS());
CustomItemList.ChromaticLens.set(NHItemList.ChromaticLens.getIS());
CustomItemList.ChromaticGem.set(NHItemList.ChromaticGem.getIS());
CustomItemList.ChromaticGemFlawless.set(NHItemList.ChromaticGemFlawless.getIS());
CustomItemList.ChromaticGemExquisite.set(NHItemList.ChromaticGemExquisite.getIS());
CustomItemList.NanoCircuitOrigin.set(NHItemList.NanoCircuitOrigin.getIS());
CustomItemList.ChevronOrigin.set(NHItemList.ChevronOrigin.getIS());
CustomItemList.FramePartOrigin.set(NHItemList.FramePartOrigin.getIS());
Original file line number Diff line number Diff line change
@@ -15,9 +15,9 @@ private void registerMaterialRecipes() {
GTModHandler.addShapelessCraftingRecipe(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Alumite, 8),
GTModHandler.RecipeBits.NOT_REMOVABLE,
new Object[] { OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Aluminium),
OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Aluminium),
OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Steel),
new Object[] { OrePrefixes.dust.get(Materials.Zinc), OrePrefixes.dust.get(Materials.Zinc),
OrePrefixes.dust.get(Materials.Zinc), OrePrefixes.dust.get(Materials.Zinc),
OrePrefixes.dust.get(Materials.Zinc), OrePrefixes.dust.get(Materials.Steel),
OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dust.get(Materials.Obsidian),
OrePrefixes.dust.get(Materials.Obsidian) });

Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
import static com.dreammaster.scripts.IScriptLoader.wildcard;
import static gregtech.api.enums.Mods.EnderIO;
import static gregtech.api.enums.Mods.IndustrialCraft2;
import static gregtech.api.enums.Mods.TinkerConstruct;
import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;

@@ -226,17 +225,6 @@ public void run() {

}
}

if (TinkerConstruct.isModLoaded()) {
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 3L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L))
.itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 4L, 14)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(alloySmelterRecipes);

}

}

}
Loading

0 comments on commit 71dd6de

Please sign in to comment.