diff --git a/gradle.properties b/gradle.properties index 7241aee5..7db2fe39 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ modId = GoodGenerator modGroup = GoodGenerator -modVersion = 0.0.2 +modVersion = 0.0.2-QF1 minecraftVersion=1.7.10 forgeVersion=10.13.4.1614 diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java index b10583a8..4c3522b1 100644 --- a/src/main/java/GoodGenerator/Items/MyMaterial.java +++ b/src/main/java/GoodGenerator/Items/MyMaterial.java @@ -75,7 +75,7 @@ public class MyMaterial implements Runnable { public static final Werkstoff thoriumBasedLiquidFuel = new Werkstoff( new short[]{0x50,0x32,0x66}, "Thorium Based Liquid Fuel", - subscriptNumbers("Th864Li4D2Hg"), + subscriptNumbers("Th432Li4D2Hg"), new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -86,7 +86,7 @@ public class MyMaterial implements Runnable { public static final Werkstoff thoriumBasedLiquidFuelExcited = new Werkstoff( new short[]{0x50,0x32,0x66}, "Thorium Based Liquid Fuel (Excited State)", - subscriptNumbers("*(Th864Li4D2Hg)*"), + subscriptNumbers("*(Th432Li4D2Hg)*"), new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), diff --git a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java index e4f6d0b2..99c96d4d 100644 --- a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java @@ -6,8 +6,8 @@ public class FuelRecipeLoader { public static void RegisterFuel(){ - MyRecipeAdder.instance.addLiquidMentalFuel(Materials.NaquadahEnriched.getMolten(1L),Materials.Naquadah.getMolten(1L),32768,1200); - MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,100); + 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.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1),32400,150); diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java index 8dab0792..aaca98af 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java @@ -1,14 +1,9 @@ package GoodGenerator.Loader; import GoodGenerator.Items.MyMaterial; -import codechicken.nei.ItemStackSet; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.system.oredict.OreDictHandler; -import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.block.material.Material; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -187,7 +182,7 @@ public static void RecipeLoad(){ Materials.Helium.getPlasma(750L), null, MyMaterial.thoriumBasedLiquidFuelExcited.get(OrePrefixes.cell,1), - 4500, + 120, 3840 );