diff --git a/1.11/To-Dos b/1.11/To-Dos index a06b7c88..b60e80ee 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -1,14 +1,14 @@ To-Dos -- [ ] Forging Recipe Handler - - [ ] Iron Temp Min - - [ ] Iron Temp Max - - [ ] Iron Ideal Time - - [ ] Iron Time Modifier - - [ ] Iron Failure Modifier - - [ ] Iron Pre-Fail Output - - [ ] Iron Success Output - - [ ] Iron Post Fail Output +- [x] Forging Recipe Handler + - [x] Iron Temp Min + - [x] Iron Temp Max + - [x] Iron Ideal Time + - [x] Iron Time Modifier + - [x] Iron Failure Modifier + - [x] Iron Pre-Fail Output + - [x] Iron Success Output + - [x] Iron Post Fail Output - [X] Soft Crucible - [x] Model @@ -18,13 +18,29 @@ To-Dos - [x] Tongs - [x] Model - [x] Item(s) - - [ ] Functionality - - [ ] Item NBT - - [ ] Modify Model via NBT - - [ ] Remove hot things from bloomery / firebox and place in world or anvil to cool + - [x] Functionality + - [x] Item NBT + - [x] Modify Model via NBT + - [x] Remove hot things from bloomery / firebox and place in world or anvil to cool + +- [x] Update Forge Version 11.2 + +*** Priority *** +- [ ] Wrought Iron Ingot model +- [ ] Crafting for filled crucible +- [ ] Crafting Recipe for filled iron crucible +- [ ] Crafting Recipe for hot iron crucible +- [ ] Crafting Recipe for hot cooked iron crucible +- [ ] Item Drop for failed crucible + + - [ ] Anvil - [ ] Anvil Recipe Handler -- [ ] Update Forge Version 11.2 +- [ ] Casting Table + - [ ] Block + - [ ] Gui + - [ ] Crafting recipes +- [ ] Casting Bloomery diff --git a/1.11/gradle.properties b/1.11/gradle.properties index c7e481e7..9927bad0 100644 --- a/1.11/gradle.properties +++ b/1.11/gradle.properties @@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.0.8 +mod_version=1.1.1 forge_version=13.20.0.2226 -mcp_mappings=snapshot_20170121 +mcp_mappings=snapshot_20161220 mc_version=1.11.2 primal_version=0.2.11 diff --git a/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java b/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java index bc360d0b..8e26d87b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java @@ -2,6 +2,7 @@ package nmd.primal.forgecraft; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -9,6 +10,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -54,4 +56,9 @@ public class CommonUtils { entityitem.onCollideWithPlayer(player); } + public static void spawnItemEntityFromWorld(World world, BlockPos pos, ItemStack stack){ + EntityItem entityitem = new EntityItem(world, pos.getX(), pos.getY(), pos.getZ(), stack); // player.posY - 1.0D + world.spawnEntity(entityitem); + } + } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java index 466ef665..1a228397 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java @@ -7,6 +7,9 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import nmd.primal.forgecraft.gui.GuiHandler; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModCrafting; import nmd.primal.forgecraft.init.ModItems; @@ -27,7 +30,7 @@ public class ForgeCraft { @Instance public static ForgeCraft instance; - + public static SimpleNetworkWrapper NETWORK; @SidedProxy(clientSide = ModInfo.CLIENT_PROXY, serverSide = ModInfo.SERVER_PROXY) public static CommonProxy proxy; @@ -35,6 +38,9 @@ public class ForgeCraft public void preInit(FMLPreInitializationEvent event) { + NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ModInfo.MOD_CHANNEL); + NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); + ModItems.init(); ModBlocks.init(); ModItems.register(); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java index 854c4599..ae5e46ed 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -16,9 +16,9 @@ public class ModInfo { public static final String MOD_ID = "forgecraft"; 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 = "1.0.1"; - public static final String MC_VERSIONS = "[1.11.0, 1.11.1)"; + public static final String MOD_CHANNEL = MOD_ID; + public static final String MOD_VERSION = "1.1.1"; + public static final String MC_VERSIONS = "[1.11.0, 1.12.0)"; /** Mod Structures **/ public static final String SERVER_PROXY = "nmd.primal.forgecraft.proxy.ServerProxy"; @@ -30,7 +30,8 @@ public class ModInfo { TEST("test", "ItemTest"), BELLOWSHANDLE("bellowshandle", "bellowshandle"), STONETONGS("stonetongs", "stonetongs"), - SOFTCRUCIBLE("softcrucible", "softcrucible"); + SOFTCRUCIBLE("softcrucible", "softcrucible"), + FORGINGMANUAL("forgingmanual","forgingmanual"); private String unlocalizedName; private String registryName; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/EmptyCrucible.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucible.java similarity index 65% rename from 1.11/src/main/java/nmd/primal/forgecraft/blocks/EmptyCrucible.java rename to 1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucible.java index 1a59cd33..9101a0b4 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/EmptyCrucible.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Crucible.java @@ -9,7 +9,9 @@ import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -27,22 +29,26 @@ import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.tiles.TileBaseCrucible; import nmd.primal.forgecraft.tiles.TileFirebox; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.Random; + +import static nmd.primal.forgecraft.CommonUtils.spawnItemEntityFromWorld; /** * Created by mminaie on 1/24/17. */ -public class EmptyCrucible extends Block { +public class Crucible extends Block { protected static final AxisAlignedBB boundBox = new AxisAlignedBB(4/16D, 0.0D, 4/16D, 12/16D, 7/16D, 12/16D); //public static final PropertyInteger SIZE = PropertyInteger.create("size", 0, 3); - public EmptyCrucible(Material material, String registryName) { + public Crucible(Material material, String registryName) { super(material); - setUnlocalizedName(ModInfo.ForgecraftBlocks.EMPTYCRUCIBLE.getUnlocalizedName()); - //setUnlocalizedName("emptycrucible"); + setUnlocalizedName(registryName); setRegistryName(registryName); - //setRegistryName(ModInfo.ForgecraftBlocks.FIREBOX.getRegistryName()); setCreativeTab(ModInfo.TAB_FORGECRAFT); setHardness(3.0f); //this.blockState.getBaseState().withProperty(SIZE, Integer.valueOf(0)); @@ -69,11 +75,48 @@ public class EmptyCrucible extends Block { } /*@Override - public TileEntity createNewTileEntity(World worldIn, int meta) - { - return new TileBaseCrucible(); + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){ + List ret = new java.util.ArrayList(); + ret.add(0, new ItemStack(ModBlocks.emptycrucible, 1)); + if(this.getUnlocalizedName()=="tile.coolironcrucible"){ + ret.add(1, new ItemStack(Items.IRON_INGOT, 1)); + } + + return ret; }*/ + public void onBlockDestroyedByPlayer(World world, BlockPos pos, IBlockState state) + { + + if(!world.isRemote){ + spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.emptycrucible, 1)); + if (checkDrops(this.getUnlocalizedName()).equals(this.getUnlocalizedName())){ + spawnItemEntityFromWorld(world, pos, new ItemStack(getItemFromName(this.getUnlocalizedName()), 1)); + } + } + } + + private String checkDrops(String name){ + String string = null; + + if(name.equals("tile.coolironcrucible")){ + string = this.getUnlocalizedName(); + } + return string; + } + + private Item getItemFromName(String name){ + if(name.equals(getUnlocalizedName())){ + return Items.IRON_INGOT; + } else return Items.AIR; + } + + @Override + public int quantityDropped(Random random) + { + return 0; + } + @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/EmptyCrucibleHot.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CrucibleHot.java similarity index 86% rename from 1.11/src/main/java/nmd/primal/forgecraft/blocks/EmptyCrucibleHot.java rename to 1.11/src/main/java/nmd/primal/forgecraft/blocks/CrucibleHot.java index c771d922..4a705add 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/EmptyCrucibleHot.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/CrucibleHot.java @@ -21,18 +21,16 @@ import nmd.primal.forgecraft.tiles.TileBaseCrucible; /** * Created by mminaie on 2/4/17. */ -public class EmptyCrucibleHot extends Block implements ITileEntityProvider { +public class CrucibleHot extends Block implements ITileEntityProvider { protected static final AxisAlignedBB boundBox = new AxisAlignedBB(4/16D, 0.0D, 4/16D, 12/16D, 7/16D, 12/16D); //public static final PropertyInteger SIZE = PropertyInteger.create("size", 0, 3); - public EmptyCrucibleHot(Material material, String registryName) { + public CrucibleHot(Material material, String registryName) { super(material); - setUnlocalizedName(ModInfo.ForgecraftBlocks.EMPTYCRUCIBLE.getUnlocalizedName()); - //setUnlocalizedName("emptycrucible"); + setUnlocalizedName(registryName); setRegistryName(registryName); - //setRegistryName(ModInfo.ForgecraftBlocks.FIREBOX.getRegistryName()); setCreativeTab(ModInfo.TAB_FORGECRAFT); setHardness(3.0f); //this.blockState.getBaseState().withProperty(SIZE, Integer.valueOf(0)); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/handler/EnumHandler.java b/1.11/src/main/java/nmd/primal/forgecraft/enumhandler/EnumHandler.java similarity index 94% rename from 1.11/src/main/java/nmd/primal/forgecraft/handler/EnumHandler.java rename to 1.11/src/main/java/nmd/primal/forgecraft/enumhandler/EnumHandler.java index e767d35b..4932cb97 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/handler/EnumHandler.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/enumhandler/EnumHandler.java @@ -1,4 +1,4 @@ -package nmd.primal.forgecraft.handler; +package nmd.primal.forgecraft.enumhandler; import net.minecraft.util.IStringSerializable; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/gui/GuiForgingManual.java b/1.11/src/main/java/nmd/primal/forgecraft/gui/GuiForgingManual.java new file mode 100644 index 00000000..818d89b2 --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/gui/GuiForgingManual.java @@ -0,0 +1,51 @@ +package nmd.primal.forgecraft.gui; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; + +import java.io.IOException; + +/** + * Created by mminaie on 2/4/17. + */ +public class GuiForgingManual extends GuiScreen { + + GuiButton a; + GuiButton b; + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + this.drawDefaultBackground(); + super.drawScreen(mouseX, mouseY, partialTicks); + } + + @Override + public boolean doesGuiPauseGame() { + return false; + } + + @Override + public void initGui() { + + this.buttonList.add(this.a = new GuiButton(0, this.width / 2 - 100, this.height / 2 - 24, "This is button a")); + this.buttonList.add(this.b = new GuiButton(1, this.width / 2 - 100, this.height / 2 + 4, "This is button b")); + + } + + @Override + protected void actionPerformed(GuiButton button) throws IOException { + if (button == this.a) { + //Main.packetHandler.sendToServer(...); + this.mc.displayGuiScreen(null); + if (this.mc.currentScreen == null) + this.mc.setIngameFocus(); + } + if (button == this.b){ + //Main.packetHandler.sendToServer(...); + this.mc.displayGuiScreen(null); + if (this.mc.currentScreen == null) + this.mc.setIngameFocus(); + } + } + +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/gui/GuiHandler.java b/1.11/src/main/java/nmd/primal/forgecraft/gui/GuiHandler.java new file mode 100644 index 00000000..f7903cc8 --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/gui/GuiHandler.java @@ -0,0 +1,27 @@ +package nmd.primal.forgecraft.gui; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.network.IGuiHandler; + +/** + * Created by mminaie on 2/4/17. + */ +public class GuiHandler implements IGuiHandler { + + public static final int FORGINGMANUALGUI = 0; + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + if(ID == FORGINGMANUALGUI){ + return new GuiForgingManual(); + } + return null; + } + +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 8a7be4d8..71527032 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -27,36 +27,63 @@ public class ModBlocks { public static Block emptycruciblecracked; public static Block emptycruciblecrackedhot; + public static Block rawironcrucible; + public static Block hotironcrucible; + public static Block hotcookedironcrucible; + public static Block coolironcrucible; + public static Block failedironcrucible; + public static Block failedironcruciblehot; public static void init() { firebox = new Firebox(Material.ROCK); + + bloomery = new Bloomery(Material.ROCK, "bloomery"); + pistonbellowsoak = new PistonBellows(Material.WOOD, "pistonbellowsoak"); pistonbellowsjungle = new PistonBellows(Material.WOOD, "pistonbellowsjungle"); pistonbellowsbirch = new PistonBellows(Material.WOOD, "pistonbellowsbirch"); pistonbellowsspruce = new PistonBellows(Material.WOOD, "pistonbellowsspruce"); pistonbellowsdarkoak = new PistonBellows(Material.WOOD, "pistonbellowsdarkoak"); pistonbellowsacacia = new PistonBellows(Material.WOOD, "pistonbellowsacacia"); - bloomery = new Bloomery(Material.ROCK, "bloomery"); - emptycrucible = new EmptyCrucible(Material.ROCK, "emptycrucible"); - emptycruciblehot = new EmptyCrucibleHot(Material.ROCK, "emptycruciblehot"); - emptycruciblecracked = new EmptyCrucible(Material.ROCK, "emptycruciblecracked"); - emptycruciblecrackedhot = new EmptyCrucibleHot(Material.ROCK, "emptycruciblecrackedhot"); + + emptycrucible = new Crucible(Material.ROCK, "emptycrucible"); + emptycruciblehot = new CrucibleHot(Material.ROCK, "emptycruciblehot"); + emptycruciblecracked = new Crucible(Material.ROCK, "emptycruciblecracked"); + emptycruciblecrackedhot = new CrucibleHot(Material.ROCK, "emptycruciblecrackedhot"); + + rawironcrucible = new Crucible(Material.ROCK, "rawironcrucible"); + hotironcrucible = new CrucibleHot(Material.ROCK, "hotironcrucible"); + hotcookedironcrucible = new CrucibleHot(Material.ROCK, "hotcookedironcrucible"); + coolironcrucible = new Crucible(Material.ROCK, "coolironcrucible"); + failedironcrucible = new Crucible(Material.ROCK, "failedironcrucible"); + failedironcruciblehot = new Crucible(Material.ROCK, "failedironcruciblehot"); + } public static void register() { registerBlock(firebox); + registerBlock(bloomery); + registerBlock(pistonbellowsoak); registerBlock(pistonbellowsjungle); registerBlock(pistonbellowsbirch); registerBlock(pistonbellowsspruce); registerBlock(pistonbellowsdarkoak); registerBlock(pistonbellowsacacia); - registerBlock(bloomery); + registerBlock(emptycrucible); registerBlock(emptycruciblehot); registerBlock(emptycruciblecracked); registerBlock(emptycruciblecrackedhot); + + registerBlock(rawironcrucible); + registerBlock(hotironcrucible); + registerBlock(hotcookedironcrucible); + registerBlock(coolironcrucible); + registerBlock(failedironcrucible); + registerBlock(failedironcruciblehot); + } public static void registerRenders() { @@ -72,6 +99,14 @@ public class ModBlocks { registerRender(emptycruciblehot); registerRender(emptycruciblecracked); registerRender(emptycruciblecrackedhot); + + registerRender(rawironcrucible); + registerRender(hotironcrucible); + registerRender(hotcookedironcrucible); + registerRender(coolironcrucible); + registerRender(failedironcrucible); + registerRender(failedironcruciblehot); + } private static void registerBlock(Block block) { diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index eaa39535..265822af 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -34,6 +34,8 @@ public class ModCrafting { /***Bellows Handle***/ GameRegistry.addShapedRecipe(new ItemStack(ModItems.pistonbellows), "X X", "X X", " X ", 'X', Items.STICK); + GameRegistry.addShapedRecipe(new ItemStack(ModItems.stonetongs, 1), "X X", "YSY", 'X', Blocks.STONE, 'S', Items.STRING, 'Y', Items.STICK); + /***Bloomery Crafting***/ //DryingRecipe.addRecipe(new ItemStack(Items.FISH, 1, 0), new ItemStack(PrimalItems.FISH_COD_DRIED), new ItemStack(PrimalItems.FISH_COD_ROTTEN), 25, 0.006F); BloomeryCrafting.addRecipe( diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index d3e38c7b..66f999a9 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -11,8 +11,8 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.common.registry.GameRegistry; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.handler.EnumHandler; import nmd.primal.forgecraft.items.ItemBellowsHandle; +import nmd.primal.forgecraft.items.ItemForgingManual; import nmd.primal.forgecraft.items.ItemSoftCrucible; import nmd.primal.forgecraft.items.ItemStoneTongs; @@ -22,30 +22,29 @@ import nmd.primal.forgecraft.items.ItemStoneTongs; public class ModItems { public static Item pistonbellows; - public static Item test; public static Item softcrucible; public static Item stonetongs; - //public static Item stonetongsemptyhot; - //public static Item stonetongsfilledhot; - //public static Item + //public static Item forgingmanual; public static void init() { OBJLoader.INSTANCE.addDomain(ModInfo.MOD_ID); pistonbellows = new ItemBellowsHandle(); softcrucible = new ItemSoftCrucible(); stonetongs = new ItemStoneTongs("stonetongs"); + //forgingmanual = new ItemForgingManual(); } public static void register() { GameRegistry.register(pistonbellows); GameRegistry.register(softcrucible); GameRegistry.register(stonetongs); + //GameRegistry.register(forgingmanual); } public static void registerRenders() { registerRender(pistonbellows); registerRender(softcrucible); - + //registerRender(forgingmanual); } public static void registerCustomRenders(){ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java new file mode 100644 index 00000000..86195a7c --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemForgingManual.java @@ -0,0 +1,34 @@ +package nmd.primal.forgecraft.items; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.world.World; +import nmd.primal.forgecraft.ForgeCraft; +import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.gui.GuiHandler; +import sun.applet.Main; + +/** + * Created by mminaie on 2/4/17. + */ +public class ItemForgingManual extends BaseItem { + + public ItemForgingManual() { + setUnlocalizedName(ModInfo.ForgecraftItems.FORGINGMANUAL.getUnlocalizedName()); + setRegistryName(ModInfo.ForgecraftItems.FORGINGMANUAL.getRegistryName()); + } + + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) + { + if (world.isRemote) { + //player.openGui(ForgeCraft.instance, GuiHandler., world, 0, 0, 0); + player.openGui(ForgeCraft.instance, 0, world, (int) player.posX, (int) player.posY, (int) player.posZ); + return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand)); + } + return new ActionResult(EnumActionResult.PASS, player.getHeldItem(hand)); + } + +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java index 5d63672b..b5fc02c0 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java @@ -1,32 +1,18 @@ package nmd.primal.forgecraft.items; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityEnderPearl; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; -import net.minecraft.stats.StatList; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.tiles.TileBloomery; -import nmd.primal.forgecraft.handler.EnumHandler.TongTypes; - -import java.util.List; /** * Created by mminaie on 1/23/17. diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBaseCrucible.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBaseCrucible.java index 4d2a8580..7cccb9a4 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBaseCrucible.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBaseCrucible.java @@ -22,11 +22,11 @@ public class TileBaseCrucible extends BaseTile implements ITickable { World world = this.getWorld(); IBlockState state = world.getBlockState(this.pos); iteration++; - System.out.println(iteration); + //System.out.println(iteration); if(iteration == 100 ){ iteration = 0; countdown += 100; - System.out.println(countdown); + //System.out.println(countdown); BloomeryCrafting recipe = BloomeryCrafting.getRecipeFromOutput(new ItemStack(state.getBlock(), 1)); if(recipe != null){ if (countdown > recipe.getCooldown()){ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 59e90907..b536f9f8 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -60,9 +60,9 @@ public class TileBloomery extends TileBaseSlot implements ITickable { private void slotOneManager(){ BloomeryCrafting recipe = BloomeryCrafting.getRecipe(this.getSlotStack(1)); if(recipe != null){ - System.out.println(recipe.getIdealTime() + " : " + recipe.getHeatThreshold()); - System.out.println(this.cookCounter + " : " + this.getHeat()); - System.out.println("===================="); + //System.out.println(recipe.getIdealTime() + " : " + recipe.getHeatThreshold()); + //System.out.println(this.cookCounter + " : " + this.getHeat()); + //System.out.println("===================="); if(this.getHeat() >= recipe.getHeatThreshold()){ cookCounter++; } @@ -70,7 +70,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { this.setSlotStack(1, recipe.getOutput()); this.cookCounter = 0; - System.out.print(" :Success: " + this.getSlotStack(1)); + //System.out.print(" :Success: " + this.getSlotStack(1)); this.updateBlock(); this.markDirty(); } @@ -79,7 +79,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { this.setSlotStack(1, recipe.getOutputFailed()); this.cookCounter = 0; - System.out.print(" :Failure Time: " + this.getSlotStack(1)); + //System.out.print(" :Failure Time: " + this.getSlotStack(1)); this.updateBlock(); this.markDirty(); } @@ -88,7 +88,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { this.setSlotStack(1, recipe.getOutputFailed()); this.cookCounter = 0; - System.out.print(" :Failure Heat: " + this.getSlotStack(1)); + //System.out.print(" :Failure Heat: " + this.getSlotStack(1)); this.updateBlock(); this.markDirty(); } diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/coolironcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/coolironcrucible.json new file mode 100644 index 00000000..73d7acf3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/coolironcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/failedironcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/failedironcrucible.json new file mode 100644 index 00000000..168baa06 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/failedironcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_burnt", + "texture": "forgecraft:blocks/stone_slab_burnt" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/failedironcruciblehot.json b/1.11/src/main/resources/assets/forgecraft/blockstates/failedironcruciblehot.json new file mode 100644 index 00000000..62b92916 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/failedironcruciblehot.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot_burnt", + "texture": "forgecraft:blocks/stone_slab_hot_burnt" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedironcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedironcrucible.json new file mode 100644 index 00000000..11a526c7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotcookedironcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/hotironcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/hotironcrucible.json new file mode 100644 index 00000000..11a526c7 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/hotironcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/rawironcrucible.json b/1.11/src/main/resources/assets/forgecraft/blockstates/rawironcrucible.json new file mode 100644 index 00000000..73d7acf3 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/rawironcrucible.json @@ -0,0 +1,12 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + } + }, + "variants": { + "normal": { "model": "forgecraft:crucibleshut" } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery2.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery2.json deleted file mode 100644 index 3901877b..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery2.json +++ /dev/null @@ -1,217 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/brick" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 2, 0, 2 ], - "to": [ 14, 1, 14 ], - "faces": { - "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture" }, - "north": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "west": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube3", - "from": [ 0, 0, 3 ], - "to": [ 2, 14, 13 ], - "faces": { - "down": { "uv": [ 0, 3, 2, 13 ], "texture": "#texture" }, - "up": { "uv": [ 3, 1, 13, 3 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "west": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube4", - "from": [ 3, 0, 14 ], - "to": [ 13, 1, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 13, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 13, 16 ], "texture": "#texture" }, - "north": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 15, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 15, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube6", - "from": [ 3, 0, 0 ], - "to": [ 13, 14, 2 ], - "faces": { - "down": { "uv": [ 3, 14, 13, 16 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 12, 2 ], "texture": "#texture" }, - "north": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "east": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 14, 0, 3 ], - "to": [ 16, 14, 13 ], - "faces": { - "down": { "uv": [ 14, 3, 16, 13 ], "texture": "#texture" }, - "up": { "uv": [ 2, 9, 12, 11 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "south": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture" }, - "east": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 3, 1, 14 ], - "to": [ 4, 3, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 13, 13, 15 ], "texture": "#texture" }, - "south": { "uv": [ 3, 13, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 14, 13, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 0, 13, 2, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 12, 1, 14 ], - "to": [ 13, 3, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4, 1 ], "texture": "#texture" }, - "up": { "uv": [ 3, 15, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 11, 13, 15 ], "texture": "#texture" }, - "south": { "uv": [ 3, 11, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 15, 11, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 0, 11, 1, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube16", - "from": [ 3, 3, 14 ], - "to": [ 13, 14, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 13, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 9, 13, 11 ], "texture": "#texture" }, - "north": { "uv": [ 2, 2, 12, 13 ], "texture": "#texture" }, - "south": { "uv": [ 3, 2, 13, 13 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 0, 2, 2, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 2, 0, 14 ], - "to": [ 3, 14, 15 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 1, 0, 13 ], - "to": [ 3, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 1, 0, 2 ], - "to": [ 3, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 2, 0, 1 ], - "to": [ 3, 14, 2 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 14, 0, 2 ], - "to": [ 15, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 13, 0, 1 ], - "to": [ 14, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 13, 0, 13 ], - "to": [ 14, 14, 15 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 14, 0, 13 ], - "to": [ 15, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - } - ] -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit2.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit2.json deleted file mode 100644 index 38ca91db..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit2.json +++ /dev/null @@ -1,218 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "blocks/brick", - "texture": "blocks/brick", - "texture1": "blocks/brick_lit" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 2, 0, 2 ], - "to": [ 14, 1, 14 ], - "faces": { - "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, - "north": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "west": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube3", - "from": [ 0, 0, 3 ], - "to": [ 2, 14, 13 ], - "faces": { - "down": { "uv": [ 0, 3, 2, 13 ], "texture": "#texture" }, - "up": { "uv": [ 3, 1, 13, 3 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "west": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube4", - "from": [ 3, 0, 14 ], - "to": [ 13, 1, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 13, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 13, 16 ], "texture": "#texture" }, - "north": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 15, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 15, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube6", - "from": [ 3, 0, 0 ], - "to": [ 13, 14, 2 ], - "faces": { - "down": { "uv": [ 3, 14, 13, 16 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 12, 2 ], "texture": "#texture" }, - "north": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "east": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 14, 0, 3 ], - "to": [ 16, 14, 13 ], - "faces": { - "down": { "uv": [ 14, 3, 16, 13 ], "texture": "#texture" }, - "up": { "uv": [ 2, 9, 12, 11 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "south": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 3, 1, 14 ], - "to": [ 4, 3, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 13, 13, 15 ], "texture": "#texture1" }, - "south": { "uv": [ 3, 13, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 14, 13, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 0, 13, 2, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 12, 1, 14 ], - "to": [ 13, 3, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4, 1 ], "texture": "#texture" }, - "up": { "uv": [ 3, 15, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 11, 13, 15 ], "texture": "#texture1" }, - "south": { "uv": [ 3, 11, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 15, 11, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 0, 11, 1, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube16", - "from": [ 3, 3, 14 ], - "to": [ 13, 14, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 13, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 9, 13, 11 ], "texture": "#texture" }, - "north": { "uv": [ 2, 2, 12, 13 ], "texture": "#texture1" }, - "south": { "uv": [ 3, 2, 13, 13 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 0, 2, 2, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 2, 0, 14 ], - "to": [ 3, 14, 15 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 1, 0, 13 ], - "to": [ 3, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture1" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube17", - "from": [ 1, 0, 2 ], - "to": [ 3, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 2, 0, 1 ], - "to": [ 3, 14, 2 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 14, 0, 2 ], - "to": [ 15, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 13, 0, 1 ], - "to": [ 14, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 13, 0, 13 ], - "to": [ 14, 14, 15 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture1" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 14, 0, 13 ], - "to": [ 15, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture1" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture1" } - } - } - ] -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered2.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered2.json deleted file mode 100644 index f98d06a2..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered2.json +++ /dev/null @@ -1,234 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "blocks/brick", - "texture": "blocks/brick", - "texture1": "blocks/brick_lit", - "texture2": "blocks/stone_slab", - "texture3": "blocks/stone_slab_hot" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 2, 0, 2 ], - "to": [ 14, 1, 14 ], - "faces": { - "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, - "north": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "west": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube3", - "from": [ 0, 0, 3 ], - "to": [ 2, 14, 13 ], - "faces": { - "down": { "uv": [ 0, 3, 2, 13 ], "texture": "#texture" }, - "up": { "uv": [ 3, 1, 13, 3 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 13, 2, 15, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "west": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube4", - "from": [ 3, 0, 14 ], - "to": [ 13, 1, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 13, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 13, 16 ], "texture": "#texture" }, - "north": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 15, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 15, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube6", - "from": [ 3, 0, 0 ], - "to": [ 13, 14, 2 ], - "faces": { - "down": { "uv": [ 3, 14, 13, 16 ], "texture": "#texture" }, - "up": { "uv": [ 2, 0, 12, 2 ], "texture": "#texture" }, - "north": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "east": { "uv": [ 14, 2, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 14, 0, 3 ], - "to": [ 16, 14, 13 ], - "faces": { - "down": { "uv": [ 14, 3, 16, 13 ], "texture": "#texture" }, - "up": { "uv": [ 2, 9, 12, 11 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "south": { "uv": [ 13, 2, 15, 16 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 12, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 3, 1, 14 ], - "to": [ 4, 3, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 13, 13, 15 ], "texture": "#texture1" }, - "south": { "uv": [ 3, 13, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 14, 13, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 0, 13, 2, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube14", - "from": [ 12, 1, 14 ], - "to": [ 13, 3, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4, 1 ], "texture": "#texture" }, - "up": { "uv": [ 3, 15, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 11, 13, 15 ], "texture": "#texture1" }, - "south": { "uv": [ 3, 11, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 15, 11, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 0, 11, 1, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube16", - "from": [ 3, 3, 14 ], - "to": [ 13, 14, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 13, 2 ], "texture": "#texture" }, - "up": { "uv": [ 3, 9, 13, 11 ], "texture": "#texture" }, - "north": { "uv": [ 2, 2, 12, 13 ], "texture": "#texture1" }, - "south": { "uv": [ 3, 2, 13, 13 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 16, 13 ], "texture": "#texture" }, - "east": { "uv": [ 0, 2, 2, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 2, 0, 14 ], - "to": [ 3, 14, 15 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 1, 0, 13 ], - "to": [ 3, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture1" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube17", - "from": [ 1, 0, 2 ], - "to": [ 3, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 2, 0, 1 ], - "to": [ 3, 14, 2 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 14, 0, 2 ], - "to": [ 15, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 13, 0, 1 ], - "to": [ 14, 14, 3 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 13, 0, 13 ], - "to": [ 14, 14, 15 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture1" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube17", - "from": [ 14, 0, 13 ], - "to": [ 15, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, - "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, - "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "lid", - "from": [ -0.5, 14, 8 ], - "to": [ 11.5, 16, 20 ], - "rotation": { "origin": [ -0.5, 14, 8 ], "axis": "y", "angle": 45 }, - "faces": { - "down": { "uv": [ 2, 14, 14, 2 ], "texture": "#texture3" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture3" }, - "north": { "uv": [ 14, 9, 2, 11 ], "texture": "#texture3" }, - "south": { "uv": [ 2, 4, 14, 6 ], "texture": "#texture3" }, - "west": { "uv": [ 4, 2, 6, 14 ], "texture": "#texture3", "rotation": 270 }, - "east": { "uv": [ 4, 1, 6, 13 ], "texture": "#texture3", "rotation": 270 } - } - } - ] -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/crucibleshut.json b/1.11/src/main/resources/assets/forgecraft/models/block/crucibleshut.json new file mode 100644 index 00000000..221840cb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/block/crucibleshut.json @@ -0,0 +1,157 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + }, + "elements": [ + { + "__comment": "Cube1", + "from": [ 5, 0, 5 ], + "to": [ 11, 1, 11 ], + "faces": { + "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 5, 11, 11 ], "texture": "#texture" }, + "north": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 15, 11, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube11", + "from": [ 5, 1, 5 ], + "to": [ 11, 7, 6 ], + "faces": { + "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture" }, + "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, + "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, + "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube11", + "from": [ 5, 1, 10 ], + "to": [ 11, 7, 11 ], + "faces": { + "down": { "uv": [ 5, 10, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 5, 11, 6 ], "texture": "#texture" }, + "north": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 11, 15 ], "texture": "#texture" }, + "west": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, + "east": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube13", + "from": [ 5, 1, 6 ], + "to": [ 6, 7, 10 ], + "faces": { + "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, + "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, + "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, + "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" }, + "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube13", + "from": [ 10, 1, 6 ], + "to": [ 11, 7, 10 ], + "faces": { + "down": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, + "up": { "uv": [ 5, 6, 6, 10 ], "texture": "#texture" }, + "north": { "uv": [ 10, 9, 11, 15 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 6, 15 ], "texture": "#texture" }, + "west": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" }, + "east": { "uv": [ 6, 9, 10, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube15", + "from": [ 4, 5, 6 ], + "to": [ 5, 6, 10 ], + "faces": { + "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, + "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, + "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, + "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, + "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube15", + "from": [ 11, 5, 6 ], + "to": [ 12, 6, 10 ], + "faces": { + "down": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, + "up": { "uv": [ 4, 6, 5, 10 ], "texture": "#texture" }, + "north": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, + "south": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, + "west": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "east": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube17", + "from": [ 6, 5, 4 ], + "to": [ 10, 6, 5 ], + "faces": { + "down": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture" }, + "up": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "west": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" }, + "east": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Cube18", + "from": [ 6, 5, 11 ], + "to": [ 10, 6, 12 ], + "faces": { + "down": { "uv": [ 6, 4, 10, 5 ], "texture": "#texture" }, + "up": { "uv": [ 6, 11, 10, 12 ], "texture": "#texture" }, + "north": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "south": { "uv": [ 6, 10, 10, 11 ], "texture": "#texture" }, + "west": { "uv": [ 11, 10, 12, 11 ], "texture": "#texture" }, + "east": { "uv": [ 4, 10, 5, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Lid", + "from": [ 5.5, 7, 5.5 ], + "to": [ 10.5, 8, 10.5 ], + "faces": { + "down": { "uv": [ 5.5, 5.5, 10.5, 10.5 ], "texture": "#texture" }, + "up": { "uv": [ 5.5, 5.5, 10.5, 10.5 ], "texture": "#texture" }, + "north": { "uv": [ 5.5, 8, 10.5, 9 ], "texture": "#texture" }, + "south": { "uv": [ 5.5, 8, 10.5, 9 ], "texture": "#texture" }, + "west": { "uv": [ 5.5, 8, 10.5, 9 ], "texture": "#texture" }, + "east": { "uv": [ 5.5, 8, 10.5, 9 ], "texture": "#texture" } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ 0.1, 1.1, -2.35 ] + }, + "firstperson_righthand": { + "translation": [ 0, 4, 0 ] + }, + "gui": { + "translation": [ 0, 4, 0 ] + }, + "ground": { + "translation": [ 0, 4, 0 ] + }, + "fixed": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 4, 0 ] + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/fireboxv2.json b/1.11/src/main/resources/assets/forgecraft/models/block/fireboxv2.json deleted file mode 100644 index d463f276..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/fireboxv2.json +++ /dev/null @@ -1,270 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "blocks/brick", - "texture": "blocks/brick" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 0, 0, 0 ], - "to": [ 16, 1, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 15, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 15, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 15, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 15, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube2", - "from": [ 0, 1, 14 ], - "to": [ 4, 5, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 4, 2 ], "texture": "#texture" }, - "up": { "uv": [ 0, 14, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 11, 4, 15 ], "texture": "#texture" }, - "south": { "uv": [ 0, 11, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 14, 11, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 14, 11, 16, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube2", - "from": [ 12, 1, 14 ], - "to": [ 16, 5, 16 ], - "faces": { - "down": { "uv": [ 0, 15, 4, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 4, 1 ], "texture": "#texture" }, - "north": { "uv": [ 12, 11, 16, 15 ], "texture": "#texture" }, - "south": { "uv": [ 0, 11, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 0, 4, 1, 8 ], "texture": "#texture" }, - "east": { "uv": [ 0, 11, 2, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube4", - "from": [ 0, 1, 0 ], - "to": [ 2, 16, 14 ], - "faces": { - "down": { "uv": [ 0, 0, 2, 14 ], "texture": "#texture" }, - "up": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "north": { "uv": [ 14, 0, 16, 15 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 2, 8 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 14, 15 ], "texture": "#texture" }, - "east": { "uv": [ 2, 0, 16, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube4", - "from": [ 14, 1, 0 ], - "to": [ 16, 16, 14 ], - "faces": { - "down": { "uv": [ 0, 14, 2, 15 ], "texture": "#texture" }, - "up": { "uv": [ 0, 2, 2, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 2, 15 ], "texture": "#texture" }, - "south": { "uv": [ 0, 4, 2, 8 ], "texture": "#texture" }, - "west": { "uv": [ 2, 0, 16, 15 ], "texture": "#texture" }, - "east": { "uv": [ 2, 0, 16, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube6", - "from": [ 0, 5, 14 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 2, 16 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 0, 3, 16, 7 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 11 ], "texture": "#texture" }, - "west": { "uv": [ 14, 0, 16, 11 ], "texture": "#texture" }, - "east": { "uv": [ 14, 0, 16, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube7", - "from": [ 2, 1, 0 ], - "to": [ 14, 16, 2 ], - "faces": { - "down": { "uv": [ 2, 0, 14, 0 ], "texture": "#texture" }, - "up": { "uv": [ 0, 12, 14, 14 ], "texture": "#texture" }, - "north": { "uv": [ 2, 0, 14, 15 ], "texture": "#texture" }, - "south": { "uv": [ 2, 0, 14, 15 ], "texture": "#texture" }, - "west": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 0, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 2.5, 13, 2 ], - "to": [ 3.5, 14, 14 ], - "faces": { - "down": { "uv": [ 2.5, 2, 3.5, 14 ], "texture": "#texture" }, - "up": { "uv": [ 2, 2, 3, 14 ], "texture": "#texture" }, - "north": { "uv": [ 12.5, 2, 13.5, 3 ], "texture": "#texture" }, - "south": { "uv": [ 2.5, 2, 3.5, 3 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 4.5, 13, 2 ], - "to": [ 5.5, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 12, 14, 13 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 3, 6, 15, 7 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 12, 2, 13, 3 ], "texture": "#texture" }, - "south": { "uv": [ 4, 2, 5, 3 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 6.5, 13, 2 ], - "to": [ 7.5, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 9, 14, 10 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 3, 6, 15, 7 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 12, 2, 13, 3 ], "texture": "#texture" }, - "south": { "uv": [ 4, 2, 5, 3 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 12.5, 13, 2 ], - "to": [ 13.5, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 9, 14, 10 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 2, 9, 14, 10 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 12, 2, 13, 3 ], "texture": "#texture" }, - "south": { "uv": [ 4, 2, 5, 3 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 10.5, 13, 2 ], - "to": [ 11.5, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 9, 14, 10 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 3, 6, 15, 7 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 12, 2, 13, 3 ], "texture": "#texture" }, - "south": { "uv": [ 4, 2, 5, 3 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 8.5, 13, 2 ], - "to": [ 9.5, 14, 14 ], - "faces": { - "down": { "uv": [ 2, 9, 14, 10 ], "texture": "#texture", "rotation": 90 }, - "up": { "uv": [ 3, 6, 15, 7 ], "texture": "#texture", "rotation": 90 }, - "north": { "uv": [ 12, 2, 13, 3 ], "texture": "#texture" }, - "south": { "uv": [ 4, 2, 5, 3 ], "texture": "#texture" }, - "west": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" }, - "east": { "uv": [ 2, 2, 14, 3 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube19", - "from": [ 2, 14, 2.5 ], - "to": [ 14, 15, 3.5 ], - "faces": { - "down": { "uv": [ 3, 13, 15, 14 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 15, 15 ], "texture": "#texture" }, - "north": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "west": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "east": { "uv": [ 13, 1, 14, 2 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube19", - "from": [ 2, 14, 4.5 ], - "to": [ 14, 15, 5.5 ], - "faces": { - "down": { "uv": [ 3, 13, 15, 14 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 15, 15 ], "texture": "#texture" }, - "north": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "west": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "east": { "uv": [ 13, 1, 14, 2 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube19", - "from": [ 2, 14, 6.5 ], - "to": [ 14, 15, 7.5 ], - "faces": { - "down": { "uv": [ 3, 13, 15, 14 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 15, 15 ], "texture": "#texture" }, - "north": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "west": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "east": { "uv": [ 13, 1, 14, 2 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube19", - "from": [ 2, 14, 8.5 ], - "to": [ 14, 15, 9.5 ], - "faces": { - "down": { "uv": [ 3, 13, 15, 14 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 15, 15 ], "texture": "#texture" }, - "north": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "west": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "east": { "uv": [ 13, 1, 14, 2 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube19", - "from": [ 2, 14, 10.5 ], - "to": [ 14, 15, 11.5 ], - "faces": { - "down": { "uv": [ 3, 13, 15, 14 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 15, 15 ], "texture": "#texture" }, - "north": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "west": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "east": { "uv": [ 13, 1, 14, 2 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube19", - "from": [ 2, 14, 12.5 ], - "to": [ 14, 15, 13.5 ], - "faces": { - "down": { "uv": [ 3, 13, 15, 14 ], "texture": "#texture" }, - "up": { "uv": [ 3, 14, 15, 15 ], "texture": "#texture" }, - "north": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "south": { "uv": [ 2, 1, 14, 2 ], "texture": "#texture" }, - "west": { "uv": [ 2, 1, 3, 2 ], "texture": "#texture" }, - "east": { "uv": [ 13, 1, 14, 2 ], "texture": "#texture" } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ 60, 45, 0 ], - "scale": [ 0.5, 0.6, 0.5 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.7, 0.7, 0.7 ] - }, - "gui": { - "rotation": [ 45, 45, 0 ], - "scale": [ 0.6, 0.6, 0.6 ] - } - } -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/pistonbellows2.json b/1.11/src/main/resources/assets/forgecraft/models/block/pistonbellows2.json deleted file mode 100644 index 68dd5525..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/pistonbellows2.json +++ /dev/null @@ -1,245 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "blocks/checker_test", - "texture_test": "blocks/checker_test", - "texture": "blocks/planks_oak" - }, - "elements": [ - { - "__comment": "wall4", - "from": [ 3, 0, 0 ], - "to": [ 13, 1, 14 ], - "faces": { - "down": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "up": { "uv": [ 3, 0, 13, 14 ], "texture": "#texture" }, - "north": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "south": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 15, 14, 16 ], "texture": "#texture" }, - "east": { "uv": [ 2, 15, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "wall_flap2", - "from": [ 3, 1, 0 ], - "to": [ 13, 11, 1 ], - "faces": { - "down": { "uv": [ 3, 15, 13, 16 ], "texture": "#texture" }, - "up": { "uv": [ 3, 0, 13, 1 ], "texture": "#texture" }, - "north": { "uv": [ 3, 5, 13, 15 ], "texture": "#texture" }, - "south": { "uv": [ 3, 5, 13, 15 ], "texture": "#texture" }, - "west": { "uv": [ 0, 5, 1, 15 ], "texture": "#texture" }, - "east": { "uv": [ 15, 5, 16, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "wall", - "from": [ 3, 3, 13 ], - "to": [ 7.5, 4, 14 ], - "faces": { - "down": { "uv": [ 3, 2, 7.5, 3 ], "texture": "#texture" }, - "up": { "uv": [ 3, 13, 7.5, 14 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 12, 13, 13 ], "texture": "#texture" }, - "south": { "uv": [ 3, 12, 7.5, 13 ], "texture": "#texture" }, - "west": { "uv": [ 13, 12, 14, 13 ], "texture": "#texture" }, - "east": { "uv": [ 2, 12, 3, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "wall1", - "from": [ 8.5, 3, 13 ], - "to": [ 13, 4, 14 ], - "faces": { - "down": { "uv": [ 3, 2, 7.5, 3 ], "texture": "#texture" }, - "up": { "uv": [ 3, 13, 7.5, 14 ], "texture": "#texture" }, - "north": { "uv": [ 8, 10, 12.5, 11 ], "texture": "#texture" }, - "south": { "uv": [ 2.5, 10, 7, 11 ], "texture": "#texture" }, - "west": { "uv": [ 13, 10, 14, 11 ], "texture": "#texture" }, - "east": { "uv": [ 2, 10, 3, 11 ], "texture": "#texture" } - } - }, - { - "__comment": "wall2", - "from": [ 3, 11, 0 ], - "to": [ 13, 12, 14 ], - "faces": { - "down": { "uv": [ 3, 2, 13, 16 ], "texture": "#texture" }, - "up": { "uv": [ 3, 0, 13, 14 ], "texture": "#texture" }, - "north": { "uv": [ 3, 4, 13, 5 ], "texture": "#texture" }, - "south": { "uv": [ 3, 4, 13, 5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 4, 14, 5 ], "texture": "#texture" }, - "east": { "uv": [ 2, 4, 16, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "wall3", - "from": [ 3, 1, 13 ], - "to": [ 13, 3, 14 ], - "faces": { - "down": { "uv": [ 3, 2, 13, 3 ], "texture": "#texture" }, - "up": { "uv": [ 3, 13, 13, 14 ], "texture": "#texture" }, - "north": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" }, - "south": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" }, - "west": { "uv": [ 13, 13, 14, 15 ], "texture": "#texture" }, - "east": { "uv": [ 2, 13, 3, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "wall_flap1", - "from": [ 3, 4, 13 ], - "to": [ 13, 8, 14 ], - "faces": { - "down": { "uv": [ 3, 2, 13, 3 ], "texture": "#texture" }, - "up": { "uv": [ 3, 13, 13, 14 ], "texture": "#texture" }, - "north": { "uv": [ 3, 8, 13, 12 ], "texture": "#texture" }, - "south": { "uv": [ 3, 8, 13, 12 ], "texture": "#texture" }, - "west": { "uv": [ 13, 8, 14, 12 ], "texture": "#texture" }, - "east": { "uv": [ 2, 8, 3, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "wall5", - "from": [ 3, 8, 13 ], - "to": [ 7.5, 9, 14 ], - "faces": { - "down": { "uv": [ 3, 2, 7.5, 3 ], "texture": "#texture" }, - "up": { "uv": [ 3, 13, 7.5, 14 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 12, 13, 13 ], "texture": "#texture" }, - "south": { "uv": [ 2, 12, 6.5, 13 ], "texture": "#texture" }, - "west": { "uv": [ 13, 12, 14, 13 ], "texture": "#texture" }, - "east": { "uv": [ 2, 12, 3, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "wall6", - "from": [ 8.5, 8, 13 ], - "to": [ 13, 9, 14 ], - "faces": { - "down": { "uv": [ 3, 2, 7.5, 3 ], "texture": "#texture" }, - "up": { "uv": [ 3, 13, 7.5, 14 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 12, 13, 13 ], "texture": "#texture" }, - "south": { "uv": [ 2, 12, 6.5, 13 ], "texture": "#texture" }, - "west": { "uv": [ 13, 12, 14, 13 ], "texture": "#texture" }, - "east": { "uv": [ 2, 12, 3, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "wall7", - "from": [ 3, 9, 13 ], - "to": [ 13, 11, 14 ], - "faces": { - "down": { "uv": [ 3, 2, 13, 3 ], "texture": "#texture" }, - "up": { "uv": [ 3, 13, 13, 14 ], "texture": "#texture" }, - "north": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" }, - "south": { "uv": [ 3, 13, 13, 15 ], "texture": "#texture" }, - "west": { "uv": [ 13, 13, 14, 15 ], "texture": "#texture" }, - "east": { "uv": [ 2, 13, 3, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "wall8", - "from": [ 3, 1, 1 ], - "to": [ 4, 11, 13 ], - "faces": { - "down": { "uv": [ 3, 3, 4, 15 ], "texture": "#texture" }, - "up": { "uv": [ 3, 1, 4, 13 ], "texture": "#texture" }, - "north": { "uv": [ 12, 5, 13, 15 ], "texture": "#texture" }, - "south": { "uv": [ 3, 5, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 1, 5, 13, 15 ], "texture": "#texture" }, - "east": { "uv": [ 3, 5, 15, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "wall9", - "from": [ 12, 1, 1 ], - "to": [ 13, 11, 13 ], - "faces": { - "down": { "uv": [ 3, 3, 4, 15 ], "texture": "#texture" }, - "up": { "uv": [ 3, 1, 4, 13 ], "texture": "#texture" }, - "north": { "uv": [ 12, 5, 13, 15 ], "texture": "#texture" }, - "south": { "uv": [ 3, 5, 4, 15 ], "texture": "#texture" }, - "west": { "uv": [ 1, 5, 13, 15 ], "texture": "#texture" }, - "east": { "uv": [ 3, 5, 15, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "outlet", - "from": [ 15, 4, 5 ], - "to": [ 16, 11, 11 ], - "faces": { - "down": { "uv": [ 15, 5, 16, 11 ], "texture": "#texture" }, - "up": { "uv": [ 15, 5, 16, 11 ], "texture": "#texture" }, - "north": { "uv": [ 0, 8, 1, 15 ], "texture": "#texture" }, - "south": { "uv": [ 15, 8, 16, 15 ], "texture": "#texture" }, - "west": { "uv": [ 5, 8, 11, 15 ], "texture": "#texture" }, - "east": { "uv": [ 5, 1, 11, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "outlet1", - "from": [ 13, 0, 4 ], - "to": [ 16, 1, 12 ], - "faces": { - "down": { "uv": [ 13, 4, 16, 12 ], "texture": "#texture" }, - "up": { "uv": [ 13, 4, 16, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0, 15, 3, 16 ], "texture": "#texture" }, - "south": { "uv": [ 13, 15, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture" }, - "east": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "outlet2", - "from": [ 13, 11, 4 ], - "to": [ 16, 12, 12 ], - "faces": { - "down": { "uv": [ 13, 4, 16, 12 ], "texture": "#texture" }, - "up": { "uv": [ 13, 4, 16, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0, 4, 3, 5 ], "texture": "#texture" }, - "south": { "uv": [ 13, 4, 16, 5 ], "texture": "#texture" }, - "west": { "uv": [ 4, 4, 12, 5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 4, 12, 5 ], "texture": "#texture" } - } - }, - { - "__comment": "outlet3", - "from": [ 13, 1, 11 ], - "to": [ 16, 11, 12 ], - "faces": { - "down": { "uv": [ 13, 4, 16, 5 ], "texture": "#texture" }, - "up": { "uv": [ 13, 11, 16, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0, 5, 3, 15 ], "texture": "#texture" }, - "south": { "uv": [ 13, 5, 16, 15 ], "texture": "#texture" }, - "west": { "uv": [ 11, 5, 12, 15 ], "texture": "#texture" }, - "east": { "uv": [ 4, 5, 5, 15 ], "texture": "#texture" } - } - }, - { - "__comment": "outlet4", - "from": [ 13, 1, 4 ], - "to": [ 16, 11, 5 ], - "faces": { - "down": { "uv": [ 13, 4, 16, 5 ], "texture": "#texture" }, - "up": { "uv": [ 13, 11, 16, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0, 5, 3, 15 ], "texture": "#texture" }, - "south": { "uv": [ 13, 5, 16, 15 ], "texture": "#texture" }, - "west": { "uv": [ 11, 5, 12, 15 ], "texture": "#texture" }, - "east": { "uv": [ 4, 5, 5, 15 ], "texture": "#texture" } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ 60, 45, 0 ], - "scale": [ 0.5, 0.6, 0.5 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.7, 0.7, 0.7 ] - }, - "gui": { - "rotation": [ 45, 45, 0 ], - "scale": [ 0.6, 0.6, 0.6 ] - } - } -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/coolironcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/coolironcrucible.json new file mode 100644 index 00000000..0b7be2fb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/coolironcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/failedironcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/failedironcrucible.json new file mode 100644 index 00000000..39ac95e5 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/failedironcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_burnt", + "texture": "forgecraft:blocks/stone_slab_burnt" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/failedironcruciblehot.json b/1.11/src/main/resources/assets/forgecraft/models/item/failedironcruciblehot.json new file mode 100644 index 00000000..18b1af63 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/failedironcruciblehot.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot_burnt", + "texture": "forgecraft:blocks/stone_slab_hot_burnt" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedironcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedironcrucible.json new file mode 100644 index 00000000..70bc79c2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotcookedironcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/hotironcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/hotironcrucible.json new file mode 100644 index 00000000..70bc79c2 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/hotironcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab_hot", + "texture": "forgecraft:blocks/stone_slab_hot" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/rawironcrucible.json b/1.11/src/main/resources/assets/forgecraft/models/item/rawironcrucible.json new file mode 100644 index 00000000..0b7be2fb --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/rawironcrucible.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab" + }, + "parent": "forgecraft:block/crucibleshut" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab.png index 090657d3..371793b6 100644 Binary files a/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab.png and b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_burnt.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_burnt.png new file mode 100644 index 00000000..5e872357 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_burnt.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_cracked_hot.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_cracked_hot.png index 2509c752..be833e99 100644 Binary files a/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_cracked_hot.png and b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_cracked_hot.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_hot_burnt.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_hot_burnt.png new file mode 100644 index 00000000..d82a257c Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/blocks/stone_slab_hot_burnt.png differ diff --git a/1.11/src/main/resources/mcmod.info b/1.11/src/main/resources/mcmod.info index 13b9ea09..f0c5d6eb 100644 --- a/1.11/src/main/resources/mcmod.info +++ b/1.11/src/main/resources/mcmod.info @@ -2,8 +2,8 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.0.0", - "mcversion": "1.10.2", + "version": "1.1.1", + "mcversion": "1.11.2", "url": "", "updateUrl": "", "authorList": ["KitsuShadow"],