From 305f74b107147a12634bca0b3cab3d57a1bad589 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 12 Sep 2018 16:56:24 +0300 Subject: [PATCH] Storage blocks flattened --- .../java/techreborn/blocks/BlockStorage.java | 113 +++---- .../java/techreborn/blocks/BlockStorage2.java | 138 -------- .../techreborn/client/RegisterItemJsons.java | 5 +- src/main/java/techreborn/init/ModBlocks.java | 64 ++-- .../java/techreborn/init/TRIngredients.java | 47 ++- .../init/recipes/CraftingTableRecipes.java | 15 +- .../itemblocks/ItemBlockStorage.java | 38 --- .../itemblocks/ItemBlockStorage2.java | 38 --- .../techreborn/blockstates/storage.json | 295 +++++++++--------- .../assets/techreborn/lang/en_us.lang | 22 +- 10 files changed, 274 insertions(+), 501 deletions(-) delete mode 100644 src/main/java/techreborn/blocks/BlockStorage2.java delete mode 100644 src/main/java/techreborn/itemblocks/ItemBlockStorage.java delete mode 100644 src/main/java/techreborn/itemblocks/ItemBlockStorage2.java diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index 55310b2f3..faf1545dd 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -24,94 +24,59 @@ package techreborn.blocks; -import com.google.common.collect.Lists; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseBlock; -import reborncore.common.blocks.PropertyString; -import reborncore.common.util.ArrayUtils; -import techreborn.events.TRRecipeHandler; -import techreborn.init.ModBlocks; -import techreborn.lib.ModInfo; import techreborn.utils.TechRebornCreativeTab; -import java.util.List; -import java.util.Random; - public class BlockStorage extends BaseBlock { - public static final String[] types = new String[] { "silver", "aluminum", "titanium", "chrome", "steel", "brass", - "lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "iridium", "bronze" }; - public static final PropertyString TYPE = new PropertyString("type", types); - private static final List typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); - public BlockStorage() { super(Material.IRON); setCreativeTab(TechRebornCreativeTab.instance); setHardness(2f); - this.setDefaultState(this.getDefaultState().withProperty(TYPE, "silver")); - for (int i = 0; i < types.length; i++) { - RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + types[i]).setFileName("storage")); - } - TRRecipeHandler.hideEntry(this); + setSoundType(SoundType.METAL); } - public static ItemStack getStorageBlockByName(String name, int count) { - for (int i = 0; i < types.length; i++) { - if (types[i].equals(name)) { - return new ItemStack(ModBlocks.STORAGE, count, i); - } - } - return BlockStorage2.getStorageBlockByName(name, count); - } +// public static ItemStack getStorageBlockByName(String name, int count) { +// for (int i = 0; i < types.length; i++) { +// if (types[i].equals(name)) { +// return new ItemStack(ModBlocks.STORAGE, count, i); +// } +// } +// return BlockStorage2.getStorageBlockByName(name, count); +// } - public static ItemStack getStorageBlockByName(String name) { - return getStorageBlockByName(name, 1); - } +// public static ItemStack getStorageBlockByName(String name) { +// return getStorageBlockByName(name, 1); +// } - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(this); - } +// @Override +// public Item getItemDropped(IBlockState state, Random rand, int fortune) { +// return Item.getItemFromBlock(this); +// } +// +// @Override +// public int damageDropped(IBlockState state) { +// return getMetaFromState(state); +// } - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(CreativeTabs creativeTabs, NonNullList list) { - for (int meta = 0; meta < types.length; meta++) { - list.add(new ItemStack(this, 1, meta)); - } - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta > types.length) { - meta = 0; - } - return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta)); - } - - @Override - public int getMetaFromState(IBlockState state) { - return typesList.indexOf(state.getValue(TYPE)); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, TYPE); - } +// @Override +// public IBlockState getStateFromMeta(int meta) { +// if (meta > types.length) { +// meta = 0; +// } +// return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta)); +// } +// +// @Override +// public int getMetaFromState(IBlockState state) { +// return typesList.indexOf(state.getValue(TYPE)); +// } +// +// @Override +// protected BlockStateContainer createBlockState() { +// return new BlockStateContainer(this, TYPE); +// } } diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java deleted file mode 100644 index b82529500..000000000 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks; - -import com.google.common.base.CaseFormat; -import com.google.common.collect.Lists; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; -import reborncore.common.BaseBlock; -import reborncore.common.blocks.PropertyString; -import reborncore.common.util.ArrayUtils; -import techreborn.events.TRRecipeHandler; -import techreborn.init.ModBlocks; -import techreborn.lib.ModInfo; -import techreborn.utils.TechRebornCreativeTab; - -import javax.annotation.Nullable; -import java.security.InvalidParameterException; -import java.util.List; -import java.util.Random; - -public class BlockStorage2 extends BaseBlock { - - public static final String[] types = new String[] { "tungstensteel", "iridium_reinforced_tungstensteel", - "iridium_reinforced_stone", "ruby", "sapphire", "peridot", "yellow_garnet", "red_garnet", "copper", "tin", - "refined_iron" }; - public static final PropertyString TYPE = new PropertyString("type", types); - private static final List typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); - - public BlockStorage2() { - super(Material.IRON); - setCreativeTab(TechRebornCreativeTab.instance); - setHardness(2f); - this.setDefaultState(this.getDefaultState().withProperty(TYPE, "tungstensteel")); - for (int i = 0; i < types.length; i++) { - RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + types[i]) - .setFileName("storage")); - } - TRRecipeHandler.hideEntry(this); - } - - public static ItemStack getStorageBlockByName(String name, int count) { - name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name); - for (int i = 0; i < types.length; i++) { - if (types[i].equals(name)) { - return new ItemStack(ModBlocks.STORAGE2, count, i); - } - } - throw new InvalidParameterException("The storage block " + name + " could not be found."); - } - - public static ItemStack getStorageBlockByName(String name) { - return getStorageBlockByName(name, 1); - } - - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(this); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(CreativeTabs creativeTabs, NonNullList list) { - for (int meta = 0; meta < types.length; meta++) { - list.add(new ItemStack(this, 1, meta)); - } - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta > types.length) { - meta = 0; - } - return getBlockState().getBaseState().withProperty(TYPE, typesList.get(meta)); - } - - @Override - public int getMetaFromState(IBlockState state) { - return typesList.indexOf(state.getValue(TYPE)); - } - - @Override - public float getExplosionResistance(World world, BlockPos pos, @Nullable Entity exploder, Explosion explosion) { - String blockType = world.getBlockState(pos).getValue(TYPE); - if (blockType == "tungstensteel" || blockType == "iridium_reinforced_stone") { - return 300F; - } else if (blockType == "iridium_reinforced_tungstensteel") { - return 400F; - } - return 30F; - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, TYPE); - } - -} diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 9aa035821..22c807bc5 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -45,13 +45,12 @@ import java.util.Map; public class RegisterItemJsons { public static void registerModels() { + TRIngredients.registerModel(); registerItems(); registerBlocks(); } - private static void registerItems() { - TRIngredients.registerModel(); - + private static void registerItems() { // Armor register(TRItems.CLOAKING_DEVICE, "tool/cloaking_device"); register(TRItems.LAPOTRONIC_ORB_PACK, "tool/lapotronic_orbpack"); diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 2c13268a4..0aadd53e2 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -57,10 +57,6 @@ import techreborn.lib.ModInfo; */ public class ModBlocks { - // Storage Blocks - public static Block STORAGE; - public static Block STORAGE2; - // Misc Blocks public static Block CABLE; public static Block COMPUTER_CUBE; @@ -211,18 +207,6 @@ public class ModBlocks { MACHINE_CASINGS = new BlockMachineCasing(); registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machine_casing"); -// ORE = new BlockOre(); -// registerBlock(ORE, ItemBlockOre.class, "ore"); -// -// ORE2 = new BlockOre2(); -// registerBlock(ORE2, ItemBlockOre2.class, "ore2"); - - STORAGE = new BlockStorage(); - registerBlock(STORAGE, ItemBlockStorage.class, "storage"); - - STORAGE2 = new BlockStorage2(); - registerBlock(STORAGE2, ItemBlockStorage2.class, "storage2"); - DRAGON_EGG_SYPHON = new BlockDragonEggSyphon(); registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon"); @@ -449,30 +433,30 @@ public class ModBlocks { // } - OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver")); - OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum")); - OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum")); - OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium")); - OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome")); - OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel")); - OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass")); - OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead")); - OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum")); - OreUtil.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc")); - OreUtil.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum")); - OreUtil.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten")); - OreUtil.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel")); - OreUtil.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar")); - OreUtil.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium")); - OreUtil.registerOre("blockBronze", BlockStorage.getStorageBlockByName("bronze")); - OreUtil.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1)); - OreUtil.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1)); - OreUtil.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1)); - OreUtil.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1)); - OreUtil.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1)); - OreUtil.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1)); - OreUtil.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1)); - OreUtil.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1)); +// OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver")); +// OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum")); +// OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum")); +// OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium")); +// OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome")); +// OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel")); +// OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass")); +// OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead")); +// OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum")); +// OreUtil.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc")); +// OreUtil.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum")); +// OreUtil.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten")); +// OreUtil.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel")); +// OreUtil.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar")); +// OreUtil.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium")); +// OreUtil.registerOre("blockBronze", BlockStorage.getStorageBlockByName("bronze")); +// OreUtil.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1)); +// OreUtil.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1)); +// OreUtil.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1)); +// OreUtil.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1)); +// OreUtil.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1)); +// OreUtil.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1)); +// OreUtil.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1)); +// OreUtil.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1)); OreUtil.registerOre("craftingPiston", Blocks.PISTON); OreUtil.registerOre("craftingPiston", Blocks.STICKY_PISTON); diff --git a/src/main/java/techreborn/init/TRIngredients.java b/src/main/java/techreborn/init/TRIngredients.java index 4f2dd1fb1..dfebeddae 100644 --- a/src/main/java/techreborn/init/TRIngredients.java +++ b/src/main/java/techreborn/init/TRIngredients.java @@ -38,6 +38,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornRegistry; import techreborn.blocks.BlockOre; +import techreborn.blocks.BlockStorage; import techreborn.events.TRRecipeHandler; import techreborn.items.ItemTR; import techreborn.lib.ModInfo; @@ -50,11 +51,9 @@ public class TRIngredients { public static void registerBlocks() { Arrays.stream(Ores.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); - - + Arrays.stream(Storage.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); } - public static void registerItems() { Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); Arrays.stream(DustsSmall.values()).forEach(value -> RebornRegistry.registerItem(value.item)); @@ -65,7 +64,6 @@ public class TRIngredients { Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item)); } - @SideOnly(Side.CLIENT) public static void registerModel() { ResourceLocation dustsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/dusts"); @@ -97,15 +95,26 @@ public class TRIngredients { new ModelResourceLocation(platesRL, "type=" + value.name))); ResourceLocation oresRL = new ResourceLocation(ModInfo.MOD_ID, "ores"); - for (Ores ore : Ores.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(ore.block), 0, new ModelResourceLocation(oresRL, "type=" + ore.name)); - ModelLoader.setCustomStateMapper(ore.block, new DefaultStateMapper() { + for (Ores value : Ores.values()) { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(oresRL, "type=" + value.name)); + ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation(oresRL, "type=" + ore.name); + return new ModelResourceLocation(oresRL, "type=" + value.name); } }); } + + ResourceLocation storageRL = new ResourceLocation(ModInfo.MOD_ID, "storage"); + for (Storage value : Storage.values()) { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.name)); + ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation(storageRL, "type=" + value.name); + } + }); + } } public static enum Ores implements IStringSerializable { @@ -129,6 +138,28 @@ public class TRIngredients { } } + + public static enum Storage implements IStringSerializable { + ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE, + IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, OSMIUM, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY, + SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC; + + public final String name; + public final Block block; + + private Storage() { + name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "BLOCK_" + this.toString()); + block = new BlockStorage(); + block.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); + block.setTranslationKey(ModInfo.MOD_ID + ".storage." + this.toString().toLowerCase()); + TRRecipeHandler.hideEntry(block); + } + + @Override + public String getName() { + return name; + } + } public static enum Dusts implements IStringSerializable { ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME, diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index cfcd890d4..323597d10 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -32,7 +32,6 @@ import net.minecraftforge.oredict.OreDictionary; import reborncore.common.util.RebornCraftingHelper; import techreborn.Core; import techreborn.blocks.BlockStorage; -import techreborn.blocks.BlockStorage2; import techreborn.blocks.cable.EnumCableType; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; @@ -49,9 +48,9 @@ public class CraftingTableRecipes extends RecipeMethods { registerCompressionRecipes(); registerMixedMetalIngotRecipes(); - registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "stone", "plateIridiumAlloy"); - registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("tungstensteel", 1), "plateIridium"); - registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "ingotTungstensteel"); +// registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "stone", "plateIridiumAlloy"); +// registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("tungstensteel", 1), "plateIridium"); +// registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "ingotTungstensteel"); registerShapeless(getStack(ModBlocks.RUBBER_PLANKS, 4), getStack(ModBlocks.RUBBER_LOG)); registerShaped(DynamicCell.getEmptyCell(16), " T ", "T T", " T ", 'T', "ingotTin"); registerShaped(getStack(ModBlocks.REFINED_IRON_FENCE), "RRR", "RRR", 'R', "ingotRefinedIron"); @@ -294,7 +293,7 @@ public class CraftingTableRecipes extends RecipeMethods { } static void registerCompressionRecipes() { - for (String name : BlockStorage.types) { +// for (String name : BlockStorage.types) { // if (OreUtil.hasIngot(name)) { // registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', "ingot" + StringUtils.toFirstCapital(name)); // registerShapeless(getMaterial(name, 9, Type.INGOT), BlockStorage.getStorageBlockByName(name)); @@ -302,9 +301,9 @@ public class CraftingTableRecipes extends RecipeMethods { // registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', "gem" + StringUtils.toFirstCapital(name)); // registerShapeless(getMaterial(name, 9, Type.GEM), BlockStorage.getStorageBlockByName(name)); // } - } +// } - for (String block : BlockStorage2.types){ +// for (String block : BlockStorage2.types){ // block = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, block); // if (OreUtil.hasIngot(block)) { // registerShaped(BlockStorage2.getStorageBlockByName(block), "AAA", "AAA", "AAA", 'A', "ingot" + StringUtils.toFirstCapital(block)); @@ -313,7 +312,7 @@ public class CraftingTableRecipes extends RecipeMethods { // registerShaped(BlockStorage2.getStorageBlockByName(block), "AAA", "AAA", "AAA", 'A', "gem" + StringUtils.toFirstCapital(block)); // registerShapeless(getMaterial(block, 9, Type.GEM), BlockStorage2.getStorageBlockByName(block)); // } - } +// } // for (String name : ItemDustsSmall.types) { // registerShapeless(getMaterial(name, 4, Type.SMALL_DUST), getMaterialObject(name, Type.DUST)); diff --git a/src/main/java/techreborn/itemblocks/ItemBlockStorage.java b/src/main/java/techreborn/itemblocks/ItemBlockStorage.java deleted file mode 100644 index 99d9c287c..000000000 --- a/src/main/java/techreborn/itemblocks/ItemBlockStorage.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.itemblocks; - -import net.minecraft.block.Block; -import reborncore.common.itemblock.ItemBlockBase; -import techreborn.blocks.BlockStorage; -import techreborn.init.ModBlocks; - -public class ItemBlockStorage extends ItemBlockBase { - - public ItemBlockStorage(Block block) { - super(ModBlocks.STORAGE, ModBlocks.STORAGE, BlockStorage.types); - } - -} diff --git a/src/main/java/techreborn/itemblocks/ItemBlockStorage2.java b/src/main/java/techreborn/itemblocks/ItemBlockStorage2.java deleted file mode 100644 index 593a7b1e0..000000000 --- a/src/main/java/techreborn/itemblocks/ItemBlockStorage2.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.itemblocks; - -import net.minecraft.block.Block; -import reborncore.common.itemblock.ItemBlockBase; -import techreborn.blocks.BlockStorage2; -import techreborn.init.ModBlocks; - -public class ItemBlockStorage2 extends ItemBlockBase { - - public ItemBlockStorage2(Block block) { - super(ModBlocks.STORAGE2, ModBlocks.STORAGE2, BlockStorage2.types); - } - -} diff --git a/src/main/resources/assets/techreborn/blockstates/storage.json b/src/main/resources/assets/techreborn/blockstates/storage.json index 3214f0a32..7a84cfb83 100644 --- a/src/main/resources/assets/techreborn/blockstates/storage.json +++ b/src/main/resources/assets/techreborn/blockstates/storage.json @@ -1,145 +1,154 @@ { - "forge_marker": 1, - "defaults": { - "textures": {}, - "transform": "forge:default-block", - "model": "cube_all" - }, - "variants": { - "inventory": [ - {} - ], - "type": { - "silver": { - "textures": { - "all": "techreborn:blocks/storage/silver_block" - } - }, - "aluminum": { - "textures": { - "all": "techreborn:blocks/storage/aluminum_block" - } - }, - "iridium": { - "textures": { - "all": "techreborn:blocks/storage/iridium_block" - } - }, - "titanium": { - "textures": { - "all": "techreborn:blocks/storage/titanium_block" - } - }, - "chrome": { - "textures": { - "all": "techreborn:blocks/storage/chrome_block" - } - }, - "steel": { - "textures": { - "all": "techreborn:blocks/storage/steel_block" - } - }, - "brass": { - "textures": { - "all": "techreborn:blocks/storage/brass_block" - } - }, - "lead": { - "textures": { - "all": "techreborn:blocks/storage/lead_block" - } - }, - "electrum": { - "textures": { - "all": "techreborn:blocks/storage/electrum_block" - } - }, - "zinc": { - "textures": { - "all": "techreborn:blocks/storage/zinc_block" - } - }, - "platinum": { - "textures": { - "all": "techreborn:blocks/storage/platinum_block" - } - }, - "tungsten": { - "textures": { - "all": "techreborn:blocks/storage/tungsten_block" - } - }, - "nickel": { - "textures": { - "all": "techreborn:blocks/storage/nickel_block" - } - }, - "invar": { - "textures": { - "all": "techreborn:blocks/storage/invar_block" - } - }, - "tungstensteel": { - "textures": { - "all": "techreborn:blocks/storage/tungstensteel_block" - } - }, - "iridium_reinforced_tungstensteel": { - "textures": { - "all": "techreborn:blocks/storage/iridium_reinforced_tungstensteel_block" - } - }, - "iridium_reinforced_stone": { - "textures": { - "all": "techreborn:blocks/storage/iridium_reinforced_stone_block" - } - }, - "ruby": { - "textures": { - "all": "techreborn:blocks/storage/ruby_block" - } - }, - "sapphire": { - "textures": { - "all": "techreborn:blocks/storage/sapphire_block" - } - }, - "peridot": { - "textures": { - "all": "techreborn:blocks/storage/peridot_block" - } - }, - "yellow_garnet": { - "textures": { - "all": "techreborn:blocks/storage/yellowgarnet_block" - } - }, - "red_garnet": { - "textures": { - "all": "techreborn:blocks/storage/redgarnet_block" - } - }, - "copper": { - "textures": { - "all": "techreborn:blocks/storage/copper_block" - } - }, - "tin": { - "textures": { - "all": "techreborn:blocks/storage/tin_block" - } - }, - "refined_iron": { - "textures": { - "all": "techreborn:blocks/storage/refinediron_block" - } - }, - "bronze": { - "textures": { - "all": "techreborn:blocks/storage/bronze_block" - } - } - } - } + "forge_marker": 1, + "defaults": { + "textures": { + + }, + "transform": "forge:default-block", + "model": "cube_all" + }, + "variants": { + "inventory": [ + { + + } + ], + "type": { + "blockaluminum": { + "textures": { + "all": "techreborn:blocks/storage/aluminum_block" + } + }, + "blockbrass": { + "textures": { + "all": "techreborn:blocks/storage/brass_block" + } + }, + "blockbronze": { + "textures": { + "all": "techreborn:blocks/storage/bronze_block" + } + }, + "blockchrome": { + "textures": { + "all": "techreborn:blocks/storage/chrome_block" + } + }, + "blockcopper": { + "textures": { + "all": "techreborn:blocks/storage/copper_block" + } + }, + "blockelectrum": { + "textures": { + "all": "techreborn:blocks/storage/electrum_block" + } + }, + "blockinvar": { + "textures": { + "all": "techreborn:blocks/storage/invar_block" + } + }, + "blockiridium": { + "textures": { + "all": "techreborn:blocks/storage/iridium_block" + } + }, + "blockiridiumreinforcedstone": { + "textures": { + "all": "techreborn:blocks/storage/iridium_reinforced_stone_block" + } + }, + "blockiridiumreinforcedtungstensteel": { + "textures": { + "all": "techreborn:blocks/storage/iridium_reinforced_tungstensteel_block" + } + }, + "blocklead": { + "textures": { + "all": "techreborn:blocks/storage/lead_block" + } + }, + "blocknickel": { + "textures": { + "all": "techreborn:blocks/storage/nickel_block" + } + }, + "blockosmium": { + "textures": { + "all": "techreborn:blocks/storage/osmium_block" + } + }, + "blockperidot": { + "textures": { + "all": "techreborn:blocks/storage/peridot_block" + } + }, + "blockplatinum": { + "textures": { + "all": "techreborn:blocks/storage/platinum_block" + } + }, + "blockredgarnet": { + "textures": { + "all": "techreborn:blocks/storage/redgarnet_block" + } + }, + "blockrefinediron": { + "textures": { + "all": "techreborn:blocks/storage/refinediron_block" + } + }, + "blockruby": { + "textures": { + "all": "techreborn:blocks/storage/ruby_block" + } + }, + "blocksapphire": { + "textures": { + "all": "techreborn:blocks/storage/sapphire_block" + } + }, + "blocksilver": { + "textures": { + "all": "techreborn:blocks/storage/silver_block" + } + }, + "blocksteel": { + "textures": { + "all": "techreborn:blocks/storage/steel_block" + } + }, + "blocktin": { + "textures": { + "all": "techreborn:blocks/storage/tin_block" + } + }, + "blocktitanium": { + "textures": { + "all": "techreborn:blocks/storage/titanium_block" + } + }, + "blocktungsten": { + "textures": { + "all": "techreborn:blocks/storage/tungsten_block" + } + }, + "blocktungstensteel": { + "textures": { + "all": "techreborn:blocks/storage/tungstensteel_block" + } + }, + "blockyellowgarnet": { + "textures": { + "all": "techreborn:blocks/storage/yellowgarnet_block" + } + }, + "blockzinc": { + "textures": { + "all": "techreborn:blocks/storage/zinc_block" + } + } + } + } } diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index 221fbaac7..75e6dc0fd 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -115,28 +115,28 @@ tile.techreborn.storage.aluminum.name=Block of Aluminium tile.techreborn.storage.brass.name=Block of Brass tile.techreborn.storage.bronze.name=Block of Bronze tile.techreborn.storage.chrome.name=Block of Chrome -tile.techreborn.storage2.copper.name=Block of Copper +tile.techreborn.storage.copper.name=Block of Copper tile.techreborn.storage.electrum.name=Block of Electrum tile.techreborn.storage.invar.name=Block of Invar tile.techreborn.storage.iridium.name=Block of Iridium -tile.techreborn.storage2.iridium_reinforced_stone.name=Iridium Reinforced Stone -tile.techreborn.storage2.iridium_reinforced_tungstensteel.name=Iridium Reinforced Tungstensteel Block +tile.techreborn.storage.iridium_reinforced_stone.name=Iridium Reinforced Stone +tile.techreborn.storage.iridium_reinforced_tungstensteel.name=Iridium Reinforced Tungstensteel Block tile.techreborn.storage.lead.name=Block of Lead tile.techreborn.storage.nickel.name=Block of Nickel tile.techreborn.storage.osmium.name=Block of Osmium -tile.techreborn.storage2.peridot.name=Block of Peridot +tile.techreborn.storage.peridot.name=Block of Peridot tile.techreborn.storage.platinum.name=Block of Platinum -tile.techreborn.storage2.red_garnet.name=Block of Red Garnet -tile.techreborn.storage2.refined_iron.name=Block of Refined Iron -tile.techreborn.storage2.ruby.name=Block of Ruby -tile.techreborn.storage2.sapphire.name=Block of Sapphire +tile.techreborn.storage.red_garnet.name=Block of Red Garnet +tile.techreborn.storage.refined_iron.name=Block of Refined Iron +tile.techreborn.storage.ruby.name=Block of Ruby +tile.techreborn.storage.sapphire.name=Block of Sapphire tile.techreborn.storage.silver.name=Block of Silver tile.techreborn.storage.steel.name=Block of Steel -tile.techreborn.storage2.tin.name=Block of Tin +tile.techreborn.storage.tin.name=Block of Tin tile.techreborn.storage.titanium.name=Block of Titanium tile.techreborn.storage.tungsten.name=Block of Tungsten -tile.techreborn.storage2.tungstensteel.name=Block of Tungstensteel -tile.techreborn.storage2.yellow_garnet.name=Block of Yellow Garnet +tile.techreborn.storage.tungstensteel.name=Block of Tungstensteel +tile.techreborn.storage.yellow_garnet.name=Block of Yellow Garnet tile.techreborn.storage.zinc.name=Block of Zinc #Cables