aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlodBlock <1356392126@qq.com>2021-07-20 14:54:19 +0800
committerGlodBlock <1356392126@qq.com>2021-07-20 14:54:19 +0800
commit865c6457a740e8b7d651a7726980e14c206c6ffc (patch)
treea63cba408314518dd654c3bb6f356a29a7ab23d3 /src
parent4bd5c963f44f8933cf6707ba833758aac31b71a7 (diff)
downloadGT5-Unofficial-865c6457a740e8b7d651a7726980e14c206c6ffc.tar.gz
GT5-Unofficial-865c6457a740e8b7d651a7726980e14c206c6ffc.tar.bz2
GT5-Unofficial-865c6457a740e8b7d651a7726980e14c206c6ffc.zip
add recipes
Diffstat (limited to 'src')
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java8
-rw-r--r--src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java2
-rw-r--r--src/main/java/GoodGenerator/Loader/Loaders.java101
-rw-r--r--src/main/java/GoodGenerator/Loader/RecipeLoader.java200
-rw-r--r--src/main/java/GoodGenerator/util/CrackRecipeAdder.java14
-rw-r--r--src/main/resources/assets/goodgenerator/lang/en_US.lang4
-rw-r--r--src/main/resources/assets/goodgenerator/textures/blocks/rawCylinder.pngbin0 -> 1978 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/aluminumNitride.pngbin0 -> 1994 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/specialCeramics.pngbin0 -> 2209 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/specialCeramicsPlate.pngbin0 -> 1945 bytes
10 files changed, 263 insertions, 66 deletions
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java b/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
index 39b257cb60..9897d6eff5 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
@@ -95,7 +95,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM imple
'X',
ofChain(
ofHatchAdder(
- FuelRefineFactory::addToFRFList,60,
+ FuelRefineFactory::addToFRFList,179,
Loaders.FRF_Casings,0
),
ofBlock(
@@ -343,9 +343,9 @@ public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM imple
@SuppressWarnings("ALL")
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
if(aSide == aFacing){
- if(aActive) return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(48), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE), TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW).glow().build()};
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(48), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE), TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW).glow().build()};
+ if(aActive) return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(179), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE), TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW).glow().build()};
+ return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(179), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE), TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW).glow().build()};
}
- return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(48)};
+ return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(179)};
}
}
diff --git a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
index ba72b8efc0..9d620193e8 100644
--- a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
@@ -15,7 +15,7 @@ public class FuelRecipeLoader {
//MyRecipeAdder.instance.addLiquidMentalFuel(Materials.NaquadahEnriched.getMolten(1L),Materials.Naquadah.getMolten(1L),32768,100);
//MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,120);
MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1),12960,100);
- MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1),4320,500);
+ MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1),5400,400);
MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1),32400,150);
MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1),288000,320);
MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1),1276000,100);
diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java
index 66020a1d12..faf68c814b 100644
--- a/src/main/java/GoodGenerator/Loader/Loaders.java
+++ b/src/main/java/GoodGenerator/Loader/Loaders.java
@@ -16,60 +16,71 @@ import net.minecraftforge.oredict.OreDictionary;
public class Loaders {
- public static final Item radiationProtectionPlate = new MyItems("radiationProtectionPlate",GoodGenerator.GG);
- public static final Item wrappedUraniumIngot = new MyItems("wrappedUraniumIngot",GoodGenerator.GG);
- public static final Item highDensityUraniumNugget = new MyItems("highDensityUraniumNugget",GoodGenerator.GG);
- public static final Item highDensityUranium = new MyItems("highDensityUranium",GoodGenerator.GG);
- public static final Item wrappedThoriumIngot = new MyItems("wrappedThoriumIngot",GoodGenerator.GG);
- public static final Item highDensityThoriumNugget = new MyItems("highDensityThoriumNugget",GoodGenerator.GG);
- public static final Item highDensityThorium = new MyItems("highDensityThorium",GoodGenerator.GG);
- public static final Item wrappedPlutoniumIngot = new MyItems("wrappedPlutoniumIngot",GoodGenerator.GG);
- public static final Item highDensityPlutoniumNugget = new MyItems("highDensityPlutoniumNugget",GoodGenerator.GG);
- public static final Item highDensityPlutonium = new MyItems("highDensityPlutonium",GoodGenerator.GG);
- public static final Item rawAtomicSeparationCatalyst = new MyItems("rawAtomicSeparationCatalyst",GoodGenerator.GG);
- public static final Item advancedRadiationProtectionPlate = new MyItems("advancedRadiationProtectionPlate",GoodGenerator.GG);
+ public static final int IDOffset = 32001;
- public static final Block MAR_Casing = new Casing("MAR_Casing",new String[]{GoodGenerator.MOD_ID+":MAR_Casing"});
- public static final Block FRF_Casings = new Casing("FRF_Casing",new String[]{"gregtech:iconsets/MACHINE_CASING_ROBUST_TUNGSTENSTEEL"});
- public static final Block FRF_Coil_1 = new Casing("FRF_Coil_1",new String[]{GoodGenerator.MOD_ID+":FRF_Coils/1"});
- public static final Block FRF_Coil_2 = new Casing("FRF_Coil_2",new String[]{GoodGenerator.MOD_ID+":FRF_Coils/2"});
- public static final Block FRF_Coil_3 = new Casing("FRF_Coil_3",new String[]{GoodGenerator.MOD_ID+":FRF_Coils/3"});
- public static final Block radiationProtectionSteelFrame = new Frame("radiationProtectionSteelFrame",new String[]{GoodGenerator.MOD_ID+":radiationProtectionSteelFrame"});
- public static final Block fieldRestrictingGlass = new Frame("fieldRestrictingGlass",new String[]{GoodGenerator.MOD_ID+":fieldRestrictingGlass"});
- public static final Block titaniumPlatedCylinder = new Casing("titaniumPlatedCylinder",new String[]{GoodGenerator.MOD_ID+":titaniumPlatedCylinder"});
+ public static final Item radiationProtectionPlate = new MyItems("radiationProtectionPlate", GoodGenerator.GG);
+ public static final Item wrappedUraniumIngot = new MyItems("wrappedUraniumIngot", GoodGenerator.GG);
+ public static final Item highDensityUraniumNugget = new MyItems("highDensityUraniumNugget", GoodGenerator.GG);
+ public static final Item highDensityUranium = new MyItems("highDensityUranium", GoodGenerator.GG);
+ public static final Item wrappedThoriumIngot = new MyItems("wrappedThoriumIngot", GoodGenerator.GG);
+ public static final Item highDensityThoriumNugget = new MyItems("highDensityThoriumNugget", GoodGenerator.GG);
+ public static final Item highDensityThorium = new MyItems("highDensityThorium", GoodGenerator.GG);
+ public static final Item wrappedPlutoniumIngot = new MyItems("wrappedPlutoniumIngot", GoodGenerator.GG);
+ public static final Item highDensityPlutoniumNugget = new MyItems("highDensityPlutoniumNugget", GoodGenerator.GG);
+ public static final Item highDensityPlutonium = new MyItems("highDensityPlutonium", GoodGenerator.GG);
+ public static final Item rawAtomicSeparationCatalyst = new MyItems("rawAtomicSeparationCatalyst", GoodGenerator.GG);
+ public static final Item advancedRadiationProtectionPlate = new MyItems("advancedRadiationProtectionPlate", GoodGenerator.GG);
+ public static final Item aluminumNitride = new MyItems("aluminumNitride", GoodGenerator.GG);
+ public static final Item specialCeramics = new MyItems("specialCeramics", GoodGenerator.GG);
+ public static final Item specialCeramicsPlate = new MyItems("specialCeramicsPlate", GoodGenerator.GG);
+
+ public static final Block MAR_Casing = new Casing("MAR_Casing", new String[]{GoodGenerator.MOD_ID+":MAR_Casing"});
+ public static final Block FRF_Casings = new Casing("FRF_Casing", new String[]{"gregtech:iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM"});
+ public static final Block FRF_Coil_1 = new Casing("FRF_Coil_1", new String[]{GoodGenerator.MOD_ID+":FRF_Coils/1"});
+ public static final Block FRF_Coil_2 = new Casing("FRF_Coil_2", new String[]{GoodGenerator.MOD_ID+":FRF_Coils/2"});
+ public static final Block FRF_Coil_3 = new Casing("FRF_Coil_3", new String[]{GoodGenerator.MOD_ID+":FRF_Coils/3"});
+ public static final Block radiationProtectionSteelFrame = new Frame("radiationProtectionSteelFrame", new String[]{GoodGenerator.MOD_ID+":radiationProtectionSteelFrame"});
+ public static final Block fieldRestrictingGlass = new Frame("fieldRestrictingGlass", new String[]{GoodGenerator.MOD_ID+":fieldRestrictingGlass"});
+ public static final Block rawCylinder = new Casing("rawCylinder", new String[]{GoodGenerator.MOD_ID+":rawCylinder"});
+ public static final Block titaniumPlatedCylinder = new Casing("titaniumPlatedCylinder", new String[]{GoodGenerator.MOD_ID+":titaniumPlatedCylinder"});
public static ItemStack MAR;
public static ItemStack FRF;
public static ItemStack UCFE;
public static void Register(){
- GameRegistry.registerBlock(MAR_Casing, MyItemBlocks.class,"MAR_Casing");
- GameRegistry.registerBlock(radiationProtectionSteelFrame,MyItemBlocks.class,"radiationProtectionSteelFrame");
- GameRegistry.registerBlock(fieldRestrictingGlass,MyItemBlocks.class,"fieldRestrictingGlass");
- GameRegistry.registerBlock(FRF_Casings,MyItemBlocks.class,"FRF_Casings");
- GameRegistry.registerBlock(FRF_Coil_1,MyItemBlocks.class,"FRF_Coil_1");
- GameRegistry.registerBlock(FRF_Coil_2,MyItemBlocks.class,"FRF_Coil_2");
- GameRegistry.registerBlock(FRF_Coil_3,MyItemBlocks.class,"FRF_Coil_3");
- GameRegistry.registerBlock(titaniumPlatedCylinder,MyItemBlocks.class,"titaniumPlatedCylinder");
- GameRegistry.registerItem(radiationProtectionPlate,"radiationProtectionPlate",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(wrappedUraniumIngot,"wrappedUraniumIngot",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(highDensityUraniumNugget,"highDensityUraniumNugget",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(highDensityUranium,"highDensityUranium",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(wrappedThoriumIngot,"wrappedThoriumIngot",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(highDensityThoriumNugget,"highDensityThoriumNugget",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(highDensityThorium,"highDensityThorium",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(wrappedPlutoniumIngot,"wrappedPlutoniumIngot",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(highDensityPlutoniumNugget,"highDensityPlutoniumNugget",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(highDensityPlutonium,"highDensityPlutonium",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(rawAtomicSeparationCatalyst,"rawAtomicSeparationCatalyst",GoodGenerator.MOD_ID);
- GameRegistry.registerItem(advancedRadiationProtectionPlate,"advancedRadiationProtectionPlate",GoodGenerator.MOD_ID);
- Loaders.MAR = new MultiNqGenerator(12732,"NaG","Large Naquadah Reactor").getStackForm(1L);
- Loaders.FRF = new FuelRefineFactory(16999,"FRF","Naquadah Fuel Refine Factory").getStackForm(1L);
- Loaders.UCFE = new UniversalChemicalFuelEngine(15500,"UniversalChemicalFuelEngine","Universal Chemical Fuel Engine").getStackForm(1L);
+ GameRegistry.registerBlock(MAR_Casing, MyItemBlocks.class, "MAR_Casing");
+ GameRegistry.registerBlock(radiationProtectionSteelFrame, MyItemBlocks.class, "radiationProtectionSteelFrame");
+ GameRegistry.registerBlock(fieldRestrictingGlass, MyItemBlocks.class, "fieldRestrictingGlass");
+ GameRegistry.registerBlock(FRF_Casings, MyItemBlocks.class, "FRF_Casings");
+ GameRegistry.registerBlock(FRF_Coil_1, MyItemBlocks.class, "FRF_Coil_1");
+ GameRegistry.registerBlock(FRF_Coil_2, MyItemBlocks.class, "FRF_Coil_2");
+ GameRegistry.registerBlock(FRF_Coil_3, MyItemBlocks.class, "FRF_Coil_3");
+ GameRegistry.registerBlock(rawCylinder, MyItemBlocks.class, "rawCylinder");
+ GameRegistry.registerBlock(titaniumPlatedCylinder, MyItemBlocks.class, "titaniumPlatedCylinder");
+ GameRegistry.registerItem(radiationProtectionPlate, "radiationProtectionPlate", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(wrappedUraniumIngot, "wrappedUraniumIngot", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(highDensityUraniumNugget, "highDensityUraniumNugget", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(highDensityUranium, "highDensityUranium", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(wrappedThoriumIngot, "wrappedThoriumIngot", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(highDensityThoriumNugget, "highDensityThoriumNugget", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(highDensityThorium, "highDensityThorium", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(wrappedPlutoniumIngot, "wrappedPlutoniumIngot", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(highDensityPlutoniumNugget, "highDensityPlutoniumNugget", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(highDensityPlutonium, "highDensityPlutonium", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(rawAtomicSeparationCatalyst, "rawAtomicSeparationCatalyst", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(advancedRadiationProtectionPlate, "advancedRadiationProtectionPlate", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(aluminumNitride, "aluminumNitride", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(specialCeramics, "specialCeramics", GoodGenerator.MOD_ID);
+ GameRegistry.registerItem(specialCeramicsPlate, "specialCeramicsPlate", GoodGenerator.MOD_ID);
+ Loaders.MAR = new MultiNqGenerator(12732, "NaG", "Large Naquadah Reactor").getStackForm(1L);
+ Loaders.FRF = new FuelRefineFactory(16999, "FRF", "Naquadah Fuel Refine Factory").getStackForm(1L);
+ Loaders.UCFE = new UniversalChemicalFuelEngine(IDOffset, "UniversalChemicalFuelEngine", "Universal Chemical Fuel Engine").getStackForm(1L);
}
public static void addOreDic(){
- OreDictionary.registerOre("blockGlass",fieldRestrictingGlass);
- OreDictionary.registerOre("blockGlassZPM",fieldRestrictingGlass);
+ OreDictionary.registerOre("blockGlass", fieldRestrictingGlass);
+ OreDictionary.registerOre("blockGlassZPM", fieldRestrictingGlass);
+ OreDictionary.registerOre("dustAluminumNitride", aluminumNitride);
}
}
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
index 3581a4effa..11bc62b021 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
@@ -5,12 +5,14 @@ import GoodGenerator.util.CrackRecipeAdder;
import GoodGenerator.util.MaterialFix;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import gregtech.api.enums.*;
+import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import ic2.core.Ic2Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import gregtech.api.util.GT_Utility;
+import net.minecraftforge.oredict.OreDictionary;
public class RecipeLoader {
public static void RecipeLoad(){
@@ -38,7 +40,7 @@ public class RecipeLoader {
ItemList.Electric_Pump_ZPM.get(8),
new Object[]{OrePrefixes.circuit.get(Materials.Superconductor),4},
GT_OreDictUnificator.get(OrePrefixes.wireGt08,Materials.SuperconductorLuV,8),
- GT_OreDictUnificator.get(OrePrefixes.pipeHuge,Materials.Lead,4),
+ GT_OreDictUnificator.get(OrePrefixes.pipeLarge,Materials.Lead,4),
GT_OreDictUnificator.get(OrePrefixes.plate,Materials.NaquadahAlloy,8),
GT_OreDictUnificator.get(OrePrefixes.screw,Materials.Osmium,16)
},
@@ -497,12 +499,16 @@ public class RecipeLoader {
MyMaterial.atomicSeparationCatalyst.getMolten(4),
new FluidStack[]{
Materials.Helium.getGas(300),
- WerkstoffLoader.Xenon.getFluidOrGas(40),
+ WerkstoffLoader.Neon.getFluidOrGas(50),
+ Materials.Argon.getGas(80),
WerkstoffLoader.Krypton.getFluidOrGas(20),
+ WerkstoffLoader.Xenon.getFluidOrGas(40),
Materials.Radon.getGas(14000)
},
GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Naquadah,1),
- 4
+ 6,
+ 4020,
+ 300
);
CrackRecipeAdder.crackerAdder(
@@ -517,7 +523,9 @@ public class RecipeLoader {
MyMaterial.naquadahAsphalt.getFluidOrGas(140)
},
GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Uranium235,1),
- 6
+ 6,
+ 4020,
+ 450
);
CrackRecipeAdder.crackerAdder(
@@ -532,7 +540,9 @@ public class RecipeLoader {
MyMaterial.naquadahAsphalt.getFluidOrGas(240)
},
GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Plutonium,1),
- 6
+ 6,
+ 4020,
+ 500
);
CrackRecipeAdder.crackerAdder(
@@ -547,7 +557,9 @@ public class RecipeLoader {
MyMaterial.heavyNaquadahFuel.getFluidOrGas(350)
},
GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Naquadria,1),
- 6
+ 6,
+ 4020,
+ 800
);
GT_Values.RA.addMultiblockChemicalRecipe(
@@ -956,10 +968,166 @@ public class RecipeLoader {
10,
30
);
+
+ GT_Values.RA.addElectrolyzerRecipe(
+ new ItemStack(Loaders.aluminumNitride,2),
+ null,
+ null,
+ Materials.Nitrogen.getGas(1000L),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Aluminium,1),
+ null,null,null,null,null,
+ new int[]{10000},
+ 100,
+ 120
+ );
+
+ GT_Values.RA.addMixerRecipe(
+ new ItemStack(Loaders.aluminumNitride,4),
+ WerkstoffLoader.YttriumOxide.get(OrePrefixes.dust,5),
+ GT_Utility.getIntegratedCircuit(9),
+ null,
+ FluidRegistry.getFluidStack("refinedglue",1000),
+ null,
+ new ItemStack(Loaders.specialCeramics,9),
+ 1000,
+ 1980
+ );
+
+ GT_Values.RA.addMixerRecipe(
+ new ItemStack(Loaders.aluminumNitride,4),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Uraninite,5),
+ GT_Utility.getIntegratedCircuit(9),
+ null,
+ FluidRegistry.getFluidStack("refinedglue",1000),
+ null,
+ new ItemStack(Loaders.specialCeramics,9),
+ 1000,
+ 1980
+ );
+
+ GT_Values.RA.addExtruderRecipe(
+ new ItemStack(Loaders.specialCeramics,2),
+ ItemList.Shape_Extruder_Plate.get(0L),
+ new ItemStack(Loaders.specialCeramicsPlate,1),
+ 400,
+ 480
+ );
+
+ GT_ModHandler.addCraftingRecipe(
+ new ItemStack(Loaders.rawCylinder,1),
+ new Object[]{
+ "PPP","PFP","PPP",
+ 'P', new ItemStack(Loaders.specialCeramicsPlate),
+ 'F', GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel,1)
+ }
+ );
+
+ GT_Values.RA.addAssemblerRecipe(
+ new ItemStack[]{
+ new ItemStack(Loaders.rawCylinder,1),
+ GT_OreDictUnificator.get(OrePrefixes.gearGt,Materials.Titanium,1),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong,Materials.Titanium,4),
+ GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Titanium,6),
+ GT_Utility.getIntegratedCircuit(4)
+ },
+ null,
+ new ItemStack(Loaders.titaniumPlatedCylinder,1),
+ 300,
+ 1920
+ );
+
+ GT_Values.RA.addMultiblockChemicalRecipe(
+ new ItemStack[]{
+ GT_Utility.getIntegratedCircuit(16),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Saltpeter,2)
+ },
+ new FluidStack[]{
+ FluidRegistry.getFluidStack("liquidoxygen",1000),
+ Materials.NitrogenDioxide.getGas(1000)
+ },
+ new FluidStack[]{
+ FluidRegistry.getFluidStack("combustionpromotor",500)
+ },
+ null,
+ 200,
+ 120
+ );
+
+ GT_Values.RA.addMultiblockChemicalRecipe(
+ new ItemStack[]{
+ GT_Utility.getIntegratedCircuit(16),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.PotassiumNitrade,2)
+ },
+ new FluidStack[]{
+ FluidRegistry.getFluidStack("liquidoxygen",1000),
+ Materials.NitrogenDioxide.getGas(1000)
+ },
+ new FluidStack[]{
+ FluidRegistry.getFluidStack("combustionpromotor",500)
+ },
+ null,
+ 200,
+ 120
+ );
+
+ GT_Values.RA.addMultiblockChemicalRecipe(
+ new ItemStack[]{
+ GT_Utility.getIntegratedCircuit(16),
+ WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust,2)
+ },
+ new FluidStack[]{
+ FluidRegistry.getFluidStack("liquidoxygen",1000),
+ Materials.NitrogenDioxide.getGas(1000)
+ },
+ new FluidStack[]{
+ FluidRegistry.getFluidStack("combustionpromotor",500)
+ },
+ null,
+ 200,
+ 120
+ );
+
+ GT_ModHandler.addCraftingRecipe(
+ Loaders.UCFE.copy(),
+ new Object[]{
+ "TZT","ALB","WGW",
+ 'T', GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium,1),
+ 'Z', "circuitUltimate",
+ 'A', ItemList.Machine_Multi_DieselEngine.get(1),
+ 'B', ItemList.Machine_Multi_ExtremeDieselEngine.get(1),
+ 'L', ItemList.Hull_LuV,
+ 'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah,1),
+ 'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium,1),
+ }
+ );
}
public static void InitLoadRecipe(){
GT_Values.RA.addBlastRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sapphire,1),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Carbon,3),
+ Materials.Nitrogen.getGas(1000),
+ null,
+ new ItemStack(Loaders.aluminumNitride,2),
+ null,
+ 2000,
+ 1920,
+ 4600
+ );
+
+ GT_Values.RA.addBlastRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.GreenSapphire,1),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Carbon,3),
+ Materials.Nitrogen.getGas(1000),
+ null,
+ new ItemStack(Loaders.aluminumNitride,2),
+ null,
+ 2000,
+ 1920,
+ 4600
+ );
+
+ GT_Values.RA.addBlastRecipe(
MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust,1),
GT_Utility.getIntegratedCircuit(1),
null,null,
@@ -970,6 +1138,20 @@ public class RecipeLoader {
7000
);
+ GT_Values.RA.addVacuumFreezerRecipe(
+ MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot,1),
+ MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingot,1),
+ 200,
+ 30720
+ );
+
+ GT_Values.RA.addVacuumFreezerRecipe(
+ MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot,1),
+ MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot,1),
+ 400,
+ 30720
+ );
+
GT_Values.RA.addCentrifugeRecipe(
GT_Utility.getIntegratedCircuit(1),null,
MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1000),
@@ -1053,9 +1235,9 @@ public class RecipeLoader {
GT_Utility.getIntegratedCircuit(1),null,
MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1000),
null,
- GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lutetium,8),
- GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lutetium,8),
- GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lutetium,4),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lutetium,64),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lutetium,48),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lutetium,32),
GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Praseodymium,1),
GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Boron,2),
GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Indium,4),
diff --git a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java b/src/main/java/GoodGenerator/util/CrackRecipeAdder.java
index 2c74128073..ced35fa9e6 100644
--- a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java
+++ b/src/main/java/GoodGenerator/util/CrackRecipeAdder.java
@@ -10,15 +10,15 @@ public class CrackRecipeAdder {
static float[] coe1 = {1.25f,1.2f,1.1f,0.9f,0.85f,0.8f,0.75f};
static float[] coe2 = {1.4f,1.25f,1.2f,0.8f,0.75f,0.7f,0.65f};
static float[] coe3 = {1.6f,1.5f,1.45f,0.7f,0.6f,0.55f,0.45f};
- public static void crackerAdder(FluidStack inputFluid, FluidStack cracker, FluidStack[] outputFluids, ItemStack outputItem, int num){
+ public static void crackerAdder(FluidStack inputFluid, FluidStack cracker, FluidStack[] outputFluids, ItemStack outputItem, int num, int EUt, int Duration){
String name;
FluidStack[] actOutput = new FluidStack[num];
name = inputFluid.getFluid().getName().replaceAll(" ","");
- GT_Values.RA.addCrackingRecipe(1,inputFluid,cracker, FluidRegistry.getFluidStack("lightlycracked"+name,1000),320,7680);
- GT_Values.RA.addCrackingRecipe(2,inputFluid,cracker, FluidRegistry.getFluidStack("moderatelycracked"+name,1000),480,7680);
- GT_Values.RA.addCrackingRecipe(3,inputFluid,cracker, FluidRegistry.getFluidStack("heavilycracked"+name,1000),560,7680);
+ GT_Values.RA.addCrackingRecipe(1,inputFluid,cracker, FluidRegistry.getFluidStack("lightlycracked"+name,1000),(int)(Duration * 0.8),EUt);
+ GT_Values.RA.addCrackingRecipe(2,inputFluid,cracker, FluidRegistry.getFluidStack("moderatelycracked"+name,1000),Duration,EUt);
+ GT_Values.RA.addCrackingRecipe(3,inputFluid,cracker, FluidRegistry.getFluidStack("heavilycracked"+name,1000),(int)(Duration * 1.2),EUt);
for ( int i = num - 1, j = 0; i >= 0; i --, j ++ ){
Fluid tmp1 = outputFluids[i].getFluid();
@@ -26,7 +26,7 @@ public class CrackRecipeAdder {
actOutput[j] = new FluidStack(tmp1, tmp2);
}
- GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("lightlycracked"+name,1000),actOutput,outputItem,120,7680);
+ GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("lightlycracked"+name,1000),actOutput,outputItem,Duration / 2,EUt / 3);
for ( int i = num - 1, j = 0; i >= 0; i --, j ++ ){
Fluid tmp1 = outputFluids[i].getFluid();
@@ -34,7 +34,7 @@ public class CrackRecipeAdder {
actOutput[j] = new FluidStack(tmp1, tmp2);
}
- GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("moderatelycracked"+name,1000),actOutput,outputItem,120,7680);
+ GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("moderatelycracked"+name,1000),actOutput,outputItem,Duration / 2,EUt / 3);
for ( int i = num - 1, j = 0; i >= 0; i --, j ++ ){
Fluid tmp1 = outputFluids[i].getFluid();
@@ -42,6 +42,6 @@ public class CrackRecipeAdder {
actOutput[j] = new FluidStack(tmp1, tmp2);
}
- GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("heavilycracked"+name,1000),actOutput,outputItem,120,7680);
+ GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("heavilycracked"+name,1000),actOutput,outputItem,Duration / 2,EUt / 3);
}
}
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index 7bf12781f9..7a92103a65 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -6,6 +6,7 @@ FRF_Coil_1.0.name=Field Restriction Coil
FRF_Coil_2.0.name=Advanced Field Restriction Coil
FRF_Coil_3.0.name=Ultimate Field Restriction Coil
FRF_Casing.0.name=Naquadah Fuel Refine Factory Casing
+rawCylinder.0.name=Raw Cylinder
titaniumPlatedCylinder.0.name=Titanium Plated Cylinder
item.radiationProtectionPlate.name=Radiation Proof Plate
@@ -21,6 +22,9 @@ item.highDensityPlutonium.name=High Density Plutonium
item.rawAtomicSeparationCatalyst.name=Raw Atomic Separation Catalyst
item.advancedRadiationProtectionPlate.name=Advanced Radiation Proof Plate
item.chromaticGem.name=Chromatic Gem
+item.aluminumNitride.name=Aluminum Nitride Dust
+item.specialCeramics.name=Special Ceramics Dust
+item.specialCeramicsPlate.name=Special Ceramics Plate
fluid.lightlyCrackedNaquadahGas=Lightly Cracked Naquadah Gas
fluid.moderatelyCrackedNaquadahGas=Moderately Cracked Naquadah Gas
diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/rawCylinder.png b/src/main/resources/assets/goodgenerator/textures/blocks/rawCylinder.png
new file mode 100644
index 0000000000..d7eb7f4235
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/blocks/rawCylinder.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/aluminumNitride.png b/src/main/resources/assets/goodgenerator/textures/items/aluminumNitride.png
new file mode 100644
index 0000000000..29d5ef9e0d
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/aluminumNitride.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/specialCeramics.png b/src/main/resources/assets/goodgenerator/textures/items/specialCeramics.png
new file mode 100644
index 0000000000..2d322a6212
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/specialCeramics.png
Binary files differ
diff --git a/src/main/resources/assets/goodgenerator/textures/items/specialCeramicsPlate.png b/src/main/resources/assets/goodgenerator/textures/items/specialCeramicsPlate.png
new file mode 100644
index 0000000000..65e07cf5db
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/specialCeramicsPlate.png
Binary files differ