Skip to content

Commit

Permalink
Merge branch 'master' into add_nc_hatch_recipes
Browse files Browse the repository at this point in the history
  • Loading branch information
@serenibyss
serenibyss authored Jan 12, 2025
2 parents 3b09776 + c659d57 commit b0727fa
Show file tree
Hide file tree
Showing 48 changed files with 1,154 additions and 1,484 deletions.
22 changes: 11 additions & 11 deletions src/main/java/com/dreammaster/creativetab/ModTabList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import net.minecraft.item.Item;

import com.dreammaster.gthandler.CustomItemList;
import com.dreammaster.item.ItemList;
import com.dreammaster.item.NHItemList;

import eu.usrv.yamcore.creativetabs.CreativeTabsManager;
import eu.usrv.yamcore.creativetabs.ModCreativeTab;
Expand All @@ -32,27 +32,27 @@ private ModTabList() {}

public static void InitModTabs(CreativeTabsManager pTabManager, ModItemManager pItemManager) {
pTabManager.AddCreativeTab(
new ModCreativeTab(ModGenericTab, ItemList.AsteroidsStoneDust.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModShapesTab, ItemList.ShapeBlock.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModMoldsTab, ItemList.MoldFormAnvil.Item.getConstructedItem()));
new ModCreativeTab(ModGenericTab, NHItemList.AsteroidsStoneDust.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModShapesTab, NHItemList.ShapeBlock.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModMoldsTab, NHItemList.MoldFormAnvil.Item.getConstructedItem()));
pTabManager.AddCreativeTab(
new ModCreativeTab(ModThaumcraftTab, ItemList.ChargedVoidWandCap.Item.getConstructedItem()));
pTabManager
.AddCreativeTab(new ModCreativeTab(ModCircuitsTab, ItemList.QuantumCircuit.Item.getConstructedItem()));
new ModCreativeTab(ModThaumcraftTab, NHItemList.ChargedVoidWandCap.Item.getConstructedItem()));
pTabManager.AddCreativeTab(
new ModCreativeTab(ModCircuitsTab, NHItemList.QuantumCircuit.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModFluidsTab, Items.bucket));
pTabManager.AddCreativeTab(new ModCreativeTab(ModBlocksTab, Item.getItemFromBlock(Blocks.stone)));
pTabManager.AddCreativeTab(
new ModCreativeTab(ModSpaceTab, ItemList.HeavyDutyNoseConeTier3.Item.getConstructedItem()));
new ModCreativeTab(ModSpaceTab, NHItemList.HeavyDutyNoseConeTier3.Item.getConstructedItem()));
pTabManager.AddCreativeTab(
new ModCreativeTab(
ModSolarTab,
ItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.Item.getConstructedItem()));
NHItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.Item.getConstructedItem()));
pTabManager.AddCreativeTab(
new ModCreativeTab(ModBarsAndCasingsTab, ItemList.ChromeBars.Item.getConstructedItem()));
new ModCreativeTab(ModBarsAndCasingsTab, NHItemList.ChromeBars.Item.getConstructedItem()));
pTabManager.AddCreativeTab(
new ModCreativeTab(
ModAdditionsToGregTechTab,
ItemList.EtchedLudicrousVoltageWiring.Item.getConstructedItem()) {
NHItemList.EtchedLudicrousVoltageWiring.Item.getConstructedItem()) {

@Override
public void displayAllReleventItems(List stuffToShow) {
Expand Down
129 changes: 65 additions & 64 deletions src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/main/java/com/dreammaster/gthandler/GT_CustomLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;

import com.dreammaster.item.ItemList;
import com.dreammaster.item.NHItemList;
import com.dreammaster.item.food.QuantumBread;
import com.dreammaster.modfixes.biomesoplenty.BlockHarvestToolFix;
import com.dreammaster.modfixes.enderIO.FrankenskullFix;
Expand All @@ -29,7 +29,7 @@ public enum AdvancedGTMaterials {

ZPM(OrePrefixes.circuit.get(Materials.ZPM), OrePrefixes.wireGt04.get(Materials.YttriumBariumCuprate),
Materials.Naquadah, OrePrefixes.wireGt02.get(Materials.Naquadah),
OrePrefixes.gemExquisite.get(Materials.GarnetYellow), ItemList.MysteriousCrystal.getIS(),
OrePrefixes.gemExquisite.get(Materials.GarnetYellow), NHItemList.MysteriousCrystal.getIS(),
"blockGlassZPM", Materials.Iridium, Materials.Naquadah),

UV(OrePrefixes.circuit.get(Materials.UV), OrePrefixes.wireGt08.get(Materials.YttriumBariumCuprate),
Expand Down
816 changes: 408 additions & 408 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java
View file

Large diffs are not rendered by default.

89 changes: 46 additions & 43 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_OreDictionary.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import net.minecraft.item.ItemStack;

import com.dreammaster.block.BlockList;
import com.dreammaster.item.ItemList;
import com.dreammaster.item.NHItemList;

import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
Expand Down Expand Up @@ -57,42 +57,43 @@ public void run() {
GTOreDictUnificator.registerOre("cropCarrot", GTModHandler.getModItem(BiomesOPlenty.ID, "food", 1L, 2));

GTOreDictUnificator
.registerOre(OrePrefixes.compressed, Materials.Mytryl, ItemList.MytrylCompressedPlate.getIS());
.registerOre(OrePrefixes.compressed, Materials.Mytryl, NHItemList.MytrylCompressedPlate.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.block, Materials.Mytryl, BlockList.Mytryl.getIS());
GTOreDictUnificator.registerOre("blockCallistoIce", BlockList.CallistoColdIce.getIS());
GTOreDictUnificator.registerOre(
OrePrefixes.compressed,
Materials.CallistoIce,
ItemList.CallistoIceCompressedPlate.getIS());
NHItemList.CallistoIceCompressedPlate.getIS());
GTOreDictUnificator.registerOre("blockLedox", BlockList.Ledox.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.compressed, Materials.Ledox, ItemList.LedoxCompressedPlate.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.stick, Materials.Stone, ItemList.CobbleStoneRod.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Stone, ItemList.StonePlate.getIS());
GTOreDictUnificator.registerOre("stickSandstone", ItemList.SandStoneRod.getIS());
GTOreDictUnificator.registerOre("lensReinforcedGlass", ItemList.ReinforcedGlassLense.getIS());
GTOreDictUnificator.registerOre("plateReinforcedGlass", ItemList.ReinforcedGlassPlate.getIS());
GTOreDictUnificator
.registerOre(OrePrefixes.compressed, Materials.Ledox, NHItemList.LedoxCompressedPlate.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.stick, Materials.Stone, NHItemList.CobbleStoneRod.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.plate, Materials.Stone, NHItemList.StonePlate.getIS());
GTOreDictUnificator.registerOre("stickSandstone", NHItemList.SandStoneRod.getIS());
GTOreDictUnificator.registerOre("lensReinforcedGlass", NHItemList.ReinforcedGlassLense.getIS());
GTOreDictUnificator.registerOre("plateReinforcedGlass", NHItemList.ReinforcedGlassPlate.getIS());
GTOreDictUnificator.registerOre("blockQuantium", BlockList.Quantinum.getIS());
GTOreDictUnificator
.registerOre(OrePrefixes.compressed, Materials.Quantium, ItemList.QuantinumCompressedPlate.getIS());
.registerOre(OrePrefixes.compressed, Materials.Quantium, NHItemList.QuantinumCompressedPlate.getIS());
GTOreDictUnificator
.registerOre(OrePrefixes.block, Materials.MysteriousCrystal, BlockList.MysteriousCrystal.getIS());
GTOreDictUnificator.registerOre(
OrePrefixes.compressed,
Materials.MysteriousCrystal,
ItemList.MysteriousCrystalCompressedPlate.getIS());
NHItemList.MysteriousCrystalCompressedPlate.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.block, Materials.BlackPlutonium, BlockList.BlackPlutonium.getIS());
GTOreDictUnificator.registerOre(
OrePrefixes.dust,
Materials.CertusQuartzCharged,
com.dreammaster.item.ItemList.ChargedCertusQuartzDust.getIS(1));
NHItemList.ChargedCertusQuartzDust.getIS(1));
GTOreDictUnificator.registerOre(
OrePrefixes.plate,
Materials.CertusQuartzCharged,
com.dreammaster.item.ItemList.ChargedCertusQuartzPlate.getIS(1));
NHItemList.ChargedCertusQuartzPlate.getIS(1));
GTOreDictUnificator.registerOre(
OrePrefixes.stick,
Materials.CertusQuartzCharged,
com.dreammaster.item.ItemList.ChargedCertusQuartzRod.getIS(1));
NHItemList.ChargedCertusQuartzRod.getIS(1));
GTOreDictUnificator.registerOre(
OrePrefixes.crystal,
Materials.CertusQuartzCharged,
Expand All @@ -101,41 +102,43 @@ public void run() {
OrePrefixes.gem,
Materials.CertusQuartzCharged,
getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 1));
GTOreDictUnificator.registerOre("dustCokeOvenBrick", com.dreammaster.item.ItemList.CokeOvenBrickDust.getIS(1));
GTOreDictUnificator.registerOre("ingotCokeOvenBrick", com.dreammaster.item.ItemList.CokeOvenBrick.getIS(1));
GTOreDictUnificator.registerOre("leather", com.dreammaster.item.ItemList.ArtificialLeather.getIS(1));
GTOreDictUnificator.registerOre("itemLeather", com.dreammaster.item.ItemList.ArtificialLeather.getIS(1));
GTOreDictUnificator
.registerOre("dustPotassiumHydroxide", com.dreammaster.item.ItemList.PotassiumHydroxideDust.getIS(1));
GTOreDictUnificator.registerOre("dustCokeOvenBrick", NHItemList.CokeOvenBrickDust.getIS(1));
GTOreDictUnificator.registerOre("ingotCokeOvenBrick", NHItemList.CokeOvenBrick.getIS(1));
GTOreDictUnificator.registerOre("leather", NHItemList.ArtificialLeather.getIS(1));
GTOreDictUnificator.registerOre("itemLeather", NHItemList.ArtificialLeather.getIS(1));
GTOreDictUnificator.registerOre("dustPotassiumHydroxide", NHItemList.PotassiumHydroxideDust.getIS(1));

GTOreDictUnificator.registerOre(OrePrefixes.stickLong, Materials.Obsidian, ItemList.LongObsidianRod.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.stickLong, Materials.Obsidian, NHItemList.LongObsidianRod.getIS());

GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Aluminium, ItemList.AluminiumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Chrome, ItemList.ChromeBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Aluminium, NHItemList.AluminiumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Chrome, NHItemList.ChromeBars.getIS());
GTOreDictUnificator
.registerOre(OrePrefixes.bars, Materials.ConductiveIron, NHItemList.ConductiveIronBars.getIS());
GTOreDictUnificator
.registerOre(OrePrefixes.bars, Materials.ConductiveIron, ItemList.ConductiveIronBars.getIS());
.registerOre(OrePrefixes.bars, Materials.ElectricalSteel, NHItemList.ElectricalSteelBars.getIS());
GTOreDictUnificator
.registerOre(OrePrefixes.bars, Materials.ElectricalSteel, ItemList.ElectricalSteelBars.getIS());
.registerOre(OrePrefixes.bars, Materials.EnergeticAlloy, NHItemList.EnergeticAlloyBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Enderium, NHItemList.EnderiumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.EnderiumBase, NHItemList.EnderiumBaseBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Iridium, NHItemList.IridiumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Neutronium, NHItemList.NeutroniumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Osmium, NHItemList.OsmiumBars.getIS());
GTOreDictUnificator
.registerOre(OrePrefixes.bars, Materials.EnergeticAlloy, ItemList.EnergeticAlloyBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Enderium, ItemList.EnderiumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.EnderiumBase, ItemList.EnderiumBaseBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Iridium, ItemList.IridiumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Neutronium, ItemList.NeutroniumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Osmium, ItemList.OsmiumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.PulsatingIron, ItemList.PulsatingIronBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.RedstoneAlloy, ItemList.RedstoneAlloyBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Soularium, ItemList.SoulariumBars.getIS());
.registerOre(OrePrefixes.bars, Materials.PulsatingIron, NHItemList.PulsatingIronBars.getIS());
GTOreDictUnificator
.registerOre(OrePrefixes.bars, Materials.RedstoneAlloy, NHItemList.RedstoneAlloyBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Soularium, NHItemList.SoulariumBars.getIS());
GTOreDictUnificator.registerOre(
OrePrefixes.bars,
Materials.Soularium,
GTModHandler.getModItem(EnderIO.ID, "blockSoulariumBars", 1L, 0));
GTOreDictUnificator
.registerOre(OrePrefixes.bars, Materials.StainlessSteel, ItemList.StainlessSteelBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Steel, ItemList.SteelBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Titanium, ItemList.TitaniumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Tungsten, ItemList.TungstenBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.TungstenSteel, ItemList.TungstenSteelBars.getIS());
.registerOre(OrePrefixes.bars, Materials.StainlessSteel, NHItemList.StainlessSteelBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Steel, NHItemList.SteelBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Titanium, NHItemList.TitaniumBars.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.bars, Materials.Tungsten, NHItemList.TungstenBars.getIS());
GTOreDictUnificator
.registerOre(OrePrefixes.bars, Materials.TungstenSteel, NHItemList.TungstenSteelBars.getIS());

GTOreDictUnificator.registerOre(
OrePrefixes.ore,
Expand Down Expand Up @@ -320,10 +323,10 @@ public void run() {
GTModHandler.getModItem(IndustrialCraft2.ID, "blockRubWood", 1L, 0));

// oreDict UMV and UXV circuits
GTOreDictUnificator.registerOre(OrePrefixes.circuit, Materials.UMV, ItemList.PikoCircuit.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.circuit, Materials.UXV, ItemList.QuantumCircuit.getIS());
GTOreDictUnificator.addToBlacklist(ItemList.PikoCircuit.getIS());
GTOreDictUnificator.addToBlacklist(ItemList.QuantumCircuit.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.circuit, Materials.UMV, NHItemList.PikoCircuit.getIS());
GTOreDictUnificator.registerOre(OrePrefixes.circuit, Materials.UXV, NHItemList.QuantumCircuit.getIS());
GTOreDictUnificator.addToBlacklist(NHItemList.PikoCircuit.getIS());
GTOreDictUnificator.addToBlacklist(NHItemList.QuantumCircuit.getIS());

// Add ore dictionary entries for sand and red sand to craft unfired coke oven bricks.
GTOreDictUnificator.registerOre("sand", new ItemStack(Blocks.sand, 1, 0));
Expand Down
Loading

0 comments on commit b0727fa

Please sign in to comment.