diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-10 15:28:40 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-10 15:28:40 +1000 |
commit | a5ab04af307c9ff03a47461afeadc5256d97fd89 (patch) | |
tree | 7161e9defb86820c4ae4457ba00fa827bf4ed083 | |
parent | a56a7c295a6a2b8f3cbaf0d517ac740eda70b485 (diff) | |
download | GT5-Unofficial-a5ab04af307c9ff03a47461afeadc5256d97fd89.tar.gz GT5-Unofficial-a5ab04af307c9ff03a47461afeadc5256d97fd89.tar.bz2 GT5-Unofficial-a5ab04af307c9ff03a47461afeadc5256d97fd89.zip |
[1.4.6.1-release]
% Bumped Version.
% Cleaned up Dev. Code and disabled a few components for a new public release.
% Changed some internal code related to blocks, GT casings from GT++ should now handle better.
- Removed Processing_HotIngots.java
8 files changed, 10 insertions, 36 deletions
diff --git a/build.gradle b/build.gradle index 17e3fef576..6f58f61e2e 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 archivesBaseName = "GT-PlusPlus" -version = "1.4.4.2-release" +version = "1.4.6.1-release" minecraft.version = "1.7.10-10.13.4.1448-1.7.10" task sourceJar(type: Jar) { diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 262f46b831..8076728de4 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -20,7 +20,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.4.4.2-release"; + public static final String VERSION = "1.4.6.1-release"; public static boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java index 7bd49b1ccd..00c9c65e80 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java @@ -36,8 +36,8 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Matter Fabricator Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Iron Plated Bricks"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Unused Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Reactor Casing Tier I"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Reactor Casing Tier II"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hastelloy-N Reactor Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Zeron-100 Reactor Shielding"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Unused Coil Block"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Unused Coil Block"); GregtechItemList.Casing_Centrifuge1.set(new ItemStack(this, 1, 0)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java index 1b9b571ef7..957a12bc14 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java @@ -1,10 +1,9 @@ package gtPlusPlus.xmod.gregtech.common.blocks; -import gregtech.common.blocks.GT_Item_Casings_Abstract; import net.minecraft.block.Block; public class GregtechMetaCasingItems - extends GT_Item_Casings_Abstract { + extends GregtechMetaItemCasingsAbstract { public GregtechMetaCasingItems(Block par1) { super(par1); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java index 2cd7164fe1..6fa5b9fcac 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java @@ -150,12 +150,12 @@ public class GregtechMetaTileEntityMassFabricator extends GT_MetaTileEntity_Mult mMatterProduced++; mAmplifierUsed++; updateSlots(); - Utils.LOG_INFO("Recipes Finished: "+mMatterProduced); + //Utils.LOG_INFO("Recipes Finished: "+mMatterProduced); return true; } } else { - Utils.LOG_INFO("Invalid Recipe"); + //Utils.LOG_INFO("Invalid Recipe"); return false; } } @@ -185,7 +185,7 @@ public class GregtechMetaTileEntityMassFabricator extends GT_MetaTileEntity_Mult ArrayUtils.reverse(mOutputFluids); mMatterProduced++; updateSlots(); - Utils.LOG_INFO("Recipes Finished: "+mMatterProduced); + //Utils.LOG_INFO("Recipes Finished: "+mMatterProduced); return true; } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_HotIngots.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_HotIngots.java deleted file mode 100644 index e895b7cc0c..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_HotIngots.java +++ /dev/null @@ -1,23 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; -import net.minecraft.item.ItemStack; - -public class Processing_HotIngots implements Interface_OreRecipeRegistrator { - public Processing_HotIngots() { - Utils.LOG_INFO("Generating Hot Ingot."); - GregtechOrePrefixes.ingotHot.add(this); - } - - @Override - public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_Values.RA.addVacuumFreezerRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), (int) Math.max(aMaterial.getMass() * 3L, 1L)); - } -} diff --git a/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java b/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java index 55875fc02d..97f37a8628 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java +++ b/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java @@ -1,17 +1,15 @@ package gtPlusPlus.xmod.ic2; import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.xmod.ic2.block.RTGGenerator.BlockRTG; import gtPlusPlus.xmod.ic2.item.IC2_Items; import gtPlusPlus.xmod.ic2.recipe.RECIPE_IC2; -import ic2.core.init.InternalName; public class HANDLER_IC2{ public static void preInit() { if (LoadedMods.IndustrialCraft2){ IC2_Items.register(); - new BlockRTG(InternalName.beer); + //new BlockRTG(InternalName.beer); } } diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 1d5e926316..42d66add56 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.4.4.2-release", + "version": "1.4.6.1-release", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/MiscUtilities/wiki", "updateUrl": "https://github.com/draknyte1/MiscUtilities/tree/master/build/libs", |