diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java index c61bc8edd..6f82e3b8f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java @@ -36,9 +36,7 @@ public class BlockMisc extends BlockBase{ public IIcon[] textures; @SideOnly(Side.CLIENT) - private IIcon casingSeasonalTop; - @SideOnly(Side.CLIENT) - private IIcon stoneCasingSeasonal; + private IIcon ironCasingSeasonalTop; @SideOnly(Side.CLIENT) private IIcon ironCasingSeasonal; @@ -53,11 +51,8 @@ public class BlockMisc extends BlockBase{ @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ if(ClientProxy.jingleAllTheWay && side != 0){ - if(metadata == TheMiscBlocks.STONE_CASING.ordinal()){ - return side == 1 ? this.casingSeasonalTop : this.stoneCasingSeasonal; - } - else if(metadata == TheMiscBlocks.IRON_CASING.ordinal()){ - return side == 1 ? this.casingSeasonalTop : this.ironCasingSeasonal; + if(metadata == TheMiscBlocks.IRON_CASING.ordinal()){ + return side == 1 ? this.ironCasingSeasonalTop : this.ironCasingSeasonal; } } return metadata >= textures.length ? null : textures[metadata]; @@ -84,8 +79,7 @@ public class BlockMisc extends BlockBase{ textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getBaseName()+allMiscBlocks[i].name); } - this.casingSeasonalTop = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscStoneCasingSnowTop"); - this.stoneCasingSeasonal = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscStoneCasingSnow"); + this.ironCasingSeasonalTop = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscIronCasingSnowTop"); this.ironCasingSeasonal = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscIronCasingSnow"); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java index b54e14120..eae2a4675 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java @@ -19,7 +19,6 @@ public enum TheMiscBlocks{ QUARTZ("BlackQuartz", EnumRarity.rare), ORE_QUARTZ("OreBlackQuartz", EnumRarity.epic), WOOD_CASING("WoodCasing", EnumRarity.common), - STONE_CASING("StoneCasing", EnumRarity.uncommon), CHARCOAL_BLOCK("Charcoal", EnumRarity.common), ENDERPEARL_BLOCK("Enderpearl", EnumRarity.rare), LAVA_FACTORY_CASE("LavaFactoryCase", EnumRarity.uncommon), diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index 778307766..9b13cf213 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -65,7 +65,7 @@ public class InitBooklet{ new BookletChapter("bookTutorial", entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageCrafting(3, ItemCrafting.recipeBook)); new BookletChapter("crystals", entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("", TileEntityAtomicReconstructor.ENERGY_USE), new PageTextOnly(2), new PageTextOnly(3), new PagePicture(4, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(5), new PageCrafting(6, BlockCrafting.recipeAtomicReconstructor).setNoText().setPageStacksWildcard(), new PageCrafting(7, MiscCrafting.recipesCrystals).setNoText(), new PageCrafting(8, MiscCrafting.recipesCrystalBlocks).setNoText(), new PageReconstructor(9, LensNoneRecipeHandler.mainPageRecipes).setNoText()).setSpecial(); new BookletChapter("coalGen", entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("", TileEntityCoalGenerator.PRODUCE)); - new BookletChapter("craftingIngs", entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), new PageCrafting(5, BlockCrafting.recipeStoneCase).setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(7, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(8, ItemCrafting.recipeRing).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(11, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(12, ItemCrafting.recipeDough).setNoText(), new PageCrafting(13, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(14, BlockCrafting.recipeIronCase).setNoText()).setImportant(); + new BookletChapter("craftingIngs", entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), new PageCrafting(5, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(7, ItemCrafting.recipeRing).setNoText(), new PageCrafting(8, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(11, ItemCrafting.recipeDough).setNoText(), new PageCrafting(12, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(13, BlockCrafting.recipeIronCase).setNoText()).setImportant(); new BookletChapter("rf", entryGettingStarted, new ItemStack(Items.redstone), new PageTextOnly(1)); //Miscellaneous diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 2fe7b2d58..5005b8e03 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -19,7 +19,6 @@ public enum ConfigCrafting{ XP_SOLIDIFIER("Experience Solidifier", ConfigCategories.BLOCKS_CRAFTING), WOOD_CASING("Wood Casing", ConfigCategories.BLOCKS_CRAFTING), IRON_CASING("Iron Casing", ConfigCategories.BLOCKS_CRAFTING), - STONE_CASING("Stone Casing", ConfigCategories.BLOCKS_CRAFTING), FISHING_NET("Fishing Net", ConfigCategories.BLOCKS_CRAFTING), REPAIRER("Repairer", ConfigCategories.BLOCKS_CRAFTING), SOLAR_PANEL("Solar Panel", ConfigCategories.BLOCKS_CRAFTING), diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index 28c23576d..ceb71971c 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -41,7 +41,6 @@ public class BlockCrafting{ public static IRecipe recipeLiquidCollector; public static IRecipe recipeCase; public static IRecipe recipeIronCase; - public static IRecipe recipeStoneCase; public static IRecipe recipeEnderCase; public static IRecipe recipeEnderPearlBlock; public static IRecipe recipeESD; @@ -193,7 +192,7 @@ public class BlockCrafting{ " A ", "EHE", " C ", 'E', new ItemStack(Items.ender_pearl), 'H', new ItemStack(Blocks.hopper), - 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'A', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()))); recipeRangedCollector = Util.GetRecipes.lastIRecipe(); } @@ -289,7 +288,7 @@ public class BlockCrafting{ " C ", " S ", "AMA", 'M', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), 'C', InitItems.itemCoffeeBean, - 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()))); recipeCoffeeMachine = Util.GetRecipes.lastIRecipe(); } @@ -424,7 +423,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockOilGenerator), "CRC", "CBC", "CRC", 'C', "cobblestone", - 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'B', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal()))); recipeOilGen = Util.GetRecipes.lastIRecipe(); } @@ -434,8 +433,8 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCoalGenerator), "CRC", "CBC", "CRC", 'C', "cobblestone", - 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), - 'B', new ItemStack(Items.coal, 1, Util.WILDCARD))); + 'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), + 'R', new ItemStack(Items.coal, 1, Util.WILDCARD))); recipeCoalGen = Util.GetRecipes.lastIRecipe(); } @@ -459,16 +458,6 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.ender_pearl, 4), new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()))); - //Stone Casing - if(ConfigCrafting.STONE_CASING.isEnabled()){ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), - "WSW", "SRS", "WSW", - 'W', "cobblestone", - 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), - 'S', "stickWood")); - recipeStoneCase = Util.GetRecipes.lastIRecipe(); - } - //Quartz Block GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()), "QQ", "QQ", @@ -556,7 +545,7 @@ public class BlockCrafting{ 'M', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'C', "cobblestone", 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), - 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'P', new ItemStack(Blocks.piston), 'F', new ItemStack(Items.flint))); recipeCrusher = Util.GetRecipes.lastIRecipe(); @@ -569,7 +558,7 @@ public class BlockCrafting{ 'C', "cobblestone", 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'R', InitBlocks.blockGrinder, - 'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'P', new ItemStack(Blocks.piston))); recipeDoubleCrusher = Util.GetRecipes.lastIRecipe(); } @@ -581,7 +570,7 @@ public class BlockCrafting{ 'C', "cobblestone", 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'R', new ItemStack(Blocks.furnace), - 'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'P', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); recipeFurnace = Util.GetRecipes.lastIRecipe(); } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 13f23cde5..fe5d43fab 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -49,7 +49,6 @@ tile.actuallyadditions.blockFurnaceSolar.name=Solar Panel tile.actuallyadditions.blockHeatCollector.name=Heat Collector tile.actuallyadditions.blockItemRepairer.name=Item Repairer tile.actuallyadditions.blockMiscWoodCasing.name=Wood Casing -tile.actuallyadditions.blockMiscStoneCasing.name=Stone Casing tile.actuallyadditions.blockGreenhouseGlass.name=Greenhouse Glass tile.actuallyadditions.blockEnergizer.name=Energizer tile.actuallyadditions.blockEnervator.name=Enervator diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscStoneCasingSnowTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscIronCasingSnowTop.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscStoneCasingSnowTop.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscIronCasingSnowTop.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscStoneCasing.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscStoneCasing.png deleted file mode 100644 index e32c54303..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscStoneCasing.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscStoneCasingSnow.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscStoneCasingSnow.png deleted file mode 100644 index 6d5978344..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscStoneCasingSnow.png and /dev/null differ