Ubujira
/
ironbarrels
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move registering the recipe classes above any usage of them, and change the vanilla to iron shulker box upgrade to use a shulker shell and not a shulker box

This commit is contained in:
alexbegt 2017-06-17 15:03:31 -04:00
parent e9c3b940c2
commit 7f7b469f0b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/cpw/mods/ironchest/common/ICContent.java
View File

@ -109,6 +109,9 @@ public class ICContent
// Shulkers Start // Shulkers Start
setVanillaShulkerList(); setVanillaShulkerList();
RecipeSorter.register(IronChest.MOD_ID, IronShulkerBoxColoringRecipe.class, Category.SHAPELESS, "after:forge:shapelessore");
RecipeSorter.register(IronChest.MOD_ID, IronShulkerBoxRecipe.class, Category.SHAPED, "after:forge:shapelessore");
ShulkerBoxChangerType.buildItems(); ShulkerBoxChangerType.buildItems();
registerShulkerBlocks(); registerShulkerBlocks();
@ -134,8 +137,6 @@ public class ICContent
} }
GameRegistry.addRecipe(new IronShulkerBoxColoringRecipe()); GameRegistry.addRecipe(new IronShulkerBoxColoringRecipe());
RecipeSorter.register(IronChest.MOD_ID, IronShulkerBoxColoringRecipe.class, Category.SHAPELESS, "after:forge:shapelessore");
RecipeSorter.register(IronChest.MOD_ID, IronShulkerBoxRecipe.class, Category.SHAPED, "after:forge:shapelessore");
ShulkerBoxChangerType.generateRecipes(); ShulkerBoxChangerType.generateRecipes();
// Shulkers End // Shulkers End

7
src/main/java/cpw/mods/ironchest/common/blocks/shulker/IronShulkerBoxType.java
View File

@ -25,6 +25,7 @@ import cpw.mods.ironchest.common.tileentity.shulker.TileEntityObsidianShulkerBox
import cpw.mods.ironchest.common.tileentity.shulker.TileEntitySilverShulkerBox; import cpw.mods.ironchest.common.tileentity.shulker.TileEntitySilverShulkerBox;
import net.minecraft.block.BlockShulkerBox; import net.minecraft.block.BlockShulkerBox;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumDyeColor;
@ -42,7 +43,7 @@ public enum IronShulkerBoxType implements IStringSerializable
SILVER(72, 9, false, "_silver.png", TileEntitySilverShulkerBox.class, 184, 238, Collections.singleton("ingotSilver"), "mmmm3mmmm", "mGmG0GmGm"), SILVER(72, 9, false, "_silver.png", TileEntitySilverShulkerBox.class, 184, 238, Collections.singleton("ingotSilver"), "mmmm3mmmm", "mGmG0GmGm"),
CRYSTAL(108, 12, true, "_crystal.png", TileEntityCrystalShulkerBox.class, 238, 256, Collections.singleton("blockGlass"), "GGGGPGGGG"), CRYSTAL(108, 12, true, "_crystal.png", TileEntityCrystalShulkerBox.class, 238, 256, Collections.singleton("blockGlass"), "GGGGPGGGG"),
OBSIDIAN(108, 12, false, "_obsidian.png", TileEntityObsidianShulkerBox.class, 238, 256, Collections.singleton("obsidian"), "mmmm2mmmm"), OBSIDIAN(108, 12, false, "_obsidian.png", TileEntityObsidianShulkerBox.class, 238, 256, Collections.singleton("obsidian"), "mmmm2mmmm"),
VANILLA(0, 0, false, "", null, 0, 0, Collections.singleton("shulkerBox")); VANILLA(0, 0, false, "", null, 0, 0, Collections.singleton("shulkerShell"));
//@formatter:on //@formatter:on
public static final IronShulkerBoxType VALUES[] = values(); public static final IronShulkerBoxType VALUES[] = values();
@ -163,9 +164,9 @@ public enum IronShulkerBoxType implements IStringSerializable
public static Object translateOreName(String mat) public static Object translateOreName(String mat)
{ {
if (mat.equals("shulkerBox")) if (mat.equals("shulkerShell"))
{ {
return Blocks.PURPLE_SHULKER_BOX; return Items.SHULKER_SHELL;
} }
if (mat.equals("obsidian")) if (mat.equals("obsidian"))