diff options
Diffstat (limited to 'src/main')
5 files changed, 37 insertions, 1 deletions
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java index 9c110af39f..3b0c27bc23 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java @@ -946,6 +946,16 @@ public class RecipeLoader { 300, 120000 ); + + GT_Values.RA.addChemicalRecipe( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Calcium,1), + Materials.Oxygen.getGas(1000), + null, + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Quicklime,2), + 10, + 30 + ); } public static void InitLoadRecipe(){ @@ -1109,6 +1119,21 @@ public class RecipeLoader { 6000, 2040 ); + + GT_Values.RA.addCentrifugeRecipe( + MyMaterial.radioactiveSludge.get(OrePrefixes.dust,1), + null,null, + Materials.Radon.getGas(5), + GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Calcium,8), + GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Calcium,4), + GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Naquadah,1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Uranium,1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Plutonium,1), + WerkstoffLoader.Tellurium.get(OrePrefixes.dustSmall,1), + new int[]{10000,9500,8000,2500,2000,2000}, + 100, + 120 + ); } public static void Fixer(){ diff --git a/src/main/java/GoodGenerator/Main/GoodGenerator.java b/src/main/java/GoodGenerator/Main/GoodGenerator.java index 6fc8343993..79f2529734 100644 --- a/src/main/java/GoodGenerator/Main/GoodGenerator.java +++ b/src/main/java/GoodGenerator/Main/GoodGenerator.java @@ -14,11 +14,16 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import net.minecraft.creativetab.CreativeTabs; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.Loader; import static GoodGenerator.Loader.Loaders.addOreDic; @SuppressWarnings("ALL") -@Mod(modid = GoodGenerator.MOD_ID, version = GoodGenerator.VERSION) +@Mod(modid = GoodGenerator.MOD_ID, version = GoodGenerator.VERSION, + dependencies = "required-after:IC2; " + + "required-after:gregtech; " + + "required-after:bartworks; " + + "required-after:tectech; ") public final class GoodGenerator { public static final String MOD_ID = "GoodGenerator"; public static final String VERSION = "GRADLETOKEN_VERSION"; diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang index 52881a0601..b2d731324e 100644 --- a/src/main/resources/assets/goodgenerator/lang/en_US.lang +++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang @@ -19,6 +19,7 @@ item.highDensityPlutoniumNugget.name=High Density Plutonium Nugget 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 fluid.lightlyCrackedNaquadahGas=Lightly Cracked Naquadah Gas fluid.moderatelyCrackedNaquadahGas=Moderately Cracked Naquadah Gas diff --git a/src/main/resources/assets/goodgenerator/textures/items/chromaticGem.png b/src/main/resources/assets/goodgenerator/textures/items/chromaticGem.png Binary files differnew file mode 100644 index 0000000000..8a7c65a313 --- /dev/null +++ b/src/main/resources/assets/goodgenerator/textures/items/chromaticGem.png diff --git a/src/main/resources/assets/goodgenerator/textures/items/chromaticGem.png.mcmeta b/src/main/resources/assets/goodgenerator/textures/items/chromaticGem.png.mcmeta new file mode 100644 index 0000000000..97596ba817 --- /dev/null +++ b/src/main/resources/assets/goodgenerator/textures/items/chromaticGem.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +}
\ No newline at end of file |
