From 0d434ff9b37652ad7ed9c4e431dd66c35327d84b Mon Sep 17 00:00:00 2001 From: Cricket Date: Mon, 22 Jun 2015 14:21:22 -0400 Subject: [PATCH] fixed controllers and removed AE2 support --- .../java/com/cricketcraft/chisel/Chisel.java | 2 +- .../com/cricketcraft/chisel/Features.java | 22 ------------------- .../blocks/futura/WIP/controller.png.mcmeta | 4 ++-- .../futura/WIP/controllerPurple.png.mcmeta | 4 ++-- 4 files changed, 5 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 9de3195e..5798835f 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -52,7 +52,7 @@ import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.Type; -@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:EE3;after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft;after:AWWayofTime;after:TwilightForest") +@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:EE3;after:ForgeMultipart;after:Thaumcraft;after:Railcraft;after:AWWayofTime;after:TwilightForest") public class Chisel { public static final String MOD_ID = "chisel"; diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 26d124ac..64758c85 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -58,28 +58,6 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; public enum Features { - AE_CERTUS_QUARTZ("appliedenergistics2") { - - @Override - void addBlocks() { - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.appliedenergistics2.BlockQuartz"), 0, 0); - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.appliedenergistics2.BlockQuartzPillar"), 0, 1); - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.appliedenergistics2.BlockQuartzChiseled"), 0, 2); - Carving.chisel.registerOre("AECertusQuartz", "AECertusQuartz"); - } - }, - - AE_SKY_STONE("appliedenergistics2") { - - @Override - void addBlocks() { - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.appliedenergistics2.BlockSkyStone"), 1, 0); - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.appliedenergistics2.BlockSkyStone"), 2, 1); - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.appliedenergistics2.BlockSkyStone"), 3, 2); - Carving.chisel.registerOre("AESkyStone", "AESkyStone"); - } - }, - ALUMINUM { @Override diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png.mcmeta index 9f04d7ff..3a077b37 100644 --- a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png.mcmeta +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png.mcmeta @@ -2,6 +2,7 @@ "animation": { "frametime": 3, "frames": [ + 0, 1, 2, 3, @@ -12,8 +13,7 @@ 8, 9, 10, - 11, - 0 + 11 ] } } diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerPurple.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerPurple.png.mcmeta index fd1abe54..e0a228a9 100644 --- a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerPurple.png.mcmeta +++ b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerPurple.png.mcmeta @@ -2,6 +2,7 @@ "animation": { "frametime": 2, "frames": [ + 0, 1, 2, 3, @@ -12,8 +13,7 @@ 8, 9, 10, - 11, - 0 + 11 ] } }