From ef02ef50ebc6df9ff0d1c85c02906e8f20f4b5c8 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Thu, 2 Feb 2017 21:40:27 -0500 Subject: [PATCH] attempting nbt rendering --- 1.11/To-Dos | 8 + 1.11/gradle.properties | 10 +- .../nmd/primal/forgecraft/ForgeCraft.java | 4 + .../forgecraft/handler/EnumHandler.java | 38 + .../nmd/primal/forgecraft/init/ModItems.java | 62 +- .../forgecraft/items/ItemStoneTongs.java | 63 +- .../primal/forgecraft/proxy/ClientProxy.java | 17 + .../primal/forgecraft/proxy/CommonProxy.java | 4 + .../primal/forgecraft/proxy/ServerProxy.java | 11 +- .../{stonetongs_demo.json => stonetongs.json} | 8 +- .../forgecraft/models/item/stonetongs.obj | 1175 ----------------- .../models/item/stonetongs_default.json | 9 + ...netongs2.json => stonetongs_emptyhot.json} | 22 +- .../forgecraft/models/item/tongsempty.mtl | 8 - 14 files changed, 205 insertions(+), 1234 deletions(-) create mode 100644 1.11/src/main/java/nmd/primal/forgecraft/handler/EnumHandler.java rename 1.11/src/main/resources/assets/forgecraft/blockstates/{stonetongs_demo.json => stonetongs.json} (92%) delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs.obj create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default.json rename 1.11/src/main/resources/assets/forgecraft/models/item/{stonetongs2.json => stonetongs_emptyhot.json} (82%) delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/tongsempty.mtl diff --git a/1.11/To-Dos b/1.11/To-Dos index 6ab04222..a06b7c88 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -19,4 +19,12 @@ To-Dos - [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 + +- [ ] Anvil + - [ ] Anvil Recipe Handler + +- [ ] Update Forge Version 11.2 diff --git a/1.11/gradle.properties b/1.11/gradle.properties index 6cb4b7dd..c7e481e7 100644 --- a/1.11/gradle.properties +++ b/1.11/gradle.properties @@ -5,12 +5,12 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.0.7 -forge_version=13.19.1.2189 -mcp_mappings=snapshot_20161130 -mc_version=1.11 +mod_version=1.0.8 +forge_version=13.20.0.2226 +mcp_mappings=snapshot_20170121 +mc_version=1.11.2 primal_version=0.2.11 jei_version=4.0+ waila_version=1.7.0-B3 -apple_version=2.1+ +apple_version=2.1+ \ No newline at end of file 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 32061059..466ef665 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java @@ -34,11 +34,14 @@ public class ForgeCraft @EventHandler public void preInit(FMLPreInitializationEvent event) { + ModItems.init(); ModBlocks.init(); ModItems.register(); ModBlocks.register(); ModTiles.registerTileEntities(); +// ModItems.registerRenders(); + proxy.preInit(); } @EventHandler @@ -47,6 +50,7 @@ public class ForgeCraft //this.proxy.init(event); proxy.init(); ModCrafting.register(); + //proxy.registerModelBakeryVariants(); } @EventHandler diff --git a/1.11/src/main/java/nmd/primal/forgecraft/handler/EnumHandler.java b/1.11/src/main/java/nmd/primal/forgecraft/handler/EnumHandler.java new file mode 100644 index 00000000..e767d35b --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/handler/EnumHandler.java @@ -0,0 +1,38 @@ +package nmd.primal.forgecraft.handler; + +import net.minecraft.util.IStringSerializable; + +/** + * Created by mminaie on 2/1/17. + */ +public class EnumHandler { + + public static enum TongTypes implements IStringSerializable { + DEFAULT("default", 0), + EMPTYHOT("emptyhot", 1); + + private int ID; + private String name; + + private TongTypes(String name, int ID) { + this.ID = ID; + this.name = name; + } + + @Override + public String getName() { + return this.name; + } + + public int getID() { + return ID; + } + + @Override + public String toString() { + return getName(); + } + + } + +} 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 70db249c..03f9149f 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 @@ -1,12 +1,17 @@ package nmd.primal.forgecraft.init; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; 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.ItemSoftCrucible; import nmd.primal.forgecraft.items.ItemStoneTongs; @@ -20,49 +25,60 @@ public class ModItems { public static Item test; public static Item softcrucible; public static Item stonetongs; - - //public static ModelResourceLocation modelLocation = new ModelResourceLocation("stonetongs", "inventory"); - - /* - @Override - public void preInit(FMLPreInitializationEvent event) { - OBJLoader.INSTANCE.addDomain(TutorialMod.MODID); - registerModel(ModItems.tutorialItem); - } - - public void registerModel(Item item) { - ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(TutorialMod.MODID + ":" + item.getUnlocalizedName().substring(5), "inventory")); - } - */ - - + //public static Item stonetongsemptyhot; + //public static Item stonetongsfilledhot; + //public static Item public static void init() { OBJLoader.INSTANCE.addDomain(ModInfo.MOD_ID); pistonbellows = new ItemBellowsHandle(); softcrucible = new ItemSoftCrucible(); - stonetongs = new ItemStoneTongs(); - //test = new ItemTest(); + stonetongs = new ItemStoneTongs("stonetongs"); } public static void register() { GameRegistry.register(pistonbellows); GameRegistry.register(softcrucible); GameRegistry.register(stonetongs); - //GameRegistry.register(test); } public static void registerRenders() { registerRender(pistonbellows); registerRender(softcrucible); - registerRender(stonetongs); - //Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(stonetongs, 0, new ModelResourceLocation("stonetongs", "inventory");); - //ModelLoader.setCustomModelResourceLocation(stonetongs, 0, new ModelResourceLocation(ModInfo.MOD_ID + ":" + stonetongs + ".obj", "inventory")); - //registerRender(test); + + } + + public static void registerCustomRenders(){ + ModelBakery.registerItemVariants(ModItems.stonetongs, ModItems.stonetongs.getRegistryName(), new ResourceLocation(ModInfo.MOD_ID, "stonetongs")); + ModelLoader.setCustomMeshDefinition(ModItems.stonetongs, new ItemMeshDefinition() { + + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + if (stack.hasTagCompound()) { + //if (stack.getTagCompound().getInteger("type")) { + if (stack.getTagCompound().getInteger("type") == 0 ){ + return new ModelResourceLocation(stack.getItem().getRegistryName() + "_default"); + } else { + return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); + } + } + return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); + } + }); } private static void registerRender(Item item) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); } + /*public static void registerRender(Item item, int meta, String fileName) { + ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(new ResourceLocation(fileName), "inventory")); + + } + + public static void registerRender(Item item, int meta, String fileName) { + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, meta, new ModelResourceLocation(fileName, "inventory")); + }*/ + + } 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 f0cc2022..596fa17c 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,77 @@ package nmd.primal.forgecraft.items; +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. */ -public class ItemStoneTongs extends BaseItem { +public class ItemStoneTongs extends Item { - public ItemStoneTongs() { - setUnlocalizedName(ModInfo.ForgecraftItems.STONETONGS.getUnlocalizedName()); - //setRegistryName(); - setRegistryName(new ResourceLocation(ModInfo.MOD_ID, ModInfo.ForgecraftItems.STONETONGS.getRegistryName())); - setMaxDamage(100); - setNoRepair(); - setMaxStackSize(1); + public ItemStoneTongs(String unlocalizedName) { + setUnlocalizedName(unlocalizedName); + this.setRegistryName(unlocalizedName); + //this.setMaxDamage(0); + //this.setHasSubtypes(true); //This just says the item has metadata + this.setMaxStackSize(1); + this.setCreativeTab(ModInfo.TAB_FORGECRAFT); } + + public void onUpdate(ItemStack item, World world, Entity player, int itemSlot, boolean isSelected) { + if (!item.hasTagCompound()) { + item.setTagCompound(new NBTTagCompound()); + //this.setDamage(item, 1000); + item.getTagCompound().setInteger("type", 0); + //item.getTagCompound().setBoolean("active", false); + } + } + + /* //For Subtypes + @Override + public String getUnlocalizedName(ItemStack stack) { + for(int i = 0; i < TongTypes.values().length; i++) { + if(stack.getItemDamage() == i) { + return this.getUnlocalizedName() + "." + TongTypes.values()[i].getName(); + } + else { + continue; + } + } + return this.getUnlocalizedName() + "." + TongTypes.DEFAULT.getName(); + } + + @SideOnly(Side.CLIENT) + @Override + public void getSubItems(Item item, CreativeTabs tab, NonNullList items) { + for(int i = 0; i < TongTypes.values().length; i++) { + items.add(new ItemStack(item, 1, i)); + } + } + */ + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { //pos = pos.offset(facing); @@ -35,7 +80,7 @@ public class ItemStoneTongs extends BaseItem { if (world.getBlockState(pos).getBlock() == ModBlocks.bloomery) { TileBloomery tile = (TileBloomery) world.getTileEntity(pos); System.out.println(tile.getSlotStack(1)); - itemstack.damageItem(1, player); + //itemstack.damageItem(1, player); return EnumActionResult.SUCCESS; } else return EnumActionResult.FAIL; } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/proxy/ClientProxy.java b/1.11/src/main/java/nmd/primal/forgecraft/proxy/ClientProxy.java index 63748b6b..db4892da 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/proxy/ClientProxy.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/proxy/ClientProxy.java @@ -1,7 +1,13 @@ package nmd.primal.forgecraft.proxy; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.client.registry.ClientRegistry; import nmd.primal.forgecraft.ModInfo; @@ -19,12 +25,18 @@ import nmd.primal.forgecraft.tiles.TilePistonBellows; */ public class ClientProxy implements CommonProxy { + @Override + public void preInit(){ + ModItems.registerCustomRenders(); + } + @Override public void init() { //OBJLoader.INSTANCE.addDomain(ModInfo.MOD_ID); //Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(ModItems.stonetongs, 0, new ModelResourceLocation("stonetongs", "inventory")); ModItems.registerRenders(); ModBlocks.registerRenders(); + //this.registerModelBakeryStuff(); this.registerTileRendering(); } @@ -36,5 +48,10 @@ public class ClientProxy implements CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileBloomery.class, new TileBloomeryRender()); } + @Override + public void registerModelBakeryVariants(){ + //ModelBakery.registerItemVariants(ModItems.stonetongs, new ResourceLocation(ModInfo.MOD_ID, "stonetongs_default"), + // new ResourceLocation(ModInfo.MOD_ID, "stonetongs_emptyhot")); + } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/proxy/CommonProxy.java b/1.11/src/main/java/nmd/primal/forgecraft/proxy/CommonProxy.java index ed0cf734..5fb1c7bf 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/proxy/CommonProxy.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/proxy/CommonProxy.java @@ -5,6 +5,10 @@ package nmd.primal.forgecraft.proxy; */ public interface CommonProxy { + public void preInit(); + public void init(); + public void registerModelBakeryVariants(); + } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/proxy/ServerProxy.java b/1.11/src/main/java/nmd/primal/forgecraft/proxy/ServerProxy.java index a9baf1b9..a0d5ffa2 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/proxy/ServerProxy.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/proxy/ServerProxy.java @@ -5,8 +5,17 @@ package nmd.primal.forgecraft.proxy; */ public class ServerProxy implements CommonProxy { + @Override - public void init() { + public void preInit() { + + } + + public void init(){ + + } + + public void registerModelBakeryVariants(){ } } diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/stonetongs_demo.json b/1.11/src/main/resources/assets/forgecraft/blockstates/stonetongs.json similarity index 92% rename from 1.11/src/main/resources/assets/forgecraft/blockstates/stonetongs_demo.json rename to 1.11/src/main/resources/assets/forgecraft/blockstates/stonetongs.json index 7f2b6953..e27d2757 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/stonetongs_demo.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/stonetongs.json @@ -1,7 +1,8 @@ { "forge_marker": 1, "defaults": { - "model": "forgecraft:stonetongs.obj" + //"model": "forgecraft:stonetongs.obj" + "model": "forgecraft:item/stonetongs" }, "variants": { "inventory": [ @@ -40,4 +41,7 @@ } ] } -} \ No newline at end of file +} + + + diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs.obj b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs.obj deleted file mode 100644 index 18968245..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs.obj +++ /dev/null @@ -1,1175 +0,0 @@ -# Blender v2.77 (sub 0) OBJ File: '' -# www.blender.org -mtllib tongsempty.mtl -o mesh -v -1.080120 71.253952 10.996112 -v 0.983880 71.711159 12.429011 -v -1.028821 71.711159 12.429011 -v -1.081120 66.667656 10.133511 -v 0.984880 66.210052 11.566410 -v -1.029320 66.210052 11.566410 -v 1.035580 71.253952 10.996112 -v 1.220180 70.128059 5.722012 -v -1.106021 72.214355 9.848412 -v -1.265120 70.128059 5.721911 -v -3.045912 16.093353 0.000003 -v 1.529289 16.093353 -2.627197 -v 3.046889 16.093353 0.000003 -v -1.529311 16.093353 2.627203 -v -4.283206 -14.558145 0.020998 -v 2.139594 -14.558143 -3.716202 -v 4.281293 -14.557643 0.020998 -v -2.142606 -14.558145 3.757898 -v 3.037590 8.431558 0.021001 -v 1.524890 8.431557 2.639501 -v -3.037110 8.431556 0.021001 -v 1.525890 8.431557 -2.597699 -v 1.650390 7.697357 7.876601 -v 1.650390 6.612556 8.967201 -v -1.665010 6.612555 8.967001 -v -1.665010 7.697356 7.876601 -v -1.524910 8.431557 2.639501 -v -1.720207 -12.628243 12.460898 -v 1.705093 -12.121847 10.746598 -v 1.705093 -12.628243 12.460898 -v -1.720207 -11.293345 14.651198 -v 1.705093 -11.293345 14.651198 -v 1.650390 7.697360 -7.834599 -v -1.525910 8.431557 -2.597699 -v -1.664610 7.697359 -7.834699 -v -1.665010 6.612557 -8.925200 -v -1.720207 -12.628240 -12.419102 -v -1.720207 -11.293341 -14.609402 -v 1.705093 -11.293341 -14.609402 -v 1.704593 -12.628240 -12.419102 -v 1.705093 -12.121843 -10.704702 -v 1.649390 6.612558 -8.925200 -v 1.036580 66.667656 10.133511 -v 1.061979 72.214355 9.848311 -v 1.529281 60.205757 2.627210 -v 0.927681 62.686352 14.294110 -v -1.529319 60.205757 2.627210 -v -0.972719 62.686352 14.294110 -v -1.184121 76.179863 7.645412 -v 1.139179 76.179863 7.645412 -v -0.972221 75.089363 14.294112 -v 0.927679 75.089363 14.294112 -v -1.529311 16.093353 -2.627197 -v 1.529289 16.093353 2.627203 -v -2.142606 -14.558143 -3.716102 -v 2.140594 -14.558045 3.757898 -v -1.720207 -12.121847 10.746598 -v -1.720207 -12.121843 -10.704702 -v 1.139181 64.076454 7.645411 -v 1.529278 80.053459 2.627213 -v 0.927679 77.570061 14.294112 -v 1.034680 69.046356 10.996012 -v 0.983880 68.588959 12.429011 -v -1.106020 68.085754 9.848412 -v -1.079620 69.046356 10.996012 -v 0.985379 74.089958 11.566412 -v 1.036579 73.632652 10.133512 -v 1.061980 68.085754 9.848412 -v -1.529322 80.053459 -2.627187 -v 1.529278 80.053459 -2.627187 -v 3.046378 80.053459 0.000013 -v 0.958980 67.170853 12.714211 -v 0.958979 73.129257 12.714211 -v 0.927681 65.166954 14.294110 -v 1.305689 12.390854 -2.309598 -v -1.307611 16.093758 -2.313097 -v 1.306189 16.093758 -2.313097 -v 2.601588 16.093758 -0.071297 -v -1.305711 12.390854 -2.309598 -v 2.597689 12.390854 -0.071298 -v 1.305689 12.390854 2.166902 -v 1.306189 16.093758 2.170503 -v 1.649390 8.809359 -9.871498 -v 1.649390 8.294157 -11.965799 -v 1.705092 -7.352144 -13.915801 -v 1.705093 -7.819746 10.107899 -v 1.705093 -8.769546 15.108799 -v 1.705092 -7.352149 13.957599 -v 1.704592 -7.819743 -10.065901 -v 1.705093 -8.769540 -15.066901 -v 2.139593 -8.288245 -3.716101 -v 2.139593 -8.288247 3.757899 -v 1.649390 8.809355 9.913301 -v 1.649390 8.294153 12.007701 -v 1.649390 10.467658 8.669702 -v 1.649390 10.467660 -8.627798 -v 3.037589 12.390458 0.021002 -v 1.524889 12.390457 2.639502 -v 1.524889 12.390457 -2.597698 -v 4.281693 -8.288943 0.020999 -v -1.665010 10.467660 -8.627798 -v -1.665010 8.809359 -9.871498 -v -1.720207 -8.769540 -15.066901 -v -1.720208 -7.352145 -13.915801 -v -1.207010 8.431557 -2.066998 -v 1.206090 8.431458 -2.066998 -v -1.207008 -8.288944 -2.067001 -v 1.206092 -8.288944 -2.067001 -v 2.399890 8.431557 0.000001 -v 1.206990 8.431557 2.067001 -v 1.206993 -8.288944 2.066998 -v 2.399893 -8.288944 -0.000001 -v -1.720207 -7.819746 10.107899 -v -1.665010 8.294157 -11.965799 -v -0.972721 77.570061 14.294112 -v -1.529322 80.053459 2.627213 -v -1.184619 64.076553 7.645411 -v -1.003920 67.170853 12.714211 -v -1.028820 68.588959 12.429011 -v -1.003921 73.129257 12.714211 -v -1.030321 74.089958 11.566412 -v -1.081121 73.632652 10.133512 -v -3.045922 80.053459 0.000013 -v -0.972719 65.166954 14.294110 -v 0.000495 -22.774145 1.697996 -v 0.000495 -20.976345 -1.927203 -v 0.000495 -22.774145 -1.700904 -v 0.000494 -19.937145 1.871797 -v 0.000494 -19.937145 -1.737703 -v 0.000494 -20.144745 -2.947303 -v 0.000499 -47.680046 -4.987108 -v 0.000499 -49.005142 -4.438208 -v 0.000499 -46.354942 -4.438208 -v 0.000499 -49.554043 -3.113008 -v 0.000499 -45.806046 -3.113007 -v 0.000499 -51.044846 -3.174608 -v 0.000500 -53.289646 -2.244809 -v 0.000499 -49.277046 -2.442408 -v 0.000499 -48.529144 -1.590708 -v 0.000499 -47.680046 -1.239108 -v 0.000500 -53.289646 2.244792 -v 0.000499 -51.044846 3.174692 -v 0.000499 -49.277046 2.442392 -v 0.000499 -48.529144 1.590792 -v 0.000499 -47.680046 1.239392 -v 0.000499 -47.714043 4.987092 -v 0.000499 -46.354942 4.438192 -v 0.000499 -49.039043 4.438192 -v 0.000499 -45.840145 3.113193 -v 0.000494 -16.061146 -0.001603 -v 0.000494 -16.726246 -1.607103 -v 0.000494 -16.726246 1.603997 -v 0.000500 -54.219444 -0.000009 -v 0.000499 -47.870346 -0.000008 -v 0.000499 -46.620945 -0.000008 -v 0.000499 -47.145744 -0.908908 -v 0.000499 -47.145744 0.909092 -v 0.000495 -23.424345 1.348796 -v 0.000495 -23.424345 -1.351804 -v 0.000495 -25.358244 -2.087204 -v 0.000494 -19.613445 -3.808003 -v 0.000494 -19.579346 -2.664603 -v 0.000499 -49.554043 3.113192 -v 0.000499 -46.354942 1.788092 -v 0.000499 -46.354942 -1.788108 -v 0.000495 -25.358244 2.084096 -v 0.000496 -26.778345 -0.001604 -v 0.000499 -48.246143 -0.906508 -v 0.000499 -48.246143 0.906492 -v 0.000494 -18.331745 2.268997 -v 0.000494 -18.331745 -2.272103 -v -2.400410 8.431557 0.000001 -v -1.207008 -8.288944 2.066998 -v -1.207010 8.431557 2.067001 -v -2.400407 -8.288944 -0.000001 -v 0.000494 -20.168644 -4.072504 -v -2.899906 -15.940742 -0.410603 -v -2.899906 -15.940742 0.410597 -v -2.899906 -14.557644 -0.410602 -v -1.470706 -18.083046 0.410597 -v -1.470706 -18.083046 -0.410603 -v 1.459994 -18.083046 -0.410603 -v 1.459994 -18.083046 0.410597 -v 2.889194 -15.940742 -0.410603 -v 2.889194 -14.557644 -0.410602 -v 2.889194 -15.940742 0.410597 -v -2.899906 -14.557644 0.410598 -v 2.889194 -14.557644 0.410598 -v 1.550796 -29.672045 -0.000005 -v 1.550795 -25.299444 -0.000004 -v -1.550805 -25.299444 -0.000004 -v -1.550804 -29.672045 -0.000005 -v 0.000496 -32.619644 1.550895 -v 0.000496 -28.247044 1.550895 -v 0.000496 -32.619644 -1.550905 -v 1.550797 -35.621742 -0.000006 -v 1.550796 -31.249044 -0.000005 -v -1.550804 -31.249044 -0.000005 -v -1.550803 -35.621742 -0.000006 -v 0.000496 -28.247044 -1.550905 -v 1.550798 -41.731842 -0.000007 -v 1.550797 -37.359245 -0.000006 -v -1.550803 -37.359245 -0.000006 -v -1.550802 -41.731842 -0.000007 -v 0.000498 -40.423145 1.550893 -v 0.000498 -40.423145 -1.550907 -v 0.000498 -44.795746 -1.550907 -v 0.000497 -38.658943 1.550894 -v 0.000497 -34.286346 1.550894 -v 0.000497 -34.286346 -1.550906 -v 0.000497 -38.658943 -1.550906 -v 0.000498 -44.795746 1.550893 -v 1.550798 -43.489243 -0.000007 -v -1.550802 -43.489243 -0.000007 -v 1.550799 -47.861843 -0.000008 -v -1.550801 -47.861843 -0.000008 -v -1.720207 -8.769546 15.108799 -v -1.720208 -7.352149 13.957599 -v -2.142607 -8.288247 3.757899 -v -1.665010 8.294153 12.007701 -v -1.665010 8.809355 9.913301 -v -1.665010 10.467658 8.669702 -v -4.283207 -8.288247 0.020999 -v -1.525911 12.390457 2.639502 -v -2.142607 -8.288245 -3.716101 -v -1.720207 -7.819744 -10.065901 -v -3.037111 12.390456 0.021002 -v -1.525911 12.390457 -2.597698 -v -2.602111 16.093758 -0.071197 -v -2.598611 12.390854 -0.071198 -v -1.306211 12.390854 2.167002 -v -1.308611 16.093758 2.170503 -vt 0.2993 0.8378 -vt 0.3374 0.8956 -vt 0.3378 0.8378 -vt 0.2598 0.8378 -vt 0.2984 0.8956 -vt 0.2993 0.8378 -vt 0.2984 0.8956 -vt 0.6303 0.3235 -vt 0.7453 0.2678 -vt 0.6302 0.2653 -vt 0.5510 0.1828 -vt 0.6033 0.2747 -vt 0.5453 0.3046 -vt 0.6030 0.2131 -vt 0.7282 0.3654 -vt 0.8120 0.4852 -vt 0.7279 0.5311 -vt 0.8120 0.4039 -vt 0.7279 0.5311 -vt 0.8120 0.4852 -vt 0.7282 0.3654 -vt 0.8120 0.4852 -vt 0.4067 0.9954 -vt 0.3731 0.9954 -vt 0.3730 0.9282 -vt 0.4066 0.9282 -vt 0.5112 0.9282 -vt 0.6280 0.8098 -vt 0.6529 0.8893 -vt 0.6303 0.8893 -vt 0.5916 0.8098 -vt 0.5915 0.8893 -vt 0.4067 0.9954 -vt 0.5112 0.9282 -vt 0.4066 0.9282 -vt 0.3730 0.9282 -vt 0.6280 0.8098 -vt 0.5916 0.8098 -vt 0.5915 0.8893 -vt 0.6303 0.8893 -vt 0.6529 0.8893 -vt 0.3731 0.9954 -vt 0.2578 0.8956 -vt 0.7436 0.3210 -vt 0.6906 0.5376 -vt 0.4299 0.5217 -vt 0.6883 0.4808 -vt 0.4291 0.4868 -vt 0.7963 0.1819 -vt 0.7997 0.2354 -vt 0.6235 0.1868 -vt 0.6275 0.2301 -vt 0.6030 0.2131 -vt 0.6033 0.2747 -vt 0.8120 0.4039 -vt 0.8120 0.4039 -vt 0.8349 0.8880 -vt 0.6946 0.8879 -vt 0.8295 0.8120 -vt 0.6978 0.8142 -vt 0.6505 0.8098 -vt 0.5109 0.9953 -vt 0.8120 0.4852 -vt 0.5109 0.9953 -vt 0.6505 0.8098 -vt 0.6978 0.8142 -vt 0.6946 0.8879 -vt 0.8295 0.8120 -vt 0.8349 0.8880 -vt 0.8120 0.4039 -vt 0.5057 0.5795 -vt 0.5706 0.6626 -vt 0.5473 0.7720 -vt 0.6711 0.6307 -vt 0.8359 0.5793 -vt 0.7722 0.6626 -vt 0.7983 0.7742 -vt 0.6535 0.7178 -vt 0.6455 0.7411 -vt 0.6062 0.7273 -vt 0.6137 0.7035 -vt 0.4557 0.8378 -vt 0.4159 0.8378 -vt 0.4133 0.8959 -vt 0.2578 0.8956 -vt 0.7375 0.7272 -vt 0.6975 0.7411 -vt 0.6903 0.7178 -vt 0.7297 0.7035 -vt 0.6373 0.6988 -vt 0.7061 0.6988 -vt 0.9941 0.1040 -vt 0.0048 0.0550 -vt 0.0049 0.1037 -vt 0.9990 0.1575 -vt 0.9948 0.0541 -vt 0.0049 0.1575 -vt 0.0049 0.1037 -vt 0.9941 0.1040 -vt 0.6208 0.7448 -vt 0.7199 0.7448 -vt 0.4525 0.8959 -vt 0.2598 0.8378 -vt 0.5875 0.7708 -vt 0.7569 0.7742 -vt 0.3745 0.4734 -vt 0.2935 0.4157 -vt 0.2940 0.4729 -vt 0.2955 0.5311 -vt 0.3740 0.4158 -vt 0.3761 0.5311 -vt 0.3745 0.4734 -vt 0.2940 0.4729 -vt 0.3925 0.6336 -vt 0.4324 0.6166 -vt 0.4122 0.6530 -vt 0.4230 0.5789 -vt 0.1391 0.5439 -vt 0.1313 0.6157 -vt 0.1134 0.5232 -vt 0.0676 0.5314 -vt 0.1391 0.5439 -vt 0.3925 0.6336 -vt 0.1313 0.6157 -vt 0.1134 0.5232 -vt 0.0676 0.5314 -vt 0.0434 0.5706 -vt 0.0526 0.6013 -vt 0.0084 0.7275 -vt 0.1222 0.7277 -vt 0.0084 0.7275 -vt 0.1222 0.7277 -vt 0.0526 0.6013 -vt 0.0434 0.5706 -vt 0.4324 0.6166 -vt 0.4230 0.5789 -vt 0.4622 0.6385 -vt 0.4122 0.6530 -vt 0.4251 0.7463 -vt 0.4622 0.6385 -vt 0.4251 0.7463 -vt 0.0044 0.9947 -vt 0.0821 0.9902 -vt 0.0044 0.8818 -vt 0.0821 0.9902 -vt 0.1094 0.9954 -vt 0.0044 0.9947 -vt 0.0822 0.8786 -vt 0.0044 0.8818 -vt 0.0822 0.8786 -vt 0.6753 0.9954 -vt 0.6414 0.9282 -vt 0.6413 0.9954 -vt 0.6754 0.9282 -vt 0.5237 0.8892 -vt 0.5253 0.8096 -vt 0.4890 0.8096 -vt 0.2293 0.2270 -vt 0.2295 0.2702 -vt 0.5152 0.2276 -vt 0.5163 0.2704 -vt 0.2305 0.3126 -vt 0.2295 0.2702 -vt 0.5163 0.2704 -vt 0.5183 0.3126 -vt 0.0822 0.8786 -vt 0.1094 0.9282 -vt 0.4969 0.7465 -vt 0.0821 0.9902 -vt 0.0821 0.9902 -vt 0.4969 0.7465 -vt 0.4866 0.8892 -vt 0.7124 0.9282 -vt 0.7123 0.9954 -vt 0.9884 0.9282 -vt 0.9882 0.9953 -vt 0.0822 0.8786 -vt 0.7722 0.6626 -vt 0.7983 0.7742 -vt 0.8359 0.5793 -vt 0.6711 0.6307 -vt 0.5057 0.5795 -vt 0.5706 0.6626 -vt 0.5473 0.7720 -vt 0.3378 0.8378 -vt 0.3374 0.8956 -vt 0.3757 0.8378 -vt 0.3740 0.8959 -vt 0.3740 0.8959 -vt 0.3757 0.8378 -vt 0.4133 0.8959 -vt 0.6535 0.7178 -vt 0.6062 0.7273 -vt 0.6455 0.7411 -vt 0.6137 0.7035 -vt 0.7375 0.7272 -vt 0.6903 0.7178 -vt 0.6975 0.7411 -vt 0.7297 0.7035 -vt 0.4159 0.8378 -vt 0.4557 0.8378 -vt 0.6373 0.6988 -vt 0.7061 0.6988 -vt 0.7453 0.2678 -vt 0.9990 0.0049 -vt 0.0047 0.0049 -vt 0.9948 0.0541 -vt 0.0048 0.0550 -vt 0.5510 0.1828 -vt 0.5453 0.3046 -vt 0.6030 0.2131 -vt 0.6033 0.2747 -vt 0.6208 0.7448 -vt 0.7199 0.7448 -vt 0.6235 0.1868 -vt 0.6275 0.2301 -vt 0.7997 0.2354 -vt 0.7963 0.1819 -vt 0.7453 0.2678 -vt 0.6302 0.2653 -vt 0.6303 0.3235 -vt 0.7436 0.3210 -vt 0.2239 0.8402 -vt 0.1576 0.8402 -vt 0.1569 0.9021 -vt 0.2229 0.9021 -vt 0.4525 0.8959 -vt 0.7436 0.3210 -vt 0.7569 0.7742 -vt 0.5875 0.7708 -vt 0.2239 0.8402 -vt 0.1576 0.8402 -vt 0.1569 0.9021 -vt 0.2229 0.9021 -vt 0.7453 0.2678 -vt 0.7436 0.3210 -vt 0.6303 0.3235 -vt 0.6302 0.2653 -vt 0.6954 0.3662 -vt 0.4075 0.3775 -vt 0.4057 0.4208 -vt 0.6905 0.4361 -vt 0.6033 0.2747 -vt 0.6030 0.2131 -vt 0.9597 0.4074 -vt 0.8500 0.3675 -vt 0.8461 0.4042 -vt 0.9776 0.3084 -vt 0.8542 0.3088 -vt 0.7983 0.3271 -vt 0.1993 0.2423 -vt 0.1777 0.2960 -vt 0.1777 0.1878 -vt 0.1256 0.3176 -vt 0.1256 0.1662 -vt 0.1281 0.3781 -vt 0.0915 0.4692 -vt 0.0993 0.3064 -vt 0.0658 0.2760 -vt 0.0520 0.2416 -vt 0.0915 0.4692 -vt 0.1281 0.3781 -vt 0.0993 0.3064 -vt 0.0658 0.2760 -vt 0.0520 0.2416 -vt 0.1993 0.2423 -vt 0.1777 0.1878 -vt 0.1777 0.2960 -vt 0.1256 0.1662 -vt 0.9136 0.1755 -vt 0.8587 0.1984 -vt 0.9684 0.1982 -vt 0.0032 0.5070 -vt 0.1588 0.4820 -vt 0.1588 0.3472 -vt 0.2570 0.4039 -vt 0.2570 0.4039 -vt 0.9597 0.4282 -vt 0.8570 0.4265 -vt 0.8381 0.4951 -vt 0.7887 0.2862 -vt 0.8196 0.2894 -vt 0.1256 0.3176 -vt 0.0735 0.1878 -vt 0.0735 0.1878 -vt 0.0032 0.2493 -vt 0.9848 0.4944 -vt 0.9136 0.5436 -vt 0.2570 0.5226 -vt 0.2570 0.5226 -vt 0.9911 0.2533 -vt 0.8359 0.2537 -vt 0.2303 0.1856 -vt 0.5152 0.2276 -vt 0.2293 0.2270 -vt 0.5181 0.1856 -vt 0.7722 0.3082 -vt 0.8693 0.6185 -vt 0.9137 0.6184 -vt 0.8693 0.5778 -vt 0.9137 0.6928 -vt 0.8693 0.6928 -vt 0.9137 0.6928 -vt 0.9137 0.7745 -vt 0.8693 0.6928 -vt 0.8692 0.7743 -vt 0.9137 0.8469 -vt 0.9137 0.8871 -vt 0.8692 0.8467 -vt 0.9137 0.5776 -vt 0.8692 0.8868 -vt 0.3655 0.8041 -vt 0.1593 0.8041 -vt 0.1597 0.6581 -vt 0.3667 0.6586 -vt 0.3667 0.6586 -vt 0.1597 0.6581 -vt 0.3655 0.8041 -vt 0.3655 0.8041 -vt 0.1593 0.8041 -vt 0.1597 0.6581 -vt 0.3667 0.6586 -vt 0.1593 0.8041 -vt 0.3655 0.8041 -vt 0.1593 0.8041 -vt 0.1597 0.6581 -vt 0.3667 0.6586 -vt 0.1597 0.6581 -vt 0.1593 0.8041 -vt 0.3655 0.8041 -vt 0.3667 0.6586 -vt 0.1597 0.6581 -vt 0.1593 0.8041 -vt 0.3655 0.8041 -vt 0.3667 0.6586 -vt 0.1593 0.8041 -vt 0.1597 0.6581 -vt 0.3655 0.8041 -vt 0.3667 0.6586 -vt 0.1134 0.5232 -vt 0.1391 0.5439 -vt 0.1313 0.6157 -vt 0.0676 0.5314 -vt 0.0434 0.5706 -vt 0.0526 0.6013 -vt 0.0084 0.7275 -vt 0.1222 0.7277 -vt 0.3925 0.6336 -vt 0.4230 0.5789 -vt 0.4324 0.6166 -vt 0.4622 0.6385 -vt 0.4122 0.6530 -vt 0.4251 0.7463 -vt 0.7279 0.5311 -vt 0.7282 0.3654 -vt 0.8120 0.4039 -vt 0.7123 0.9954 -vt 0.7124 0.9282 -vt 0.9884 0.9282 -vt 0.6753 0.9954 -vt 0.5253 0.8096 -vt 0.5237 0.8892 -vt 0.4890 0.8096 -vt 0.6754 0.9282 -vt 0.6413 0.9954 -vt 0.6414 0.9282 -vt 0.5112 0.9282 -vt 0.0044 0.9947 -vt 0.0044 0.8818 -vt 0.0821 0.9902 -vt 0.8120 0.4852 -vt 0.0047 0.7699 -vt 0.1201 0.7768 -vt 0.1192 0.8320 -vt 0.0047 0.8390 -vt 0.9882 0.9953 -vt 0.4866 0.8892 -vt 0.4969 0.7465 -vt 0.5109 0.9953 -vt 0.0822 0.8786 -vt 0.4622 0.6385 -vt 0.4122 0.6530 -vt 0.4251 0.7463 -vt 0.4324 0.6166 -vt 0.3925 0.6336 -vt 0.4230 0.5789 -vt 0.1391 0.5439 -vt 0.0084 0.7275 -vt 0.1222 0.7277 -vt 0.1313 0.6157 -vt 0.0526 0.6013 -vt 0.0434 0.5706 -vt 0.1134 0.5232 -vt 0.8120 0.4852 -vt 0.7279 0.5311 -vt 0.7282 0.3654 -vt 0.8120 0.4039 -vt 0.8120 0.4852 -vt 0.0044 0.9947 -vt 0.0044 0.8818 -vt 0.0822 0.8786 -vt 0.0821 0.9902 -vt 0.0822 0.8786 -vt 0.5112 0.9282 -vt 0.1094 0.9954 -vt 0.0676 0.5314 -vt 0.8120 0.4852 -vt 0.0821 0.9902 -vt 0.8120 0.4039 -vt 0.0821 0.9902 -vt 0.5109 0.9953 -vt 0.4969 0.7465 -vt 0.0047 0.7699 -vt 0.0047 0.8390 -vt 0.1192 0.8320 -vt 0.1201 0.7768 -vt 0.1094 0.9282 -vt 0.0822 0.8786 -vt 0.8120 0.4039 -vt 0.2953 0.3610 -vt 0.3759 0.3610 -vt 0.3740 0.4158 -vt 0.2935 0.4157 -vn 0.0000 -0.9527 0.3040 -vn 0.0000 -0.9526 -0.3042 -vn -0.0000 -0.8924 0.4512 -vn 0.0000 -1.0000 -0.0000 -vn 0.0000 -1.0000 0.0001 -vn 0.0000 -0.7090 -0.7052 -vn 0.0000 -0.7089 -0.7053 -vn 0.0000 -0.9903 -0.1388 -vn 0.0000 -0.9590 -0.2833 -vn 0.0000 -0.8539 0.5204 -vn -0.0000 -0.9903 0.1388 -vn -0.0000 -0.7090 0.7052 -vn -0.0000 -0.7090 0.7053 -vn 0.0000 -0.8539 -0.5204 -vn 0.0000 -0.9590 0.2833 -vn 0.0000 -0.9781 0.2080 -vn 0.0000 -0.9868 -0.1619 -vn 0.0000 -0.9443 0.3292 -vn 0.0000 -1.0000 -0.0001 -vn 0.0000 -0.9443 -0.3292 -vn 0.9980 0.0468 0.0415 -vn 0.9975 0.0091 0.0705 -vn 0.9950 0.0000 0.0994 -vn 0.9975 -0.0091 0.0705 -vn 0.9980 -0.0467 0.0415 -vn 0.9994 -0.0111 0.0324 -vn 0.9994 -0.0111 0.0319 -vn 0.9994 -0.0111 0.0322 -vn 0.9994 -0.0111 0.0330 -vn 0.0000 0.7668 -0.6419 -vn -0.0000 -0.7669 -0.6417 -vn 0.9994 0.0112 0.0323 -vn 0.9994 0.0111 0.0324 -vn 0.9994 0.0112 0.0324 -vn 0.9994 0.0113 0.0322 -vn 0.9994 -0.0112 0.0332 -vn 0.9987 -0.0079 0.0495 -vn 0.9994 0.0114 0.0325 -vn 0.9988 0.0080 0.0493 -vn 0.0000 0.0000 -1.0000 -vn 0.8659 0.0000 -0.5002 -vn 0.8660 0.0000 -0.5001 -vn 0.8660 0.0000 0.5001 -vn 0.8659 0.0000 0.5002 -vn 0.9994 0.0111 0.0322 -vn -0.0000 -0.7669 -0.6418 -vn 0.9993 -0.0014 0.0376 -vn 0.9995 0.0000 0.0318 -vn 0.9993 0.0014 0.0376 -vn 0.0000 -0.0009 -1.0000 -vn 0.8658 -0.0006 -0.5003 -vn 0.8661 -0.0009 -0.4999 -vn 0.8660 -0.0008 0.5001 -vn 0.8661 -0.0009 0.4999 -vn 0.8659 -0.0007 0.5002 -vn 0.8658 -0.0006 0.5003 -vn 1.0000 -0.0001 -0.0001 -vn 1.0000 0.0000 -0.0002 -vn 1.0000 -0.0001 -0.0005 -vn 1.0000 -0.0000 0.0000 -vn 1.0000 0.0034 0.0016 -vn 1.0000 0.0033 0.0018 -vn 1.0000 0.0037 0.0009 -vn 1.0000 0.0037 -0.0009 -vn 1.0000 0.0036 -0.0012 -vn 1.0000 0.0038 -0.0005 -vn 1.0000 -0.0000 0.0001 -vn 1.0000 -0.0001 0.0001 -vn 1.0000 0.0002 -0.0003 -vn 0.9982 0.0089 -0.0590 -vn 0.9977 0.0000 -0.0683 -vn 0.9977 0.0002 0.0683 -vn 0.9982 0.0088 0.0591 -vn 1.0000 0.0004 0.0002 -vn 1.0000 0.0003 0.0002 -vn 1.0000 0.0004 0.0001 -vn 1.0000 0.0034 -0.0015 -vn 1.0000 0.0003 0.0003 -vn 0.9997 0.0069 -0.0230 -vn 1.0000 0.0003 -0.0003 -vn 0.9997 0.0069 0.0228 -vn 0.8660 0.0001 -0.5001 -vn 0.0001 -0.0788 -0.9969 -vn 0.0000 -0.0788 -0.9969 -vn 0.8676 0.0001 0.4972 -vn 0.8677 0.0000 0.4972 -vn 0.8677 -0.0001 0.4971 -vn 0.8676 -0.0000 -0.4972 -vn 0.8676 -0.0000 -0.4973 -vn 0.8676 -0.0001 -0.4972 -vn 0.0000 0.6000 -0.8000 -vn 0.0000 -0.1784 -0.9840 -vn 0.0000 0.6304 -0.7763 -vn 0.8659 0.0000 -0.5001 -vn 0.8661 0.0000 0.4998 -vn 0.9998 0.0000 -0.0206 -vn 0.8676 0.0001 0.4973 -vn 0.9998 0.0003 0.0206 -vn 0.0000 0.1237 -0.9923 -vn 1.0000 0.0038 0.0006 -vn 0.8661 0.0002 -0.4999 -vn -0.9985 -0.0377 0.0396 -vn -0.9980 -0.0068 0.0634 -vn -0.9964 -0.0000 0.0851 -vn -0.9980 0.0068 0.0633 -vn -0.9985 0.0375 0.0397 -vn 0.0000 0.1972 0.9804 -vn 0.0000 -0.7668 0.6419 -vn 0.0000 0.9526 0.3041 -vn 0.0000 -0.1972 0.9804 -vn 0.0000 0.7668 0.6418 -vn -0.9994 -0.0112 0.0321 -vn -0.9994 -0.0113 0.0317 -vn -0.9994 -0.0111 0.0325 -vn -0.9994 0.0111 0.0321 -vn -0.9994 0.0111 0.0322 -vn -0.9994 0.0111 0.0319 -vn 0.0000 0.9527 -0.3040 -vn -0.9994 -0.0111 0.0323 -vn -0.9987 -0.0076 0.0495 -vn -0.9988 0.0076 0.0492 -vn -0.0000 0.8962 0.4436 -vn -0.8661 -0.0000 -0.4999 -vn -0.8661 -0.0000 0.4999 -vn 0.0000 -0.0000 1.0000 -vn 0.0000 1.0000 0.0000 -vn -0.9994 -0.0112 0.0315 -vn 0.0000 0.9868 -0.1619 -vn 0.0000 0.9868 -0.1618 -vn -0.9993 -0.0012 0.0379 -vn -0.0000 -0.6926 0.7213 -vn -0.9993 0.0013 0.0378 -vn -0.9995 -0.0002 0.0318 -vn -0.9995 0.0000 0.0319 -vn 0.0000 0.6988 0.7154 -vn 0.0000 0.9781 0.2082 -vn -1.0000 -0.0000 -0.0000 -vn -0.8660 -0.0000 -0.5000 -vn -0.8660 -0.0000 0.5000 -vn -0.8319 -0.5550 0.0000 -vn 0.8319 -0.5550 0.0000 -vn -0.9983 0.0085 0.0574 -vn -0.9978 -0.0000 0.0664 -vn -1.0000 0.0033 -0.0018 -vn -1.0000 0.0036 -0.0009 -vn -1.0000 0.0035 -0.0014 -vn -0.9996 0.0074 -0.0257 -vn 0.0001 1.0000 0.0000 -vn 0.0001 1.0000 -0.0001 -vn 0.0000 0.1237 0.9923 -vn 0.0000 0.9711 0.2389 -vn 0.0000 0.6304 0.7762 -vn 0.0000 -0.1784 0.9840 -vn 0.0000 0.6000 0.8000 -vn 0.0000 0.9527 0.3038 -vn -0.8677 -0.0000 0.4971 -vn 0.0000 1.0000 -0.0002 -vn -0.0000 0.9973 -0.0736 -vn -1.0000 0.0038 -0.0005 -vn -0.9997 -0.0003 -0.0231 -vn -0.9996 0.0071 0.0255 -vn -1.0000 0.0000 0.0002 -vn -1.0000 -0.0001 0.0001 -vn -1.0000 -0.0000 0.0001 -vn -1.0000 0.0001 0.0002 -vn -1.0000 0.0033 0.0018 -vn -1.0000 0.0035 0.0014 -vn -1.0000 0.0036 0.0010 -vn -0.9978 -0.0000 -0.0664 -vn -0.9983 0.0085 -0.0574 -vn -1.0000 0.0038 0.0005 -vn 0.0001 1.0000 0.0001 -vn -0.8661 -0.0001 0.5000 -vn -0.8660 -0.0000 0.5001 -vn -0.8660 -0.0001 0.5000 -vn -0.8661 -0.0000 -0.4998 -vn -0.8677 -0.0000 -0.4970 -vn 0.0000 0.9527 -0.3038 -vn 0.0000 0.9710 -0.2389 -vn -0.0000 -0.0788 0.9969 -vn -0.8661 -0.0002 0.4999 -vn -0.9997 -0.0000 0.0231 -vn -0.0000 0.9973 0.0736 -vn -0.8660 -0.0009 -0.5000 -vn -0.8660 -0.0009 -0.5001 -vn -0.8659 -0.0008 -0.5002 -vn -0.8660 -0.0008 0.5001 -vn 0.0000 -0.0010 1.0000 -vn -0.8661 -0.0010 0.4998 -vn 0.0000 -0.0009 1.0000 -usemtl Material__65 -f 1/1/1 2/2/1 3/3/1 -f 4/4/2 5/5/2 6/6/2 -f 7/7/1 2/2/1 1/1/1 -f 8/8/3 9/9/3 10/10/3 -f 11/11/4 12/12/4 13/13/4 -f 14/14/4 11/11/4 13/13/4 -f 15/15/4 16/16/5 17/17/4 -f 18/18/4 15/15/4 17/17/4 -f 19/19/4 20/20/4 21/21/4 -f 22/22/4 19/19/4 21/21/4 -f 23/23/6 24/24/6 25/25/7 -f 23/23/6 25/25/7 26/26/7 -f 27/27/8 23/23/8 26/26/8 -f 28/28/9 29/29/9 30/30/9 -f 31/31/10 28/28/10 30/30/10 -f 31/31/10 30/30/10 32/32/10 -f 33/33/11 34/34/11 35/35/11 -f 36/36/12 33/33/12 35/35/13 -f 37/37/14 38/38/14 39/39/14 -f 37/37/14 39/39/14 40/40/14 -f 41/41/15 37/37/15 40/40/15 -f 42/42/12 33/33/12 36/36/12 -f 43/43/2 5/5/2 4/4/2 -f 44/44/3 9/9/3 8/8/3 -f 45/45/16 46/46/16 47/47/16 -f 48/48/16 47/47/16 46/46/16 -f 49/49/17 50/50/17 51/51/17 -f 52/52/17 51/51/17 50/50/17 -f 53/53/4 12/12/4 11/11/4 -f 54/54/4 14/14/4 13/13/4 -f 55/55/4 16/16/5 15/15/4 -f 27/56/4 21/21/4 20/20/4 -f 56/57/18 29/58/18 18/59/18 -f 57/60/18 18/59/18 29/58/18 -f 57/61/9 29/29/9 28/28/9 -f 20/62/8 23/23/8 27/27/8 -f 56/63/19 18/18/4 17/17/4 -f 22/64/11 34/34/11 33/33/11 -f 58/65/15 37/37/15 41/41/15 -f 58/66/20 41/67/20 55/68/20 -f 16/69/20 55/68/20 41/67/20 -f 34/70/4 22/22/4 21/21/4 -f 45/71/21 59/72/21 46/73/21 -f 8/74/22 59/72/22 45/71/22 -f 60/75/23 8/74/23 45/71/23 -f 50/76/24 8/74/24 60/75/24 -f 61/77/25 50/76/25 60/75/25 -f 62/78/26 63/79/27 5/80/28 -f 43/81/29 62/78/26 5/80/28 -f 64/82/30 65/83/30 62/84/30 -f 44/85/31 7/7/31 1/1/31 -f 66/86/32 2/87/33 7/88/34 -f 67/89/35 66/86/32 7/88/34 -f 68/90/36 62/78/26 43/81/29 -f 59/72/37 68/90/37 43/81/37 -f 67/89/35 7/88/34 44/91/38 -f 50/76/39 67/89/39 44/91/39 -f 12/92/40 69/93/40 70/94/40 -f 13/95/41 12/92/41 70/94/42 -f 69/93/40 12/92/40 53/96/40 -f 71/97/43 60/98/43 54/99/44 -f 72/100/27 5/80/28 63/79/27 -f 73/101/45 2/87/33 66/86/32 -f 68/102/30 64/82/30 62/84/30 -f 9/103/46 44/85/31 1/1/31 -f 8/74/47 68/90/47 59/72/47 -f 74/104/48 46/73/48 59/72/48 -f 8/74/49 50/76/49 44/91/49 -f 52/105/48 50/76/48 61/77/48 -f 71/97/42 13/95/41 70/94/42 -f 13/95/44 71/97/43 54/99/44 -f 75/106/50 76/107/50 77/108/50 -f 78/109/51 75/106/51 77/108/51 -f 76/107/50 75/106/50 79/110/50 -f 80/111/52 75/106/52 78/109/52 -f 81/112/53 80/111/54 78/109/55 -f 81/112/53 78/109/55 82/113/56 -f 42/114/57 83/115/58 33/116/59 -f 84/117/60 83/115/58 42/114/57 -f 85/118/61 84/117/62 42/114/63 -f 86/119/60 87/120/60 32/121/60 -f 88/122/60 87/120/60 86/119/60 -f 24/123/64 88/122/65 86/119/66 -f 89/124/60 90/125/67 85/118/68 -f 39/126/67 90/125/67 89/124/60 -f 40/127/60 39/126/67 89/124/60 -f 89/124/60 41/128/69 40/127/60 -f 16/129/70 41/128/70 89/124/70 -f 91/130/71 16/129/71 89/124/71 -f 56/131/72 92/132/72 86/119/72 -f 29/133/73 56/131/73 86/119/73 -f 30/134/60 29/133/60 86/119/60 -f 32/121/60 30/134/60 86/119/60 -f 24/123/74 93/135/75 94/136/76 -f 88/122/65 24/123/64 94/136/77 -f 95/137/78 93/135/75 23/138/78 -f 20/139/79 95/137/79 23/138/79 -f 33/116/59 83/115/58 96/140/80 -f 22/141/81 33/116/81 96/140/81 -f 97/142/44 98/143/44 19/144/44 -f 99/145/82 97/142/41 19/144/82 -f 24/24/83 86/146/84 25/25/83 -f 100/147/85 56/148/86 17/149/87 -f 16/150/88 100/147/89 17/149/90 -f 83/151/91 101/152/91 96/153/91 -f 102/154/91 101/152/91 83/151/91 -f 38/38/92 90/155/92 39/39/92 -f 90/155/92 38/38/92 103/156/92 -f 104/157/93 90/155/93 103/156/93 -f 105/158/40 106/159/40 107/160/40 -f 108/161/40 107/160/40 106/159/40 -f 109/162/94 108/161/94 106/159/94 -f 109/162/95 110/163/95 111/164/95 -f 109/162/95 111/164/95 112/165/95 -f 108/161/94 109/162/94 112/165/94 -f 93/135/75 24/123/74 23/138/78 -f 20/166/44 19/144/44 98/143/44 -f 113/167/84 25/25/83 86/146/84 -f 98/168/96 95/137/96 20/139/96 -f 92/169/97 56/148/86 100/147/85 -f 91/170/89 100/147/89 16/150/88 -f 99/171/98 22/141/98 96/140/98 -f 85/172/93 90/155/93 104/157/93 -f 114/173/99 84/174/99 104/175/99 -f 85/176/99 104/175/99 84/174/99 -f 89/124/100 85/118/61 42/114/63 -f 22/177/101 99/145/82 19/144/82 -f 49/178/102 115/179/102 116/180/102 -f 116/180/103 10/181/103 49/178/103 -f 10/181/104 116/180/104 47/182/104 -f 47/182/105 117/183/105 10/181/105 -f 117/183/106 47/182/106 48/184/106 -f 118/185/107 72/186/107 119/187/107 -f 72/186/108 118/185/108 6/6/108 -f 63/188/107 119/187/107 72/186/107 -f 119/187/109 63/188/109 65/83/109 -f 3/3/110 2/2/110 73/189/110 -f 73/189/110 120/190/110 3/3/110 -f 120/190/111 73/189/111 66/191/111 -f 6/6/108 5/5/108 72/186/108 -f 65/192/112 6/193/112 119/194/113 -f 6/193/112 65/192/112 4/195/114 -f 62/84/109 65/83/109 63/188/109 -f 121/196/115 1/197/115 3/198/116 -f 1/197/115 121/196/115 122/199/117 -f 66/191/111 121/200/111 120/190/111 -f 121/200/118 66/191/118 122/201/118 -f 64/202/119 4/195/114 65/192/112 -f 4/195/120 64/202/120 117/183/120 -f 122/199/117 9/203/117 1/197/115 -f 9/203/121 122/199/121 49/178/121 -f 8/8/122 10/10/122 64/204/122 -f 69/93/123 53/96/123 11/205/123 -f 11/205/123 123/206/123 69/93/123 -f 123/206/124 11/205/124 14/207/124 -f 14/207/124 116/208/124 123/206/124 -f 116/208/125 14/207/125 54/99/125 -f 123/209/126 71/210/126 69/211/126 -f 71/210/126 123/209/126 60/212/126 -f 54/99/125 60/98/125 116/208/125 -f 6/193/112 118/213/127 119/194/113 -f 3/198/116 120/214/116 121/196/115 -f 124/215/128 74/216/128 59/217/129 -f 59/217/129 117/218/129 124/215/128 -f 64/202/130 10/181/130 117/183/130 -f 4/219/131 117/220/131 59/221/131 -f 59/221/131 43/222/131 4/219/131 -f 124/223/125 48/224/125 46/225/125 -f 46/225/125 74/226/125 124/223/125 -f 49/178/132 10/181/132 9/203/132 -f 66/191/118 67/227/118 122/201/118 -f 64/204/122 68/228/122 8/8/122 -f 49/178/133 51/229/133 115/179/133 -f 48/184/134 124/230/134 117/183/134 -f 115/231/125 51/232/125 52/233/125 -f 52/233/125 61/234/125 115/231/125 -f 122/235/135 67/236/135 50/237/135 -f 50/237/135 49/238/135 122/235/135 -f 116/239/136 115/240/136 61/241/136 -f 61/241/136 60/242/136 116/239/136 -f 71/210/126 70/243/126 69/211/126 -f 123/209/126 116/244/126 60/212/126 -f 125/245/137 126/246/137 127/247/137 -f 126/246/137 125/245/137 128/248/137 -f 128/248/137 129/249/137 126/246/137 -f 130/250/137 126/246/137 129/249/137 -f 131/251/137 132/252/137 133/253/137 -f 134/254/137 135/255/137 132/252/137 -f 133/253/137 132/252/137 135/255/137 -f 136/256/137 137/257/137 138/258/137 -f 139/259/137 138/258/137 137/257/137 -f 138/258/137 139/259/137 140/260/137 -f 141/261/137 142/262/137 143/263/137 -f 143/263/137 144/264/137 141/261/137 -f 144/264/137 143/263/137 145/265/137 -f 146/266/137 147/267/137 148/268/137 -f 149/269/137 148/268/137 147/267/137 -f 150/270/137 151/271/137 152/272/137 -f 153/273/137 141/261/137 144/264/137 -f 154/274/137 155/275/137 156/276/137 -f 155/275/137 154/274/137 157/277/137 -f 158/278/137 159/279/137 160/280/137 -f 159/279/137 158/278/137 127/247/137 -f 161/281/137 130/250/137 162/282/137 -f 148/268/137 149/269/137 163/283/137 -f 149/269/137 164/284/137 143/263/137 -f 135/255/137 138/258/137 165/285/137 -f 153/273/137 154/286/137 139/259/137 -f 154/286/137 153/273/137 144/264/137 -f 166/287/137 160/280/137 167/288/137 -f 160/280/137 166/287/137 158/278/137 -f 156/276/137 168/289/137 154/274/137 -f 169/290/137 157/277/137 154/274/137 -f 129/249/137 128/248/137 170/291/137 -f 170/291/137 171/292/137 129/249/137 -f 171/292/137 170/291/137 151/271/137 -f 105/158/138 107/160/138 172/293/138 -f 111/164/125 110/163/125 173/294/125 -f 174/295/125 173/294/125 110/163/125 -f 173/294/139 174/295/139 172/293/139 -f 172/293/139 175/296/139 173/294/139 -f 175/296/138 172/293/138 107/160/138 -f 161/281/137 176/297/137 130/250/137 -f 125/245/137 127/247/137 158/278/137 -f 135/255/137 134/254/137 138/258/137 -f 139/259/137 137/257/137 153/273/137 -f 177/298/137 178/299/137 179/300/137 -f 178/299/140 177/298/140 180/301/140 -f 181/302/140 180/301/140 177/298/140 -f 181/303/4 182/304/4 180/305/4 -f 183/306/4 180/305/4 182/304/4 -f 182/304/141 184/307/141 183/306/141 -f 184/307/60 185/308/60 186/309/60 -f 186/309/141 183/306/141 184/307/141 -f 170/291/137 152/272/137 151/271/137 -f 129/249/137 162/282/137 130/250/137 -f 143/263/137 163/283/137 149/269/137 -f 143/263/137 164/284/137 145/265/137 -f 140/260/137 165/285/137 138/258/137 -f 178/299/137 187/310/137 179/300/137 -f 186/309/60 185/308/60 188/311/60 -f 189/312/125 190/313/125 191/314/125 -f 191/314/125 192/315/125 189/312/125 -f 193/316/137 194/317/137 195/318/137 -f 196/319/125 197/320/125 198/321/125 -f 198/321/125 199/322/125 196/319/125 -f 194/317/137 200/323/137 195/318/137 -f 201/324/125 202/325/125 203/326/125 -f 203/326/125 204/327/125 201/324/125 -f 205/328/137 206/329/137 207/330/137 -f 208/331/137 209/332/137 210/333/137 -f 210/333/137 211/334/137 208/331/137 -f 207/330/137 212/335/137 205/328/137 -f 213/336/125 214/337/125 215/338/125 -f 216/339/125 215/338/125 214/337/125 -f 217/340/137 218/341/137 113/342/137 -f 113/342/137 31/343/137 217/340/137 -f 31/343/137 113/342/137 28/344/137 -f 57/345/137 28/344/137 113/342/137 -f 113/342/142 18/346/142 57/345/142 -f 18/346/143 113/342/143 219/347/143 -f 25/348/137 220/349/137 221/350/137 -f 220/349/144 25/348/145 218/341/146 -f 222/351/137 26/352/137 221/350/137 -f 26/352/147 222/351/147 27/353/147 -f 100/354/148 223/355/148 219/356/149 -f 94/357/150 220/358/150 218/359/150 -f 220/358/151 94/357/151 93/360/151 -f 217/361/152 87/362/152 218/363/152 -f 87/362/153 217/361/153 31/31/153 -f 93/360/151 221/364/151 220/358/151 -f 221/364/154 93/360/154 95/365/154 -f 31/31/153 32/32/153 87/362/153 -f 95/365/154 222/366/154 221/364/154 -f 222/366/155 95/365/155 224/367/155 -f 223/368/156 15/369/156 219/370/156 -f 25/348/137 221/350/137 26/352/137 -f 219/356/149 92/371/157 100/354/148 -f 219/372/158 113/373/158 86/374/158 -f 86/374/158 92/375/158 219/372/158 -f 218/359/150 88/376/150 94/357/150 -f 87/362/152 88/377/152 218/363/152 -f 25/348/145 113/342/159 218/341/146 -f 222/351/160 224/378/160 27/353/160 -f 95/365/155 98/379/155 224/367/155 -f 15/369/156 18/380/156 219/370/156 -f 101/381/161 35/382/161 34/383/161 -f 35/382/162 101/381/163 102/384/164 -f 102/384/164 36/385/165 35/382/162 -f 36/385/165 102/384/164 114/386/137 -f 114/386/166 104/387/167 36/385/168 -f 55/388/169 225/389/169 226/390/169 -f 226/390/170 58/391/170 55/388/170 -f 58/391/137 226/390/137 37/392/137 -f 226/390/137 104/387/137 103/393/137 -f 104/387/167 226/390/171 36/385/168 -f 223/355/148 100/354/148 91/394/172 -f 97/395/126 227/396/126 224/397/126 -f 227/396/126 97/395/126 99/398/126 -f 227/399/173 21/400/174 27/401/175 -f 21/400/176 227/399/176 228/402/176 -f 15/369/177 223/368/177 55/403/177 -f 96/153/178 101/152/178 228/404/178 -f 102/154/179 83/151/179 114/173/179 -f 42/42/180 36/36/180 89/405/180 -f 37/392/137 226/390/137 38/406/137 -f 226/390/137 103/393/137 38/406/137 -f 224/397/126 98/407/126 97/395/126 -f 27/401/175 224/408/181 227/399/173 -f 91/394/172 225/409/126 223/355/148 -f 223/368/177 225/410/177 55/403/177 -f 228/404/178 99/411/178 96/153/178 -f 34/383/182 228/412/182 101/381/182 -f 83/151/179 84/174/179 114/173/179 -f 225/413/183 91/414/183 89/415/183 -f 89/415/183 226/416/183 225/413/183 -f 36/36/180 226/417/180 89/405/180 -f 228/402/176 34/418/176 21/400/176 -f 99/398/126 228/419/126 227/396/126 -f 76/107/184 79/110/185 229/420/185 -f 230/421/186 229/420/185 79/110/185 -f 229/420/187 230/421/187 231/422/187 -f 81/112/188 82/113/188 232/423/188 -f 231/422/189 232/423/189 229/420/189 -f 232/423/190 231/422/190 81/112/190 \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default.json new file mode 100644 index 00000000..75a38d2b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_default.json @@ -0,0 +1,9 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab" + }, + "parent": "forgecraft:item/stonetongs" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs2.json b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhot.json similarity index 82% rename from 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs2.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhot.json index e6785478..2e4eddf1 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs2.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/stonetongs_emptyhot.json @@ -1,9 +1,9 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/checker_test", - "texture1": "blocks/stone_slab" + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab" }, "elements": [ { @@ -65,10 +65,10 @@ "from": [ 6.5, 0, 7.5 ], "to": [ 7.5, 1, 16 ], "faces": { - "down": { "uv": [ 6, 0.5, 7, 9 ], "texture": "#texture" }, - "up": { "uv": [ 6, 2.5, 7, 11 ], "texture": "#texture" }, - "north": { "uv": [ 9, 15, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 7, 15, 8, 16 ], "texture": "#texture" }, + "down": { "uv": [ 6.5, 0, 7.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 6.5, 7.5, 7.5, 16 ], "texture": "#texture" }, + "north": { "uv": [ 8.5, 15, 9.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 6.5, 15, 7.5, 16 ], "texture": "#texture" }, "west": { "uv": [ 7.5, 15, 16, 16 ], "texture": "#texture" }, "east": { "uv": [ 0, 15, 8.5, 16 ], "texture": "#texture" } } @@ -78,10 +78,10 @@ "from": [ 8.5, 0, 7.5 ], "to": [ 9.5, 1, 16 ], "faces": { - "down": { "uv": [ 8, 0.5, 9, 9 ], "texture": "#texture" }, - "up": { "uv": [ 8, 6.5, 9, 15 ], "texture": "#texture" }, - "north": { "uv": [ 7, 15, 8, 16 ], "texture": "#texture" }, - "south": { "uv": [ 9, 15, 10, 16 ], "texture": "#texture" }, + "down": { "uv": [ 8.5, 0, 9.5, 8.5 ], "texture": "#texture" }, + "up": { "uv": [ 8.5, 7.5, 9.5, 16 ], "texture": "#texture" }, + "north": { "uv": [ 6.5, 15, 7.5, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8.5, 15, 9.5, 16 ], "texture": "#texture" }, "west": { "uv": [ 7.5, 15, 16, 16 ], "texture": "#texture" }, "east": { "uv": [ 0, 15, 8.5, 16 ], "texture": "#texture" } } diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/tongsempty.mtl b/1.11/src/main/resources/assets/forgecraft/models/item/tongsempty.mtl deleted file mode 100644 index cc337e26..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/item/tongsempty.mtl +++ /dev/null @@ -1,8 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl Material__65 -Ka 1.000000 1.000000 1.000000 -Kd 0.640000 0.640000 0.640000 -d 1.000000 -map_Kd forgecraft:items/stonetongs