From a384b3e4c69dcb67b83cc0271933fdead4d0c5b4 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Wed, 26 Feb 2014 14:35:52 +0800 Subject: [PATCH] Resolved #297 - Moved resources into new creative tab --- .../src/main/java/resonantinduction/archaic/Archaic.java | 2 +- build.gradle | 6 ++++++ .../main/java/resonantinduction/electrical/Electrical.java | 2 +- .../java/resonantinduction/electrical/wire/ItemWire.java | 2 +- .../main/java/resonantinduction/mechanical/Mechanical.java | 2 +- src/main/java/resonantinduction/core/ResonantInduction.java | 1 + src/main/java/resonantinduction/core/TabRI.java | 3 ++- .../resonantinduction/core/prefab/imprint/ItemImprint.java | 2 +- .../assets/resonantinduction/languages/en_US.properties | 1 + 9 files changed, 15 insertions(+), 6 deletions(-) diff --git a/archaic/src/main/java/resonantinduction/archaic/Archaic.java b/archaic/src/main/java/resonantinduction/archaic/Archaic.java index d347db8b..f88196a1 100644 --- a/archaic/src/main/java/resonantinduction/archaic/Archaic.java +++ b/archaic/src/main/java/resonantinduction/archaic/Archaic.java @@ -67,7 +67,7 @@ public class Archaic @Mod.Metadata(ID) public static ModMetadata metadata; - public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, Settings.idManager, ID).setPrefix(Reference.PREFIX).setTab(TabRI.CORE); + public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, Settings.idManager, ID).setPrefix(Reference.PREFIX).setTab(TabRI.DEFAULT); public static Block blockEngineeringTable; public static Block blockCrate; diff --git a/build.gradle b/build.gradle index e0177425..254fa929 100644 --- a/build.gradle +++ b/build.gradle @@ -52,6 +52,12 @@ allprojects { name = "forge" url = "http://files.minecraftforge.net/maven" } + + ivy { + name 'FMP' + artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]" + } + ivy { artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]" } diff --git a/electrical/src/main/java/resonantinduction/electrical/Electrical.java b/electrical/src/main/java/resonantinduction/electrical/Electrical.java index c35bdee0..64a4f2fb 100644 --- a/electrical/src/main/java/resonantinduction/electrical/Electrical.java +++ b/electrical/src/main/java/resonantinduction/electrical/Electrical.java @@ -72,7 +72,7 @@ public class Electrical @Mod.Metadata(ID) public static ModMetadata metadata; - public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, Settings.idManager, ID).setPrefix(Reference.PREFIX).setTab(TabRI.CORE); + public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, Settings.idManager, ID).setPrefix(Reference.PREFIX).setTab(TabRI.DEFAULT); // Energy public static Item itemWire; diff --git a/electrical/src/main/java/resonantinduction/electrical/wire/ItemWire.java b/electrical/src/main/java/resonantinduction/electrical/wire/ItemWire.java index 65d0fc0f..70581aa5 100644 --- a/electrical/src/main/java/resonantinduction/electrical/wire/ItemWire.java +++ b/electrical/src/main/java/resonantinduction/electrical/wire/ItemWire.java @@ -46,7 +46,7 @@ public class ItemWire extends JItemMultiPart super(Settings.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "wire", id).getInt(id)); this.setUnlocalizedName(Reference.PREFIX + "wire"); this.setTextureName(Reference.PREFIX + "wire"); - this.setCreativeTab(TabRI.CORE); + this.setCreativeTab(TabRI.DEFAULT); this.setHasSubtypes(true); this.setMaxDamage(0); } diff --git a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java index 221e2aee..47a05ebb 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/Mechanical.java @@ -80,7 +80,7 @@ public class Mechanical @Mod.Metadata(ID) public static ModMetadata metadata; - public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, Settings.idManager, ID).setPrefix(Reference.PREFIX).setTab(TabRI.CORE); + public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, Settings.idManager, ID).setPrefix(Reference.PREFIX).setTab(TabRI.DEFAULT); // Energy public static Item itemHandCrank; diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java index 150e63c9..04d7c117 100644 --- a/src/main/java/resonantinduction/core/ResonantInduction.java +++ b/src/main/java/resonantinduction/core/ResonantInduction.java @@ -119,6 +119,7 @@ public class ResonantInduction // Already registered with ContentRegistry // GameRegistry.registerTileEntity(TileMaterial.class, "ri_material"); GameRegistry.registerTileEntity(TileFluidMixture.class, "ri_fluid_mixture"); + proxy.preInit(); TabRI.ITEMSTACK = new ItemStack(blockMachinePart); } diff --git a/src/main/java/resonantinduction/core/TabRI.java b/src/main/java/resonantinduction/core/TabRI.java index 0f4cafb5..412fd932 100644 --- a/src/main/java/resonantinduction/core/TabRI.java +++ b/src/main/java/resonantinduction/core/TabRI.java @@ -12,7 +12,8 @@ import net.minecraft.item.ItemStack; */ public class TabRI extends CreativeTabs { - public static final TabRI CORE = new TabRI(CreativeTabs.getNextID(), Reference.DOMAIN); + public static final TabRI DEFAULT = new TabRI(CreativeTabs.getNextID(), Reference.DOMAIN); + public static final TabRI CORE = new TabRI(CreativeTabs.getNextID(), Reference.DOMAIN + ".core"); public static ItemStack ITEMSTACK; public TabRI(int par1, String par2Str) diff --git a/src/main/java/resonantinduction/core/prefab/imprint/ItemImprint.java b/src/main/java/resonantinduction/core/prefab/imprint/ItemImprint.java index 1989c03d..1dd2bafb 100644 --- a/src/main/java/resonantinduction/core/prefab/imprint/ItemImprint.java +++ b/src/main/java/resonantinduction/core/prefab/imprint/ItemImprint.java @@ -24,7 +24,7 @@ public class ItemImprint extends Item super(Settings.CONFIGURATION.getItem("imprint", id).getInt()); this.setUnlocalizedName(Reference.PREFIX + "imprint"); this.setTextureName(Reference.PREFIX + "imprint"); - this.setCreativeTab(TabRI.CORE); + this.setCreativeTab(TabRI.DEFAULT); this.setHasSubtypes(true); this.maxStackSize = 1; } diff --git a/src/main/resources/assets/resonantinduction/languages/en_US.properties b/src/main/resources/assets/resonantinduction/languages/en_US.properties index d783f16e..72115575 100644 --- a/src/main/resources/assets/resonantinduction/languages/en_US.properties +++ b/src/main/resources/assets/resonantinduction/languages/en_US.properties @@ -4,6 +4,7 @@ # A % followed by a number is used for colors. The exact usage will be outlined in the comment above the localization. itemGroup.resonantinduction=Resonant Induction +itemGroup.resonantinduction.core=Resonant Induction Core meta.resonantinduction.description=Resonant Induction is a Minecraft mod focusing on the manipulation of electricity and wireless technology. Ever wanted blazing electrical shocks flying off your evil lairs? You've came to the right place! meta.resonantinduction.credits=Visit website for credits.