Storage blocks flattened
This commit is contained in:
parent
7393a8bdd6
commit
305f74b107
10 changed files with 274 additions and 501 deletions
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue