Renamed Mod! Wohoo!

This commit is contained in:
Ellpeck 2014-12-03 22:33:46 +01:00
parent 00800f6108
commit 5eb1a30871
64 changed files with 425 additions and 89 deletions

6
.gitignore vendored
View file

@ -1,6 +1,6 @@
ThingyCraft.iws Gemification.iws
ThingyCraft.ipr Gemification.ipr
ThingyCraft.iml Gemification.iml
idea idea
.gradle .gradle
build build

View file

@ -1,4 +0,0 @@
ThingyCraft
===========
Do things, craft things, make things, eat things! Open things, close things, let things explode, explore things! Things and Thingies everywhere!

287
ThingyCraft.ipr Normal file
View file

@ -0,0 +1,287 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld)" />
<entry name=".+\.(gif|png|jpeg|jpg)" />
</resourceExtensions>
<wildcardResourcePatterns>
<entry name="!?*.groovy" />
<entry name="!?*.java" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
<component name="CopyrightManager" default="" />
<component name="DependencyValidationManager">
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="GradleUISettings">
<setting name="root" />
</component>
<component name="GradleUISettings2">
<setting name="root" />
</component>
<component name="IdProvider" IDEtalkID="11DA1DB66DD62DDA1ED602B7079FE97C" />
<component name="InspectionProjectProfileManager">
<profiles>
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
<inspection_tool class="GroovyAssignabilityCheck" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="GroovyUnusedAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
</inspection_tool>
</profile>
</profiles>
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_PROFILE" value="true" />
<version value="1.0" />
</component>
<component name="JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY" />
<option name="OPTION_SCOPE" value="protected" />
<option name="OPTION_HIERARCHY" value="true" />
<option name="OPTION_NAVIGATOR" value="true" />
<option name="OPTION_INDEX" value="true" />
<option name="OPTION_SEPARATE_INDEX" value="true" />
<option name="OPTION_DOCUMENT_TAG_USE" value="false" />
<option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
<option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
<option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
<option name="OPTION_DEPRECATED_LIST" value="true" />
<option name="OTHER_OPTIONS" value="" />
<option name="HEAP_SIZE" />
<option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="true" />
</component>
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
<component name="ProjectDictionaryState">
<dictionary name="Ellpeck">
<words>
<w>almandine</w>
<w>amazonite</w>
<w>andradite</w>
<w>clinohumite</w>
<w>crafter</w>
<w>danburite</w>
<w>diopside</w>
<w>ellpeck</w>
<w>fayalite</w>
<w>forsterite</w>
<w>gemification</w>
<w>glossular</w>
<w>goshen</w>
<w>goshenite</w>
<w>idiochromatic</w>
<w>iolite</w>
<w>lepidolite</w>
<w>mcmod</w>
<w>mcversion</w>
<w>melanite</w>
<w>minecraftforge</w>
<w>moldavite</w>
<w>nuummite</w>
<w>orthoclase</w>
<w>paraiba</w>
<w>peridot</w>
<w>pickaxe</w>
<w>rhodochrosite</w>
<w>rodochrosite</w>
<w>smithsonite</w>
<w>sodalite</w>
<w>sonatype</w>
<w>sphene</w>
<w>thingycraft</w>
<w>titanian</w>
<w>tourlamine</w>
</words>
</dictionary>
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/ThingyCraft.iml" filepath="$PROJECT_DIR$/ThingyCraft.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SvnBranchConfigurationManager">
<option name="mySupportsUserInfoFilter" value="true" />
</component>
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
<component name="masterDetails">
<states>
<state key="ArtifactsStructureConfigurable.UI">
<UIState>
<splitter-proportions>
<SplitterProportionsDataImpl />
</splitter-proportions>
<settings />
</UIState>
</state>
<state key="Copyright.UI">
<UIState>
<splitter-proportions>
<SplitterProportionsDataImpl />
</splitter-proportions>
</UIState>
</state>
<state key="ProjectJDKs.UI">
<UIState>
<splitter-proportions>
<SplitterProportionsDataImpl>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</SplitterProportionsDataImpl>
</splitter-proportions>
<last-edited>1.6</last-edited>
</UIState>
</state>
<state key="ScopeChooserConfigurable.UI">
<UIState>
<splitter-proportions>
<SplitterProportionsDataImpl />
</splitter-proportions>
<settings />
</UIState>
</state>
</states>
</component>
</project>

View file

@ -18,8 +18,8 @@ buildscript {
apply plugin: 'forge' apply plugin: 'forge'
version = "1.7.10-1.0.1" version = "1.7.10-1.0.1"
group = "ellpeck.thingycraft" group = "ellpeck.gemification"
archivesBaseName = "ThingyCraft" archivesBaseName = "Gemification"
minecraft { minecraft {
version = "1.7.10-10.13.2.1236" version = "1.7.10-10.13.2.1236"

View file

@ -0,0 +1,18 @@
package ellpeck.gemification;
import ellpeck.gemification.blocks.InitBlocks;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
public class CreativeTab extends CreativeTabs{
public static CreativeTab instance = new CreativeTab();
public CreativeTab(){
super(Gemification.MOD_ID);
}
public Item getTabIconItem() {
return Item.getItemFromBlock(InitBlocks.blockCrucible);
}
}

View file

@ -1,4 +1,4 @@
package ellpeck.thingycraft; package ellpeck.gemification;
public class GemType { public class GemType {

View file

@ -1,4 +1,4 @@
package ellpeck.thingycraft; package ellpeck.gemification;
import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.*; import cpw.mods.fml.common.Mod.*;
@ -8,24 +8,24 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import ellpeck.thingycraft.blocks.InitBlocks; import ellpeck.gemification.blocks.InitBlocks;
import ellpeck.thingycraft.container.GuiHandler; import ellpeck.gemification.container.GuiHandler;
import ellpeck.thingycraft.crafting.CrucibleCraftingManager; import ellpeck.gemification.crafting.CrucibleCraftingManager;
import ellpeck.thingycraft.items.InitItems; import ellpeck.gemification.items.InitItems;
import ellpeck.thingycraft.proxy.IProxy; import ellpeck.gemification.proxy.IProxy;
import ellpeck.thingycraft.tile.TileEntityCrucible; import ellpeck.gemification.tile.TileEntityCrucible;
@Mod(modid = ThingyCraft.MOD_ID, name = ThingyCraft.NAME, version = ThingyCraft.VERSION) @Mod(modid = Gemification.MOD_ID, name = Gemification.NAME, version = Gemification.VERSION)
public class ThingyCraft { public class Gemification {
@Instance(ThingyCraft.MOD_ID) @Instance(Gemification.MOD_ID)
public static ThingyCraft instance; public static Gemification instance;
@SidedProxy(clientSide = "ellpeck.thingycraft.proxy.ClientProxy", serverSide = "ellpeck.thingycraft.proxy.ServerProxy") @SidedProxy(clientSide = "ellpeck.gemification.proxy.ClientProxy", serverSide = "ellpeck.gemification.proxy.ServerProxy")
public static IProxy proxy; public static IProxy proxy;
public static final String MOD_ID = "thingycraft"; public static final String MOD_ID = "gemification";
public static final String NAME = "ThingyCraft"; public static final String NAME = "Gemification";
public static final String VERSION = "1.7.10-1.0.1"; public static final String VERSION = "1.7.10-1.0.1";
public static final int guiCrucible = 0; public static final int guiCrucible = 0;
@ -45,7 +45,7 @@ public class ThingyCraft {
proxy.init(); proxy.init();
NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler()); NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler());
GameRegistry.registerWorldGenerator(new OreGen(), 0); GameRegistry.registerWorldGenerator(new OreGen(), 0);
GameRegistry.registerTileEntity(TileEntityCrucible.class, ThingyCraft.MOD_ID + "tileEntityCrucible"); GameRegistry.registerTileEntity(TileEntityCrucible.class, Gemification.MOD_ID + "tileEntityCrucible");
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")

View file

@ -1,7 +1,7 @@
package ellpeck.thingycraft; package ellpeck.gemification;
import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.IWorldGenerator;
import ellpeck.thingycraft.blocks.InitBlocks; import ellpeck.gemification.blocks.InitBlocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.world.World; import net.minecraft.world.World;

View file

@ -1,4 +1,4 @@
package ellpeck.thingycraft; package ellpeck.gemification;
import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;

View file

@ -1,14 +1,14 @@
package ellpeck.thingycraft.blocks; package ellpeck.gemification.blocks;
import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry;
import ellpeck.thingycraft.ThingyCraft; import ellpeck.gemification.CreativeTab;
import ellpeck.thingycraft.Util; import ellpeck.gemification.Gemification;
import ellpeck.thingycraft.tile.TileEntityCrucible; import ellpeck.gemification.Util;
import ellpeck.gemification.tile.TileEntityCrucible;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
@ -25,7 +25,7 @@ public class BlockCrucible extends BlockContainer{
protected BlockCrucible(){ protected BlockCrucible(){
super(Material.rock); super(Material.rock);
this.setBlockName("blockCrucible"); this.setBlockName("blockCrucible");
this.setCreativeTab(CreativeTabs.tabBrewing); this.setCreativeTab(CreativeTab.instance);
} }
public TileEntity createNewTileEntity(World world, int i){ public TileEntity createNewTileEntity(World world, int i){
@ -40,7 +40,7 @@ public class BlockCrucible extends BlockContainer{
tileCrucible.currentFluid = Util.fluidWater; tileCrucible.currentFluid = Util.fluidWater;
if(!player.capabilities.isCreativeMode) player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(Items.bucket)); if(!player.capabilities.isCreativeMode) player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(Items.bucket));
} }
else player.openGui(ThingyCraft.instance, ThingyCraft.guiCrucible, world, x, y, z); else player.openGui(Gemification.instance, Gemification.guiCrucible, world, x, y, z);
} }
return true; return true;
} }

View file

@ -1,4 +1,4 @@
package ellpeck.thingycraft.blocks; package ellpeck.gemification.blocks;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -14,7 +14,7 @@ public class InitBlocks{
blockCrucible = new BlockCrucible(); blockCrucible = new BlockCrucible();
GameRegistry.registerBlock(oreGem, ItemBlockOreGem.class, oreGem.getUnlocalizedName().substring(5)); GameRegistry.registerBlock(oreGem, ItemBlockOreGem.class, oreGem.getUnlocalizedName().substring(5));
GameRegistry.registerBlock(blockCrucible, blockCrucible.getUnlocalizedName().substring(5)); GameRegistry.registerBlock(blockCrucible, ItemBlockCrucible.class, blockCrucible.getUnlocalizedName().substring(5));
} }

View file

@ -0,0 +1,31 @@
package ellpeck.gemification.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.gemification.Util;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import java.util.List;
public class ItemBlockCrucible extends ItemBlock {
public ItemBlockCrucible(Block block){
super(block);
setHasSubtypes(false);
}
public String getUnlocalizedName(ItemStack stack) {
return this.getUnlocalizedName();
}
@SuppressWarnings("unchecked")
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) {
if(Util.isShiftPressed()) list.add(StatCollector.translateToLocal("tooltip." + this.getUnlocalizedName().substring(5) + ".desc"));
else list.add(Util.shiftForInfo());
}
}

View file

@ -1,8 +1,8 @@
package ellpeck.thingycraft.blocks; package ellpeck.gemification.blocks;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.thingycraft.Util; import ellpeck.gemification.Util;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;

View file

@ -1,10 +1,11 @@
package ellpeck.thingycraft.blocks; package ellpeck.gemification.blocks;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.thingycraft.ThingyCraft; import ellpeck.gemification.CreativeTab;
import ellpeck.thingycraft.Util; import ellpeck.gemification.Gemification;
import ellpeck.thingycraft.items.InitItems; import ellpeck.gemification.Util;
import ellpeck.gemification.items.InitItems;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@ -26,7 +27,7 @@ public class OreGem extends Block{
this.setHardness(3.0F); this.setHardness(3.0F);
this.setResistance(5.0F); this.setResistance(5.0F);
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
this.setCreativeTab(CreativeTabs.tabBrewing); this.setCreativeTab(CreativeTab.instance);
this.setBlockName("oreGem"); this.setBlockName("oreGem");
this.setHarvestLevel("pickaxe", 2); this.setHarvestLevel("pickaxe", 2);
} }
@ -57,7 +58,7 @@ public class OreGem extends Block{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconReg) { public void registerBlockIcons(IIconRegister iconReg) {
for (int i = 0; i < Util.gemList.size(); i++) { for (int i = 0; i < Util.gemList.size(); i++) {
textures[i] = iconReg.registerIcon(ThingyCraft.MOD_ID + ":" + this.getUnlocalizedName().substring(5) + Util.gemList.get(i).name.substring(5)); textures[i] = iconReg.registerIcon(Gemification.MOD_ID + ":" + this.getUnlocalizedName().substring(5) + Util.gemList.get(i).name.substring(5));
} }
} }
} }

View file

@ -1,4 +1,4 @@
package ellpeck.thingycraft.blocks.models; package ellpeck.gemification.blocks.models;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;

View file

@ -1,6 +1,6 @@
package ellpeck.thingycraft.blocks.models; package ellpeck.gemification.blocks.models;
import ellpeck.thingycraft.ThingyCraft; import ellpeck.gemification.Gemification;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
public class RendererCrucible extends TileEntitySpecialRenderer{ public class RendererCrucible extends TileEntitySpecialRenderer{
public static final ResourceLocation resLoc = new ResourceLocation(ThingyCraft.MOD_ID, "textures/blocks/models/modelCrucible.png"); public static final ResourceLocation resLoc = new ResourceLocation(Gemification.MOD_ID, "textures/blocks/models/modelCrucible.png");
private ModelCrucible model; private ModelCrucible model;
public RendererCrucible(){ public RendererCrucible(){

View file

@ -1,4 +1,4 @@
package ellpeck.thingycraft.blocks.models; package ellpeck.gemification.blocks.models;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

View file

@ -1,8 +1,8 @@
package ellpeck.thingycraft.container; package ellpeck.gemification.container;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.thingycraft.tile.TileEntityCrucible; import ellpeck.gemification.tile.TileEntityCrucible;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.*; import net.minecraft.inventory.*;
@ -56,7 +56,6 @@ public class ContainerCrucible extends Container {
iCraft.sendProgressBarUpdate(this, 2, this.tileCrucible.processTimeNeeded); iCraft.sendProgressBarUpdate(this, 2, this.tileCrucible.processTimeNeeded);
} }
@SuppressWarnings("all")
public void detectAndSendChanges(){ public void detectAndSendChanges(){
super.detectAndSendChanges(); super.detectAndSendChanges();
for (Object crafter : this.crafters) { for (Object crafter : this.crafters) {

View file

@ -1,8 +1,8 @@
package ellpeck.thingycraft.container; package ellpeck.gemification.container;
import ellpeck.thingycraft.ThingyCraft; import ellpeck.gemification.Gemification;
import ellpeck.thingycraft.Util; import ellpeck.gemification.Util;
import ellpeck.thingycraft.tile.TileEntityCrucible; import ellpeck.gemification.tile.TileEntityCrucible;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@ -16,7 +16,7 @@ public class GuiCrucible extends GuiContainer{
private TileEntityCrucible tileCrucible; private TileEntityCrucible tileCrucible;
public static final ResourceLocation resLoc = new ResourceLocation(ThingyCraft.MOD_ID, "textures/gui/guiCrucible.png"); public static final ResourceLocation resLoc = new ResourceLocation(Gemification.MOD_ID, "textures/gui/guiCrucible.png");
public GuiCrucible(InventoryPlayer inventoryPlayer, TileEntityCrucible tileCrucible) { public GuiCrucible(InventoryPlayer inventoryPlayer, TileEntityCrucible tileCrucible) {
super(new ContainerCrucible(inventoryPlayer, tileCrucible)); super(new ContainerCrucible(inventoryPlayer, tileCrucible));

View file

@ -1,8 +1,8 @@
package ellpeck.thingycraft.container; package ellpeck.gemification.container;
import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.IGuiHandler;
import ellpeck.thingycraft.ThingyCraft; import ellpeck.gemification.Gemification;
import ellpeck.thingycraft.tile.TileEntityCrucible; import ellpeck.gemification.tile.TileEntityCrucible;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -10,7 +10,7 @@ public class GuiHandler implements IGuiHandler {
public Object getServerGuiElement(int id, EntityPlayer entityPlayer, World world, int x, int y, int z) { public Object getServerGuiElement(int id, EntityPlayer entityPlayer, World world, int x, int y, int z) {
switch (id) { switch (id) {
case ThingyCraft.guiCrucible: case Gemification.guiCrucible:
TileEntityCrucible tileCrucible = (TileEntityCrucible) world.getTileEntity(x, y, z); TileEntityCrucible tileCrucible = (TileEntityCrucible) world.getTileEntity(x, y, z);
return new ContainerCrucible(entityPlayer.inventory, tileCrucible); return new ContainerCrucible(entityPlayer.inventory, tileCrucible);
@ -21,7 +21,7 @@ public class GuiHandler implements IGuiHandler {
public Object getClientGuiElement(int id, EntityPlayer entityPlayer, World world, int x, int y, int z) { public Object getClientGuiElement(int id, EntityPlayer entityPlayer, World world, int x, int y, int z) {
switch (id) { switch (id) {
case ThingyCraft.guiCrucible: case Gemification.guiCrucible:
TileEntityCrucible tileCrucible = (TileEntityCrucible) world.getTileEntity(x, y, z); TileEntityCrucible tileCrucible = (TileEntityCrucible) world.getTileEntity(x, y, z);
return new GuiCrucible(entityPlayer.inventory, tileCrucible); return new GuiCrucible(entityPlayer.inventory, tileCrucible);

View file

@ -1,10 +1,10 @@
package ellpeck.thingycraft.crafting; package ellpeck.gemification.crafting;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import ellpeck.thingycraft.GemType; import ellpeck.gemification.GemType;
import ellpeck.thingycraft.Util; import ellpeck.gemification.Util;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
@ -21,7 +21,7 @@ public class CrucibleCraftingManager{
this.addRecipe(new ItemStack(Blocks.acacia_stairs), Util.fluidNone, 200, new Object[]{"ccc", "cgc", "ccc", 'c', Blocks.cobblestone, 'g', new ItemStack(Items.stick)}); this.addRecipe(new ItemStack(Blocks.acacia_stairs), Util.fluidNone, 200, new Object[]{"ccc", "cgc", "ccc", 'c', Blocks.cobblestone, 'g', new ItemStack(Items.stick)});
} }
@SuppressWarnings("all") @SuppressWarnings("static-access, unchecked")
public void addRecipe(ItemStack output, GemType fluidNeeded, int processTimeNeeded, Object ... recipe){ public void addRecipe(ItemStack output, GemType fluidNeeded, int processTimeNeeded, Object ... recipe){
String s = ""; String s = "";
int i = 0; int i = 0;

View file

@ -1,6 +1,6 @@
package ellpeck.thingycraft.crafting; package ellpeck.gemification.crafting;
import ellpeck.thingycraft.GemType; import ellpeck.gemification.GemType;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public class CrucibleRecipe{ public class CrucibleRecipe{

View file

@ -1,4 +1,4 @@
package ellpeck.thingycraft.items; package ellpeck.gemification.items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;

View file

@ -1,9 +1,10 @@
package ellpeck.thingycraft.items; package ellpeck.gemification.items;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.thingycraft.ThingyCraft; import ellpeck.gemification.CreativeTab;
import ellpeck.thingycraft.Util; import ellpeck.gemification.Gemification;
import ellpeck.gemification.Util;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -21,7 +22,7 @@ public class ItemGem extends Item {
public ItemGem(){ public ItemGem(){
textures = new IIcon[Util.gemList.size()]; textures = new IIcon[Util.gemList.size()];
this.setHasSubtypes(true); this.setHasSubtypes(true);
this.setCreativeTab(CreativeTabs.tabBrewing); this.setCreativeTab(CreativeTab.instance);
this.setUnlocalizedName("itemGem"); this.setUnlocalizedName("itemGem");
} }
@ -58,7 +59,7 @@ public class ItemGem extends Item {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconReg){ public void registerIcons(IIconRegister iconReg){
for (int i = 0; i < Util.gemList.size(); i++) { for (int i = 0; i < Util.gemList.size(); i++) {
textures[i] = iconReg.registerIcon(ThingyCraft.MOD_ID + ":" + this.getUnlocalizedName().substring(5) + Util.gemList.get(i).name.substring(5)); textures[i] = iconReg.registerIcon(Gemification.MOD_ID + ":" + this.getUnlocalizedName().substring(5) + Util.gemList.get(i).name.substring(5));
} }
} }

View file

@ -1,11 +1,11 @@
package ellpeck.thingycraft.proxy; package ellpeck.gemification.proxy;
import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.ClientRegistry;
import ellpeck.thingycraft.blocks.InitBlocks; import ellpeck.gemification.blocks.InitBlocks;
import ellpeck.thingycraft.blocks.models.ModelCrucible; import ellpeck.gemification.blocks.models.ModelCrucible;
import ellpeck.thingycraft.blocks.models.RendererCrucible; import ellpeck.gemification.blocks.models.RendererCrucible;
import ellpeck.thingycraft.blocks.models.RendererHoldingTileEntity; import ellpeck.gemification.blocks.models.RendererHoldingTileEntity;
import ellpeck.thingycraft.tile.TileEntityCrucible; import ellpeck.gemification.tile.TileEntityCrucible;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;

View file

@ -1,4 +1,4 @@
package ellpeck.thingycraft.proxy; package ellpeck.gemification.proxy;
public interface IProxy { public interface IProxy {

View file

@ -1,4 +1,4 @@
package ellpeck.thingycraft.proxy; package ellpeck.gemification.proxy;
public class ServerProxy implements IProxy{ public class ServerProxy implements IProxy{

View file

@ -1,12 +1,12 @@
package ellpeck.thingycraft.tile; package ellpeck.gemification.tile;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.thingycraft.GemType; import ellpeck.gemification.GemType;
import ellpeck.thingycraft.Util; import ellpeck.gemification.Util;
import ellpeck.thingycraft.blocks.InitBlocks; import ellpeck.gemification.blocks.InitBlocks;
import ellpeck.thingycraft.crafting.CrucibleCraftingManager; import ellpeck.gemification.crafting.CrucibleCraftingManager;
import ellpeck.thingycraft.items.ItemGem; import ellpeck.gemification.items.ItemGem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.ISidedInventory;

View file

@ -1,3 +1,5 @@
itemGroup.thingycraft=ThingyCraft
tile.oreGemOnyx.name=Onyx Ore tile.oreGemOnyx.name=Onyx Ore
tile.oreGemAlmandineGarnet.name=Almandine Garnet Ore tile.oreGemAlmandineGarnet.name=Almandine Garnet Ore
tile.oreGemChromeDiopside.name=Chrome Diopside Ore tile.oreGemChromeDiopside.name=Chrome Diopside Ore
@ -33,6 +35,7 @@ item.itemGemClinohumite.name=Clinohumite
item.itemGemGoshenite.name=Goshenite item.itemGemGoshenite.name=Goshenite
tooltip.shiftForInfo.desc=<Hold Shift> tooltip.shiftForInfo.desc=<Hold Shift>
tooltip.blockCrucible.desc=Better than Cauldrons, better than everything!
tooltip.gemIsOre.desc=Ore Form, needs to get broken down to use. tooltip.gemIsOre.desc=Ore Form, needs to get broken down to use.
tooltip.gemOnyx.desc=Black form of chalcedony, a form of quartz tooltip.gemOnyx.desc=Black form of chalcedony, a form of quartz

View file

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB