From 453a77485c9e630e90a98023bce17b0db2b5aa5b Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Wed, 31 Jan 2018 05:52:22 +1000 Subject: % Tweaked recipe for Everglades portal frame. ^ Version bump to 1.7.0-pre3. --- src/Java/gtPlusPlus/core/lib/CORE.java | 2 +- src/Java/gtPlusPlus/core/recipe/RECIPES_General.java | 15 ++++----------- .../world/darkworld/block/blockDarkWorldPortalFrame.java | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) (limited to 'src/Java/gtPlusPlus') diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 70feec195c..9f58f222aa 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -47,7 +47,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.7.0-prerelease-2"; + public static final String VERSION = "1.7.0-prerelease-3"; public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static String USER_COUNTRY = GeoUtils.determineUsersCountry(); public static boolean isModUpToDate = Utils.isModUpToDate(); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index 4112be2687..4f69840290 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -130,19 +130,12 @@ public class RECIPES_General { Logger.INFO("Added a recipe for Mining Explosives."); } - - //Set Shards - ItemStack shardAer = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Air Shard", 0, 1); - ItemStack shardIgnis = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Fire Shard", 1, 1); - ItemStack shardAqua = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Warer Shard", 2, 1); - ItemStack shardTerra = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Earth Shard", 3, 1); - //Mystic Frame if (RecipeUtils.recipeBuilder( - shardAer, shardIgnis, shardAqua, - shardTerra, "gemRuby", shardTerra, - shardAqua, shardIgnis, shardAer, - ItemUtils.getSimpleStack(Dimension_DarkWorld.blockPortalFrame))){ + CI.sensor_HV, CI.fieldGenerator_MV, CI.sensor_HV, + CI.craftingToolHammer_Hard, ItemList.Casing_SolidSteel, CI.craftingToolSolderingIron, + CI.emitter_HV, CI.fieldGenerator_MV, CI.emitter_HV, + ItemUtils.getSimpleStack(Dimension_DarkWorld.blockPortalFrame, 2))){ Logger.INFO("Added a recipe for the Toxic Everglades Portal frame"); } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java index 1ab4a95b2f..ef6f2b0c7d 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java @@ -15,7 +15,7 @@ public class blockDarkWorldPortalFrame extends Block implements ITileTooltip{ this.setBlockName("blockDarkWorldPortalFrame"); this.setHardness(3.0F); this.setLightLevel(0.5F); - this.setBlockTextureName(CORE.MODID + ":" + "SwirlYellow"); + this.setBlockTextureName(CORE.MODID + ":" + "metro/TEXTURE_TECH_PANEL_A"); LanguageRegistry.addName(this, "Containment Frame"); } -- cgit