From 21646c9c68ed0e262ff88162d3e9cf63953537c1 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 3 Oct 2015 22:09:53 +0200 Subject: [PATCH] Rewrote Crusher Recipes --- .../ellpeck/actuallyadditions/booklet/page/PageCrafting.java | 1 + .../actuallyadditions/booklet/page/PageCrusherRecipe.java | 1 + .../communication/InterModCommunications.java | 1 + .../actuallyadditions/config/values/ConfigCrafting.java | 1 + .../ellpeck/actuallyadditions/crafting/CrusherCrafting.java | 3 +++ .../ellpeck/actuallyadditions/inventory/ContainerGrinder.java | 1 + .../actuallyadditions/recipe/CrusherRecipeRegistry.java | 1 + .../java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java | 1 + src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java | 1 + 9 files changed, 11 insertions(+) diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java index 87468422d..8a89eda61 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java @@ -26,6 +26,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import java.util.ArrayList; + public class PageCrafting extends BookletPage{ private final IRecipe[] recipes; diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java index 111a66ef6..140ddf379 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java @@ -19,6 +19,7 @@ import ellpeck.actuallyadditions.util.Util; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; + public class PageCrusherRecipe extends BookletPage{ public CrusherRecipeRegistry.CrusherRecipe recipe; diff --git a/src/main/java/ellpeck/actuallyadditions/communication/InterModCommunications.java b/src/main/java/ellpeck/actuallyadditions/communication/InterModCommunications.java index 60633e766..6f16803b2 100644 --- a/src/main/java/ellpeck/actuallyadditions/communication/InterModCommunications.java +++ b/src/main/java/ellpeck/actuallyadditions/communication/InterModCommunications.java @@ -21,6 +21,7 @@ import net.minecraft.potion.PotionEffect; import java.util.List; + public class InterModCommunications{ public static void processIMC(List messages){ diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 032fa38f7..7f8279a86 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -134,6 +134,7 @@ public enum ConfigCrafting{ COAL("Coal -> Coal Dust", ConfigCategories.CRUSHER_RECIPES, "Crusher"), COAL_ORE("Coal Ore -> Coal", ConfigCategories.CRUSHER_RECIPES, "Crusher"), COAL_BLOCKS("Coal Block -> Coal Dust", ConfigCategories.CRUSHER_RECIPES, "Crusher"), + QUARTZ_ORE("Quartz Ore -> Quartz", ConfigCategories.CRUSHER_RECIPES, "Crusher"), COBBLESTONE("Cobblestone -> Sand", ConfigCategories.CRUSHER_RECIPES, "Crusher"), GRAVEL("Gravel -> Flint", ConfigCategories.CRUSHER_RECIPES, "Crusher"), STONE("Stone -> Cobblestone", ConfigCategories.CRUSHER_RECIPES, "Crusher"), diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java index 1751871e1..3838b3a7c 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java @@ -34,6 +34,9 @@ public class CrusherCrafting{ if(ConfigCrafting.COAL_BLOCKS.isEnabled()){ CrusherRecipeRegistry.addRecipe("blockCoal", "coal", 9); } + if(ConfigCrafting.QUARTZ_ORE.isEnabled()){ + CrusherRecipeRegistry.addRecipe("oreQuartz", "gemQuartz", 3); + } if(ConfigCrafting.COBBLESTONE.isEnabled()){ CrusherRecipeRegistry.addRecipe("cobblestone", "sand", 1); diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java index 520bb1d1e..550a9bc8f 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java @@ -21,6 +21,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + @InventoryContainer public class ContainerGrinder extends Container{ diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeRegistry.java b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeRegistry.java index 819f0889a..54e62245f 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeRegistry.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeRegistry.java @@ -18,6 +18,7 @@ import net.minecraftforge.oredict.OreDictionary; import java.util.ArrayList; + public class CrusherRecipeRegistry{ public static ArrayList recipes = new ArrayList(); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java index 481b10001..65eedca03 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java @@ -10,6 +10,7 @@ package ellpeck.actuallyadditions.tile; + import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java b/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java index 5dd7c0ae2..cf985c454 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java @@ -19,6 +19,7 @@ import net.minecraft.nbt.NBTTagList; import java.util.List; + public class ItemUtil{ public static Item getItemFromName(String name){