aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/goodgenerator/loader
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-09-02 23:17:17 +0200
committerGitHub <noreply@github.com>2024-09-02 23:17:17 +0200
commit1b820de08a05070909a267e17f033fcf58ac8710 (patch)
tree02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/goodgenerator/loader
parentafd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff)
downloadGT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip
The Great Renaming (#3014)
* move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names
Diffstat (limited to 'src/main/java/goodgenerator/loader')
-rw-r--r--src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java207
-rw-r--r--src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java84
-rw-r--r--src/main/java/goodgenerator/loader/FuelRecipeLoader.java163
-rw-r--r--src/main/java/goodgenerator/loader/FuelRodLoader.java52
-rw-r--r--src/main/java/goodgenerator/loader/Loaders.java295
-rw-r--r--src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java497
-rw-r--r--src/main/java/goodgenerator/loader/NeutronActivatorLoader.java34
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader.java1057
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader2.java (renamed from src/main/java/goodgenerator/loader/RecipeLoader_02.java)1053
9 files changed, 1720 insertions, 1722 deletions
diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java
index ecbb67fbf8..36ce938a04 100644
--- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java
+++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java
@@ -15,12 +15,12 @@ import static goodgenerator.util.ItemRefer.Compassline_Casing_UXV;
import static goodgenerator.util.ItemRefer.Compassline_Casing_ZPM;
import static goodgenerator.util.ItemRefer.Component_Assembly_Line;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
-import static gregtech.api.util.GT_RecipeBuilder.HOURS;
-import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
-import static gregtech.api.util.GT_RecipeBuilder.TICKS;
-import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
+import static gregtech.api.util.GTRecipeBuilder.HOURS;
+import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
import java.util.HashMap;
@@ -31,21 +31,20 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-import com.github.technus.tectech.recipe.TT_recipeAdder;
-
+import bartworks.system.material.WerkstoffLoader;
import cpw.mods.fml.common.registry.GameRegistry;
-import goodgenerator.items.MyMaterial;
+import goodgenerator.items.GGMaterial;
import goodgenerator.util.StackUtils;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTUtility;
import gtPlusPlus.core.recipe.common.CI;
+import tectech.recipe.TTRecipeAdder;
public class ComponentAssemblyLineMiscRecipes {
@@ -63,7 +62,7 @@ public class ComponentAssemblyLineMiscRecipes {
generateWrapRecipes();
// The controller itself
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, Compassline_Casing_EV.get(1))
.metadata(RESEARCH_TIME, 1 * HOURS)
.itemInputs(
@@ -76,8 +75,8 @@ public class ComponentAssemblyLineMiscRecipes {
.get(32),
ComponentType.Electric_Motor.getComponent(7)
.get(32),
- GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 16),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32),
+ GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 16),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32),
ItemList.FluidSolidifierZPM.get(16L),
getALCircuit(8, 16),
getALCircuit(7, 20),
@@ -96,118 +95,118 @@ public class ComponentAssemblyLineMiscRecipes {
private static void generateCasingRecipes() {
int t = 1;
// lv 1
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 4),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 4),
ComponentType.Robot_Arm.getComponent(t)
.get(4),
ComponentType.Electric_Piston.getComponent(t)
.get(8),
ComponentType.Electric_Motor.getComponent(t)
.get(10),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Steel, 4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tin, 6),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Steel, 4),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tin, 6),
getCircuit(t, 16))
.fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1)))
.itemOutputs(Compassline_Casing_LV.get(1))
.duration(16 * SECONDS)
- .eut(GT_Values.VP[t])
+ .eut(GTValues.VP[t])
.addTo(assemblerRecipes);
// mv 2
t++;
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 4),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 4),
ComponentType.Robot_Arm.getComponent(t)
.get(4),
ComponentType.Electric_Piston.getComponent(t)
.get(8),
ComponentType.Electric_Motor.getComponent(t)
.get(10),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Aluminium, 4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.AnyCopper, 6),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Aluminium, 4),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.AnyCopper, 6),
getCircuit(t, 8),
getCircuit(t - 1, 16))
.fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1)))
.itemOutputs(Compassline_Casing_MV.get(1))
.duration(16 * SECONDS)
- .eut(GT_Values.VP[t])
+ .eut(GTValues.VP[t])
.addTo(assemblerRecipes);
// hv 3
t++;
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StainlessSteel, 4),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.StainlessSteel, 4),
ComponentType.Robot_Arm.getComponent(t)
.get(4),
ComponentType.Electric_Piston.getComponent(t)
.get(8),
ComponentType.Electric_Motor.getComponent(t)
.get(10),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.StainlessSteel, 4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Gold, 6),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.StainlessSteel, 4),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Gold, 6),
getCircuit(t, 8),
getCircuit(t - 1, 16))
.fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1)))
.itemOutputs(Compassline_Casing_HV.get(1))
.duration(16 * SECONDS)
- .eut(GT_Values.VP[t])
+ .eut(GTValues.VP[t])
.addTo(assemblerRecipes);
// ev 4
t++;
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4),
ComponentType.Robot_Arm.getComponent(t)
.get(4),
ComponentType.Electric_Piston.getComponent(t)
.get(8),
ComponentType.Electric_Motor.getComponent(t)
.get(10),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 6),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 4),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 6),
getCircuit(t, 8),
getCircuit(t - 1, 16))
.fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1)))
.itemOutputs(Compassline_Casing_EV.get(1))
.duration(16 * SECONDS)
- .eut(GT_Values.VP[t])
+ .eut(GTValues.VP[t])
.addTo(assemblerRecipes);
// iv 5
t++;
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4),
ComponentType.Robot_Arm.getComponent(t)
.get(4),
ComponentType.Electric_Piston.getComponent(t)
.get(8),
ComponentType.Electric_Motor.getComponent(t)
.get(10),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 6),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 4),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 6),
getCircuit(t, 8),
getCircuit(t - 1, 16))
.fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1)))
.itemOutputs(Compassline_Casing_IV.get(1))
.duration(16 * SECONDS)
- .eut(GT_Values.VP[t])
+ .eut(GTValues.VP[t])
.addTo(assemblerRecipes);
Fluid sold = FluidRegistry.getFluid("molten.indalloy140");
// Assline Recipes!
// luv 6
t++;
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, Compassline_Casing_IV.get(1))
.metadata(RESEARCH_TIME, (2250 << t) * TICKS)
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1),
WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plateDense, 6),
ComponentType.Robot_Arm.getComponent(t)
.get(8),
@@ -217,7 +216,7 @@ public class ComponentAssemblyLineMiscRecipes {
.get(16),
WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt, 4),
WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGtSmall, 16),
- GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8),
+ GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8),
getALCircuit(t, 8),
getALCircuit(t - 1, 16))
.fluidInputs(
@@ -231,21 +230,21 @@ public class ComponentAssemblyLineMiscRecipes {
.addTo(AssemblyLine);
// zpm 7
t++;
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, Compassline_Casing_LuV.get(1))
.metadata(RESEARCH_TIME, (2250 << t) * TICKS)
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 6),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 6),
ComponentType.Robot_Arm.getComponent(t)
.get(8),
ComponentType.Electric_Piston.getComponent(t)
.get(10),
ComponentType.Electric_Motor.getComponent(t)
.get(16),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iridium, 4),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 16),
- GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 8),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Iridium, 4),
+ GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 16),
+ GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 8),
getALCircuit(t, 8),
getALCircuit(t - 1, 16))
.fluidInputs(
@@ -260,21 +259,21 @@ public class ComponentAssemblyLineMiscRecipes {
// uv 8
t++;
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, Compassline_Casing_ZPM.get(1))
.metadata(RESEARCH_TIME, (2250 << t) * TICKS)
.itemInputs(
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 6),
+ GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 6),
ComponentType.Robot_Arm.getComponent(t)
.get(8),
ComponentType.Electric_Piston.getComponent(t)
.get(10),
ComponentType.Electric_Motor.getComponent(t)
.get(16),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 4),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 16),
- GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 4),
+ GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 16),
+ GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8),
getALCircuit(t, 8),
getALCircuit(t - 1, 16))
.fluidInputs(
@@ -288,23 +287,23 @@ public class ComponentAssemblyLineMiscRecipes {
.addTo(AssemblyLine);
// uhv 9
t++;
- TT_recipeAdder.addResearchableAssemblylineRecipe(
+ TTRecipeAdder.addResearchableAssemblylineRecipe(
Compassline_Casing_UV.get(1),
375 << (t - 2),
1 << (t - 3),
(int) TierEU.RECIPE_UV,
1,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6),
+ new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6),
ComponentType.Robot_Arm.getComponent(t)
.get(8),
ComponentType.Electric_Piston.getComponent(t)
.get(10),
ComponentType.Electric_Motor.getComponent(t)
.get(16),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.CosmicNeutronium, 4),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16),
- GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8), getALCircuit(t, 8),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.CosmicNeutronium, 4),
+ GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16),
+ GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8), getALCircuit(t, 8),
getALCircuit(t - 1, 16) },
new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2),
StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) },
@@ -314,23 +313,23 @@ public class ComponentAssemblyLineMiscRecipes {
sold = FluidRegistry.getFluid("molten.mutatedlivingsolder");
// uev 10
t++;
- TT_recipeAdder.addResearchableAssemblylineRecipe(
+ TTRecipeAdder.addResearchableAssemblylineRecipe(
Compassline_Casing_UHV.get(1),
375 << (t - 2),
1 << (t - 3),
(int) TierEU.RECIPE_UHV,
1,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6),
+ new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6),
ComponentType.Robot_Arm.getComponent(t)
.get(8),
ComponentType.Electric_Piston.getComponent(t)
.get(10),
ComponentType.Electric_Motor.getComponent(t)
.get(16),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 16),
- GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8), getALCircuit(t, 8),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4),
+ GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 16),
+ GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8), getALCircuit(t, 8),
getALCircuit(t - 1, 16) },
new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2),
StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) },
@@ -339,23 +338,23 @@ public class ComponentAssemblyLineMiscRecipes {
(int) TierEU.RECIPE_UHV);
// uiv 11
t++;
- TT_recipeAdder.addResearchableAssemblylineRecipe(
+ TTRecipeAdder.addResearchableAssemblylineRecipe(
Compassline_Casing_UEV.get(1),
375 << (t - 2),
1 << (t - 3),
(int) TierEU.RECIPE_UEV,
1,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6),
+ new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6),
ComponentType.Robot_Arm.getComponent(t)
.get(8),
ComponentType.Electric_Piston.getComponent(t)
.get(10),
ComponentType.Electric_Motor.getComponent(t)
.get(16),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 4),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16),
- GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), getALCircuit(t, 8),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 4),
+ GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16),
+ GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), getALCircuit(t, 8),
getALCircuit(t - 1, 16) },
new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2),
StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) },
@@ -364,23 +363,23 @@ public class ComponentAssemblyLineMiscRecipes {
(int) TierEU.RECIPE_UEV);
// umv 12
t++;
- TT_recipeAdder.addResearchableAssemblylineRecipe(
+ TTRecipeAdder.addResearchableAssemblylineRecipe(
Compassline_Casing_UIV.get(1),
375 << (t - 2),
1 << (t - 3),
(int) TierEU.RECIPE_UIV,
1,
- new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6),
+ new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1),
+ GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6),
ComponentType.Robot_Arm.getComponent(t)
.get(8),
ComponentType.Electric_Piston.getComponent(t)
.get(10),
ComponentType.Electric_Motor.getComponent(t)
.get(16),
- GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 4),
- GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 16),
- GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8),
+ GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 4),
+ GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 16),
+ GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8),
getALCircuit(t - 1, 16) },
new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t - 1, 144 * t * 2),
StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) },
@@ -389,31 +388,31 @@ public class ComponentAssemblyLineMiscRecipes {
(int) TierEU.RECIPE_UIV);
// uxv 13
t++;
- TT_recipeAdder.addResearchableAssemblylineRecipe(
+ TTRecipeAdder.addResearchableAssemblylineRecipe(
Compassline_Casing_UMV.get(1),
375 << (t - 2),
1 << (t - 3),
(int) TierEU.RECIPE_UMV,
1,
new Object[] {
- GT_OreDictUnificator
+ GTOreDictUnificator
.get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1),
- GT_OreDictUnificator
+ GTOreDictUnificator
.get(OrePrefixes.plateDense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 3),
- MyMaterial.shirabon.get(OrePrefixes.plateDense, 3), ComponentType.Robot_Arm.getComponent(t)
+ GGMaterial.shirabon.get(OrePrefixes.plateDense, 3), ComponentType.Robot_Arm.getComponent(t)
.get(8),
ComponentType.Electric_Piston.getComponent(t)
.get(10),
ComponentType.Electric_Motor.getComponent(t)
.get(16),
- GT_OreDictUnificator
+ GTOreDictUnificator
.get(OrePrefixes.gearGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2),
- MyMaterial.shirabon.get(OrePrefixes.gearGt, 2),
- GT_OreDictUnificator
+ GGMaterial.shirabon.get(OrePrefixes.gearGt, 2),
+ GTOreDictUnificator
.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8),
- MyMaterial.shirabon.get(OrePrefixes.gearGtSmall, 8),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4),
- GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4), getALCircuit(t, 8),
+ GGMaterial.shirabon.get(OrePrefixes.gearGtSmall, 8),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4),
+ GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4), getALCircuit(t, 8),
getALCircuit(t - 1, 16) },
new FluidStack[] { new FluidStack(sold, 144 * t * 4),
MaterialsUEVplus.BlackDwarfMatter.getMolten(144 * t * 2), MaterialsUEVplus.Eternity.getMolten(144 * t),
@@ -425,27 +424,27 @@ public class ComponentAssemblyLineMiscRecipes {
private static void generateWrapRecipes() {
for (int i = 0; i <= 11; i++) {
- GT_Values.RA.stdBuilder()
- .itemInputs(getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16))
+ GTValues.RA.stdBuilder()
+ .itemInputs(getCircuit(i, 16), GTUtility.getIntegratedCircuit(16))
.fluidInputs(Materials.SolderingAlloy.getMolten(72L))
.itemOutputs(new ItemStack(Loaders.circuitWrap, 1, i))
.duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);
}
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(
GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16),
- GT_Utility.getIntegratedCircuit(16))
+ GTUtility.getIntegratedCircuit(16))
.fluidInputs(Materials.SolderingAlloy.getMolten(72L))
.itemOutputs(new ItemStack(Loaders.circuitWrap, 1, 12))
.duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(
GameRegistry.findItemStack("dreamcraft", "item.QuantumCircuit", 16),
- GT_Utility.getIntegratedCircuit(16))
+ GTUtility.getIntegratedCircuit(16))
.fluidInputs(Materials.SolderingAlloy.getMolten(72L))
.itemOutputs(new ItemStack(Loaders.circuitWrap, 1, 13))
.duration(30 * SECONDS)
@@ -466,13 +465,13 @@ public class ComponentAssemblyLineMiscRecipes {
Sensor;
public ItemList getComponent(int tier) {
- if (tier < 0 || tier > GT_Values.VN.length) throw new IllegalArgumentException("Tier is out of range!");
- return ItemList.valueOf(this.name() + "_" + GT_Values.VN[tier]);
+ if (tier < 0 || tier > GTValues.VN.length) throw new IllegalArgumentException("Tier is out of range!");
+ return ItemList.valueOf(this.name() + "_" + GTValues.VN[tier]);
}
}
private static ItemStack getCircuit(int tier, long amount) {
- return GT_OreDictUnificator.get(OrePrefixes.circuit, getCircuitMaterial(tier), amount);
+ return GTOreDictUnificator.get(OrePrefixes.circuit, getCircuitMaterial(tier), amount);
}
private static Object[] getALCircuit(int tier, int amount) {
diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java
index f72a31ed65..9de6926cf3 100644
--- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java
@@ -3,7 +3,7 @@ package goodgenerator.loader;
import static goodgenerator.util.StackUtils.getTotalItems;
import static goodgenerator.util.StackUtils.mergeStacks;
import static goodgenerator.util.StackUtils.multiplyAndSplitIntoStacks;
-import static gregtech.api.util.GT_RecipeConstants.COAL_CASING_TIER;
+import static gregtech.api.util.GTRecipeConstants.COAL_CASING_TIER;
import java.util.ArrayList;
import java.util.Arrays;
@@ -22,17 +22,17 @@ import net.minecraftforge.oredict.OreDictionary;
import org.apache.commons.lang3.tuple.Pair;
import goodgenerator.api.recipe.GoodGeneratorRecipeMaps;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.objects.ItemData;
import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.GT_IntegratedCircuit_Item;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.common.items.ItemIntegratedCircuit;
public class ComponentAssemblyLineRecipeLoader {
@@ -42,8 +42,8 @@ public class ComponentAssemblyLineRecipeLoader {
private static final String[] softBlacklistedDictPrefixes = { "Any", "crafting", "nanite" };
private static final String moltenMHDCSM = "molten.magnetohydrodynamicallyconstrainedstarmatter";
- private static LinkedHashMap<List<GT_Recipe>, Pair<ItemList, Integer>> allAssemblerRecipes;
- private static LinkedHashMap<List<GT_Recipe.GT_Recipe_AssemblyLine>, Pair<ItemList, Integer>> allAsslineRecipes;
+ private static LinkedHashMap<List<GTRecipe>, Pair<ItemList, Integer>> allAssemblerRecipes;
+ private static LinkedHashMap<List<GTRecipe.RecipeAssemblyLine>, Pair<ItemList, Integer>> allAsslineRecipes;
private static final HashMap<OrePrefixes, Double> magnetoConversionMultipliers = new HashMap<>();
private static final HashMap<OrePrefixes, OrePrefixes> conversion = new HashMap<>();
@@ -88,14 +88,14 @@ public class ComponentAssemblyLineRecipeLoader {
/** Normal assembler recipes (LV-IV) */
private static void generateAssemblerRecipes() {
allAssemblerRecipes.forEach((recipeList, info) -> {
- for (GT_Recipe recipe : recipeList) {
+ for (GTRecipe recipe : recipeList) {
if (recipe != null) {
ArrayList<ItemStack> fixedInputs = new ArrayList<>();
ArrayList<FluidStack> fixedFluids = new ArrayList<>();
for (int j = 0; j < recipe.mInputs.length; j++) {
ItemStack input = recipe.mInputs[j];
- if (GT_Utility.isStackValid(input) && !(input.getItem() instanceof GT_IntegratedCircuit_Item))
+ if (GTUtility.isStackValid(input) && !(input.getItem() instanceof ItemIntegratedCircuit))
fixedInputs.addAll(multiplyAndSplitIntoStacks(input, INPUT_MULTIPLIER));
}
for (int j = 0; j < recipe.mFluidInputs.length; j++) {
@@ -107,8 +107,8 @@ public class ComponentAssemblyLineRecipeLoader {
fixedInputs = compactItems(fixedInputs, info.getRight());
replaceIntoFluids(fixedInputs, fixedFluids, 64);
int tier = info.getRight();
- int energy = (int) Math.min(Integer.MAX_VALUE - 7, GT_Values.VP[tier - 1]);
- GT_Values.RA.stdBuilder()
+ int energy = (int) Math.min(Integer.MAX_VALUE - 7, GTValues.VP[tier - 1]);
+ GTValues.RA.stdBuilder()
.itemInputs(fixedInputs.toArray(new ItemStack[0]))
.itemOutputs(
info.getLeft()
@@ -127,7 +127,7 @@ public class ComponentAssemblyLineRecipeLoader {
/** Assembly Line Recipes (LuV+) **/
private static void generateAsslineRecipes() {
allAsslineRecipes.forEach((recipeList, info) -> {
- for (GT_Recipe.GT_Recipe_AssemblyLine recipe : recipeList) {
+ for (GTRecipe.RecipeAssemblyLine recipe : recipeList) {
if (recipe != null) {
int componentCircuit = -1;
for (int i = 0; i < compPrefixes.length; i++) if (info.getLeft()
@@ -153,17 +153,17 @@ public class ComponentAssemblyLineRecipeLoader {
// First pass.
for (ItemStack input : recipe.mInputs) {
- if (GT_Utility.isStackValid(input)) {
+ if (GTUtility.isStackValid(input)) {
int count = input.stackSize;
// Mulitplies the input by its multiplier, and adjusts the stacks accordingly
- if (!(input.getItem() instanceof GT_IntegratedCircuit_Item)) {
+ if (!(input.getItem() instanceof ItemIntegratedCircuit)) {
- ItemData data = GT_OreDictUnificator.getAssociation(input);
+ ItemData data = GTOreDictUnificator.getAssociation(input);
// trying to fix some circuit oredicting issues
if (data != null && data.mPrefix == OrePrefixes.circuit) fixedInputs.addAll(
multiplyAndSplitIntoStacks(
- GT_OreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count),
+ GTOreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count),
INPUT_MULTIPLIER));
else fixedInputs.addAll(multiplyAndSplitIntoStacks(input, INPUT_MULTIPLIER));
}
@@ -174,10 +174,10 @@ public class ComponentAssemblyLineRecipeLoader {
// If it overflows then it tries REALLY HARD to cram as much stuff into there.
if (fixedInputs.size() > (addProgrammedCircuit ? 8 : 9))
replaceIntoFluids(fixedInputs, fixedFluids, FLUID_CONVERSION_STACKSIZE_THRESHOLD / 2);
- if (addProgrammedCircuit) fixedInputs.add(GT_Utility.getIntegratedCircuit(componentCircuit));
+ if (addProgrammedCircuit) fixedInputs.add(GTUtility.getIntegratedCircuit(componentCircuit));
addEternityForMHDCSM(fixedFluids);
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(fixedInputs.toArray(new ItemStack[0]))
.itemOutputs(
info.getLeft()
@@ -195,7 +195,7 @@ public class ComponentAssemblyLineRecipeLoader {
// @allSyntheticRubber so it's quite fragile, but
// it's also the least invasive change.
if (swapSiliconeForStyreneButadiene(fixedFluids)) {
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(fixedInputs.toArray(new ItemStack[0]))
.itemOutputs(
info.getLeft()
@@ -225,15 +225,15 @@ public class ComponentAssemblyLineRecipeLoader {
if (OreDictionary.getOreIDs(input).length > 0 && count > threshold) {
FluidStack foundFluidStack = tryConvertItemStackToFluidMaterial(input);
- ItemData data = GT_OreDictUnificator.getAssociation(input);
+ ItemData data = GTOreDictUnificator.getAssociation(input);
// Prevents the uncraftable molten magnetic samarium from being converted into fluid during auto
// generation
if (data != null && data.mMaterial.mMaterial == Materials.SamariumMagnetic) {
- input = GT_OreDictUnificator.get(data.mPrefix, Materials.Samarium, 1);
+ input = GTOreDictUnificator.get(data.mPrefix, Materials.Samarium, 1);
foundFluidStack = tryConvertItemStackToFluidMaterial(input);
} else if (data != null && data.mMaterial.mMaterial == Materials.TengamAttuned) {
- input = GT_OreDictUnificator.get(data.mPrefix, Materials.TengamPurified, 1);
+ input = GTOreDictUnificator.get(data.mPrefix, Materials.TengamPurified, 1);
foundFl