aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-07-10 23:07:41 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-07-10 23:07:41 +1000
commit15916806ea230a62d81c1cdb54a25ce74d0ca5bd (patch)
treee698ba98f121252b6f7abbd27ec1089c443cb9d1
parent2cd84444e671ba210e6a2d0c2c4a6e3891d941b4 (diff)
downloadGT5-Unofficial-15916806ea230a62d81c1cdb54a25ce74d0ca5bd.tar.gz
GT5-Unofficial-15916806ea230a62d81c1cdb54a25ce74d0ca5bd.tar.bz2
GT5-Unofficial-15916806ea230a62d81c1cdb54a25ce74d0ca5bd.zip
$ Fixed Coal Coke OreDict naming.
+ Added a configuration option for Biome ID. ^ Version bump to 1.5.6-Pre.
-rw-r--r--build.gradle2
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java5
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java7
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java3
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java6
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java3
-rw-r--r--src/resources/mcmod.info2
8 files changed, 20 insertions, 10 deletions
diff --git a/build.gradle b/build.gradle
index ec1f0c5e89..737d3e0588 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ sourceCompatibility = 1.7
targetCompatibility = 1.7
archivesBaseName = "GT-PlusPlus"
-version = "1.5.5-Pre-release"
+version = "1.5.6-Pre-release"
minecraft.version = "1.7.10-10.13.4.1448-1.7.10"
task sourceJar(type: Jar) {
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 2deb9a2c94..6a2e32860e 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -145,7 +145,10 @@ public class GTplusplus implements ActionListener {
// Features
enableCustomAlvearyBlocks = config.getBoolean("enableCustomAlvearyBlocks", "features", false,
"Enables Custom Alveary Blocks.");
-
+
+ //Biomes
+ CORE.DARKBIOME_ID = config.getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension.");
+
config.save();
}
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 045e2b492c..77556aff53 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -235,7 +235,7 @@ public final class ModItems {
//Register Hydrogen Blobs first, so we can replace old helium blobs.
- itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "gemCoalCoke", 3200, 0).setTextureName(CORE.MODID + ":itemCoalCoke");
+ itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "fuelCoke", 3200, 0).setTextureName(CORE.MODID + ":itemCoalCoke");
//Register Hydrogen Blobs first, so we can replace old helium blobs.
itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 66d542ef7c..1a36d94d88 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.item.chemistry;
import gregtech.api.enums.*;
import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
@@ -13,6 +14,10 @@ public class CoalTar {
public static void run(){
+ //Special Compatibility for Coke
+ ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCoalCoke, 1), "fuelCoke");
+
+
//Create Coal Gas
FluidUtils.generateFluidNonMolten("CoalGas", "Coal Gas", 500, new short[]{48, 48, 48, 100}, null, null);
@@ -141,7 +146,7 @@ public class CoalTar {
//Coke
AddGregtechRecipe.addCokeAndPyrolyseRecipes(
- ItemUtils.getItemStackOfAmountFromOreDict("gemCoalCoke", 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8),
8,
GT_Values.NF,
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3),
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 245872af66..e218ca5554 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -31,7 +31,7 @@ public class CORE {
public static final String name = "GT++";
public static final String MODID = "miscutils";
- public static final String VERSION = "1.5.5-Pre-release";
+ public static final String VERSION = "1.5.6-Pre-release";
public static final String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
public static final String USER_COUNTRY = GeoUtils.determineUsersCountry();
public static boolean isModUpToDate = Utils.isModUpToDate();
@@ -55,6 +55,7 @@ public class CORE {
//Because I want to be lazy.
public static boolean GTNH = false;
+ public static int DARKBIOME_ID = 238;
/**
* A List containing all the Materials, which are somehow in use by GT and therefor receive a specific Set of Items.
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 90e9d3d4cc..54c1fe9488 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -64,7 +64,7 @@ public class RECIPES_GREGTECH {
GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L),
22,
GT_ModHandler.getSteam(1000),
- ItemUtils.getItemStackOfAmountFromOreDict("gemCoalCoke", 10),
+ ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 10),
FluidUtils.getFluidStack("fluid.coalgas", 2880),
30,
120);
@@ -72,10 +72,10 @@ public class RECIPES_GREGTECH {
//Coke & Coal
CORE.RA.addCokeOvenRecipe(
GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L),
- ItemUtils.getItemStackOfAmountFromOreDict("gemCoalCoke", 6),
+ ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 6),
GT_ModHandler.getSteam(2000),
FluidUtils.getFluidStack("fluid.coalgas", 5040),
- ItemUtils.getItemStackOfAmountFromOreDict("gemCoalCoke", 14),
+ ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 14),
60*20,
240);
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
index b61f168ca0..1dd550aac5 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
@@ -6,6 +6,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
import net.minecraft.entity.monster.*;
@@ -54,7 +55,7 @@ public class Biome_DarkWorld {
static class BiomeGenbiomeDarkWorld extends BiomeGenBase {
@SuppressWarnings("unchecked")
public BiomeGenbiomeDarkWorld() {
- super(40);
+ super(CORE.DARKBIOME_ID);
Utils.LOG_INFO("Dark World Temperature Category: "+getTempCategory());
setBiomeName("Dark World");
topBlock = Dimension_DarkWorld.blockTopLayer;
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 243007676c..faa09969f2 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
"description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)",
"credits": "",
"logoFile": "",
- "version": "1.5.5-Pre-release",
+ "version": "1.5.6-Pre-release",
"mcversion": "1.7.10",
"url": "https://github.com/draknyte1/GTplusplus/wiki",
"updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",