Skip to content

Commit

Permalink
Merge branch 'master' into Waila-pipes
Browse files Browse the repository at this point in the history
  • Loading branch information
serenibyss authored Jan 21, 2025
2 parents 42c87b7 + 3f08a8e commit 5fc4628
Show file tree
Hide file tree
Showing 30 changed files with 192 additions and 114 deletions.
2 changes: 1 addition & 1 deletion src/main/java/goodgenerator/loader/RecipeLoader2.java
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ public static void RecipeLoad() {
GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.Titanium, 4),
GGMaterial.hikarium.get(OrePrefixes.gearGt, 4),
GGMaterial.marM200.get(OrePrefixes.plateDouble, 2),
ItemRefer.IC2_Ir_Plate.get(2),
GTOreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 2),
GGMaterial.lumiium.get(OrePrefixes.bolt, 48))
.fluidInputs(Materials.Palladium.getMolten(1152))
.itemOutputs(ItemRefer.Precise_Assembler.get(1))
Expand Down
106 changes: 101 additions & 5 deletions src/main/java/goodgenerator/util/ItemRefer.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,112 @@
package goodgenerator.util;

import static goodgenerator.loader.FuelRodLoader.*;
import static goodgenerator.loader.Loaders.*;
import static goodgenerator.loader.FuelRodLoader.rodCompressedPlutonium;
import static goodgenerator.loader.FuelRodLoader.rodCompressedPlutoniumDepleted;
import static goodgenerator.loader.FuelRodLoader.rodCompressedPlutoniumDepleted_2;
import static goodgenerator.loader.FuelRodLoader.rodCompressedPlutoniumDepleted_4;
import static goodgenerator.loader.FuelRodLoader.rodCompressedPlutonium_2;
import static goodgenerator.loader.FuelRodLoader.rodCompressedPlutonium_4;
import static goodgenerator.loader.FuelRodLoader.rodCompressedUranium;
import static goodgenerator.loader.FuelRodLoader.rodCompressedUraniumDepleted;
import static goodgenerator.loader.FuelRodLoader.rodCompressedUraniumDepleted_2;
import static goodgenerator.loader.FuelRodLoader.rodCompressedUraniumDepleted_4;
import static goodgenerator.loader.FuelRodLoader.rodCompressedUranium_2;
import static goodgenerator.loader.FuelRodLoader.rodCompressedUranium_4;
import static goodgenerator.loader.FuelRodLoader.rodLiquidPlutonium;
import static goodgenerator.loader.FuelRodLoader.rodLiquidPlutoniumDepleted;
import static goodgenerator.loader.FuelRodLoader.rodLiquidPlutoniumDepleted_2;
import static goodgenerator.loader.FuelRodLoader.rodLiquidPlutoniumDepleted_4;
import static goodgenerator.loader.FuelRodLoader.rodLiquidPlutonium_2;
import static goodgenerator.loader.FuelRodLoader.rodLiquidPlutonium_4;
import static goodgenerator.loader.FuelRodLoader.rodLiquidUranium;
import static goodgenerator.loader.FuelRodLoader.rodLiquidUraniumDepleted;
import static goodgenerator.loader.FuelRodLoader.rodLiquidUraniumDepleted_2;
import static goodgenerator.loader.FuelRodLoader.rodLiquidUraniumDepleted_4;
import static goodgenerator.loader.FuelRodLoader.rodLiquidUranium_2;
import static goodgenerator.loader.FuelRodLoader.rodLiquidUranium_4;
import static goodgenerator.loader.Loaders.AMForge;
import static goodgenerator.loader.Loaders.AMGenerator;
import static goodgenerator.loader.Loaders.CT;
import static goodgenerator.loader.Loaders.CompAssline;
import static goodgenerator.loader.Loaders.FRF;
import static goodgenerator.loader.Loaders.FRF_Casings;
import static goodgenerator.loader.Loaders.FRF_Coil_1;
import static goodgenerator.loader.Loaders.FRF_Coil_2;
import static goodgenerator.loader.Loaders.FRF_Coil_3;
import static goodgenerator.loader.Loaders.FRF_Coil_4;
import static goodgenerator.loader.Loaders.Generator_Diesel;
import static goodgenerator.loader.Loaders.LEG;
import static goodgenerator.loader.Loaders.LES;
import static goodgenerator.loader.Loaders.LFC;
import static goodgenerator.loader.Loaders.MAR;
import static goodgenerator.loader.Loaders.MAR_Casing;
import static goodgenerator.loader.Loaders.PA;
import static goodgenerator.loader.Loaders.SCTurbine;
import static goodgenerator.loader.Loaders.UCFE;
import static goodgenerator.loader.Loaders.XHE;
import static goodgenerator.loader.Loaders.YFT;
import static goodgenerator.loader.Loaders._null_;
import static goodgenerator.loader.Loaders.advancedFuelRod;
import static goodgenerator.loader.Loaders.advancedRadiationProtectionPlate;
import static goodgenerator.loader.Loaders.aluminumNitride;
import static goodgenerator.loader.Loaders.antimatterAnnihilationMatrix;
import static goodgenerator.loader.Loaders.antimatterContainmentCasing;
import static goodgenerator.loader.Loaders.compactFusionCoil;
import static goodgenerator.loader.Loaders.componentAssemblylineCasing;
import static goodgenerator.loader.Loaders.enrichedNaquadahMass;
import static goodgenerator.loader.Loaders.essentiaCell;
import static goodgenerator.loader.Loaders.essentiaFilterCasing;
import static goodgenerator.loader.Loaders.essentiaHatch;
import static goodgenerator.loader.Loaders.essentiaOutputHatch;
import static goodgenerator.loader.Loaders.essentiaOutputHatch_ME;
import static goodgenerator.loader.Loaders.fieldRestrictingGlass;
import static goodgenerator.loader.Loaders.fluidCore;
import static goodgenerator.loader.Loaders.gravityStabilizationCasing;
import static goodgenerator.loader.Loaders.highDensityPlutonium;
import static goodgenerator.loader.Loaders.highDensityPlutoniumNugget;
import static goodgenerator.loader.Loaders.highDensityThorium;
import static goodgenerator.loader.Loaders.highDensityThoriumNugget;
import static goodgenerator.loader.Loaders.highDensityUranium;
import static goodgenerator.loader.Loaders.highDensityUraniumNugget;
import static goodgenerator.loader.Loaders.highEnergyMixture;
import static goodgenerator.loader.Loaders.huiCircuit;
import static goodgenerator.loader.Loaders.impreciseUnitCasing;
import static goodgenerator.loader.Loaders.inverter;
import static goodgenerator.loader.Loaders.magicCasing;
import static goodgenerator.loader.Loaders.magneticFluxCasing;
import static goodgenerator.loader.Loaders.microHeater;
import static goodgenerator.loader.Loaders.naquadahMass;
import static goodgenerator.loader.Loaders.naquadriaMass;
import static goodgenerator.loader.Loaders.neutronSource;
import static goodgenerator.loader.Loaders.plasticCase;
import static goodgenerator.loader.Loaders.preciseUnitCasing;
import static goodgenerator.loader.Loaders.pressureResistantWalls;
import static goodgenerator.loader.Loaders.protomatterActivationCoil;
import static goodgenerator.loader.Loaders.quartzCrystalResonator;
import static goodgenerator.loader.Loaders.quartzWafer;
import static goodgenerator.loader.Loaders.radiationProtectionPlate;
import static goodgenerator.loader.Loaders.radiationProtectionSteelFrame;
import static goodgenerator.loader.Loaders.radioactiveWaste;
import static goodgenerator.loader.Loaders.rawAtomicSeparationCatalyst;
import static goodgenerator.loader.Loaders.rawCylinder;
import static goodgenerator.loader.Loaders.saltyRoot;
import static goodgenerator.loader.Loaders.specialCeramics;
import static goodgenerator.loader.Loaders.specialCeramicsPlate;
import static goodgenerator.loader.Loaders.speedingPipe;
import static goodgenerator.loader.Loaders.supercriticalFluidTurbineCasing;
import static goodgenerator.loader.Loaders.titaniumPlatedCylinder;
import static goodgenerator.loader.Loaders.upgradeEssentia;
import static goodgenerator.loader.Loaders.wrappedPlutoniumIngot;
import static goodgenerator.loader.Loaders.wrappedThoriumIngot;
import static goodgenerator.loader.Loaders.wrappedUraniumIngot;
import static goodgenerator.loader.Loaders.yottaFluidTankCasing;
import static goodgenerator.loader.Loaders.yottaFluidTankCell;

import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

import gregtech.api.util.GTUtility;
import ic2.core.Ic2Items;

public final class ItemRefer {

Expand Down Expand Up @@ -91,8 +189,6 @@ public final class ItemRefer {
public static ItemRefer HiC_T3 = getItemStack(huiCircuit, 2);
public static ItemRefer HiC_T4 = getItemStack(huiCircuit, 3);
public static ItemRefer HiC_T5 = getItemStack(huiCircuit, 4);
public static ItemRefer IC2_Ir_Plate = getItemStack(Ic2Items.iridiumPlate);
public static ItemRefer IC2_Glass = getItemStack(Ic2Items.reinforcedGlass);

public static ItemRefer Field_Restriction_Casing = getItemStack(MAR_Casing);
public static ItemRefer Naquadah_Fuel_Refinery_Casing = getItemStack(FRF_Casings);
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/gregtech/api/util/GTRecipe.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import gregtech.api.util.extensions.ArrayExt;
import gregtech.common.tileentities.machines.MTEHatchInputBusME;
import gregtech.common.tileentities.machines.MTEHatchInputME;
import ic2.core.Ic2Items;
import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import it.unimi.dsi.fastutil.objects.Reference2LongArrayMap;
Expand All @@ -53,7 +52,7 @@ public class GTRecipe implements Comparable<GTRecipe> {
private static ItemStack ic2FluidCell;

public static void setItemStacks() {
ic2FluidCell = Ic2Items.FluidCell.copy();
ic2FluidCell = ItemList.Cell_Universal_Fluid.get(1);
dataStick = ItemList.Tool_DataStick.get(1L);
dataOrb = ItemList.Tool_DataOrb.get(1L);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/GTProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ public void onPreLoad() {
GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("cfPack", 1L, 32767));
// GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("jetpack", 1L, 32767));
GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("treetap", 1L, 32767));
GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("weedEx", 1L, 32767));
GTModHandler.sNonReplaceableItems.add(ItemList.IC2_Spray_WeedEx.getWithDamage(1L, 32767));
GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("staticBoots", 1L, 32767));
GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("compositeArmor", 1L, 32767));
GTModHandler.sNonReplaceableItems.add(GTModHandler.getIC2Item("hazmatHelmet", 1L, 32767));
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/gregtech/loaders/misc/GTAchievements.java
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,7 @@ public void issueAchivementHatch(EntityPlayer player, ItemStack stack) {
issueAchievement(player, "finalpreparations");
}
}
if (stack.getUnlocalizedName()
.equals("ic2.itemPartIndustrialDiamond")) {
if (ItemList.IC2_Industrial_Diamond.isStackEqual(stack)) {
issueAchievement(player, "artificaldia");
issueAchievement(player, "buildCoalDiamond");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
.itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(2))
.itemOutputs(
ItemList.IC2_Resin.get(1L),
GTModHandler.getIC2Item("plantBall", 1L),
ItemList.IC2_Plantball.get(1L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L))
.outputChances(5000, 3750, 2500, 2500)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
case "Iron", "WroughtIron" -> {
GTValues.RA.stdBuilder()
.itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Cell.get(0L))
.itemOutputs(GTModHandler.getIC2Item("fuelRod", tAmount))
.itemOutputs(ItemList.IC2_Fuel_Rod_Empty.get(tAmount))
.duration((tAmount * 128) * TICKS)
.eut(TierEU.RECIPE_LV)
.addTo(extruderRecipes);
Expand Down
22 changes: 13 additions & 9 deletions src/main/java/gregtech/loaders/postload/CraftingRecipeLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -1616,13 +1616,15 @@ public void run() {
GTModHandler.getIC2Item("powerunit", 1L),
bits_no_remove_buffered,
new Object[] { "BCA", "BIM", "BCA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B',
OrePrefixes.battery.get(Materials.LV), 'A', GTModHandler.getIC2Item("casingiron", 1L), 'I',
OrePrefixes.battery.get(Materials.LV), 'A',
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 1L), 'I',
OrePrefixes.circuit.get(Materials.LV), 'M', GTModHandler.getIC2Item("elemotor", 1L) });
GTModHandler.addCraftingRecipe(
GTModHandler.getIC2Item("powerunitsmall", 1L),
bits_no_remove_buffered,
new Object[] { " CA", "BIM", " CA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B',
OrePrefixes.battery.get(Materials.LV), 'A', GTModHandler.getIC2Item("casingiron", 1L), 'I',
OrePrefixes.battery.get(Materials.LV), 'A',
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 1L), 'I',
OrePrefixes.circuit.get(Materials.LV), 'M', GTModHandler.getIC2Item("elemotor", 1L) });
GTModHandler.addCraftingRecipe(
GTModHandler.getIC2Item("remote", 1L),
Expand All @@ -1635,13 +1637,15 @@ public void run() {
bits_no_remove_buffered,
new Object[] { "PGP", "CBC", "WWW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'G',
OrePrefixes.dust.get(Materials.Glowstone), 'B', OrePrefixes.battery.get(Materials.HV), 'C',
OrePrefixes.circuit.get(Materials.HV), 'P', GTModHandler.getIC2Item("casinggold", 1L) });
OrePrefixes.circuit.get(Materials.HV), 'P',
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Gold, 1L) });
GTModHandler.addCraftingRecipe(
GTModHandler.getIC2Item("ovScanner", 1L),
bits_no_remove_buffered,
new Object[] { "PDP", "GCG", "WSW", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G',
OrePrefixes.dust.get(Materials.Glowstone), 'D', OrePrefixes.battery.get(Materials.IV), 'C',
OrePrefixes.circuit.get(Materials.HV), 'P', GTModHandler.getIC2Item("casinggold", 1L), 'S',
OrePrefixes.circuit.get(Materials.HV), 'P',
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Gold, 1L), 'S',
GTModHandler.getIC2Item("odScanner", 1L) });
GTModHandler.addCraftingRecipe(
GTModHandler.getIC2Item("staticBoots", 1L),
Expand Down Expand Up @@ -1683,7 +1687,7 @@ public void run() {
OrePrefixes.circuit.get(Materials.LV), 'P', new ItemStack(Blocks.piston), 'H',
new ItemStack(Blocks.hopper) });
GTModHandler.addCraftingRecipe(
GTModHandler.getIC2Item("suBattery", 1L),
ItemList.IC2_SuBattery.get(1L),
bits_no_remove_buffered,
new Object[] { "W", "C", "R", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C',
OrePrefixes.dust.get(Materials.HydratedCoal), 'R', OrePrefixes.dust.get(Materials.Redstone) });
Expand Down Expand Up @@ -1859,19 +1863,19 @@ public void run() {
GTModHandler.getIC2Item("carbonrotor", 1L),
bits_no_remove_buffered,
new Object[] { "dBS", "BTB", "SBw", 'B', GTModHandler.getIC2Item("carbonrotorblade", 1), 'S',
OrePrefixes.screw.get(Materials.Iridium), 'T', GTModHandler.getIC2Item("steelshaft", 1) });
OrePrefixes.screw.get(Materials.Iridium), 'T', ItemList.IC2_ShaftSteel.get(1L) });
GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("steelrotor", 1L));
GTModHandler.addCraftingRecipe(
GTModHandler.getIC2Item("steelrotor", 1L),
bits_no_remove_buffered,
new Object[] { "dBS", "BTB", "SBw", 'B', GTModHandler.getIC2Item("steelrotorblade", 1), 'S',
OrePrefixes.screw.get(Materials.StainlessSteel), 'T', GTModHandler.getIC2Item("ironshaft", 1) });
OrePrefixes.screw.get(Materials.StainlessSteel), 'T', ItemList.IC2_ShaftIron.get(1L) });
GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("ironrotor", 1L));
GTModHandler.addCraftingRecipe(
GTModHandler.getIC2Item("ironrotor", 1L),
bits_no_remove_buffered,
new Object[] { "dBS", "BTB", "SBw", 'B', GTModHandler.getIC2Item("ironrotorblade", 1), 'S',
OrePrefixes.screw.get(Materials.WroughtIron), 'T', GTModHandler.getIC2Item("ironshaft", 1) });
OrePrefixes.screw.get(Materials.WroughtIron), 'T', ItemList.IC2_ShaftIron.get(1) });
GTModHandler.removeRecipeByOutputDelayed(GTModHandler.getIC2Item("woodrotor", 1L));
GTModHandler.addCraftingRecipe(
GTModHandler.getIC2Item("woodrotor", 1L),
Expand Down Expand Up @@ -2016,7 +2020,7 @@ public void run() {
new Object[] { "RIR", "VBV", "CCC", 'R', ItemList.Circuit_Parts_Resistor.get(1), 'C',
GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1), 'V',
ItemList.Circuit_Parts_Vacuum_Tube.get(1), 'B', ItemList.Circuit_Board_Coated_Basic.get(1), 'I',
ItemList.IC2_Item_Casing_Steel.get(1) });
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Steel, 1) });
GTModHandler.addShapelessCraftingRecipe(
GTModHandler.getIC2Item("electronicCircuit", 1L),
new Object[] { ItemList.Circuit_Integrated.getWildcard(1L) });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ public void run() {
GTModHandler.addScrapboxDrop(5.0F, GTOreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 1L));
GTModHandler.addScrapboxDrop(1.0F, new ItemStack(Items.leather));
GTModHandler.addScrapboxDrop(1.0F, new ItemStack(Items.feather));
GTModHandler.addScrapboxDrop(0.7F, GTModHandler.getIC2Item("plantBall", 1L));
GTModHandler.addScrapboxDrop(0.7F, ItemList.IC2_Plantball.get(1L));
GTModHandler.addScrapboxDrop(3.8F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
GTModHandler.addScrapboxDrop(0.6F, new ItemStack(Items.slime_ball));
GTModHandler.addScrapboxDrop(0.8F, GTOreDictUnificator.get(OrePrefixes.dust, Materials.Rubber, 1L));
GTModHandler.addScrapboxDrop(2.7F, GTModHandler.getIC2Item("suBattery", 1L));
GTModHandler.addScrapboxDrop(2.7F, ItemList.IC2_SuBattery.get(1L));
GTModHandler.addScrapboxDrop(3.6F, ItemList.Circuit_Primitive.get(1L));
GTModHandler.addScrapboxDrop(0.8F, ItemList.Circuit_Parts_Advanced.get(1L));
GTModHandler.addScrapboxDrop(1.8F, ItemList.Circuit_Board_Basic.get(1L));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6856,14 +6856,18 @@ private void withRailcraft() {
// Steam Boilers

GTValues.RA.stdBuilder()
.itemInputs(ItemList.IC2_Item_Casing_Iron.get(6), GTUtility.getIntegratedCircuit(6))
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 6),
GTUtility.getIntegratedCircuit(6))
.itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 3))
.duration(20 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(ItemList.IC2_Item_Casing_Steel.get(6), GTUtility.getIntegratedCircuit(6))
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Steel, 6),
GTUtility.getIntegratedCircuit(6))
.itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 4))
.duration(20 * SECONDS)
.eut(64)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;

Expand Down Expand Up @@ -311,7 +310,7 @@ public void run() {
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 2L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(GTModHandler.getIC2Item("fuelRod", 1L))
.itemOutputs(ItemList.IC2_Fuel_Rod_Empty.get(1))
.duration(5 * SECONDS)
.eut(8)
.addTo(benderRecipes);
Expand Down
Loading

0 comments on commit 5fc4628

Please sign in to comment.