aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle3
-rw-r--r--gradle.properties2
-rw-r--r--src/main/java/GoodGenerator/Loader/RecipeLoader.java25
-rw-r--r--src/main/java/GoodGenerator/Main/GoodGenerator.java7
-rw-r--r--src/main/resources/assets/goodgenerator/lang/en_US.lang1
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/chromaticGem.pngbin0 -> 2660 bytes
-rw-r--r--src/main/resources/assets/goodgenerator/textures/items/chromaticGem.png.mcmeta5
7 files changed, 41 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index fd4acc928e..eab7dbc4ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,6 +89,9 @@ dependencies {
compile("com.github.GTNewHorizons:GT5-Unofficial:experimental-SNAPSHOT:dev") {
setChanging(true)
}
+/* compileOnly("com.github.GTNewHorizons:Avaritia:master-SNAPSHOT") {
+ setChanging(true)
+ }*/
compile files('libs/TecTech-1.7.10-4.10.4-d35bc08e.jar')
runtime("eu.usrv:YAMCore:${minecraftVersion}-${yamcoreVersion}:deobf");
}
diff --git a/gradle.properties b/gradle.properties
index 0980a4d7ca..b790172eec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
modId = GoodGenerator
modGroup = GoodGenerator
-modVersion = 0.0.6
+modVersion = 0.1.0
minecraftVersion=1.7.10
forgeVersion=10.13.4.1614
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
new file mode 100644
index 0000000000..8a7c65a313
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/chromaticGem.png
Binary files differ
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