diff --git a/src/main/java/nmd/primal/forgecraft/ModInfo.java b/src/main/java/nmd/primal/forgecraft/ModInfo.java index e93bb4b3..3e6171e3 100644 --- a/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -3,8 +3,10 @@ package nmd.primal.forgecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraftforge.fml.client.config.GuiConfigEntries; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; //import nmd.primal.forgecraft.Item.ModItems; @@ -18,7 +20,7 @@ public class ModInfo { public static final String MOD_NAME = "Kitsu's ForgeCraft"; //public static final String MOD_PREFIX = MOD_ID + ":"; //public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "0.0.0"; + public static final String MOD_VERSION = "1.0.0"; public static final String MC_VERSIONS = "[1.9.4, 1.11.0)"; /** Mod Structures **/ @@ -73,7 +75,7 @@ public class ModInfo { @Override @SideOnly(Side.CLIENT) public Item getTabIconItem() { - return ModItems.test; + return Item.getItemFromBlock(ModBlocks.firebox); } }; } \ No newline at end of file diff --git a/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index d2e6061a..5cbd8c0d 100644 --- a/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -12,6 +12,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ModCrafting { public static void register() { - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.firebox), "XXX", "XYX", "XXX", 'X', Items.BRICK, 'Y', Blocks.FURNACE); + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.firebox), "X X", "XYX", "X X", 'X', Items.BRICK, 'Y', Blocks.FURNACE); } } diff --git a/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 460b59b9..626821dd 100644 --- a/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -16,19 +16,19 @@ public class ModItems { public static void init() { - test = new ItemTest(); + //test = new ItemTest(); //cheese = new ItemCheese(); } public static void register() { - GameRegistry.register(test); + //GameRegistry.register(test); //GameRegistry.register(cheese); } public static void registerRenders() { //registerRender(cheese); - registerRender(test); + //registerRender(test); } private static void registerRender(Item item) { diff --git a/src/main/java/nmd/primal/forgecraft/renders/TileFireboxRender.java b/src/main/java/nmd/primal/forgecraft/renders/TileFireboxRender.java index d5a9ab2f..8d23cb59 100644 --- a/src/main/java/nmd/primal/forgecraft/renders/TileFireboxRender.java +++ b/src/main/java/nmd/primal/forgecraft/renders/TileFireboxRender.java @@ -31,6 +31,7 @@ public class TileFireboxRender extends TileEntitySpecialRenderer private final RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); private int rotation; private float translateX, translateZ; + private double textX, textZ; private EntityItem entItem = null; @Override @@ -62,7 +63,7 @@ public class TileFireboxRender extends TileEntitySpecialRenderer //Left and Right translateX = 1.5f; //Back and Forth - translateZ = 0.5f; + translateZ = 0.9f; break; case WEST: rotation = 1; @@ -82,92 +83,34 @@ public class TileFireboxRender extends TileEntitySpecialRenderer int bright = tile.getWorld().getCombinedLight(pos.up(), 0); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, bright % 65536, bright / 65536); - ItemStack stack = tile.getStackInSlot(0); - if (stack != null) { - /// - // rotate 90 degrees for blocks but not items? - /// - boolean is_block = stack.getItem() instanceof ItemBlock; - float height = -0.855f; + ItemStack stack = tile.getStackInSlot(0); + if (stack != null) { + boolean is_block = stack.getItem() instanceof ItemBlock; + float height = -0.75f; - float scale = is_block ? 0.9F : 1.8F; - int stackSize = stack.stackSize; + float scale = is_block ? 0.9F : 1.6F; + int stackSize = stack.stackSize; - //if(stackSize < 16){ - GL11.glPushMatrix(); - GL11.glTranslatef(translateX, height, translateZ); - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(90.0F * rotation, 0.0F, 1.0F, 0.0F); - renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); + GL11.glPushMatrix(); + GL11.glTranslatef(translateX, height, translateZ); + GL11.glScalef(scale, scale, scale); + GL11.glRotatef(90.0F * rotation, 0.0F, 1.0F, 0.0F); + Integer temp = tile.getStackInSlot(0).stackSize; - GL11.glPopMatrix(); - //} - /*if(stackSize > 15 && stackSize < 32){ - GL11.glPushMatrix(); - GL11.glTranslatef(translateX, height, translateZ); - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(90.0F * rotation, 0.0F, 1.0F, 0.0F); - renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glTranslatef(translateX, height, translateZ); - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(90.0F * (rotation + 1), 0.0F, 1.0F, 0.0F); - renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); - GL11.glPopMatrix(); - } - if(stackSize > 31 && stackSize < 48){ - GL11.glPushMatrix(); - GL11.glTranslatef(translateX, height, translateZ); - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(90.0F * rotation, 0.0F, 1.0F, 0.0F); - renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glTranslatef(translateX, height, translateZ); - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(90.0F * (rotation + 1), 0.0F, 1.0F, 0.0F); - renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glTranslatef(translateX, height, translateZ); - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(90.0F * (rotation + 2), 0.0F, 1.0F, 0.0F); - renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); - GL11.glPopMatrix(); - } - if(stackSize > 47){ - GL11.glPushMatrix(); - GL11.glTranslatef(translateX, height, translateZ); - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(90.0F * rotation, 0.0F, 1.0F, 0.0F); - renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glTranslatef(translateX, height, translateZ); - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(90.0F * (rotation + 1), 0.0F, 1.0F, 0.0F); - renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glTranslatef(translateX, height, translateZ); - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(90.0F * (rotation + 2), 0.0F, 1.0F, 0.0F); - renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glTranslatef(translateX, height, translateZ); - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(90.0F * (rotation + 3), 0.0F, 1.0F, 0.0F); - renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); - GL11.glPopMatrix(); - }*/ + renderItem.renderItem(stack, renderItem.getItemModelMesher().getItemModel(stack)); + GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); + //float scale = is_block ? 0.9F : 1.6F; + if(is_block){ + GL11.glScalef(0.08F,0.08F, 0.08f); + textZ = -23.0D; + } else { + GL11.glScalef(0.05F,0.05F, 0.05f); + textZ = -22.0D; + } + GL11.glTranslatef(0.0F, 2.0f, 0.0F); + GL11.glTranslated(0.0F, 0.0D, textZ); + getFontRenderer().drawString(temp.toString(), 0, 0, 4210752); + GL11.glPopMatrix(); } OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, prevLGTX, prevLGTY); diff --git a/src/main/resources/assets/forgecraft/lang/en_US.lang b/src/main/resources/assets/forgecraft/lang/en_US.lang index 90ccf536..ada4d510 100644 --- a/src/main/resources/assets/forgecraft/lang/en_US.lang +++ b/src/main/resources/assets/forgecraft/lang/en_US.lang @@ -1,2 +1,3 @@ item.test.name=test -tile.firebox.name=Firebox \ No newline at end of file +tile.firebox.name=Firebox +itemGroup.forgecraft=ForgeCraft \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index a8e20cfc..13b9ea09 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,14 +1,14 @@ [{ "modid": "forgecraft", "name": "Kitsu's Forgecraft", - "description": "Forge your Future", - "version": "${version}", - "mcversion": "${mcversion}", + "description": "Forged with sweat and blood", + "version": "1.0.0", + "mcversion": "1.10.2", "url": "", "updateUrl": "", "authorList": ["KitsuShadow"], - "credits": "KitsuShadow, Fluid1C3, Ishvad, Sygmarr", - "logoFile": "assets/primal/textures/logo.png", + "credits": "KitsuShadow, Fluid1C3, Ishvad, Sygmarr, An Sar", + "logoFile": "assets/forgecraft/textures/logo.png", "screenshots": [], "dependencies": [] }] \ No newline at end of file