From 5eb1a308718e81a788cbf4a767e03f88cff795cf Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 3 Dec 2014 22:33:46 +0100 Subject: [PATCH] Renamed Mod! Wohoo! --- .gitignore | 6 +- README.md | 4 - ThingyCraft.ipr | 287 ++++++++++++++++++ build.gradle | 4 +- .../ellpeck/gemification/CreativeTab.java | 18 ++ .../GemType.java | 2 +- .../Gemification.java} | 30 +- .../{thingycraft => gemification}/OreGen.java | 4 +- .../{thingycraft => gemification}/Util.java | 2 +- .../blocks/BlockCrucible.java | 14 +- .../blocks/InitBlocks.java | 4 +- .../blocks/ItemBlockCrucible.java | 31 ++ .../blocks/ItemBlockOreGem.java | 4 +- .../blocks/OreGem.java | 13 +- .../blocks/models/ModelCrucible.java | 2 +- .../blocks/models/RendererCrucible.java | 6 +- .../models/RendererHoldingTileEntity.java | 2 +- .../container/ContainerCrucible.java | 5 +- .../container/GuiCrucible.java | 10 +- .../container/GuiHandler.java | 10 +- .../crafting/CrucibleCraftingManager.java | 8 +- .../crafting/CrucibleRecipe.java | 4 +- .../items/InitItems.java | 2 +- .../items/ItemGem.java | 11 +- .../proxy/ClientProxy.java | 12 +- .../proxy/IProxy.java | 2 +- .../proxy/ServerProxy.java | 2 +- .../tile/TileEntityCrucible.java | 12 +- .../lang/en_US.lang | 3 + .../textures/blocks/models/modelCrucible.png | Bin .../textures/blocks/oreGemAlmandineGarnet.png | Bin .../textures/blocks/oreGemChromeDiopside.png | Bin .../textures/blocks/oreGemClinohumite.png | Bin .../textures/blocks/oreGemDanburite.png | Bin .../textures/blocks/oreGemGoshenite.png | Bin .../textures/blocks/oreGemHematite.png | Bin .../textures/blocks/oreGemIolite.png | Bin .../textures/blocks/oreGemJasper.png | Bin .../textures/blocks/oreGemLepidolite.png | Bin .../textures/blocks/oreGemOnyx.png | Bin .../blocks/oreGemParaibaTourlamine.png | Bin .../textures/blocks/oreGemRhodochrosite.png | Bin .../textures/blocks/oreGemSmithsonite.png | Bin .../textures/blocks/oreGemSodalite.png | Bin .../textures/blocks/oreGemSphene.png | Bin .../textures/blocks/oreGemTourmaline.png | Bin .../textures/gui/guiCrucible.png | Bin .../textures/gui/guiCrucibleFire.png | Bin .../textures/items/itemGemAlmandineGarnet.png | Bin .../textures/items/itemGemChromeDiopside.png | Bin .../textures/items/itemGemClinohumite.png | Bin .../textures/items/itemGemDanburite.png | Bin .../textures/items/itemGemGoshenite.png | Bin .../textures/items/itemGemHematite.png | Bin .../textures/items/itemGemIolite.png | Bin .../textures/items/itemGemJasper.png | Bin .../textures/items/itemGemLepidolite.png | Bin .../textures/items/itemGemOnyx.png | Bin .../items/itemGemParaibaTourlamine.png | Bin .../textures/items/itemGemRhodochrosite.png | Bin .../textures/items/itemGemSmithsonite.png | Bin .../textures/items/itemGemSodalite.png | Bin .../textures/items/itemGemSphene.png | Bin .../textures/items/itemGemTourmaline.png | Bin 64 files changed, 425 insertions(+), 89 deletions(-) delete mode 100644 README.md create mode 100644 ThingyCraft.ipr create mode 100644 src/main/java/ellpeck/gemification/CreativeTab.java rename src/main/java/ellpeck/{thingycraft => gemification}/GemType.java (89%) rename src/main/java/ellpeck/{thingycraft/ThingyCraft.java => gemification/Gemification.java} (60%) rename src/main/java/ellpeck/{thingycraft => gemification}/OreGen.java (96%) rename src/main/java/ellpeck/{thingycraft => gemification}/Util.java (98%) rename src/main/java/ellpeck/{thingycraft => gemification}/blocks/BlockCrucible.java (90%) rename src/main/java/ellpeck/{thingycraft => gemification}/blocks/InitBlocks.java (71%) create mode 100644 src/main/java/ellpeck/gemification/blocks/ItemBlockCrucible.java rename src/main/java/ellpeck/{thingycraft => gemification}/blocks/ItemBlockOreGem.java (94%) rename src/main/java/ellpeck/{thingycraft => gemification}/blocks/OreGem.java (78%) rename src/main/java/ellpeck/{thingycraft => gemification}/blocks/models/ModelCrucible.java (98%) rename src/main/java/ellpeck/{thingycraft => gemification}/blocks/models/RendererCrucible.java (84%) rename src/main/java/ellpeck/{thingycraft => gemification}/blocks/models/RendererHoldingTileEntity.java (98%) rename src/main/java/ellpeck/{thingycraft => gemification}/container/ContainerCrucible.java (96%) rename src/main/java/ellpeck/{thingycraft => gemification}/container/GuiCrucible.java (95%) rename src/main/java/ellpeck/{thingycraft => gemification}/container/GuiHandler.java (81%) rename src/main/java/ellpeck/{thingycraft => gemification}/crafting/CrucibleCraftingManager.java (95%) rename src/main/java/ellpeck/{thingycraft => gemification}/crafting/CrucibleRecipe.java (86%) rename src/main/java/ellpeck/{thingycraft => gemification}/items/InitItems.java (89%) rename src/main/java/ellpeck/{thingycraft => gemification}/items/ItemGem.java (83%) rename src/main/java/ellpeck/{thingycraft => gemification}/proxy/ClientProxy.java (65%) rename src/main/java/ellpeck/{thingycraft => gemification}/proxy/IProxy.java (79%) rename src/main/java/ellpeck/{thingycraft => gemification}/proxy/ServerProxy.java (80%) rename src/main/java/ellpeck/{thingycraft => gemification}/tile/TileEntityCrucible.java (96%) rename src/main/resources/assets/{thingycraft => gemification}/lang/en_US.lang (97%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/models/modelCrucible.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemAlmandineGarnet.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemChromeDiopside.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemClinohumite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemDanburite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemGoshenite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemHematite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemIolite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemJasper.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemLepidolite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemOnyx.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemParaibaTourlamine.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemRhodochrosite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemSmithsonite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemSodalite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemSphene.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/blocks/oreGemTourmaline.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/gui/guiCrucible.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/gui/guiCrucibleFire.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemAlmandineGarnet.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemChromeDiopside.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemClinohumite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemDanburite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemGoshenite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemHematite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemIolite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemJasper.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemLepidolite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemOnyx.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemParaibaTourlamine.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemRhodochrosite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemSmithsonite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemSodalite.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemSphene.png (100%) rename src/main/resources/assets/{thingycraft => gemification}/textures/items/itemGemTourmaline.png (100%) diff --git a/.gitignore b/.gitignore index 409ab4c84..686f00734 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -ThingyCraft.iws -ThingyCraft.ipr -ThingyCraft.iml +Gemification.iws +Gemification.ipr +Gemification.iml idea .gradle build \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index ea187ba04..000000000 --- a/README.md +++ /dev/null @@ -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! diff --git a/ThingyCraft.ipr b/ThingyCraft.ipr new file mode 100644 index 000000000..7faaa8c24 --- /dev/null +++ b/ThingyCraft.ipr @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + almandine + amazonite + andradite + clinohumite + crafter + danburite + diopside + ellpeck + fayalite + forsterite + gemification + glossular + goshen + goshenite + idiochromatic + iolite + lepidolite + mcmod + mcversion + melanite + minecraftforge + moldavite + nuummite + orthoclase + paraiba + peridot + pickaxe + rhodochrosite + rodochrosite + smithsonite + sodalite + sonatype + sphene + thingycraft + titanian + tourlamine + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.6 + + + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle index 3dfc108e6..64821c73a 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ buildscript { apply plugin: 'forge' version = "1.7.10-1.0.1" -group = "ellpeck.thingycraft" -archivesBaseName = "ThingyCraft" +group = "ellpeck.gemification" +archivesBaseName = "Gemification" minecraft { version = "1.7.10-10.13.2.1236" diff --git a/src/main/java/ellpeck/gemification/CreativeTab.java b/src/main/java/ellpeck/gemification/CreativeTab.java new file mode 100644 index 000000000..59746ffb5 --- /dev/null +++ b/src/main/java/ellpeck/gemification/CreativeTab.java @@ -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); + } +} diff --git a/src/main/java/ellpeck/thingycraft/GemType.java b/src/main/java/ellpeck/gemification/GemType.java similarity index 89% rename from src/main/java/ellpeck/thingycraft/GemType.java rename to src/main/java/ellpeck/gemification/GemType.java index 341b55d69..0097c0b5f 100644 --- a/src/main/java/ellpeck/thingycraft/GemType.java +++ b/src/main/java/ellpeck/gemification/GemType.java @@ -1,4 +1,4 @@ -package ellpeck.thingycraft; +package ellpeck.gemification; public class GemType { diff --git a/src/main/java/ellpeck/thingycraft/ThingyCraft.java b/src/main/java/ellpeck/gemification/Gemification.java similarity index 60% rename from src/main/java/ellpeck/thingycraft/ThingyCraft.java rename to src/main/java/ellpeck/gemification/Gemification.java index c0397fb14..289cb7e24 100644 --- a/src/main/java/ellpeck/thingycraft/ThingyCraft.java +++ b/src/main/java/ellpeck/gemification/Gemification.java @@ -1,4 +1,4 @@ -package ellpeck.thingycraft; +package ellpeck.gemification; 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.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.thingycraft.blocks.InitBlocks; -import ellpeck.thingycraft.container.GuiHandler; -import ellpeck.thingycraft.crafting.CrucibleCraftingManager; -import ellpeck.thingycraft.items.InitItems; -import ellpeck.thingycraft.proxy.IProxy; -import ellpeck.thingycraft.tile.TileEntityCrucible; +import ellpeck.gemification.blocks.InitBlocks; +import ellpeck.gemification.container.GuiHandler; +import ellpeck.gemification.crafting.CrucibleCraftingManager; +import ellpeck.gemification.items.InitItems; +import ellpeck.gemification.proxy.IProxy; +import ellpeck.gemification.tile.TileEntityCrucible; -@Mod(modid = ThingyCraft.MOD_ID, name = ThingyCraft.NAME, version = ThingyCraft.VERSION) -public class ThingyCraft { +@Mod(modid = Gemification.MOD_ID, name = Gemification.NAME, version = Gemification.VERSION) +public class Gemification { - @Instance(ThingyCraft.MOD_ID) - public static ThingyCraft instance; + @Instance(Gemification.MOD_ID) + 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 final String MOD_ID = "thingycraft"; - public static final String NAME = "ThingyCraft"; + public static final String MOD_ID = "gemification"; + public static final String NAME = "Gemification"; public static final String VERSION = "1.7.10-1.0.1"; public static final int guiCrucible = 0; @@ -45,7 +45,7 @@ public class ThingyCraft { proxy.init(); NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler()); GameRegistry.registerWorldGenerator(new OreGen(), 0); - GameRegistry.registerTileEntity(TileEntityCrucible.class, ThingyCraft.MOD_ID + "tileEntityCrucible"); + GameRegistry.registerTileEntity(TileEntityCrucible.class, Gemification.MOD_ID + "tileEntityCrucible"); } @SuppressWarnings("unused") diff --git a/src/main/java/ellpeck/thingycraft/OreGen.java b/src/main/java/ellpeck/gemification/OreGen.java similarity index 96% rename from src/main/java/ellpeck/thingycraft/OreGen.java rename to src/main/java/ellpeck/gemification/OreGen.java index e7add8de7..f33c78390 100644 --- a/src/main/java/ellpeck/thingycraft/OreGen.java +++ b/src/main/java/ellpeck/gemification/OreGen.java @@ -1,7 +1,7 @@ -package ellpeck.thingycraft; +package ellpeck.gemification; import cpw.mods.fml.common.IWorldGenerator; -import ellpeck.thingycraft.blocks.InitBlocks; +import ellpeck.gemification.blocks.InitBlocks; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/src/main/java/ellpeck/thingycraft/Util.java b/src/main/java/ellpeck/gemification/Util.java similarity index 98% rename from src/main/java/ellpeck/thingycraft/Util.java rename to src/main/java/ellpeck/gemification/Util.java index 228825fa3..492b5e34c 100644 --- a/src/main/java/ellpeck/thingycraft/Util.java +++ b/src/main/java/ellpeck/gemification/Util.java @@ -1,4 +1,4 @@ -package ellpeck.thingycraft; +package ellpeck.gemification; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; diff --git a/src/main/java/ellpeck/thingycraft/blocks/BlockCrucible.java b/src/main/java/ellpeck/gemification/blocks/BlockCrucible.java similarity index 90% rename from src/main/java/ellpeck/thingycraft/blocks/BlockCrucible.java rename to src/main/java/ellpeck/gemification/blocks/BlockCrucible.java index 32c2568fc..7d7c2df4e 100644 --- a/src/main/java/ellpeck/thingycraft/blocks/BlockCrucible.java +++ b/src/main/java/ellpeck/gemification/blocks/BlockCrucible.java @@ -1,14 +1,14 @@ -package ellpeck.thingycraft.blocks; +package ellpeck.gemification.blocks; import cpw.mods.fml.client.registry.RenderingRegistry; -import ellpeck.thingycraft.ThingyCraft; -import ellpeck.thingycraft.Util; -import ellpeck.thingycraft.tile.TileEntityCrucible; +import ellpeck.gemification.CreativeTab; +import ellpeck.gemification.Gemification; +import ellpeck.gemification.Util; +import ellpeck.gemification.tile.TileEntityCrucible; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -25,7 +25,7 @@ public class BlockCrucible extends BlockContainer{ protected BlockCrucible(){ super(Material.rock); this.setBlockName("blockCrucible"); - this.setCreativeTab(CreativeTabs.tabBrewing); + this.setCreativeTab(CreativeTab.instance); } public TileEntity createNewTileEntity(World world, int i){ @@ -40,7 +40,7 @@ public class BlockCrucible extends BlockContainer{ tileCrucible.currentFluid = Util.fluidWater; 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; } diff --git a/src/main/java/ellpeck/thingycraft/blocks/InitBlocks.java b/src/main/java/ellpeck/gemification/blocks/InitBlocks.java similarity index 71% rename from src/main/java/ellpeck/thingycraft/blocks/InitBlocks.java rename to src/main/java/ellpeck/gemification/blocks/InitBlocks.java index ae41ce273..37479739a 100644 --- a/src/main/java/ellpeck/thingycraft/blocks/InitBlocks.java +++ b/src/main/java/ellpeck/gemification/blocks/InitBlocks.java @@ -1,4 +1,4 @@ -package ellpeck.thingycraft.blocks; +package ellpeck.gemification.blocks; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; @@ -14,7 +14,7 @@ public class InitBlocks{ blockCrucible = new BlockCrucible(); 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)); } diff --git a/src/main/java/ellpeck/gemification/blocks/ItemBlockCrucible.java b/src/main/java/ellpeck/gemification/blocks/ItemBlockCrucible.java new file mode 100644 index 000000000..10a2b4a3a --- /dev/null +++ b/src/main/java/ellpeck/gemification/blocks/ItemBlockCrucible.java @@ -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()); + } +} diff --git a/src/main/java/ellpeck/thingycraft/blocks/ItemBlockOreGem.java b/src/main/java/ellpeck/gemification/blocks/ItemBlockOreGem.java similarity index 94% rename from src/main/java/ellpeck/thingycraft/blocks/ItemBlockOreGem.java rename to src/main/java/ellpeck/gemification/blocks/ItemBlockOreGem.java index f1561ecbd..40c8f7c5a 100644 --- a/src/main/java/ellpeck/thingycraft/blocks/ItemBlockOreGem.java +++ b/src/main/java/ellpeck/gemification/blocks/ItemBlockOreGem.java @@ -1,8 +1,8 @@ -package ellpeck.thingycraft.blocks; +package ellpeck.gemification.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.thingycraft.Util; +import ellpeck.gemification.Util; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/ellpeck/thingycraft/blocks/OreGem.java b/src/main/java/ellpeck/gemification/blocks/OreGem.java similarity index 78% rename from src/main/java/ellpeck/thingycraft/blocks/OreGem.java rename to src/main/java/ellpeck/gemification/blocks/OreGem.java index 0ea35ba26..f8a1a100d 100644 --- a/src/main/java/ellpeck/thingycraft/blocks/OreGem.java +++ b/src/main/java/ellpeck/gemification/blocks/OreGem.java @@ -1,10 +1,11 @@ -package ellpeck.thingycraft.blocks; +package ellpeck.gemification.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.thingycraft.ThingyCraft; -import ellpeck.thingycraft.Util; -import ellpeck.thingycraft.items.InitItems; +import ellpeck.gemification.CreativeTab; +import ellpeck.gemification.Gemification; +import ellpeck.gemification.Util; +import ellpeck.gemification.items.InitItems; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,7 +27,7 @@ public class OreGem extends Block{ this.setHardness(3.0F); this.setResistance(5.0F); this.setStepSound(soundTypeStone); - this.setCreativeTab(CreativeTabs.tabBrewing); + this.setCreativeTab(CreativeTab.instance); this.setBlockName("oreGem"); this.setHarvestLevel("pickaxe", 2); } @@ -57,7 +58,7 @@ public class OreGem extends Block{ @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg) { 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)); } } } diff --git a/src/main/java/ellpeck/thingycraft/blocks/models/ModelCrucible.java b/src/main/java/ellpeck/gemification/blocks/models/ModelCrucible.java similarity index 98% rename from src/main/java/ellpeck/thingycraft/blocks/models/ModelCrucible.java rename to src/main/java/ellpeck/gemification/blocks/models/ModelCrucible.java index 4d7640eef..209f688b9 100644 --- a/src/main/java/ellpeck/thingycraft/blocks/models/ModelCrucible.java +++ b/src/main/java/ellpeck/gemification/blocks/models/ModelCrucible.java @@ -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.ModelRenderer; diff --git a/src/main/java/ellpeck/thingycraft/blocks/models/RendererCrucible.java b/src/main/java/ellpeck/gemification/blocks/models/RendererCrucible.java similarity index 84% rename from src/main/java/ellpeck/thingycraft/blocks/models/RendererCrucible.java rename to src/main/java/ellpeck/gemification/blocks/models/RendererCrucible.java index 2c78d73d1..552f62718 100644 --- a/src/main/java/ellpeck/thingycraft/blocks/models/RendererCrucible.java +++ b/src/main/java/ellpeck/gemification/blocks/models/RendererCrucible.java @@ -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.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11; 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; public RendererCrucible(){ diff --git a/src/main/java/ellpeck/thingycraft/blocks/models/RendererHoldingTileEntity.java b/src/main/java/ellpeck/gemification/blocks/models/RendererHoldingTileEntity.java similarity index 98% rename from src/main/java/ellpeck/thingycraft/blocks/models/RendererHoldingTileEntity.java rename to src/main/java/ellpeck/gemification/blocks/models/RendererHoldingTileEntity.java index 71b64ee20..0ff11b2fc 100644 --- a/src/main/java/ellpeck/thingycraft/blocks/models/RendererHoldingTileEntity.java +++ b/src/main/java/ellpeck/gemification/blocks/models/RendererHoldingTileEntity.java @@ -1,4 +1,4 @@ -package ellpeck.thingycraft.blocks.models; +package ellpeck.gemification.blocks.models; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/thingycraft/container/ContainerCrucible.java b/src/main/java/ellpeck/gemification/container/ContainerCrucible.java similarity index 96% rename from src/main/java/ellpeck/thingycraft/container/ContainerCrucible.java rename to src/main/java/ellpeck/gemification/container/ContainerCrucible.java index df702137f..c7268013e 100644 --- a/src/main/java/ellpeck/thingycraft/container/ContainerCrucible.java +++ b/src/main/java/ellpeck/gemification/container/ContainerCrucible.java @@ -1,8 +1,8 @@ -package ellpeck.thingycraft.container; +package ellpeck.gemification.container; import cpw.mods.fml.relauncher.Side; 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.InventoryPlayer; import net.minecraft.inventory.*; @@ -56,7 +56,6 @@ public class ContainerCrucible extends Container { iCraft.sendProgressBarUpdate(this, 2, this.tileCrucible.processTimeNeeded); } - @SuppressWarnings("all") public void detectAndSendChanges(){ super.detectAndSendChanges(); for (Object crafter : this.crafters) { diff --git a/src/main/java/ellpeck/thingycraft/container/GuiCrucible.java b/src/main/java/ellpeck/gemification/container/GuiCrucible.java similarity index 95% rename from src/main/java/ellpeck/thingycraft/container/GuiCrucible.java rename to src/main/java/ellpeck/gemification/container/GuiCrucible.java index 7a2f495e2..32c4bf7d8 100644 --- a/src/main/java/ellpeck/thingycraft/container/GuiCrucible.java +++ b/src/main/java/ellpeck/gemification/container/GuiCrucible.java @@ -1,8 +1,8 @@ -package ellpeck.thingycraft.container; +package ellpeck.gemification.container; -import ellpeck.thingycraft.ThingyCraft; -import ellpeck.thingycraft.Util; -import ellpeck.thingycraft.tile.TileEntityCrucible; +import ellpeck.gemification.Gemification; +import ellpeck.gemification.Util; +import ellpeck.gemification.tile.TileEntityCrucible; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.InventoryPlayer; @@ -16,7 +16,7 @@ public class GuiCrucible extends GuiContainer{ 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) { super(new ContainerCrucible(inventoryPlayer, tileCrucible)); diff --git a/src/main/java/ellpeck/thingycraft/container/GuiHandler.java b/src/main/java/ellpeck/gemification/container/GuiHandler.java similarity index 81% rename from src/main/java/ellpeck/thingycraft/container/GuiHandler.java rename to src/main/java/ellpeck/gemification/container/GuiHandler.java index 20a598b0b..f25a8c462 100644 --- a/src/main/java/ellpeck/thingycraft/container/GuiHandler.java +++ b/src/main/java/ellpeck/gemification/container/GuiHandler.java @@ -1,8 +1,8 @@ -package ellpeck.thingycraft.container; +package ellpeck.gemification.container; import cpw.mods.fml.common.network.IGuiHandler; -import ellpeck.thingycraft.ThingyCraft; -import ellpeck.thingycraft.tile.TileEntityCrucible; +import ellpeck.gemification.Gemification; +import ellpeck.gemification.tile.TileEntityCrucible; import net.minecraft.entity.player.EntityPlayer; 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) { switch (id) { - case ThingyCraft.guiCrucible: + case Gemification.guiCrucible: TileEntityCrucible tileCrucible = (TileEntityCrucible) world.getTileEntity(x, y, z); 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) { switch (id) { - case ThingyCraft.guiCrucible: + case Gemification.guiCrucible: TileEntityCrucible tileCrucible = (TileEntityCrucible) world.getTileEntity(x, y, z); return new GuiCrucible(entityPlayer.inventory, tileCrucible); diff --git a/src/main/java/ellpeck/thingycraft/crafting/CrucibleCraftingManager.java b/src/main/java/ellpeck/gemification/crafting/CrucibleCraftingManager.java similarity index 95% rename from src/main/java/ellpeck/thingycraft/crafting/CrucibleCraftingManager.java rename to src/main/java/ellpeck/gemification/crafting/CrucibleCraftingManager.java index 87b0a38db..2af9de4fa 100644 --- a/src/main/java/ellpeck/thingycraft/crafting/CrucibleCraftingManager.java +++ b/src/main/java/ellpeck/gemification/crafting/CrucibleCraftingManager.java @@ -1,10 +1,10 @@ -package ellpeck.thingycraft.crafting; +package ellpeck.gemification.crafting; import java.util.ArrayList; import java.util.HashMap; -import ellpeck.thingycraft.GemType; -import ellpeck.thingycraft.Util; +import ellpeck.gemification.GemType; +import ellpeck.gemification.Util; import net.minecraft.block.Block; import net.minecraft.init.Blocks; 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)}); } - @SuppressWarnings("all") + @SuppressWarnings("static-access, unchecked") public void addRecipe(ItemStack output, GemType fluidNeeded, int processTimeNeeded, Object ... recipe){ String s = ""; int i = 0; diff --git a/src/main/java/ellpeck/thingycraft/crafting/CrucibleRecipe.java b/src/main/java/ellpeck/gemification/crafting/CrucibleRecipe.java similarity index 86% rename from src/main/java/ellpeck/thingycraft/crafting/CrucibleRecipe.java rename to src/main/java/ellpeck/gemification/crafting/CrucibleRecipe.java index d46b60289..decd783b2 100644 --- a/src/main/java/ellpeck/thingycraft/crafting/CrucibleRecipe.java +++ b/src/main/java/ellpeck/gemification/crafting/CrucibleRecipe.java @@ -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; public class CrucibleRecipe{ diff --git a/src/main/java/ellpeck/thingycraft/items/InitItems.java b/src/main/java/ellpeck/gemification/items/InitItems.java similarity index 89% rename from src/main/java/ellpeck/thingycraft/items/InitItems.java rename to src/main/java/ellpeck/gemification/items/InitItems.java index 69c4f1327..3b63e0617 100644 --- a/src/main/java/ellpeck/thingycraft/items/InitItems.java +++ b/src/main/java/ellpeck/gemification/items/InitItems.java @@ -1,4 +1,4 @@ -package ellpeck.thingycraft.items; +package ellpeck.gemification.items; import net.minecraft.item.Item; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/ellpeck/thingycraft/items/ItemGem.java b/src/main/java/ellpeck/gemification/items/ItemGem.java similarity index 83% rename from src/main/java/ellpeck/thingycraft/items/ItemGem.java rename to src/main/java/ellpeck/gemification/items/ItemGem.java index 768fb89b5..f1cd1cee6 100644 --- a/src/main/java/ellpeck/thingycraft/items/ItemGem.java +++ b/src/main/java/ellpeck/gemification/items/ItemGem.java @@ -1,9 +1,10 @@ -package ellpeck.thingycraft.items; +package ellpeck.gemification.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.thingycraft.ThingyCraft; -import ellpeck.thingycraft.Util; +import ellpeck.gemification.CreativeTab; +import ellpeck.gemification.Gemification; +import ellpeck.gemification.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -21,7 +22,7 @@ public class ItemGem extends Item { public ItemGem(){ textures = new IIcon[Util.gemList.size()]; this.setHasSubtypes(true); - this.setCreativeTab(CreativeTabs.tabBrewing); + this.setCreativeTab(CreativeTab.instance); this.setUnlocalizedName("itemGem"); } @@ -58,7 +59,7 @@ public class ItemGem extends Item { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ 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)); } } diff --git a/src/main/java/ellpeck/thingycraft/proxy/ClientProxy.java b/src/main/java/ellpeck/gemification/proxy/ClientProxy.java similarity index 65% rename from src/main/java/ellpeck/thingycraft/proxy/ClientProxy.java rename to src/main/java/ellpeck/gemification/proxy/ClientProxy.java index 864475aaf..140c32140 100644 --- a/src/main/java/ellpeck/thingycraft/proxy/ClientProxy.java +++ b/src/main/java/ellpeck/gemification/proxy/ClientProxy.java @@ -1,11 +1,11 @@ -package ellpeck.thingycraft.proxy; +package ellpeck.gemification.proxy; import cpw.mods.fml.client.registry.ClientRegistry; -import ellpeck.thingycraft.blocks.InitBlocks; -import ellpeck.thingycraft.blocks.models.ModelCrucible; -import ellpeck.thingycraft.blocks.models.RendererCrucible; -import ellpeck.thingycraft.blocks.models.RendererHoldingTileEntity; -import ellpeck.thingycraft.tile.TileEntityCrucible; +import ellpeck.gemification.blocks.InitBlocks; +import ellpeck.gemification.blocks.models.ModelCrucible; +import ellpeck.gemification.blocks.models.RendererCrucible; +import ellpeck.gemification.blocks.models.RendererHoldingTileEntity; +import ellpeck.gemification.tile.TileEntityCrucible; import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; diff --git a/src/main/java/ellpeck/thingycraft/proxy/IProxy.java b/src/main/java/ellpeck/gemification/proxy/IProxy.java similarity index 79% rename from src/main/java/ellpeck/thingycraft/proxy/IProxy.java rename to src/main/java/ellpeck/gemification/proxy/IProxy.java index cb1adf76f..7d961a7d6 100644 --- a/src/main/java/ellpeck/thingycraft/proxy/IProxy.java +++ b/src/main/java/ellpeck/gemification/proxy/IProxy.java @@ -1,4 +1,4 @@ -package ellpeck.thingycraft.proxy; +package ellpeck.gemification.proxy; public interface IProxy { diff --git a/src/main/java/ellpeck/thingycraft/proxy/ServerProxy.java b/src/main/java/ellpeck/gemification/proxy/ServerProxy.java similarity index 80% rename from src/main/java/ellpeck/thingycraft/proxy/ServerProxy.java rename to src/main/java/ellpeck/gemification/proxy/ServerProxy.java index 1054242ce..e6264fc86 100644 --- a/src/main/java/ellpeck/thingycraft/proxy/ServerProxy.java +++ b/src/main/java/ellpeck/gemification/proxy/ServerProxy.java @@ -1,4 +1,4 @@ -package ellpeck.thingycraft.proxy; +package ellpeck.gemification.proxy; public class ServerProxy implements IProxy{ diff --git a/src/main/java/ellpeck/thingycraft/tile/TileEntityCrucible.java b/src/main/java/ellpeck/gemification/tile/TileEntityCrucible.java similarity index 96% rename from src/main/java/ellpeck/thingycraft/tile/TileEntityCrucible.java rename to src/main/java/ellpeck/gemification/tile/TileEntityCrucible.java index 269f89308..10d6765bb 100644 --- a/src/main/java/ellpeck/thingycraft/tile/TileEntityCrucible.java +++ b/src/main/java/ellpeck/gemification/tile/TileEntityCrucible.java @@ -1,12 +1,12 @@ -package ellpeck.thingycraft.tile; +package ellpeck.gemification.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.thingycraft.GemType; -import ellpeck.thingycraft.Util; -import ellpeck.thingycraft.blocks.InitBlocks; -import ellpeck.thingycraft.crafting.CrucibleCraftingManager; -import ellpeck.thingycraft.items.ItemGem; +import ellpeck.gemification.GemType; +import ellpeck.gemification.Util; +import ellpeck.gemification.blocks.InitBlocks; +import ellpeck.gemification.crafting.CrucibleCraftingManager; +import ellpeck.gemification.items.ItemGem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/resources/assets/thingycraft/lang/en_US.lang b/src/main/resources/assets/gemification/lang/en_US.lang similarity index 97% rename from src/main/resources/assets/thingycraft/lang/en_US.lang rename to src/main/resources/assets/gemification/lang/en_US.lang index 8efada1d7..f0bb01b7d 100644 --- a/src/main/resources/assets/thingycraft/lang/en_US.lang +++ b/src/main/resources/assets/gemification/lang/en_US.lang @@ -1,3 +1,5 @@ +itemGroup.thingycraft=ThingyCraft + tile.oreGemOnyx.name=Onyx Ore tile.oreGemAlmandineGarnet.name=Almandine Garnet Ore tile.oreGemChromeDiopside.name=Chrome Diopside Ore @@ -33,6 +35,7 @@ item.itemGemClinohumite.name=Clinohumite item.itemGemGoshenite.name=Goshenite tooltip.shiftForInfo.desc= +tooltip.blockCrucible.desc=Better than Cauldrons, better than everything! tooltip.gemIsOre.desc=Ore Form, needs to get broken down to use. tooltip.gemOnyx.desc=Black form of chalcedony, a form of quartz diff --git a/src/main/resources/assets/thingycraft/textures/blocks/models/modelCrucible.png b/src/main/resources/assets/gemification/textures/blocks/models/modelCrucible.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/models/modelCrucible.png rename to src/main/resources/assets/gemification/textures/blocks/models/modelCrucible.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemAlmandineGarnet.png b/src/main/resources/assets/gemification/textures/blocks/oreGemAlmandineGarnet.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemAlmandineGarnet.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemAlmandineGarnet.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemChromeDiopside.png b/src/main/resources/assets/gemification/textures/blocks/oreGemChromeDiopside.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemChromeDiopside.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemChromeDiopside.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemClinohumite.png b/src/main/resources/assets/gemification/textures/blocks/oreGemClinohumite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemClinohumite.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemClinohumite.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemDanburite.png b/src/main/resources/assets/gemification/textures/blocks/oreGemDanburite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemDanburite.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemDanburite.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemGoshenite.png b/src/main/resources/assets/gemification/textures/blocks/oreGemGoshenite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemGoshenite.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemGoshenite.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemHematite.png b/src/main/resources/assets/gemification/textures/blocks/oreGemHematite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemHematite.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemHematite.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemIolite.png b/src/main/resources/assets/gemification/textures/blocks/oreGemIolite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemIolite.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemIolite.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemJasper.png b/src/main/resources/assets/gemification/textures/blocks/oreGemJasper.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemJasper.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemJasper.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemLepidolite.png b/src/main/resources/assets/gemification/textures/blocks/oreGemLepidolite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemLepidolite.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemLepidolite.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemOnyx.png b/src/main/resources/assets/gemification/textures/blocks/oreGemOnyx.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemOnyx.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemOnyx.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemParaibaTourlamine.png b/src/main/resources/assets/gemification/textures/blocks/oreGemParaibaTourlamine.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemParaibaTourlamine.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemParaibaTourlamine.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemRhodochrosite.png b/src/main/resources/assets/gemification/textures/blocks/oreGemRhodochrosite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemRhodochrosite.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemRhodochrosite.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemSmithsonite.png b/src/main/resources/assets/gemification/textures/blocks/oreGemSmithsonite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemSmithsonite.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemSmithsonite.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemSodalite.png b/src/main/resources/assets/gemification/textures/blocks/oreGemSodalite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemSodalite.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemSodalite.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemSphene.png b/src/main/resources/assets/gemification/textures/blocks/oreGemSphene.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemSphene.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemSphene.png diff --git a/src/main/resources/assets/thingycraft/textures/blocks/oreGemTourmaline.png b/src/main/resources/assets/gemification/textures/blocks/oreGemTourmaline.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/blocks/oreGemTourmaline.png rename to src/main/resources/assets/gemification/textures/blocks/oreGemTourmaline.png diff --git a/src/main/resources/assets/thingycraft/textures/gui/guiCrucible.png b/src/main/resources/assets/gemification/textures/gui/guiCrucible.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/gui/guiCrucible.png rename to src/main/resources/assets/gemification/textures/gui/guiCrucible.png diff --git a/src/main/resources/assets/thingycraft/textures/gui/guiCrucibleFire.png b/src/main/resources/assets/gemification/textures/gui/guiCrucibleFire.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/gui/guiCrucibleFire.png rename to src/main/resources/assets/gemification/textures/gui/guiCrucibleFire.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemAlmandineGarnet.png b/src/main/resources/assets/gemification/textures/items/itemGemAlmandineGarnet.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemAlmandineGarnet.png rename to src/main/resources/assets/gemification/textures/items/itemGemAlmandineGarnet.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemChromeDiopside.png b/src/main/resources/assets/gemification/textures/items/itemGemChromeDiopside.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemChromeDiopside.png rename to src/main/resources/assets/gemification/textures/items/itemGemChromeDiopside.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemClinohumite.png b/src/main/resources/assets/gemification/textures/items/itemGemClinohumite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemClinohumite.png rename to src/main/resources/assets/gemification/textures/items/itemGemClinohumite.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemDanburite.png b/src/main/resources/assets/gemification/textures/items/itemGemDanburite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemDanburite.png rename to src/main/resources/assets/gemification/textures/items/itemGemDanburite.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemGoshenite.png b/src/main/resources/assets/gemification/textures/items/itemGemGoshenite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemGoshenite.png rename to src/main/resources/assets/gemification/textures/items/itemGemGoshenite.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemHematite.png b/src/main/resources/assets/gemification/textures/items/itemGemHematite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemHematite.png rename to src/main/resources/assets/gemification/textures/items/itemGemHematite.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemIolite.png b/src/main/resources/assets/gemification/textures/items/itemGemIolite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemIolite.png rename to src/main/resources/assets/gemification/textures/items/itemGemIolite.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemJasper.png b/src/main/resources/assets/gemification/textures/items/itemGemJasper.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemJasper.png rename to src/main/resources/assets/gemification/textures/items/itemGemJasper.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemLepidolite.png b/src/main/resources/assets/gemification/textures/items/itemGemLepidolite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemLepidolite.png rename to src/main/resources/assets/gemification/textures/items/itemGemLepidolite.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemOnyx.png b/src/main/resources/assets/gemification/textures/items/itemGemOnyx.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemOnyx.png rename to src/main/resources/assets/gemification/textures/items/itemGemOnyx.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemParaibaTourlamine.png b/src/main/resources/assets/gemification/textures/items/itemGemParaibaTourlamine.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemParaibaTourlamine.png rename to src/main/resources/assets/gemification/textures/items/itemGemParaibaTourlamine.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemRhodochrosite.png b/src/main/resources/assets/gemification/textures/items/itemGemRhodochrosite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemRhodochrosite.png rename to src/main/resources/assets/gemification/textures/items/itemGemRhodochrosite.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemSmithsonite.png b/src/main/resources/assets/gemification/textures/items/itemGemSmithsonite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemSmithsonite.png rename to src/main/resources/assets/gemification/textures/items/itemGemSmithsonite.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemSodalite.png b/src/main/resources/assets/gemification/textures/items/itemGemSodalite.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemSodalite.png rename to src/main/resources/assets/gemification/textures/items/itemGemSodalite.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemSphene.png b/src/main/resources/assets/gemification/textures/items/itemGemSphene.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemSphene.png rename to src/main/resources/assets/gemification/textures/items/itemGemSphene.png diff --git a/src/main/resources/assets/thingycraft/textures/items/itemGemTourmaline.png b/src/main/resources/assets/gemification/textures/items/itemGemTourmaline.png similarity index 100% rename from src/main/resources/assets/thingycraft/textures/items/itemGemTourmaline.png rename to src/main/resources/assets/gemification/textures/items/itemGemTourmaline.png