From 350461ee1cf032afc2c1c94230f0231df550ac78 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 11 Jun 2017 21:27:13 -0400 Subject: [PATCH 1/6] updating before system restart --- .../models/block/bloomery_adobe.json | 695 ++++++++++++++++++ 1 file changed, 695 insertions(+) create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json new file mode 100644 index 00000000..367780ac --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json @@ -0,0 +1,695 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/stone_slab", + "texture": "blocks/stone_slab", + "texture1": "items/adobebrick_dry", + "texture2": "blocks/adobebrick_mortar" + }, + "elements": [ + { + "__comment": "1bricks1", + "from": [ 12.99901, -0.0005053292, 4.000048 ], + "to": [ 15.99901, 2.999495, 12.00005 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.000094, -0.0009860025, 0.0004938607 ], + "to": [ 12.00009, 2.999014, 3.000494 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.00069, 0.0002432953, 13.00012 ], + "to": [ 12.00069, 3.000243, 16.00012 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 3.999487, -0.0007641285, 0.0006402531 ], + "to": [ 6.999487, 2.999236, 5.50064 ], + "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0005636247, -0.0002443944, 11.9997 ], + "to": [ 2.999436, 2.999756, 17.4997 ], + "rotation": { "origin": [ 0, 0, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.00041, -4.93704E-05, 10.00045 ], + "to": [ 17.00041, 2.999951, 15.50045 ], + "rotation": { "origin": [ 14, 0, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999024, 0.0005986033, 1.99949 ], + "to": [ 12.99902, 3.000599, 7.49949 ], + "rotation": { "origin": [ 10, 0, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -9.055744E-05, 3.000279, 3.999157 ], + "to": [ 2.999909, 3.500279, 11.99916 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.00085, 3.000046, 3.999763 ], + "to": [ 16.00085, 3.500046, 11.99976 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.000787, 3.000445, -0.0008919159 ], + "to": [ 12.00079, 3.500445, 2.999108 ], + "faces": { + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.999659, 3.000034, 13.00047 ], + "to": [ 11.99966, 3.500034, 16.00047 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.000662, 2.999949, -0.0003989271 ], + "to": [ 7.000662, 3.499949, 5.499601 ], + "rotation": { "origin": [ 4, 3, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0001212467, 2.999675, 12.00085 ], + "to": [ 3.000121, 3.499675, 17.50085 ], + "rotation": { "origin": [ 0, 3, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.00047, 2.999647, 9.999364 ], + "to": [ 17.00047, 3.499647, 15.49936 ], + "rotation": { "origin": [ 14, 3, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 10.00009, 3.000046, 1.999668 ], + "to": [ 13.00009, 3.500046, 7.499668 ], + "rotation": { "origin": [ 10, 3, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999604, 3.500003, 2.000702 ], + "to": [ 12.9996, 6.500003, 7.500702 ], + "rotation": { "origin": [ 10, 3.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0003809606, 3.499943, 4.000859 ], + "to": [ 2.999619, 6.499943, 12.00086 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9992, 3.500882, 4.000113 ], + "to": [ 15.9992, 6.500882, 12.00011 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.000336, 3.500118, 8.205499E-05 ], + "to": [ 12.00034, 6.500118, 3.000082 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.000693, 3.500105, 13.00085 ], + "to": [ 12.00069, 6.500105, 16.00085 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 4.000699, 3.499887, -0.0008279622 ], + "to": [ 7.000699, 6.499887, 5.499172 ], + "rotation": { "origin": [ 4, 3.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0007967785, 3.500389, 12.00072 ], + "to": [ 3.000797, 6.500389, 17.50072 ], + "rotation": { "origin": [ 0, 3.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.99911, 3.500989, 9.999724 ], + "to": [ 16.99911, 6.500989, 15.49972 ], + "rotation": { "origin": [ 14, 3.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "Box38", + "from": [ 2.000213, -0.0008939529, 2.000471 ], + "to": [ 14.00021, 0.999106, 14.00047 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, + "north": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.99961, 6.999906, 9.999246 ], + "to": [ 16.99961, 9.999906, 15.49925 ], + "rotation": { "origin": [ 14, 7, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.000354, 6.500755, 0.0002160033 ], + "to": [ 7.000354, 7.000755, 5.500216 ], + "rotation": { "origin": [ 4, 6.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ -6.841531E-05, 6.500052, 12.00036 ], + "to": [ 2.999932, 7.000052, 17.50036 ], + "rotation": { "origin": [ 0, 6.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9995, 6.499704, 10.00027 ], + "to": [ 16.9995, 6.999704, 15.50027 ], + "rotation": { "origin": [ 14, 6.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999094, 6.499113, 1.999741 ], + "to": [ 12.99909, 6.999113, 7.499742 ], + "rotation": { "origin": [ 10, 6.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999537, 7.000202, 1.999252 ], + "to": [ 12.99954, 10.0002, 7.499252 ], + "rotation": { "origin": [ 10, 7, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0005208423, 6.999842, 4.000673 ], + "to": [ 2.999479, 9.999842, 12.00067 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.99983, 6.999263, 3.9991 ], + "to": [ 15.99983, 9.999263, 11.9991 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.000002, 7.000299, 0.0005580339 ], + "to": [ 12, 10.0003, 3.000558 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.999525, 6.999219, 13.0002 ], + "to": [ 11.99953, 9.999219, 16.0002 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 3.999533, 7.000402, -0.0007474885 ], + "to": [ 6.999533, 10.0004, 5.499252 ], + "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0004581314, 6.999415, 12.00066 ], + "to": [ 2.999542, 9.999415, 17.50066 ], + "rotation": { "origin": [ 0, 7, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.999568, 6.499929, 13.0007 ], + "to": [ 11.99957, 6.999929, 16.0007 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 3.999242, 6.500287, 0.000943925 ], + "to": [ 11.99924, 7.000287, 3.000944 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.00068, 6.500669, 4.000465 ], + "to": [ 16.00068, 7.000669, 12.00047 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001249014, 6.499167, 4.000904 ], + "to": [ 2.999875, 6.999167, 12.0009 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.99999, 10.50039, 10.00029 ], + "to": [ 16.99999, 13.50039, 15.50029 ], + "rotation": { "origin": [ 14, 10.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.000172, 9.999103, -7.962191E-05 ], + "to": [ 7.000172, 10.4991, 5.49992 ], + "rotation": { "origin": [ 4, 10, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.000348838, 10.00034, 11.99966 ], + "to": [ 2.999651, 10.50034, 17.49966 ], + "rotation": { "origin": [ 0, 10, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.00085, 9.999942, 9.999126 ], + "to": [ 17.00085, 10.49994, 15.49913 ], + "rotation": { "origin": [ 14, 10, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999223, 10.00036, 2.000005 ], + "to": [ 12.99922, 10.50036, 7.500006 ], + "rotation": { "origin": [ 10, 10, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999492, 10.49904, 1.999982 ], + "to": [ 12.99949, 13.49904, 7.499982 ], + "rotation": { "origin": [ 10, 10.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004085173, 10.50002, 3.999625 ], + "to": [ 2.999592, 13.50002, 11.99962 ], + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.99937, 10.49956, 3.999873 ], + "to": [ 15.99937, 13.49956, 11.99987 ], + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.00047, 10.49992, -3.377069E-05 ], + "to": [ 12.00047, 13.49992, 2.999966 ], + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.000349, 10.49983, 13.00097 ], + "to": [ 12.00035, 13.49983, 16.00097 ], + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 4.00019, 10.49973, -0.0006706055 ], + "to": [ 7.00019, 13.49973, 5.49933 ], + "rotation": { "origin": [ 4, 10.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0003478897, 10.49929, 12.00031 ], + "to": [ 3.000348, 13.49929, 17.50031 ], + "rotation": { "origin": [ 0, 10.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.000114, 9.9997, 12.99927 ], + "to": [ 12.00011, 10.4997, 15.99927 ], + "faces": { + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.000282, 10.00081, -0.000869494 ], + "to": [ 12.00028, 10.50081, 2.99913 ], + "faces": { + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9995, 9.999735, 3.999263 ], + "to": [ 15.9995, 10.49973, 11.99926 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0.000530083, 9.999576, 3.99995 ], + "to": [ 3.00053, 10.49958, 11.99995 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + } + ], + "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 From 8f30ff4e9657f703e73057bd7114909de1cb583b Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Mon, 12 Jun 2017 15:08:31 -0400 Subject: [PATCH 2/6] commiting b4 switch to bugfix branch --- 1.11/{To-Dos => To-Dos.md} | 3 +- .../forgecraft/blocks/BloomeryBase.java | 420 ++++++++++++++++++ .../forgecraft/blocks/PistonBellows.java | 46 +- .../nmd/primal/forgecraft/init/ModBlocks.java | 5 +- .../primal/forgecraft/init/ModCrafting.java | 8 +- .../renders/blocks/TileBloomeryRender.java | 3 +- .../primal/forgecraft/tiles/TileBloomery.java | 35 ++ .../forgecraft/blockstates/bloomery.json | 24 +- .../blockstates/bloomery_adobe.json | 12 + .../forgecraft/models/block/bloomery2.json | 0 .../models/block/bloomery_adobe.json | 251 ++++++----- 1.11/stoneanvil.json | 59 --- 12 files changed, 627 insertions(+), 239 deletions(-) rename 1.11/{To-Dos => To-Dos.md} (99%) create mode 100644 1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery2.json delete mode 100644 1.11/stoneanvil.json diff --git a/1.11/To-Dos b/1.11/To-Dos.md similarity index 99% rename from 1.11/To-Dos rename to 1.11/To-Dos.md index fee2a500..4b7d0267 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos.md @@ -3,7 +3,7 @@ To-Dos *** Bugs *** -*** Priority *** +*** Current Feature *** *** Feature Musket *** @@ -19,7 +19,6 @@ To-Dos *** Backlog *** - [ ] Move Ingot break into chunks logic out of the block and into the ForgeHammer -- [ ] Add Yew - [ ] Add Iron Ring Recipe - [ ] Add chainmail recipe - [ ] Add Iron Shield diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java new file mode 100644 index 00000000..25f593f9 --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java @@ -0,0 +1,420 @@ +package nmd.primal.forgecraft.blocks; + +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; +import net.minecraft.item.ItemSpade; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.core.api.PrimalStates; +import nmd.primal.core.common.crafting.FireSource; +import nmd.primal.core.common.helper.CommonUtils; +import nmd.primal.core.common.helper.FireHelper; +import nmd.primal.core.common.helper.PlayerHelper; +import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.crafting.BloomeryCrafting; +import nmd.primal.forgecraft.tiles.TileBloomery; + +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; + +import static nmd.primal.core.common.helper.FireHelper.makeSmoke; + +/** + * Created by mminaie on 6/11/17. + */ +public class BloomeryBase extends CustomContainerFacing implements ITileEntityProvider { + + //public static final PropertyBool COVERED = PropertyBool.create("covered"); + private int maxHeat; + + public BloomeryBase(Material material, String registryName, Integer maxHeat) { + super(material); + setUnlocalizedName(ModInfo.ForgecraftBlocks.BLOOMERY.getUnlocalizedName()); + setRegistryName(registryName); + setCreativeTab(ModInfo.TAB_FORGECRAFT); + setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); + setHardness(3.0f); + this.maxHeat=maxHeat; + } + + public int getMaxHeat() { + return maxHeat; + } + + public void setMaxHeat(int maxHeat) { + this.maxHeat = maxHeat; + } + + @Override + public TileEntity createNewTileEntity(World worldIn, int meta) + { + return new TileBloomery(); + } + + @Override + public void randomTick(World world, BlockPos pos, IBlockState state, Random random) + { + this.updateTick(world, pos, state, random); + if(!world.isRemote){ + if(state.getValue(PrimalStates.ACTIVE) == true) { + FireHelper.makeSmoke(world, pos, 10); + } + } + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) + { + if (!world.isRemote) { + TileBloomery tile = (TileBloomery) world.getTileEntity(pos); + if (tile != null) { + ItemStack pItem = player.inventory.getCurrentItem(); + ItemStack tileItem = tile.getSlotStack(0); + ItemStack tileItem1 = tile.getSlotStack(1); + if(pItem.isEmpty()) { + + if(!player.isSneaking()){ + if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE) == true){ + Integer bloomeryHeat = tile.getHeat(); + Integer idealTemp = null; + Integer cookCounter = tile.getCookCounter(); + Integer idealCookTime = null; + Integer remainingTime = null; + + String stringBloomeryHeat = bloomeryHeat.toString(); + String stringIdealTemp = ""; + String stringRemainingTime = ""; + + BloomeryCrafting recipe = BloomeryCrafting.getRecipe(tile.getSlotStack(1)); + if(recipe != null) { + idealTemp = recipe.getHeatThreshold(); + idealCookTime = recipe.getIdealTime(); + stringIdealTemp = idealTemp.toString(); + remainingTime = idealCookTime - cookCounter; + stringRemainingTime = remainingTime.toString(); + + } + + ITextComponent itextcomponent = new TextComponentString("Current Temp: " + stringBloomeryHeat + " Ideal Temp: " + stringIdealTemp + " Ticks Remaining: " + stringRemainingTime); + player.sendStatusMessage(itextcomponent, true); + //System.out.println(pos); + return true; + } + } + } + if(tile.getSlotStack(0) != ItemStack.EMPTY) { + if((FireSource.useSource(world, pos, player, pItem, hand, facing, hitX, hitY, hitZ))) { + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, true), 2); + tile.setHeat(100); + tile.markDirty(); + tile.updateBlock(); + return true; + } + } + if((!pItem.isEmpty()) && tile.isItemValidForSlot(0, pItem)) { + if (!tileItem.isEmpty()){ + if(pItem.getItem() == tileItem.getItem()){ + if(tileItem.getCount() < 64){ + if(tileItem.getCount() + pItem.getCount() <= 64){ + tileItem.grow(pItem.getCount()); + player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY); + tile.markDirty(); + tile.updateBlock(); + return true; + } + if(tileItem.getCount() + pItem.getCount() > 64){ + pItem.setCount(64-pItem.getCount()); + tileItem.setCount(64); + tile.markDirty(); + tile.updateBlock(); + return true; + } + } + } + } + if(tileItem.isEmpty()) { + tile.setSlotStack(0, pItem); + player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY); + return true; + } + } + + if((!pItem.isEmpty()) && tile.isItemValidForSlot(1, pItem)) { + if (!tileItem1.isEmpty()) { + return false; + } + if(tileItem1.isEmpty()){ + ItemStack tempItem = new ItemStack(pItem.getItem(), 1); + tile.setSlotStack(1, tempItem); + pItem.shrink(1); + return true; + } + } + if (player.isSneaking()) { + if (!tile.getSlotStack(0).isEmpty()) { + if(player.inventory.getCurrentItem().getItem() instanceof ItemSpade) { + ItemStack returnStack = tile.getSlotStack(0).copy(); + PlayerHelper.spawnItemOnPlayer(world, player, returnStack); + tile.clearSlot(0); + return true; + } + } + } + } + } + return false; + } + + + @Override + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) + { + int lightState =0; + if(state.getValue(PrimalStates.ACTIVE) == true){ + lightState = 10; + } + return lightState; + } + + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return 0; + } + + public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) + { + return true; + } + + @Override + public boolean isFireSource(World world, BlockPos pos, EnumFacing side) + { + if(!world.isRemote){ + if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE)==true){ + return true; + } + } + return false; + } + + @Override + public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity ent) + { + if(ent instanceof EntityPlayer){ + if(state.getValue(PrimalStates.ACTIVE) == true){ + ent.setFire(1); + } + } + } + + /** + * Called serverside after this block is replaced with another in Chunk, but before the Tile Entity is updated + */ + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) + { + if (!world.isRemote && world.getGameRules().getBoolean("doTileDrops")) + { + TileBloomery tile = (TileBloomery) world.getTileEntity(pos); + if (tile !=null) + { + for (ItemStack stack : tile.getSlotList()) + { + if (stack != null) { + float offset = 0.7F; + double offsetX = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D; + double offsetY = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D; + double offsetZ = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D; + EntityItem item = new EntityItem(world, pos.getX() + offsetX, pos.getY() + offsetY, pos.getZ() + offsetZ, stack); + item.setDefaultPickupDelay(); + world.spawnEntity(item); + } + } + } + } + super.breakBlock(world, pos, state); + } + + @Override + public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) + { + if(!worldIn.isRemote) { + worldIn.setBlockState(pos, state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)), 2); + } + } + + @Override + public int getMetaFromState(IBlockState state) { + int i = 0; + + if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(PrimalStates.ACTIVE) == false){ + i = 0; + return i; + } + if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(PrimalStates.ACTIVE) == false){ + i = 1; + return i; + } + if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(PrimalStates.ACTIVE) == false){ + i = 2; + return i; + } + if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(PrimalStates.ACTIVE) == false){ + i = 3; + return i; + } + if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(PrimalStates.ACTIVE) == true){ + i = 4; + return i; + } + if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(PrimalStates.ACTIVE) == true){ + i = 5; + return i; + } + if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(PrimalStates.ACTIVE) == true){ + i = 6; + return i; + } + if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(PrimalStates.ACTIVE) == true){ + i = 7; + return i; + } + + return i; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + EnumFacing enumfacing; + Boolean active; + switch (meta & 7) + { + case 0: + enumfacing = EnumFacing.EAST; + active = false; + break; + case 1: + enumfacing = EnumFacing.WEST; + active = false; + break; + case 2: + enumfacing = EnumFacing.SOUTH; + active = false; + break; + case 3: + enumfacing = EnumFacing.NORTH; + active = false; + break; + case 4: + enumfacing = EnumFacing.EAST; + active = true; + break; + case 5: + enumfacing = EnumFacing.WEST; + active = true; + break; + case 6: + enumfacing = EnumFacing.SOUTH; + active = true; + break; + case 7: + enumfacing = EnumFacing.NORTH; + active = true; + break; + default: + enumfacing = EnumFacing.NORTH; + active = false; + } + + return this.getDefaultState().withProperty(FACING, enumfacing).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(active)); + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] {FACING, PrimalStates.ACTIVE}); + } + + @Override + public boolean isFullCube(IBlockState state) + { + return false; + } + + @Override + public boolean isFullyOpaque(IBlockState state) + { + return false; + } + + @Override + public boolean isOpaqueCube(IBlockState state) + { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) + { + return true; + } + + @Override + public EnumBlockRenderType getRenderType(IBlockState state) + { + return EnumBlockRenderType.MODEL; + } + + @SideOnly(Side.CLIENT) + @SuppressWarnings("incomplete-switch") + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) + { + if(state.getValue(PrimalStates.ACTIVE) == true) + { + double d0 = (double)pos.getX() + 0.5D; + double d1 = (double)pos.getY() + 0.2D; + double d2 = (double)pos.getZ() + 0.5D; + double d3 = 0.52D; + double d4 = ThreadLocalRandom.current().nextDouble(0.075, 0.35); + double ySpeed = ThreadLocalRandom.current().nextDouble(0.0, 0.075); + + if (rand.nextDouble() < 0.1D) + { + world.playSound((double)pos.getX() + 0.5D, (double)pos.getY(), (double)pos.getZ() + 0.5D, SoundEvents.BLOCK_FURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); + } + if(rand.nextInt(4) == 1){ + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + } + if(rand.nextInt(4) == 2){ + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + } + if(rand.nextInt(4) == 3){ + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + } + if(rand.nextInt(4) == 4){ + world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); + } + } + } +} diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java index b357bd3e..876ef336 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java @@ -93,16 +93,13 @@ public class PistonBellows extends CustomContainerFacing { } } } - if (world.getBlockState(tempPos).getBlock() == ModBlocks.bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) - && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.EAST)) { + && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.EAST)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); - if(world.getBlockState(tempPos).getValue(Bloomery.COVERED) == true){ - tile.setHeat(tile.getHeat() + 50); - } tile.updateBlock(); tile.markDirty(); return true; @@ -124,16 +121,13 @@ public class PistonBellows extends CustomContainerFacing { } } } - if (world.getBlockState(tempPos).getBlock() == ModBlocks.bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) - && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.WEST)) { + && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.WEST)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); - if(world.getBlockState(tempPos).getValue(Bloomery.COVERED) == true){ - tile.setHeat(tile.getHeat() + 50); - } tile.updateBlock(); tile.markDirty(); return true; @@ -155,16 +149,13 @@ public class PistonBellows extends CustomContainerFacing { } } } - if (world.getBlockState(tempPos).getBlock() == ModBlocks.bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) - && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.SOUTH)) { + && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.SOUTH)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); - if(world.getBlockState(tempPos).getValue(Bloomery.COVERED) == true){ - tile.setHeat(tile.getHeat() + 50); - } tile.updateBlock(); tile.markDirty(); return true; @@ -186,16 +177,13 @@ public class PistonBellows extends CustomContainerFacing { } } } - if (world.getBlockState(tempPos).getBlock() == ModBlocks.bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) - && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.NORTH)) { + && (world.getBlockState(tempPos).getValue(FACING) == EnumFacing.NORTH)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); - if(world.getBlockState(tempPos).getValue(Bloomery.COVERED) == true){ - tile.setHeat(tile.getHeat() + 50); - } tile.updateBlock(); tile.markDirty(); return true; @@ -395,9 +383,9 @@ public class PistonBellows extends CustomContainerFacing { makeEmbers(world, tempPos, world.rand); } } - if (world.getBlockState(tempPos).getBlock() instanceof Bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.EAST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.EAST)) { makeEmbers(world, tempPos, world.rand); } } @@ -412,9 +400,9 @@ public class PistonBellows extends CustomContainerFacing { makeEmbers(world, tempPos, world.rand); } } - if (world.getBlockState(tempPos).getBlock() instanceof Bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.WEST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.WEST)) { makeEmbers(world, tempPos, world.rand); } } @@ -429,9 +417,9 @@ public class PistonBellows extends CustomContainerFacing { makeEmbers(world, tempPos, world.rand); } } - if (world.getBlockState(tempPos).getBlock() instanceof Bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.SOUTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.SOUTH)) { makeEmbers(world, tempPos, world.rand); } } @@ -446,9 +434,9 @@ public class PistonBellows extends CustomContainerFacing { makeEmbers(world, tempPos, world.rand); } } - if (world.getBlockState(tempPos).getBlock() instanceof Bloomery) { + if (world.getBlockState(tempPos).getBlock() instanceof BloomeryBase) { TileBloomery tile = (TileBloomery) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Bloomery.FACING) == EnumFacing.NORTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(BloomeryBase.FACING) == EnumFacing.NORTH)) { makeEmbers(world, tempPos, world.rand); } } @@ -460,7 +448,7 @@ public class PistonBellows extends CustomContainerFacing { double d1 = (double)pos.getY() + 0.2D; double d2 = (double)pos.getZ() + 0.5D; double d3 = 0.52D; - double d4 = ThreadLocalRandom.current().nextDouble(0.075, 0.25); + double d4 = ThreadLocalRandom.current().nextDouble(0.066, 0.33); double ySpeed = ThreadLocalRandom.current().nextDouble(0.05, 0.20); if(rand.nextInt(3) == 0){ 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 5c64bcc9..d90904b0 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 @@ -30,6 +30,7 @@ public class ModBlocks { public static Block firebox; public static Block bloomery; + public static Block bloomery_adobe; public static Block blockbreaker; public static Block pistonbellowsoak; @@ -88,7 +89,8 @@ public class ModBlocks { public static void init() { firebox = new Forge(Material.ROCK); - bloomery = new Bloomery(Material.ROCK, "bloomery"); + bloomery = new BloomeryBase(Material.ROCK, "bloomery", 1500); + bloomery_adobe = new BloomeryBase(Material.ROCK, "bloomery_adobe", 1560); blockbreaker = new Breaker(Material.WOOD, "blockbreaker", 4.0f); pistonbellowsoak = new PistonBellows(Material.WOOD, "pistonbellowsoak"); @@ -365,6 +367,7 @@ public class ModBlocks { public static void register() { registerBlock(firebox); registerBlock(bloomery); + registerBlock(bloomery_adobe); registerBlock(blockbreaker); registerBlock(pistonbellowsoak); 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 36ac03b4..91d88740 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 @@ -217,7 +217,7 @@ public class ModCrafting { new ItemStack(ModBlocks.emptycruciblehot, 1), new ItemStack(ModBlocks.emptycruciblecrackedhot, 1), new ItemStack(ModBlocks.emptycrucible, 1), - 2100, + 1450, 1600, 600, 0.25f, @@ -254,7 +254,7 @@ public class ModCrafting { new ItemStack(ModBlocks.hotcookedironcrucible, 1), new ItemStack(ModBlocks.failedironcruciblehot, 1), new ItemStack(ModBlocks.coolironcrucible, 1), - 1550, + 1400, 1200, 800, 0.33f, @@ -306,14 +306,14 @@ public class ModCrafting { new ItemStack(ModBlocks.hotcookedsteelcrucible, 1), new ItemStack(ModBlocks.failedsteelcrucible, 1), new ItemStack(ModBlocks.coolsteelcrucible, 1), - 1550, + 2100, 1500, 1000, 0.2f, 0.25f ); - //PLACE HOLDER FOR WOOTZ + //TODO PLACE HOLDER FOR WOOTZ /****************************************************************************** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java index 0cc59cc0..14a8d5f5 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import nmd.primal.forgecraft.blocks.Bloomery; +import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.tiles.TileBloomery; import org.lwjgl.opengl.GL11; @@ -25,7 +26,7 @@ public class TileBloomeryRender extends TileEntitySpecialRenderer BlockPos pos = tile.getPos(); IBlockState state = this.getWorld().getBlockState(pos); - if (state.getBlock() instanceof Bloomery) { + if (state.getBlock() instanceof BloomeryBase) { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5D, y + 0.0626D, z + 0.5D); 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 f89ce1cf..259ef3ac 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 @@ -2,6 +2,7 @@ package nmd.primal.forgecraft.tiles; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -9,10 +10,12 @@ import net.minecraft.util.ITickable; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import nmd.primal.core.api.PrimalItems; import nmd.primal.core.api.PrimalStates; import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.core.common.helper.ParticleHelper; import nmd.primal.forgecraft.blocks.Bloomery; +import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.blocks.Crucible; import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.crafting.BloomeryCrafting; @@ -152,6 +155,26 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(stack.isEmpty()){ world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL1){ + if(this.getHeat() > 1210){ + this.setHeat(1200); + } + } + if(this.getSlotStack(0).getItem() == Items.COAL && this.getSlotStack(0).getMetadata() == 1){ + if(this.getHeat() > 1210){ + this.setHeat(1200); + } + } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL2){ + if(this.getHeat() > 1610){ + this.setHeat(1600); + } + } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL3){ + if(this.getHeat() > 3010){ + this.setHeat(3000); + } + } } if(state.getValue(PrimalStates.ACTIVE) == false){ if(h > 50){ @@ -161,6 +184,13 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.setHeat(0); } } + if(world.getBlockState(pos).getBlock() instanceof BloomeryBase){ + BloomeryBase tempBlock = (BloomeryBase) world.getBlockState(pos).getBlock(); + if(this.getHeat() > tempBlock.getMaxHeat()){ + world.setBlockState(pos, Blocks.FIRE.getDefaultState(), 2); + //world.markTileEntityForRemoval(this); + } + } this.updateBlock(); this.markDirty(); } @@ -178,6 +208,11 @@ public class TileBloomery extends TileBaseSlot implements ITickable { return true; } } + if(stack.getItem() == PrimalItems.CHARCOAL1 + || stack.getItem() == PrimalItems.CHARCOAL2 + || stack.getItem() == PrimalItems.CHARCOAL3){ + return true; + } } if(index == 1){ if (stack.getItem() == ModItems.softcrucible) { diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json index 06470370..5062bb44 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json @@ -1,20 +1,12 @@ { "variants": { - "active=false,covered=false,facing=north": { "model": "forgecraft:bloomery" }, - "active=false,covered=false,facing=east": { "model": "forgecraft:bloomery", "y": 90 }, - "active=false,covered=false,facing=south": { "model": "forgecraft:bloomery", "y": 180 }, - "active=false,covered=false,facing=west": { "model": "forgecraft:bloomery", "y": 270 }, - "active=true,covered=false,facing=north": { "model": "forgecraft:bloomery_lit" }, - "active=true,covered=false,facing=east": { "model": "forgecraft:bloomery_lit", "y": 90 }, - "active=true,covered=false,facing=south": { "model": "forgecraft:bloomery_lit", "y": 180 }, - "active=true,covered=false,facing=west": { "model": "forgecraft:bloomery_lit", "y": 270 }, - "active=true,covered=true,facing=north": { "model": "forgecraft:bloomery_lit_covered" }, - "active=true,covered=true,facing=east": { "model": "forgecraft:bloomery_lit_covered", "y": 90 }, - "active=true,covered=true,facing=south": { "model": "forgecraft:bloomery_lit_covered", "y": 180 }, - "active=true,covered=true,facing=west": { "model": "forgecraft:bloomery_lit_covered", "y": 270 }, - "active=false,covered=true,facing=north": { "model": "forgecraft:bloomery_covered" }, - "active=false,covered=true,facing=east": { "model": "forgecraft:bloomery_covered", "y": 90 }, - "active=false,covered=true,facing=south": { "model": "forgecraft:bloomery_covered", "y": 180 }, - "active=false,covered=true,facing=west": { "model": "forgecraft:bloomery_covered", "y": 270 } + "active=false,facing=north": { "model": "forgecraft:bloomery" }, + "active=false,facing=east": { "model": "forgecraft:bloomery", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:bloomery", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:bloomery", "y": 270 }, + "active=true,facing=north": { "model": "forgecraft:bloomery_lit" }, + "active=true,facing=east": { "model": "forgecraft:bloomery_lit", "y": 90 }, + "active=true,facing=south": { "model": "forgecraft:bloomery_lit", "y": 180 }, + "active=true,facing=west": { "model": "forgecraft:bloomery_lit", "y": 270 } } } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json new file mode 100644 index 00000000..0523ca9d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=false,facing=north": { "model": "forgecraft:bloomery_adobe" }, + "active=false,facing=east": { "model": "forgecraft:bloomery_adobe", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:bloomery_adobe", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:bloomery_adobe", "y": 270 }, + "active=true,facing=north": { "model": "forgecraft:bloomery_adobe" }, + "active=true,facing=east": { "model": "forgecraft:bloomery_adobe", "y": 90 }, + "active=true,facing=south": { "model": "forgecraft:bloomery_adobe", "y": 180 }, + "active=true,facing=west": { "model": "forgecraft:bloomery_adobe", "y": 270 } + } +} \ 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 new file mode 100644 index 00000000..e69de29b diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json index 367780ac..c9d9c7b0 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json @@ -3,14 +3,14 @@ "textures": { "particle": "blocks/stone_slab", "texture": "blocks/stone_slab", - "texture1": "items/adobebrick_dry", - "texture2": "blocks/adobebrick_mortar" + "texture1": "primal:items/adobebrick_dry", + "texture2": "primal:blocks/adobebrick_mortar" }, "elements": [ { "__comment": "1bricks1", - "from": [ 12.99901, -0.0005053292, 4.000048 ], - "to": [ 15.99901, 2.999495, 12.00005 ], + "from": [ 12.999, -0.0005, 4 ], + "to": [ 15.999, 2.999501, 12 ], "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -21,20 +21,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.000094, -0.0009860025, 0.0004938607 ], - "to": [ 12.00009, 2.999014, 3.000494 ], - "faces": { - "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1", "rotation": 90 }, - "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, - "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, - "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } - } - }, - { - "__comment": "1bricks3", - "from": [ 4.00069, 0.0002432953, 13.00012 ], - "to": [ 12.00069, 3.000243, 16.00012 ], + "from": [ 4.0001, -0.0009999999, 0.0005 ], + "to": [ 12.0001, 2.999, 3.0005 ], "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1", "rotation": 90 }, "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -45,8 +33,8 @@ }, { "__comment": "1angle0", - "from": [ 3.999487, -0.0007641285, 0.0006402531 ], - "to": [ 6.999487, 2.999236, 5.50064 ], + "from": [ 3.9995, -0.0008, 0.0006 ], + "to": [ 6.9995, 2.9992, 5.500599 ], "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, @@ -58,8 +46,8 @@ }, { "__comment": "1angle1", - "from": [ -0.0005636247, -0.0002443944, 11.9997 ], - "to": [ 2.999436, 2.999756, 17.4997 ], + "from": [ -0.0006, -0.0002, 11.9997 ], + "to": [ 2.999399, 2.9998, 17.4997 ], "rotation": { "origin": [ 0, 0, 12 ], "axis": "y", "angle": 45 }, "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, @@ -71,8 +59,8 @@ }, { "__comment": "1angle2", - "from": [ 14.00041, -4.93704E-05, 10.00045 ], - "to": [ 17.00041, 2.999951, 15.50045 ], + "from": [ 14.0004, 0, 10.0004 ], + "to": [ 17.0004, 3, 15.5004 ], "rotation": { "origin": [ 14, 0, 10 ], "axis": "y", "angle": -45 }, "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, @@ -84,8 +72,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999024, 0.0005986033, 1.99949 ], - "to": [ 12.99902, 3.000599, 7.49949 ], + "from": [ 9.999, 0.0006, 1.9995 ], + "to": [ 12.99899, 3.0006, 7.4995 ], "rotation": { "origin": [ 10, 0, 2 ], "axis": "y", "angle": 45 }, "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, @@ -97,8 +85,8 @@ }, { "__comment": "1bricks0", - "from": [ -9.055744E-05, 3.000279, 3.999157 ], - "to": [ 2.999909, 3.500279, 11.99916 ], + "from": [ -0.0001, 3.0003, 3.9992 ], + "to": [ 2.9999, 3.5003, 11.9992 ], "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -109,8 +97,8 @@ }, { "__comment": "1bricks1", - "from": [ 13.00085, 3.000046, 3.999763 ], - "to": [ 16.00085, 3.500046, 11.99976 ], + "from": [ 13.0008, 3, 3.9998 ], + "to": [ 16.0008, 3.5, 11.9998 ], "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, @@ -120,8 +108,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.000787, 3.000445, -0.0008919159 ], - "to": [ 12.00079, 3.500445, 2.999108 ], + "from": [ 4.0008, 3.0004, -0.0009 ], + "to": [ 12.0008, 3.5004, 2.9991 ], "faces": { "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, @@ -131,11 +119,10 @@ }, { "__comment": "1bricks3", - "from": [ 3.999659, 3.000034, 13.00047 ], - "to": [ 11.99966, 3.500034, 16.00047 ], + "from": [ 3.9997, 3, 13.0005 ], + "to": [ 11.9997, 3.5, 16.0005 ], "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, @@ -144,8 +131,8 @@ }, { "__comment": "1angle0", - "from": [ 4.000662, 2.999949, -0.0003989271 ], - "to": [ 7.000662, 3.499949, 5.499601 ], + "from": [ 4.0007, 2.9999, -0.0004 ], + "to": [ 7.0007, 3.4999, 5.4996 ], "rotation": { "origin": [ 4, 3, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -156,8 +143,8 @@ }, { "__comment": "1angle1", - "from": [ 0.0001212467, 2.999675, 12.00085 ], - "to": [ 3.000121, 3.499675, 17.50085 ], + "from": [ 0.0001, 2.9997, 12.0008 ], + "to": [ 3.0001, 3.4997, 17.5008 ], "rotation": { "origin": [ 0, 3, 12 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -168,8 +155,8 @@ }, { "__comment": "1angle2", - "from": [ 14.00047, 2.999647, 9.999364 ], - "to": [ 17.00047, 3.499647, 15.49936 ], + "from": [ 14.0005, 2.9996, 9.9994 ], + "to": [ 17.0005, 3.4996, 15.4994 ], "rotation": { "origin": [ 14, 3, 10 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -180,8 +167,8 @@ }, { "__comment": "1angle3", - "from": [ 10.00009, 3.000046, 1.999668 ], - "to": [ 13.00009, 3.500046, 7.499668 ], + "from": [ 10.0001, 3, 1.9997 ], + "to": [ 13.0001, 3.5, 7.4997 ], "rotation": { "origin": [ 10, 3, 2 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -192,8 +179,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999604, 3.500003, 2.000702 ], - "to": [ 12.9996, 6.500003, 7.500702 ], + "from": [ 9.999599, 3.5, 2.0007 ], + "to": [ 12.9996, 6.5, 7.5007 ], "rotation": { "origin": [ 10, 3.5, 2 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -204,8 +191,8 @@ }, { "__comment": "1bricks0", - "from": [ -0.0003809606, 3.499943, 4.000859 ], - "to": [ 2.999619, 6.499943, 12.00086 ], + "from": [ -0.0004, 3.4999, 4.0009 ], + "to": [ 2.9996, 6.4999, 12.0009 ], "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, @@ -215,8 +202,8 @@ }, { "__comment": "1bricks1", - "from": [ 12.9992, 3.500882, 4.000113 ], - "to": [ 15.9992, 6.500882, 12.00011 ], + "from": [ 12.9992, 3.5009, 4.0001 ], + "to": [ 15.9992, 6.5009, 12.0001 ], "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, @@ -226,8 +213,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.000336, 3.500118, 8.205499E-05 ], - "to": [ 12.00034, 6.500118, 3.000082 ], + "from": [ 4.0003, 3.5001, 0.0001 ], + "to": [ 12.0003, 6.5001, 3.0001 ], "faces": { "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -237,8 +224,8 @@ }, { "__comment": "1bricks3", - "from": [ 4.000693, 3.500105, 13.00085 ], - "to": [ 12.00069, 6.500105, 16.00085 ], + "from": [ 4.0007, 3.5001, 13.0008 ], + "to": [ 12.0007, 6.5001, 16.0008 ], "faces": { "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -248,8 +235,8 @@ }, { "__comment": "1angle0", - "from": [ 4.000699, 3.499887, -0.0008279622 ], - "to": [ 7.000699, 6.499887, 5.499172 ], + "from": [ 4.0007, 3.4999, -0.0008 ], + "to": [ 7.0007, 6.4999, 5.4992 ], "rotation": { "origin": [ 4, 3.5, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -260,8 +247,8 @@ }, { "__comment": "1angle1", - "from": [ 0.0007967785, 3.500389, 12.00072 ], - "to": [ 3.000797, 6.500389, 17.50072 ], + "from": [ 0.0008, 3.5004, 12.0007 ], + "to": [ 3.0008, 6.5004, 17.5007 ], "rotation": { "origin": [ 0, 3.5, 12 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -272,8 +259,8 @@ }, { "__comment": "1angle2", - "from": [ 13.99911, 3.500989, 9.999724 ], - "to": [ 16.99911, 6.500989, 15.49972 ], + "from": [ 13.9991, 3.501, 9.9997 ], + "to": [ 16.9991, 6.501, 15.49969 ], "rotation": { "origin": [ 14, 3.5, 10 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -284,8 +271,8 @@ }, { "__comment": "Box38", - "from": [ 2.000213, -0.0008939529, 2.000471 ], - "to": [ 14.00021, 0.999106, 14.00047 ], + "from": [ 2.0002, -0.0009, 2.0005 ], + "to": [ 14.0002, 0.9991, 14.0005 ], "faces": { "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, @@ -297,8 +284,8 @@ }, { "__comment": "1angle2", - "from": [ 13.99961, 6.999906, 9.999246 ], - "to": [ 16.99961, 9.999906, 15.49925 ], + "from": [ 13.9996, 6.9999, 9.9992 ], + "to": [ 16.9996, 9.999899, 15.4992 ], "rotation": { "origin": [ 14, 7, 10 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -309,8 +296,8 @@ }, { "__comment": "1angle0", - "from": [ 4.000354, 6.500755, 0.0002160033 ], - "to": [ 7.000354, 7.000755, 5.500216 ], + "from": [ 4.0004, 6.5008, 0.0002 ], + "to": [ 7.0004, 7.0008, 5.5002 ], "rotation": { "origin": [ 4, 6.5, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -321,8 +308,8 @@ }, { "__comment": "1angle1", - "from": [ -6.841531E-05, 6.500052, 12.00036 ], - "to": [ 2.999932, 7.000052, 17.50036 ], + "from": [ -0.0001, 6.5001, 12.0004 ], + "to": [ 2.999901, 7.0001, 17.5004 ], "rotation": { "origin": [ 0, 6.5, 12 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -333,8 +320,8 @@ }, { "__comment": "1angle2", - "from": [ 13.9995, 6.499704, 10.00027 ], - "to": [ 16.9995, 6.999704, 15.50027 ], + "from": [ 13.9995, 6.4997, 10.0003 ], + "to": [ 16.9995, 6.9997, 15.5003 ], "rotation": { "origin": [ 14, 6.5, 10 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -345,8 +332,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999094, 6.499113, 1.999741 ], - "to": [ 12.99909, 6.999113, 7.499742 ], + "from": [ 9.9991, 6.4991, 1.9997 ], + "to": [ 12.9991, 6.9991, 7.499701 ], "rotation": { "origin": [ 10, 6.5, 2 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -357,8 +344,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999537, 7.000202, 1.999252 ], - "to": [ 12.99954, 10.0002, 7.499252 ], + "from": [ 9.999499, 7.0002, 1.9993 ], + "to": [ 12.9995, 10.0002, 7.4993 ], "rotation": { "origin": [ 10, 7, 2 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -369,8 +356,8 @@ }, { "__comment": "1bricks0", - "from": [ -0.0005208423, 6.999842, 4.000673 ], - "to": [ 2.999479, 9.999842, 12.00067 ], + "from": [ -0.0005, 6.9998, 4.0007 ], + "to": [ 2.9995, 9.9998, 12.0007 ], "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, @@ -380,8 +367,8 @@ }, { "__comment": "1bricks1", - "from": [ 12.99983, 6.999263, 3.9991 ], - "to": [ 15.99983, 9.999263, 11.9991 ], + "from": [ 12.9998, 6.9993, 3.9991 ], + "to": [ 15.9998, 9.9993, 11.9991 ], "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, @@ -391,8 +378,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.000002, 7.000299, 0.0005580339 ], - "to": [ 12, 10.0003, 3.000558 ], + "from": [ 4, 7.0003, 0.0006 ], + "to": [ 12, 10.0003, 3.0006 ], "faces": { "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -402,8 +389,8 @@ }, { "__comment": "1bricks3", - "from": [ 3.999525, 6.999219, 13.0002 ], - "to": [ 11.99953, 9.999219, 16.0002 ], + "from": [ 3.9995, 6.9992, 13.0002 ], + "to": [ 11.9995, 9.9992, 16.0002 ], "faces": { "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -413,8 +400,8 @@ }, { "__comment": "1angle0", - "from": [ 3.999533, 7.000402, -0.0007474885 ], - "to": [ 6.999533, 10.0004, 5.499252 ], + "from": [ 3.9995, 7.0004, -0.0007 ], + "to": [ 6.9995, 10.0004, 5.4993 ], "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -425,8 +412,8 @@ }, { "__comment": "1angle1", - "from": [ -0.0004581314, 6.999415, 12.00066 ], - "to": [ 2.999542, 9.999415, 17.50066 ], + "from": [ -0.0005, 6.9994, 12.0007 ], + "to": [ 2.9995, 9.9994, 17.5007 ], "rotation": { "origin": [ 0, 7, 12 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -437,11 +424,9 @@ }, { "__comment": "1bricks3", - "from": [ 3.999568, 6.499929, 13.0007 ], - "to": [ 11.99957, 6.999929, 16.0007 ], + "from": [ 3.9996, 6.4999, 13.0007 ], + "to": [ 11.9996, 6.9999, 16.0007 ], "faces": { - "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, @@ -450,8 +435,8 @@ }, { "__comment": "1bricks2", - "from": [ 3.999242, 6.500287, 0.000943925 ], - "to": [ 11.99924, 7.000287, 3.000944 ], + "from": [ 3.9992, 6.5003, 0.0009 ], + "to": [ 11.9992, 7.0003, 3.0009 ], "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, @@ -463,8 +448,8 @@ }, { "__comment": "1bricks1", - "from": [ 13.00068, 6.500669, 4.000465 ], - "to": [ 16.00068, 7.000669, 12.00047 ], + "from": [ 13.0007, 6.5007, 4.0005 ], + "to": [ 16.0007, 7.0007, 12.00051 ], "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, @@ -474,8 +459,8 @@ }, { "__comment": "1bricks0", - "from": [ -0.0001249014, 6.499167, 4.000904 ], - "to": [ 2.999875, 6.999167, 12.0009 ], + "from": [ -0.0001, 6.4992, 4.0009 ], + "to": [ 2.9999, 6.9992, 12.0009 ], "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, @@ -485,8 +470,8 @@ }, { "__comment": "1angle2", - "from": [ 13.99999, 10.50039, 10.00029 ], - "to": [ 16.99999, 13.50039, 15.50029 ], + "from": [ 14, 10.5004, 10.0003 ], + "to": [ 17, 13.5004, 15.5003 ], "rotation": { "origin": [ 14, 10.5, 10 ], "axis": "y", "angle": -45 }, "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, @@ -498,8 +483,8 @@ }, { "__comment": "1angle0", - "from": [ 4.000172, 9.999103, -7.962191E-05 ], - "to": [ 7.000172, 10.4991, 5.49992 ], + "from": [ 4.0002, 9.9991, -0.0001 ], + "to": [ 7.0002, 10.4991, 5.499899 ], "rotation": { "origin": [ 4, 10, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -510,8 +495,8 @@ }, { "__comment": "1angle1", - "from": [ -0.000348838, 10.00034, 11.99966 ], - "to": [ 2.999651, 10.50034, 17.49966 ], + "from": [ -0.0003, 10.0003, 11.9997 ], + "to": [ 2.9997, 10.5003, 17.4997 ], "rotation": { "origin": [ 0, 10, 12 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -522,8 +507,8 @@ }, { "__comment": "1angle2", - "from": [ 14.00085, 9.999942, 9.999126 ], - "to": [ 17.00085, 10.49994, 15.49913 ], + "from": [ 14.0008, 9.9999, 9.9991 ], + "to": [ 17.0008, 10.4999, 15.4991 ], "rotation": { "origin": [ 14, 10, 10 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -534,8 +519,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999223, 10.00036, 2.000005 ], - "to": [ 12.99922, 10.50036, 7.500006 ], + "from": [ 9.9992, 10.0004, 2 ], + "to": [ 12.9992, 10.5004, 7.500001 ], "rotation": { "origin": [ 10, 10, 2 ], "axis": "y", "angle": 45 }, "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, @@ -546,8 +531,8 @@ }, { "__comment": "1angle3", - "from": [ 9.999492, 10.49904, 1.999982 ], - "to": [ 12.99949, 13.49904, 7.499982 ], + "from": [ 9.999499, 10.499, 2 ], + "to": [ 12.9995, 13.499, 7.5 ], "rotation": { "origin": [ 10, 10.5, 2 ], "axis": "y", "angle": 45 }, "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, @@ -559,8 +544,8 @@ }, { "__comment": "1bricks0", - "from": [ -0.0004085173, 10.50002, 3.999625 ], - "to": [ 2.999592, 13.50002, 11.99962 ], + "from": [ -0.0004, 10.5, 3.9996 ], + "to": [ 2.9996, 13.5, 11.9996 ], "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -571,8 +556,8 @@ }, { "__comment": "1bricks1", - "from": [ 12.99937, 10.49956, 3.999873 ], - "to": [ 15.99937, 13.49956, 11.99987 ], + "from": [ 12.9994, 10.4996, 3.9999 ], + "to": [ 15.9994, 13.4996, 11.9999 ], "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -583,8 +568,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.00047, 10.49992, -3.377069E-05 ], - "to": [ 12.00047, 13.49992, 2.999966 ], + "from": [ 4.0005, 10.4999, 0 ], + "to": [ 12.0005, 13.4999, 3 ], "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -595,8 +580,8 @@ }, { "__comment": "1bricks3", - "from": [ 4.000349, 10.49983, 13.00097 ], - "to": [ 12.00035, 13.49983, 16.00097 ], + "from": [ 4.0003, 10.4998, 13.001 ], + "to": [ 12.0003, 13.4998, 16.001 ], "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -607,8 +592,8 @@ }, { "__comment": "1angle0", - "from": [ 4.00019, 10.49973, -0.0006706055 ], - "to": [ 7.00019, 13.49973, 5.49933 ], + "from": [ 4.0002, 10.4997, -0.0007 ], + "to": [ 7.0002, 13.4997, 5.4993 ], "rotation": { "origin": [ 4, 10.5, 0 ], "axis": "y", "angle": -45 }, "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, @@ -620,8 +605,8 @@ }, { "__comment": "1angle1", - "from": [ 0.0003478897, 10.49929, 12.00031 ], - "to": [ 3.000348, 13.49929, 17.50031 ], + "from": [ 0.0003, 10.4993, 12.0003 ], + "to": [ 3.0003, 13.4993, 17.5003 ], "rotation": { "origin": [ 0, 10.5, 12 ], "axis": "y", "angle": 45 }, "faces": { "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, @@ -633,8 +618,8 @@ }, { "__comment": "1bricks3", - "from": [ 4.000114, 9.9997, 12.99927 ], - "to": [ 12.00011, 10.4997, 15.99927 ], + "from": [ 4.0001, 9.9997, 12.9993 ], + "to": [ 12.0001, 10.4997, 15.9993 ], "faces": { "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, @@ -644,8 +629,8 @@ }, { "__comment": "1bricks2", - "from": [ 4.000282, 10.00081, -0.000869494 ], - "to": [ 12.00028, 10.50081, 2.99913 ], + "from": [ 4.0003, 10.0008, -0.0009 ], + "to": [ 12.0003, 10.5008, 2.999099 ], "faces": { "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" } @@ -653,8 +638,8 @@ }, { "__comment": "1bricks1", - "from": [ 12.9995, 9.999735, 3.999263 ], - "to": [ 15.9995, 10.49973, 11.99926 ], + "from": [ 12.9995, 9.9997, 3.9993 ], + "to": [ 15.9995, 10.49969, 11.9993 ], "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, @@ -664,14 +649,26 @@ }, { "__comment": "1bricks0", - "from": [ 0.000530083, 9.999576, 3.99995 ], - "to": [ 3.00053, 10.49958, 11.99995 ], + "from": [ 0.0005, 9.999599, 4 ], + "to": [ 3.0005, 10.4996, 12 ], "faces": { "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } } + }, + { + "__comment": "1bricks0", + "from": [ 0, 0, 4 ], + "to": [ 3, 3, 12 ], + "faces": { + "down": { "uv": [ 0, 3.99914, 2.999619, 11.99914 ], "texture": "#texture" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } } ], "display": { diff --git a/1.11/stoneanvil.json b/1.11/stoneanvil.json deleted file mode 100644 index 6bff1c13..00000000 --- a/1.11/stoneanvil.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "blocks/particle", - "texture": "blocks/texture", - "texture1": "blocks/texture1" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 0, 0, 0 ], - "to": [ 16, 14, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 2, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube2", - "from": [ 0, 14, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, - "north": { "uv": [ 0, 0, 16, 2 ], "texture": "#texture1" }, - "south": { "uv": [ 0, 0, 16, 2 ], "texture": "#texture1" }, - "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#texture1" }, - "east": { "uv": [ 0, 0, 16, 2 ], "texture": "#texture1" } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "gui": { - "rotation": [ 30, 225, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "scale": [ 0.5, 0.5, 0.5 ] - } - }, - "overrides": [ - ] -} \ No newline at end of file From f503570db794a4749dd90ba8934ff09d8c1deef6 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Wed, 14 Jun 2017 21:39:11 -0400 Subject: [PATCH 3/6] pushing to ull new branch --- .../forgecraft/blocks/BloomeryBase.java | 2 +- .../forgecraft/models/block/adobe_kiln.json | 701 ++++++++++++++++++ 2 files changed, 702 insertions(+), 1 deletion(-) create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/adobe_kiln.json diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java index 25f593f9..dbc673e6 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java @@ -46,7 +46,7 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr public BloomeryBase(Material material, String registryName, Integer maxHeat) { super(material); - setUnlocalizedName(ModInfo.ForgecraftBlocks.BLOOMERY.getUnlocalizedName()); + setUnlocalizedName(registryName); setRegistryName(registryName); setCreativeTab(ModInfo.TAB_FORGECRAFT); setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/adobe_kiln.json b/1.11/src/main/resources/assets/forgecraft/models/block/adobe_kiln.json new file mode 100644 index 00000000..437cd83c --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/block/adobe_kiln.json @@ -0,0 +1,701 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/stone_slab", + "texture": "blocks/stone_slab", + "texture1": "blocks/adobebrick", + "texture2": "blocks/adobebrick_mortar" + }, + "elements": [ + { + "__comment": "1bricks1", + "from": [ 12.999, -0.0005, 4 ], + "to": [ 15.999, 2.999501, 12 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0001, -0.0009999999, 0.0005 ], + "to": [ 12.0001, 2.999, 3.0005 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, -0.0008, 0.0006 ], + "to": [ 6.999499, 2.9992, 5.500599 ], + "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0006, -0.0002, 11.9997 ], + "to": [ 2.999399, 2.9998, 17.4997 ], + "rotation": { "origin": [ 0, 0, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0004, 0, 10.0004 ], + "to": [ 17.0004, 3, 15.5004 ], + "rotation": { "origin": [ 14, 0, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999, 0.0006, 1.9995 ], + "to": [ 12.99899, 3.0006, 7.4995 ], + "rotation": { "origin": [ 10, 0, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 3.0003, 3.9992 ], + "to": [ 2.9999, 3.5003, 11.9992 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0008, 3, 3.9998 ], + "to": [ 16.0008, 3.5, 11.9998 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0008, 3.0004, -0.0009 ], + "to": [ 12.0008, 3.5004, 2.9991 ], + "faces": { + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0007, 2.9999, -0.0004 ], + "to": [ 7.0007, 3.4999, 5.4996 ], + "rotation": { "origin": [ 4, 3, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0001, 2.9997, 12.0008 ], + "to": [ 3.0001, 3.4997, 17.5008 ], + "rotation": { "origin": [ 0, 3, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0005, 2.9996, 9.9994 ], + "to": [ 17.0005, 3.4996, 15.4994 ], + "rotation": { "origin": [ 14, 3, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 10.0001, 3, 1.9997 ], + "to": [ 13.0001, 3.5, 7.4997 ], + "rotation": { "origin": [ 10, 3, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999599, 3.5, 2.0007 ], + "to": [ 12.9996, 6.5, 7.5007 ], + "rotation": { "origin": [ 10, 3.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 3.4999, 4.0009 ], + "to": [ 2.9996, 6.4999, 12.0009 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9992, 3.5009, 4.0001 ], + "to": [ 15.9992, 6.5009, 12.0001 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 3.5001, 0.0001 ], + "to": [ 12.0003, 6.5001, 3.0001 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0007, 3.4999, -0.0008 ], + "to": [ 7.0007, 6.4999, 5.4992 ], + "rotation": { "origin": [ 4, 3.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0008, 3.5004, 12.0007 ], + "to": [ 3.0008, 6.5004, 17.5007 ], + "rotation": { "origin": [ 0, 3.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9991, 3.501, 9.9997 ], + "to": [ 16.9991, 6.501, 15.49969 ], + "rotation": { "origin": [ 14, 3.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "Box38", + "from": [ 2.0002, -0.0009, 2.0005 ], + "to": [ 14.0002, 0.9991, 14.0005 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, + "north": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9996, 6.9999, 9.9992 ], + "to": [ 16.9996, 9.999899, 15.4992 ], + "rotation": { "origin": [ 14, 7, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0004, 6.5008, 0.0002 ], + "to": [ 7.0004, 7.0008, 5.5002 ], + "rotation": { "origin": [ 4, 6.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0001, 6.5001, 12.0004 ], + "to": [ 2.999901, 7.0001, 17.5004 ], + "rotation": { "origin": [ 0, 6.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9995, 6.4997, 10.0003 ], + "to": [ 16.9995, 6.9997, 15.5003 ], + "rotation": { "origin": [ 14, 6.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.9991, 6.4991, 1.9997 ], + "to": [ 12.9991, 6.9991, 7.499701 ], + "rotation": { "origin": [ 10, 6.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999499, 7.0002, 1.9993 ], + "to": [ 12.9995, 10.0002, 7.4993 ], + "rotation": { "origin": [ 10, 7, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0005, 6.9998, 4.0007 ], + "to": [ 2.9995, 9.9998, 12.0007 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9998, 6.9993, 3.9991 ], + "to": [ 15.9998, 9.9993, 11.9991 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4, 7.0003, 0.0006 ], + "to": [ 12, 10.0003, 3.0006 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9995, 6.9992, 13.0002 ], + "to": [ 11.9995, 9.9992, 16.0002 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, 7.0004, -0.0007 ], + "to": [ 6.999499, 10.0004, 5.4993 ], + "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0005, 6.9994, 12.0007 ], + "to": [ 2.9995, 9.999399, 17.5007 ], + "rotation": { "origin": [ 0, 7, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9996, 6.4999, 13.0007 ], + "to": [ 11.9996, 6.9999, 16.0007 ], + "faces": { + "down": { "uv": [ 3.9996, 0, 11.9996, 2.9993 ], "texture": "#texture2" }, + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 3.9992, 6.5003, 0.0009 ], + "to": [ 11.9992, 7.0003, 3.0009 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0007, 6.5007, 4.0005 ], + "to": [ 16.0007, 7.0007, 12.00051 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 6.4992, 4.0009 ], + "to": [ 2.9999, 6.9992, 12.0009 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0002, 9.9991, -0.0001 ], + "to": [ 7.0002, 10.4991, 5.499899 ], + "rotation": { "origin": [ 4, 10, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "up": { "uv": [ 4.000212, 7.05719E-05, 7.000212, 5.50007 ], "texture": "#texture2" }, + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0003, 10.0003, 11.9997 ], + "to": [ 2.9997, 10.5003, 17.4997 ], + "rotation": { "origin": [ 0, 10, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "up": { "uv": [ 0, 12, 2.999575, 16 ], "texture": "#texture2" }, + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0008, 9.9999, 9.9991 ], + "to": [ 17.0008, 10.4999, 15.4991 ], + "rotation": { "origin": [ 14, 10, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "up": { "uv": [ 14.0012, 9.999929, 16, 15.49993 ], "texture": "#texture2" }, + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.9992, 10.0004, 2 ], + "to": [ 12.9992, 10.5004, 7.500001 ], + "rotation": { "origin": [ 10, 10, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "up": { "uv": [ 9.999434, 2.000566, 12.99943, 7.500566 ], "texture": "#texture2" }, + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 1, 10.5, 10 ], + "to": [ 4, 12.5, 17 ], + "rotation": { "origin": [ 1, 10.5, 10 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 4.000401, 2.9996, 12.0004 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 15 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 15 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 15 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 15 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 11, 10.5, 10 ], + "to": [ 14, 12.5, 17 ], + "rotation": { "origin": [ 1, 10.5, 10 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 4.000401, 2.9996, 12.0004 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 15 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 15 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 15 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 15 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4, 10.5, 7 ], + "to": [ 11, 12.5, 10 ], + "rotation": { "origin": [ 1, 10.5, 10 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 4.0003, 0, 12.0003, 2.999 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 8, 15 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 15 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 2, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 15 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4, 10.5, 17 ], + "to": [ 11, 12.5, 20 ], + "rotation": { "origin": [ 1, 10.5, 10 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 4.0003, 0, 12.0003, 2.999 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 8, 15 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 15 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 2, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 15 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0001, 9.9997, 12.9993 ], + "to": [ 12.0001, 10.4997, 15.9993 ], + "faces": { + "up": { "uv": [ 4.0001, 12.9993, 12.0001, 15.9993 ], "texture": "#texture2" }, + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 10.0008, -0.0009 ], + "to": [ 12.0003, 10.5008, 2.999099 ], + "faces": { + "up": { "uv": [ 4.0003, 0, 12.0003, 2.999099 ], "texture": "#texture2" }, + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 5.4992, 2.999099, 5.9992 ], "texture": "#texture" }, + "east": { "uv": [ 13.0009, 5.4992, 16, 5.9992 ], "texture": "#texture" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9995, 9.9997, 3.9993 ], + "to": [ 15.9995, 10.49969, 11.9993 ], + "faces": { + "up": { "uv": [ 12.9995, 3.9993, 15.9995, 11.9993 ], "texture": "#texture2" }, + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0.0005, 9.999599, 4 ], + "to": [ 3.0005, 10.4996, 12 ], + "faces": { + "up": { "uv": [ 0.0005, 4, 3.0005, 12 ], "texture": "#texture2" }, + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0, 0, 4 ], + "to": [ 3, 3, 12 ], + "faces": { + "down": { "uv": [ 0, 3.99914, 2.999619, 11.99914 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "Box64", + "from": [ 4, 0, 14 ], + "to": [ 12, 1, 15.5 ], + "faces": { + "down": { "uv": [ 4, 0.5, 12, 2 ], "texture": "#texture1" }, + "up": { "uv": [ 4, 14, 12, 15.5 ], "texture": "#texture1" }, + "north": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 15, 12, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 14, 15, 15.5, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0.5, 15, 2, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ 3, 12.5, 6 ], + "to": [ 6, 14.5, 10 ], + "faces": { + "down": { "uv": [ 0, 4.000401, 3, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 4 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 15 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 15 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 4, 15 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 12, 15 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 10, 12.5, 6 ], + "to": [ 13, 14.5, 10 ], + "faces": { + "down": { "uv": [ 0, 4.000401, 3, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 4 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 15 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 15 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 4, 15 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 12, 15 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 5, 12.5, 3 ], + "to": [ 11, 14.5, 6 ], + "faces": { + "down": { "uv": [ 4.0003, 0, 12.0003, 2.999 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 7 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 7, 15 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 7, 15 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 2, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 10, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.5, 12.5, 10 ], + "to": [ 11.5, 14.5, 13 ], + "faces": { + "down": { "uv": [ 4.0003, 0, 12.0003, 2.999 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 7 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 7, 15 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 7, 15 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 2, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 10, 16 ], "texture": "#texture1", "rotation": 270 } + } + } + ], + "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 From 9a607d5abdfb59f3d16ecbca199e3600081462a2 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 18 Jun 2017 05:10:47 -0400 Subject: [PATCH 4/6] need to do adobe bloomery item model and update brick bloomery model --- .../nmd/primal/forgecraft/init/ModBlocks.java | 11 +- .../primal/forgecraft/init/ModCrafting.java | 21 +- .../forgecraft/items/ItemStoneTongs.java | 10 +- .../primal/forgecraft/tiles/TileBloomery.java | 26 +- .../blockstates/bloomery_adobe.json | 8 +- .../models/block/bloomery_adobe_lit.json | 693 ++++++++++++++++++ .../textures/blocks/adobebrick_lit.png | Bin 0 -> 802 bytes 7 files changed, 739 insertions(+), 30 deletions(-) create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/adobebrick_lit.png 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 d90904b0..e341afd4 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 @@ -29,7 +29,7 @@ import nmd.primal.forgecraft.tiles.TileAnvil; public class ModBlocks { public static Block firebox; - public static Block bloomery; + public static Block bloomery_brick; public static Block bloomery_adobe; public static Block blockbreaker; @@ -89,8 +89,8 @@ public class ModBlocks { public static void init() { firebox = new Forge(Material.ROCK); - bloomery = new BloomeryBase(Material.ROCK, "bloomery", 1500); - bloomery_adobe = new BloomeryBase(Material.ROCK, "bloomery_adobe", 1560); + bloomery_brick = new BloomeryBase(Material.ROCK, "bloomery", 5000); + bloomery_adobe = new BloomeryBase(Material.ROCK, "bloomery_adobe", 5000); blockbreaker = new Breaker(Material.WOOD, "blockbreaker", 4.0f); pistonbellowsoak = new PistonBellows(Material.WOOD, "pistonbellowsoak"); @@ -366,7 +366,7 @@ public class ModBlocks { public static void register() { registerBlock(firebox); - registerBlock(bloomery); + registerBlock(bloomery_brick); registerBlock(bloomery_adobe); registerBlock(blockbreaker); @@ -438,7 +438,8 @@ public class ModBlocks { registerRender(pistonbellowsspruce); registerRender(pistonbellowsdarkoak); registerRender(pistonbellowsacacia); - registerRender(bloomery); + registerRender(bloomery_brick); + registerRender(bloomery_adobe); registerRender(emptycrucible); registerRender(emptycruciblehot); registerRender(emptycruciblecracked); 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 91d88740..5facb4a2 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 @@ -27,8 +27,11 @@ public class ModCrafting { GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.firebox), "X X", "XYX", "X X", 'X', Items.BRICK, 'Y', Blocks.FURNACE); /***Bloomery***/ - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.bloomery), + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.bloomery_brick), "X X", "X X", "XXX", 'X', Items.BRICK); + + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.bloomery_adobe), + "X X", "X X", "XXX", 'X', PrimalItems.ADOBEBRICK_DRY); /***Block Breaker***/ GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.blockbreaker), "L ", "BSB", "BBB", 'L', Blocks.LEVER, 'B', new ItemStack(Blocks.PLANKS, 1, OreDictionary.WILDCARD_VALUE), 'S', PrimalItems.SILK_CORDAGE_COILED); @@ -217,7 +220,7 @@ public class ModCrafting { new ItemStack(ModBlocks.emptycruciblehot, 1), new ItemStack(ModBlocks.emptycruciblecrackedhot, 1), new ItemStack(ModBlocks.emptycrucible, 1), - 1450, + 2000, 1600, 600, 0.25f, @@ -229,7 +232,7 @@ public class ModCrafting { new ItemStack(ModBlocks.emptycruciblecrackedhot, 1), new ItemStack(ModBlocks.emptycruciblecrackedhot, 1), new ItemStack(ModBlocks.emptycruciblecracked, 1), - 2700, + 2250, 9000, 600, 0.0f, @@ -603,6 +606,18 @@ public class ModCrafting { "null" ); + /*** Iron Bars ***/ + AnvilCrafting.addRecipe( + new String [] { + hotChunk,empty,hotChunk,empty,hotChunk, + hotChunk,hotChunk,hotChunk,hotChunk,hotChunk, + hotChunk,empty,hotChunk,empty,hotChunk, + hotChunk,hotChunk,hotChunk,hotChunk,hotChunk, + hotChunk,empty,hotChunk,empty,hotChunk, }, + new ItemStack(PrimalItems.IRON_PLATE, 1), + "null" + ); + /*** Flaked diamond ***/ AnvilCrafting.addRecipe( new String[] { 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 5c4794ab..ea86f5c9 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 @@ -16,6 +16,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.ModInfo; +import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.blocks.Crucible; import nmd.primal.forgecraft.blocks.CrucibleHot; import nmd.primal.forgecraft.blocks.IngotBall; @@ -134,7 +135,7 @@ public class ItemStoneTongs extends Item { /***** Picks Up Hot Ingots from the Ground *****/ - if (world.getBlockState(pos).getBlock() != ModBlocks.bloomery) { + if (world.getBlockState(pos).getBlock() instanceof BloomeryBase == false) { if (world.getBlockState(pos).getBlock() instanceof IngotBall) { if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE) == true) { if (world.getBlockState(pos).getBlock() == ModBlocks.ironball) { @@ -176,7 +177,7 @@ public class ItemStoneTongs extends Item { /***** Picks Up Hot Crucibles from the Ground *****/ - if (world.getBlockState(pos).getBlock() != ModBlocks.bloomery) { + if (world.getBlockState(pos).getBlock() instanceof BloomeryBase == false) { if(world.getBlockState(pos).getBlock() instanceof CrucibleHot) { TileBaseCrucible tileCrucible = (TileBaseCrucible) world.getTileEntity(pos); /*************************** @@ -398,8 +399,8 @@ public class ItemStoneTongs extends Item { /***** Pulls the crucible from the Bloomery *****/ - if(itemstack.getTagCompound().getInteger("type") == 0){ - if (world.getBlockState(pos).getBlock() == ModBlocks.bloomery) { + if (world.getBlockState(pos).getBlock() instanceof BloomeryBase) { + if (itemstack.getTagCompound().getInteger("type") == 0) { TileBloomery tile = (TileBloomery) world.getTileEntity(pos); if (tile.getSlotStack(1).getItem().equals(Item.getItemFromBlock(ModBlocks.emptycruciblehot))) { itemstack.getTagCompound().setInteger("type", 1); @@ -458,7 +459,6 @@ public class ItemStoneTongs extends Item { return EnumActionResult.SUCCESS; } } - } /***** 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 259ef3ac..d7eb4433 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 @@ -108,7 +108,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { private void slotZeroManager(World world){ if(this.getSlotStack(0) != ItemStack.EMPTY) { - Integer decrInt = (int) Math.floor(getVanillaItemBurnTime(this.getSlotStack(0)) / 20); + Integer decrInt = (int) Math.floor(getVanillaItemBurnTime(this.getSlotStack(0)) / 10); if(decrInt == 0) { decrInt = 1; } @@ -155,9 +155,9 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(stack.isEmpty()){ world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); } - if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL1){ - if(this.getHeat() > 1210){ - this.setHeat(1200); + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL_FAIR){ + if(this.getHeat() > 1610){ + this.setHeat(1600); } } if(this.getSlotStack(0).getItem() == Items.COAL && this.getSlotStack(0).getMetadata() == 1){ @@ -165,14 +165,14 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.setHeat(1200); } } - if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL2){ - if(this.getHeat() > 1610){ - this.setHeat(1600); + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL_GOOD){ + if(this.getHeat() > 2110){ + this.setHeat(2100); } } - if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL3){ - if(this.getHeat() > 3010){ - this.setHeat(3000); + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL_HIGH){ + if(this.getHeat() > 3510){ + this.setHeat(3500); } } } @@ -208,9 +208,9 @@ public class TileBloomery extends TileBaseSlot implements ITickable { return true; } } - if(stack.getItem() == PrimalItems.CHARCOAL1 - || stack.getItem() == PrimalItems.CHARCOAL2 - || stack.getItem() == PrimalItems.CHARCOAL3){ + if(stack.getItem() == PrimalItems.CHARCOAL_GOOD + || stack.getItem() == PrimalItems.CHARCOAL_HIGH + || stack.getItem() == PrimalItems.CHARCOAL_FAIR){ return true; } } diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json index 0523ca9d..f9849ffd 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_adobe.json @@ -4,9 +4,9 @@ "active=false,facing=east": { "model": "forgecraft:bloomery_adobe", "y": 90 }, "active=false,facing=south": { "model": "forgecraft:bloomery_adobe", "y": 180 }, "active=false,facing=west": { "model": "forgecraft:bloomery_adobe", "y": 270 }, - "active=true,facing=north": { "model": "forgecraft:bloomery_adobe" }, - "active=true,facing=east": { "model": "forgecraft:bloomery_adobe", "y": 90 }, - "active=true,facing=south": { "model": "forgecraft:bloomery_adobe", "y": 180 }, - "active=true,facing=west": { "model": "forgecraft:bloomery_adobe", "y": 270 } + "active=true,facing=north": { "model": "forgecraft:bloomery_adobe_lit" }, + "active=true,facing=east": { "model": "forgecraft:bloomery_adobe_lit", "y": 90 }, + "active=true,facing=south": { "model": "forgecraft:bloomery_adobe_lit", "y": 180 }, + "active=true,facing=west": { "model": "forgecraft:bloomery_adobe_lit", "y": 270 } } } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json new file mode 100644 index 00000000..0d6745cd --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json @@ -0,0 +1,693 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "blocks/stone_slab", + "texture": "blocks/stone_slab", + "texture1": "primal:blocks/adobebrick", + "texture2": "primal:blocks/adobebrick_mortar", + "texture3": "forgecraft:blocks/adobebrick_lit" + }, + "elements": [ + { + "__comment": "1bricks1", + "from": [ 12.999, -0.0005, 4 ], + "to": [ 15.999, 2.999501, 12 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0001, -0.0009999999, 0.0005 ], + "to": [ 12.0001, 2.999, 3.0005 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, -0.0008, 0.0006 ], + "to": [ 6.999499, 2.9992, 5.500599 ], + "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0006, -0.0002, 11.9997 ], + "to": [ 2.999399, 2.9998, 17.4997 ], + "rotation": { "origin": [ 0, 0, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0004, 0, 10.0004 ], + "to": [ 17.0004, 3, 15.5004 ], + "rotation": { "origin": [ 14, 0, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999, 0.0006, 1.9995 ], + "to": [ 12.99899, 3.0006, 7.4995 ], + "rotation": { "origin": [ 10, 0, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 3.0003, 3.9992 ], + "to": [ 2.9999, 3.5003, 11.9992 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0008, 3, 3.9998 ], + "to": [ 16.0008, 3.5, 11.9998 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0008, 3.0004, -0.0009 ], + "to": [ 12.0008, 3.5004, 2.9991 ], + "faces": { + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture3" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9997, 3, 13.0005 ], + "to": [ 11.9997, 3.5, 16.0005 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture3" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0007, 2.9999, -0.0004 ], + "to": [ 7.0007, 3.4999, 5.4996 ], + "rotation": { "origin": [ 4, 3, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0001, 2.9997, 12.0008 ], + "to": [ 3.0001, 3.4997, 17.5008 ], + "rotation": { "origin": [ 0, 3, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0005, 2.9996, 9.9994 ], + "to": [ 17.0005, 3.4996, 15.4994 ], + "rotation": { "origin": [ 14, 3, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 10.0001, 3, 1.9997 ], + "to": [ 13.0001, 3.5, 7.4997 ], + "rotation": { "origin": [ 10, 3, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999599, 3.5, 2.0007 ], + "to": [ 12.9996, 6.5, 7.5007 ], + "rotation": { "origin": [ 10, 3.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 3.4999, 4.0009 ], + "to": [ 2.9996, 6.4999, 12.0009 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9992, 3.5009, 4.0001 ], + "to": [ 15.9992, 6.5009, 12.0001 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 3.5001, 0.0001 ], + "to": [ 12.0003, 6.5001, 3.0001 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0007, 3.5001, 13.0008 ], + "to": [ 12.0007, 6.5001, 16.0008 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0007, 3.4999, -0.0008 ], + "to": [ 7.0007, 6.4999, 5.4992 ], + "rotation": { "origin": [ 4, 3.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0008, 3.5004, 12.0007 ], + "to": [ 3.0008, 6.5004, 17.5007 ], + "rotation": { "origin": [ 0, 3.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9991, 3.501, 9.9997 ], + "to": [ 16.9991, 6.501, 15.49969 ], + "rotation": { "origin": [ 14, 3.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "Box38", + "from": [ 2.0002, -0.0009, 2.0005 ], + "to": [ 14.0002, 0.9991, 14.0005 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture1" }, + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture3" }, + "north": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 2, 15, 14, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9996, 6.9999, 9.9992 ], + "to": [ 16.9996, 9.999899, 15.4992 ], + "rotation": { "origin": [ 14, 7, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0004, 6.5008, 0.0002 ], + "to": [ 7.0004, 7.0008, 5.5002 ], + "rotation": { "origin": [ 4, 6.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0001, 6.5001, 12.0004 ], + "to": [ 2.999901, 7.0001, 17.5004 ], + "rotation": { "origin": [ 0, 6.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9995, 6.4997, 10.0003 ], + "to": [ 16.9995, 6.9997, 15.5003 ], + "rotation": { "origin": [ 14, 6.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.9991, 6.4991, 1.9997 ], + "to": [ 12.9991, 6.9991, 7.499701 ], + "rotation": { "origin": [ 10, 6.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999499, 7.0002, 1.9993 ], + "to": [ 12.9995, 10.0002, 7.4993 ], + "rotation": { "origin": [ 10, 7, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0005, 6.9998, 4.0007 ], + "to": [ 2.9995, 9.9998, 12.0007 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9998, 6.9993, 3.9991 ], + "to": [ 15.9998, 9.9993, 11.9991 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4, 7.0003, 0.0006 ], + "to": [ 12, 10.0003, 3.0006 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9995, 6.9992, 13.0002 ], + "to": [ 11.9995, 9.9992, 16.0002 ], + "faces": { + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, 7.0004, -0.0007 ], + "to": [ 6.999499, 10.0004, 5.4993 ], + "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0005, 6.9994, 12.0007 ], + "to": [ 2.9995, 9.999399, 17.5007 ], + "rotation": { "origin": [ 0, 7, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9996, 6.4999, 13.0007 ], + "to": [ 11.9996, 6.9999, 16.0007 ], + "faces": { + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture3" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 3.9992, 6.5003, 0.0009 ], + "to": [ 11.9992, 7.0003, 3.0009 ], + "faces": { + "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture2" }, + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture3" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0007, 6.5007, 4.0005 ], + "to": [ 16.0007, 7.0007, 12.00051 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 6.4992, 4.0009 ], + "to": [ 2.9999, 6.9992, 12.0009 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 14, 10.5004, 10.0003 ], + "to": [ 17, 13.5004, 15.5003 ], + "rotation": { "origin": [ 14, 10.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0002, 9.9991, -0.0001 ], + "to": [ 7.0002, 10.4991, 5.499899 ], + "rotation": { "origin": [ 4, 10, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0003, 10.0003, 11.9997 ], + "to": [ 2.9997, 10.5003, 17.4997 ], + "rotation": { "origin": [ 0, 10, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0008, 9.9999, 9.9991 ], + "to": [ 17.0008, 10.4999, 15.4991 ], + "rotation": { "origin": [ 14, 10, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.9992, 10.0004, 2 ], + "to": [ 12.9992, 10.5004, 7.500001 ], + "rotation": { "origin": [ 10, 10, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999499, 10.499, 2 ], + "to": [ 12.9995, 13.499, 7.5 ], + "rotation": { "origin": [ 10, 10.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 10.5, 3.9996 ], + "to": [ 2.9996, 13.5, 11.9996 ], + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9994, 10.4996, 3.9999 ], + "to": [ 15.9994, 13.4996, 11.9999 ], + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0005, 10.4999, 0 ], + "to": [ 12.0005, 13.4999, 3 ], + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0003, 10.4998, 13.001 ], + "to": [ 12.0003, 13.4998, 16.001 ], + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, + "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, + "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, + "east": { "uv": [ 8, 13, 11, 16 ], "texture": "#texture1", "rotation": 270 } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0002, 10.4997, -0.0007 ], + "to": [ 7.0002, 13.4997, 5.4993 ], + "rotation": { "origin": [ 4, 10.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0003, 10.4993, 12.0003 ], + "to": [ 3.0003, 13.4993, 17.5003 ], + "rotation": { "origin": [ 0, 10.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0001, 9.9997, 12.9993 ], + "to": [ 12.0001, 10.4997, 15.9993 ], + "faces": { + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture3" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 10.0008, -0.0009 ], + "to": [ 12.0003, 10.5008, 2.999099 ], + "faces": { + "north": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 15.5, 8, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9995, 9.9997, 3.9993 ], + "to": [ 15.9995, 10.49969, 11.9993 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0.0005, 9.999599, 4 ], + "to": [ 3.0005, 10.4996, 12 ], + "faces": { + "north": { "uv": [ 13, 13, 16, 13.5 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 13, 3, 13.5 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 13, 8, 13.5 ], "texture": "#texture2" }, + "east": { "uv": [ 8, 13, 16, 13.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0, 0, 4 ], + "to": [ 3, 3, 12 ], + "faces": { + "down": { "uv": [ 0, 3.99914, 2.999619, 11.99914 ], "texture": "#texture" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture3" } + } + } + ], + "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/textures/blocks/adobebrick_lit.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/adobebrick_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..40cba9131eae21134700c372177756f25a33d4ae GIT binary patch literal 802 zcmV+-1Ks?IP)8&w#9;rD#!G8fXqJ?-L(JJAtW~{Hy@tY(2-*(v5 zlr*up&tJk9J&kruXNrhIhIs=dQV{g33em#pz9Sqqq&kv)roB+uF;Ym3yUgjQI}(b# z=`mUiV_Q?XNVq-VE6e0X%l4+jj2@w|{k20?u+E`&c7A@uk~O{)u01*EDCX&8u4f%JT&|N4TmR=CO$O^ua? zya9XGl4V3@j@eaHUD4S5$S29|Izhw|IUEYA2+BGn7ODn_ z77<0&6s#nQ(d_qu&`0FF#={QihwiMl8G g8QL29+dUxs58qv5KnG&nYybcN07*qoM6N<$g3)$y9RL6T literal 0 HcmV?d00001 From 4e5ada44cf021fb42e83942e0dd22e61e1ce5dd3 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 18 Jun 2017 14:35:20 -0400 Subject: [PATCH 5/6] adobe forge, adobe bloomery, refactor forge bloomery stonetongs --- 1.11/gradle.properties | 4 +- .../java/nmd/primal/forgecraft/ModInfo.java | 4 +- .../primal/forgecraft/blocks/AnvilIron.java | 15 - .../primal/forgecraft/blocks/AnvilStone.java | 20 - .../primal/forgecraft/blocks/Bloomery.java | 455 ------------ .../forgecraft/blocks/BloomeryBase.java | 7 +- .../nmd/primal/forgecraft/blocks/Forge.java | 68 +- .../primal/forgecraft/blocks/IngotBall.java | 1 - .../forgecraft/blocks/PistonBellows.java | 33 +- .../nmd/primal/forgecraft/init/ModBlocks.java | 17 +- .../primal/forgecraft/init/ModCrafting.java | 4 +- .../forgecraft/items/ItemStoneTongs.java | 7 +- .../items/weapons/CustomShield.java | 1 - .../renders/blocks/TileBloomeryRender.java | 1 - .../primal/forgecraft/tiles/TileBloomery.java | 12 +- .../primal/forgecraft/tiles/TileForge.java | 53 +- .../primal/forgecraft/util/AnvilHandler.java | 3 - .../forgecraft/util/BreakerHandler.java | 8 +- .../{bloomery.json => bloomery_brick.json} | 16 +- .../forgecraft/blockstates/firebox.json | 12 - .../forgecraft/blockstates/forge_adobe.json | 30 + .../forgecraft/blockstates/forge_brick.json | 12 + .../assets/forgecraft/lang/en_us.lang | 3 +- .../models/block/blockbreaker2.json | 200 ------ .../forgecraft/models/block/bloomery2.json | 0 .../models/block/bloomery_adobe_lit.json | 28 +- .../models/block/bloomery_brick.json | 676 ++++++++++++++++++ .../models/block/bloomery_brick_lit.json | 676 ++++++++++++++++++ .../models/block/bloomery_covered.json | 234 ------ .../models/block/bloomery_lit_covered.json | 234 ------ .../models/block/{firebox.json => forge.json} | 0 .../{firebox_lit.json => forge_lit.json} | 1 + .../forgecraft/models/item/forge_adobe.json | 8 + .../item/{firebox.json => forge_brick.json} | 2 +- .../textures/blocks/adobebrick_lit.png | Bin 802 -> 704 bytes .../forgecraft/textures/blocks/stone_slab.png | Bin 386 -> 414 bytes 1.11/src/main/resources/mcmod.info | 2 +- 37 files changed, 1554 insertions(+), 1293 deletions(-) delete mode 100644 1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java rename 1.11/src/main/resources/assets/forgecraft/blockstates/{bloomery.json => bloomery_brick.json} (77%) delete mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/firebox.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/forge_brick.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/blockbreaker2.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery2.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick_lit.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery_covered.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered.json rename 1.11/src/main/resources/assets/forgecraft/models/block/{firebox.json => forge.json} (100%) rename 1.11/src/main/resources/assets/forgecraft/models/block/{firebox_lit.json => forge_lit.json} (99%) create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/forge_adobe.json rename 1.11/src/main/resources/assets/forgecraft/models/item/{firebox.json => forge_brick.json} (76%) diff --git a/1.11/gradle.properties b/1.11/gradle.properties index 49d3bb6e..e26fd815 100644 --- a/1.11/gradle.properties +++ b/1.11/gradle.properties @@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.2.30 -forge_version=13.20.0.2311 +mod_version=1.2.40 +forge_version=13.20.0.2315 mcp_mappings=snapshot_20170121 mc_version=1.11.2 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 7c5ec2a1..4297d66b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,9 +17,9 @@ public class ModInfo { public static final String MOD_CONFIG = "primal/" + MOD_ID; //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.2.30"; + public static final String MOD_VERSION = "1.2.40"; public static final String MC_VERSIONS = "[1.11.0, 1.12.0)"; - public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2226,);" + "required-after:primal@[0.4,);"; + public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2315,);" + "required-after:primal@[0.4,);"; /** Mod Structures **/ public static final String SERVER_PROXY = "nmd.primal.forgecraft.proxy.ServerProxy"; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java index a8a090de..3807773f 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilIron.java @@ -1,30 +1,15 @@ package nmd.primal.forgecraft.blocks; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.api.PrimalItems; -import nmd.primal.core.api.PrimalMaterials; import nmd.primal.core.common.items.tools.WorkMallet; -import nmd.primal.forgecraft.CommonUtils; -import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; -import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.util.AnvilHandler; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java index 849172b7..5f99786c 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/AnvilStone.java @@ -1,42 +1,22 @@ package nmd.primal.forgecraft.blocks; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -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.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalItems; import nmd.primal.core.api.PrimalMaterials; import nmd.primal.core.common.items.tools.WorkMallet; import nmd.primal.forgecraft.CommonUtils; -import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.crafting.AnvilCrafting; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.items.BaseMultiItem; -import nmd.primal.forgecraft.items.ForgeHammer; -import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.tiles.TileAnvil; -import nmd.primal.forgecraft.util.AnvilHandler; - -import java.util.concurrent.ThreadLocalRandom; /** * Created by mminaie on 3/4/17. diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java deleted file mode 100644 index 0de824a6..00000000 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java +++ /dev/null @@ -1,455 +0,0 @@ -package nmd.primal.forgecraft.blocks; - -import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; -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.init.SoundEvents; -import net.minecraft.item.ItemSpade; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.api.PrimalItems; -import nmd.primal.core.api.PrimalStates; -import nmd.primal.core.common.crafting.FireSource; -import nmd.primal.core.common.helper.PlayerHelper; -import nmd.primal.forgecraft.CommonUtils; -import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.crafting.BloomeryCrafting; -import nmd.primal.forgecraft.tiles.TileBloomery; - -import java.util.Random; -import java.util.concurrent.ThreadLocalRandom; - -import static nmd.primal.core.common.helper.FireHelper.makeSmoke; - -/** - * Created by mminaie on 1/21/17. - */ -public class Bloomery extends CustomContainerFacing implements ITileEntityProvider { - - //public static final PropertyBool PrimalStates.ACTIVE = PropertyBool.create("PrimalStates.ACTIVE"); - public static final PropertyBool COVERED = PropertyBool.create("covered"); - - public Bloomery(Material material, String registryName) { - super(material); - setUnlocalizedName(ModInfo.ForgecraftBlocks.BLOOMERY.getUnlocalizedName()); - setRegistryName(registryName); - //setRegistryName(ModInfo.ForgecraftBlocks.FIREBOX.getRegistryName()); - setCreativeTab(ModInfo.TAB_FORGECRAFT); - setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); - setHardness(3.0f); - } - - @Override - public TileEntity createNewTileEntity(World worldIn, int meta) - { - return new TileBloomery(); - } - - @Override - public void randomTick(World world, BlockPos pos, IBlockState state, Random random) - { - this.updateTick(world, pos, state, random); - if(!world.isRemote){ - if(state.getValue(PrimalStates.ACTIVE) == true) { - makeSmoke(world, pos); - } - } - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) { - TileBloomery tile = (TileBloomery) world.getTileEntity(pos); - if (tile != null) { - ItemStack pItem = player.inventory.getCurrentItem(); - ItemStack tileItem = tile.getSlotStack(0); - ItemStack tileItem1 = tile.getSlotStack(1); - if(pItem.isEmpty()) { - - if(!player.isSneaking()){ - if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE) == true){ - Integer bloomeryHeat = tile.getHeat(); - Integer idealTemp = null; - Integer cookCounter = tile.getCookCounter(); - Integer idealCookTime = null; - Integer remainingTime = null; - - String stringBloomeryHeat = bloomeryHeat.toString(); - String stringIdealTemp = ""; - String stringRemainingTime = ""; - - BloomeryCrafting recipe = BloomeryCrafting.getRecipe(tile.getSlotStack(1)); - if(recipe != null) { - idealTemp = recipe.getHeatThreshold(); - idealCookTime = recipe.getIdealTime(); - stringIdealTemp = idealTemp.toString(); - remainingTime = idealCookTime - cookCounter; - stringRemainingTime = remainingTime.toString(); - - } - - ITextComponent itextcomponent = new TextComponentString("Current Temp: " + stringBloomeryHeat + " Ideal Temp: " + stringIdealTemp + " Ticks Remaining: " + stringRemainingTime); - player.sendStatusMessage(itextcomponent, true); - //System.out.println(pos); - return true; - } - } - } - if(tile.getSlotStack(0) != ItemStack.EMPTY) { - if((FireSource.useSource(world, pos, player, pItem, hand, facing, hitX, hitY, hitZ))) { - world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, true), 2); - tile.setHeat(100); - tile.markDirty(); - tile.updateBlock(); - return true; - } - } - if((!pItem.isEmpty()) && tile.isItemValidForSlot(0, pItem)) { - if (!tileItem.isEmpty()){ - if(pItem.getItem() == tileItem.getItem()){ - if(tileItem.getCount() < 64){ - if(tileItem.getCount() + pItem.getCount() <= 64){ - tileItem.grow(pItem.getCount()); - player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY); - tile.markDirty(); - tile.updateBlock(); - return true; - } - if(tileItem.getCount() + pItem.getCount() > 64){ - pItem.setCount(64-pItem.getCount()); - tileItem.setCount(64); - tile.markDirty(); - tile.updateBlock(); - return true; - } - } - } - } - if(tileItem.isEmpty()) { - tile.setSlotStack(0, pItem); - player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY); - return true; - } - } - - if((!pItem.isEmpty()) && tile.isItemValidForSlot(1, pItem)) { - if (!tileItem1.isEmpty()) { - return false; - } - if(tileItem1.isEmpty()){ - ItemStack tempItem = new ItemStack(pItem.getItem(), 1); - tile.setSlotStack(1, tempItem); - pItem.shrink(1); - return true; - } - } - if (player.isSneaking()) { - if (!tile.getSlotStack(0).isEmpty()) { - if(player.inventory.getCurrentItem().getItem() instanceof ItemSpade) { - ItemStack returnStack = tile.getSlotStack(0).copy(); - PlayerHelper.spawnItemOnPlayer(world, player, returnStack); - tile.clearSlot(0); - return true; - } - } - } - } - } - return false; - } - - - @Override - public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) - { - int lightState =0; - if(state.getValue(PrimalStates.ACTIVE) == true){ - lightState = 10; - } - return lightState; - } - - public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) - { - return 0; - } - - public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) - { - return true; - } - - @Override - public boolean isFireSource(World world, BlockPos pos, EnumFacing side) - { - if(!world.isRemote){ - if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE)==true){ - return true; - } - } - return false; - } - - @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity ent) - { - if(ent instanceof EntityPlayer){ - if(state.getValue(PrimalStates.ACTIVE) == true){ - ent.setFire(1); - } - } - } - - /** - * Called serverside after this block is replaced with another in Chunk, but before the Tile Entity is updated - */ - @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) - { - if (!world.isRemote && world.getGameRules().getBoolean("doTileDrops")) - { - TileBloomery tile = (TileBloomery) world.getTileEntity(pos); - if (tile !=null) - { - for (ItemStack stack : tile.getSlotList()) - { - if (stack != null) { - float offset = 0.7F; - double offsetX = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D; - double offsetY = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D; - double offsetZ = world.rand.nextFloat() * offset + (1.0F - offset) * 0.5D; - EntityItem item = new EntityItem(world, pos.getX() + offsetX, pos.getY() + offsetY, pos.getZ() + offsetZ, stack); - item.setDefaultPickupDelay(); - world.spawnEntity(item); - } - } - } - } - super.breakBlock(world, pos, state); - } - - @Override - public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) - { - if(!worldIn.isRemote){ - worldIn.setBlockState(pos, state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(false)), 2); - } - - } - - @Override - public int getMetaFromState(IBlockState state) { - int i = 0; - - if( state.getValue(FACING) == EnumFacing.EAST && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == false){ - i = 0; - return i; - } - if( state.getValue(FACING) == EnumFacing.WEST && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == false){ - i = 1; - return i; - } - if( state.getValue(FACING) == EnumFacing.SOUTH && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == false){ - i = 2; - return i; - } - if( state.getValue(FACING) == EnumFacing.NORTH && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == false){ - i = 3; - return i; - } - if( state.getValue(FACING) == EnumFacing.EAST && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == false){ - i = 4; - return i; - } - if( state.getValue(FACING) == EnumFacing.WEST && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == false){ - i = 5; - return i; - } - if( state.getValue(FACING) == EnumFacing.SOUTH && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == false){ - i = 6; - return i; - } - if( state.getValue(FACING) == EnumFacing.NORTH && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == false){ - i = 7; - return i; - } - if( state.getValue(FACING) == EnumFacing.EAST && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == true){ - i = 8; - return i; - } - if( state.getValue(FACING) == EnumFacing.WEST && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == true){ - i = 9; - return i; - } - if( state.getValue(FACING) == EnumFacing.SOUTH && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == true){ - i = 10; - return i; - } - if( state.getValue(FACING) == EnumFacing.NORTH && state.getValue(PrimalStates.ACTIVE) == true && state.getValue(COVERED) == true){ - i = 11; - return i; - } - if( state.getValue(FACING) == EnumFacing.EAST && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == true){ - i = 12; - return i; - } - if( state.getValue(FACING) == EnumFacing.WEST && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == true){ - i = 13; - return i; - } - if( state.getValue(FACING) == EnumFacing.SOUTH && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == true){ - i = 14; - return i; - } - if( state.getValue(FACING) == EnumFacing.NORTH && state.getValue(PrimalStates.ACTIVE) == false && state.getValue(COVERED) == true){ - i = 15; - return i; - } - return i; - } - - @Override - public IBlockState getStateFromMeta(int meta) - { - IBlockState iblockstate = this.getDefaultState(); - - if (meta == 0){ - iblockstate = iblockstate.withProperty(FACING, EnumFacing.EAST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 1) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.WEST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 2) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.SOUTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 3) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 4) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.EAST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 5) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.WEST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 6) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.SOUTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 7) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(false)); - } - if (meta == 8) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.EAST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 9) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.WEST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 10) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.SOUTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 11) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(true)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 12) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.EAST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 13) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.WEST).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 14) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.SOUTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(true)); - } - if (meta == 15) { - iblockstate = iblockstate.withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)).withProperty(COVERED, Boolean.valueOf(true)); - } - return iblockstate; - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] {FACING, PrimalStates.ACTIVE, COVERED}); - } - - @Override - public boolean isFullCube(IBlockState state) - { - return false; - } - - @Override - public boolean isFullyOpaque(IBlockState state) - { - return false; - } - - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) - { - return true; - } - - @Override - public EnumBlockRenderType getRenderType(IBlockState state) - { - return EnumBlockRenderType.MODEL; - } - - @SideOnly(Side.CLIENT) - @SuppressWarnings("incomplete-switch") - public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) - { - if(state.getValue(PrimalStates.ACTIVE) == true) - { - double d0 = (double)pos.getX() + 0.5D; - double d1 = (double)pos.getY() + 0.2D; - double d2 = (double)pos.getZ() + 0.5D; - double d3 = 0.52D; - double d4 = ThreadLocalRandom.current().nextDouble(0.075, 0.35); - double ySpeed = ThreadLocalRandom.current().nextDouble(0.0, 0.075); - - if (rand.nextDouble() < 0.1D) - { - world.playSound((double)pos.getX() + 0.5D, (double)pos.getY(), (double)pos.getZ() + 0.5D, SoundEvents.BLOCK_FURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); - } - if(rand.nextInt(4) == 1){ - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); - } - if(rand.nextInt(4) == 2){ - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); - } - if(rand.nextInt(4) == 3){ - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); - } - if(rand.nextInt(4) == 4){ - world.spawnParticle(EnumParticleTypes.FLAME, d0-d4, d1, d2-d4, 0.0D, ySpeed, 0.0D, new int[0]); - world.spawnParticle(EnumParticleTypes.FLAME, d0+d4, d1, d2+d4, 0.0D, ySpeed, 0.0D, new int[0]); - } - } - } -} \ No newline at end of file diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java index dbc673e6..88a525b8 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java @@ -3,7 +3,6 @@ package nmd.primal.forgecraft.blocks; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -24,7 +23,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalStates; import nmd.primal.core.common.crafting.FireSource; -import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.core.common.helper.FireHelper; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; @@ -34,8 +32,6 @@ import nmd.primal.forgecraft.tiles.TileBloomery; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import static nmd.primal.core.common.helper.FireHelper.makeSmoke; - /** * Created by mminaie on 6/11/17. */ @@ -51,6 +47,7 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr setCreativeTab(ModInfo.TAB_FORGECRAFT); setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); setHardness(3.0f); + setResistance(5.0f); this.maxHeat=maxHeat; } @@ -74,7 +71,7 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr this.updateTick(world, pos, state, random); if(!world.isRemote){ if(state.getValue(PrimalStates.ACTIVE) == true) { - FireHelper.makeSmoke(world, pos, 10); + FireHelper.makeSmoke(world, pos, 50); } } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java index 82a3958d..1ba4d64b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java @@ -4,7 +4,6 @@ import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -25,10 +24,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import nmd.primal.core.api.PrimalItems; +import nmd.primal.core.api.PrimalStates; import nmd.primal.core.common.crafting.FireSource; import nmd.primal.core.common.helper.PlayerHelper; -import nmd.primal.forgecraft.CommonUtils; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.items.parts.ToolPart; import nmd.primal.forgecraft.tiles.TileForge; @@ -45,19 +43,30 @@ import static nmd.primal.core.common.helper.FireHelper.makeSmoke; /** * Created by kitsu on 11/26/2016. */ -public class Forge extends CustomContainerFacing implements ITileEntityProvider/*, ITextComponent*/ { +public class Forge extends CustomContainerFacing implements ITileEntityProvider{ - public static final PropertyBool ACTIVE = PropertyBool.create("active"); + private int maxHeat; + //public static final PropertyBool PrimalStates.ACTIVE = PropertyBool.create("PrimalStates.ACTIVE"); protected static final AxisAlignedBB collideBox = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.99D, 1.0D); protected static final AxisAlignedBB boundBox = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); - public Forge(Material material) { + public Forge(Material material, String name, Integer maxHeat) { super(material); - setUnlocalizedName(ModInfo.ForgecraftBlocks.FIREBOX.getUnlocalizedName()); - setRegistryName(ModInfo.ForgecraftBlocks.FIREBOX.getRegistryName()); + setUnlocalizedName(name); + setRegistryName(name); setCreativeTab(ModInfo.TAB_FORGECRAFT); - setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, Boolean.valueOf(false))); + setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false))); setHardness(3.0f); + setResistance(5.0f); + this.maxHeat=maxHeat; + } + + public int getMaxHeat() { + return maxHeat; + } + + public void setMaxHeat(int maxHeat) { + this.maxHeat = maxHeat; } @Override @@ -107,7 +116,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ } if(pItem.isEmpty()) { if(!player.isSneaking()){ - if(world.getBlockState(pos).getValue(ACTIVE) == true){ + if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE) == true){ Integer tempInt = tile.getHeat(); String tempString = tempInt.toString(); ITextComponent itextcomponent = new TextComponentString(tempString); @@ -118,7 +127,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ } } if((FireSource.useSource(world, pos, player, pItem, hand, facing, hitX, hitY, hitZ))) { - world.setBlockState(pos, state.withProperty(ACTIVE, true), 2); + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, true), 2); tile.setHeat(100); tile.markDirty(); tile.updateBlock(); @@ -226,7 +235,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ { //if (!world.isRemote){ if(ent instanceof EntityPlayer){ - if(state.getValue(ACTIVE) == true){ + if(state.getValue(PrimalStates.ACTIVE) == true){ ent.setFire(1); } } @@ -240,7 +249,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { - if(state.getValue(ACTIVE) == true){ + if(state.getValue(PrimalStates.ACTIVE) == true){ return 15; } return 0; @@ -264,7 +273,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ if(!world.isRemote){ TileForge tile = (TileForge) world.getTileEntity(pos); if(tile.getSlotStack(0) != ItemStack.EMPTY){ - if(world.getBlockState(pos).getValue(ACTIVE)==true){ + if(world.getBlockState(pos).getValue(PrimalStates.ACTIVE)==true){ return true; } } @@ -305,14 +314,14 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ /*@Override public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { IBlockState state = super.onBlockPlaced(worldIn, pos, facing, hitX, hitY, hitZ, meta, placer); - return state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(ACTIVE, Boolean.valueOf(false)); + return state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)); }*/ @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { if(!worldIn.isRemote) { - worldIn.setBlockState(pos, state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(ACTIVE, Boolean.valueOf(false)), 2); + worldIn.setBlockState(pos, state.withProperty(FACING, placer.getHorizontalFacing()).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(false)), 2); } } @@ -320,35 +329,35 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ public int getMetaFromState(IBlockState state) { int i = 0; - if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(ACTIVE) == false){ + if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(PrimalStates.ACTIVE) == false){ i = 0; return i; } - if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(ACTIVE) == false){ + if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(PrimalStates.ACTIVE) == false){ i = 1; return i; } - if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(ACTIVE) == false){ + if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(PrimalStates.ACTIVE) == false){ i = 2; return i; } - if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(ACTIVE) == false){ + if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(PrimalStates.ACTIVE) == false){ i = 3; return i; } - if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(ACTIVE) == true){ + if( (state.getValue(FACING) == EnumFacing.EAST) && state.getValue(PrimalStates.ACTIVE) == true){ i = 4; return i; } - if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(ACTIVE) == true){ + if( (state.getValue(FACING) == EnumFacing.WEST) && state.getValue(PrimalStates.ACTIVE) == true){ i = 5; return i; } - if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(ACTIVE) == true){ + if( (state.getValue(FACING) == EnumFacing.SOUTH) && state.getValue(PrimalStates.ACTIVE) == true){ i = 6; return i; } - if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(ACTIVE) == true){ + if( (state.getValue(FACING) == EnumFacing.NORTH) && state.getValue(PrimalStates.ACTIVE) == true){ i = 7; return i; } @@ -360,9 +369,6 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ public IBlockState getStateFromMeta(int meta) { EnumFacing enumfacing; Boolean active; - - - switch (meta & 7) { case 0: @@ -402,12 +408,12 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ active = false; } - return this.getDefaultState().withProperty(FACING, enumfacing).withProperty(ACTIVE, Boolean.valueOf(active)); + return this.getDefaultState().withProperty(FACING, enumfacing).withProperty(PrimalStates.ACTIVE, Boolean.valueOf(active)); } @Override protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] {FACING, ACTIVE}); + return new BlockStateContainer(this, new IProperty[] {FACING, PrimalStates.ACTIVE}); } @Override @@ -446,7 +452,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ { this.updateTick(world, pos, state, random); if(!world.isRemote){ - if(state.getValue(ACTIVE) == true) { + if(state.getValue(PrimalStates.ACTIVE) == true) { makeSmoke(world, pos); } } @@ -456,7 +462,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ @SuppressWarnings("incomplete-switch") public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - if(state.getValue(Forge.ACTIVE) == true) + if(state.getValue(PrimalStates.ACTIVE) == true) { double d0 = (double)pos.getX() + 0.5D; double d1 = (double)pos.getY() + 0.96D; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java index 9b73dc79..d12a1756 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java @@ -3,7 +3,6 @@ package nmd.primal.forgecraft.blocks; import net.minecraft.block.BlockDynamicLiquid; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java index 876ef336..0dc0e6dc 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java @@ -18,7 +18,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModSounds; import nmd.primal.forgecraft.tiles.TileBloomery; import nmd.primal.forgecraft.tiles.TileForge; @@ -81,9 +80,9 @@ public class PistonBellows extends CustomContainerFacing { if (state.getValue(PistonBellows.FACING) == EnumFacing.NORTH) { BlockPos tempPos = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); @@ -109,9 +108,9 @@ public class PistonBellows extends CustomContainerFacing { } if (state.getValue(PistonBellows.FACING) == EnumFacing.SOUTH) { BlockPos tempPos = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); @@ -137,9 +136,9 @@ public class PistonBellows extends CustomContainerFacing { } if (state.getValue(PistonBellows.FACING) == EnumFacing.EAST) { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); @@ -165,9 +164,9 @@ public class PistonBellows extends CustomContainerFacing { } if (state.getValue(PistonBellows.FACING) == EnumFacing.WEST) { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { if (tile != null) { //System.out.println(world.getBlockState(tempPos).getValue(Forge.FACING)); tile.setHeat(tile.getHeat() + 50); @@ -377,9 +376,9 @@ public class PistonBellows extends CustomContainerFacing { if(state.getValue(PistonBellows.ACTIVE) == Boolean.TRUE) { if (state.getValue(PistonBellows.FACING) == EnumFacing.NORTH) { BlockPos tempPos = new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ()); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.EAST)) { makeEmbers(world, tempPos, world.rand); } } @@ -394,9 +393,9 @@ public class PistonBellows extends CustomContainerFacing { if (state.getValue(PistonBellows.FACING) == EnumFacing.SOUTH) { BlockPos tempPos = new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ()); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.WEST)) { makeEmbers(world, tempPos, world.rand); } } @@ -411,9 +410,9 @@ public class PistonBellows extends CustomContainerFacing { if (state.getValue(PistonBellows.FACING) == EnumFacing.EAST) { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.SOUTH)) { makeEmbers(world, tempPos, world.rand); } } @@ -428,9 +427,9 @@ public class PistonBellows extends CustomContainerFacing { if (state.getValue(PistonBellows.FACING) == EnumFacing.WEST) { BlockPos tempPos = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1); - if (world.getBlockState(tempPos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(tempPos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(tempPos); - if ((world.getBlockState(tempPos).getValue(Forge.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { + if ((world.getBlockState(tempPos).getValue(PrimalStates.ACTIVE) == true) && (world.getBlockState(tempPos).getValue(Forge.FACING) == EnumFacing.NORTH)) { makeEmbers(world, tempPos, world.rand); } } 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 e341afd4..c9215714 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 @@ -28,7 +28,8 @@ import nmd.primal.forgecraft.tiles.TileAnvil; */ public class ModBlocks { - public static Block firebox; + public static Block forge_brick; + public static Block forge_adobe; public static Block bloomery_brick; public static Block bloomery_adobe; public static Block blockbreaker; @@ -88,8 +89,9 @@ public class ModBlocks { public static void init() { - firebox = new Forge(Material.ROCK); - bloomery_brick = new BloomeryBase(Material.ROCK, "bloomery", 5000); + forge_brick = new Forge(Material.ROCK, "forge_brick", 5000); + forge_adobe = new Forge(Material.ROCK, "forge_adobe", 5000); + bloomery_brick = new BloomeryBase(Material.ROCK, "bloomery_brick", 5000); bloomery_adobe = new BloomeryBase(Material.ROCK, "bloomery_adobe", 5000); blockbreaker = new Breaker(Material.WOOD, "blockbreaker", 4.0f); @@ -365,7 +367,8 @@ public class ModBlocks { public static void register() { - registerBlock(firebox); + registerBlock(forge_brick); + registerBlock(forge_adobe); registerBlock(bloomery_brick); registerBlock(bloomery_adobe); registerBlock(blockbreaker); @@ -430,7 +433,9 @@ public class ModBlocks { @SideOnly(Side.CLIENT) public static void registerRenders() { - registerRender(firebox); + registerRender(forge_brick); + registerRender(forge_adobe); + registerRender(blockbreaker); registerRender(pistonbellowsoak); registerRender(pistonbellowsjungle); @@ -438,8 +443,10 @@ public class ModBlocks { registerRender(pistonbellowsspruce); registerRender(pistonbellowsdarkoak); registerRender(pistonbellowsacacia); + registerRender(bloomery_brick); registerRender(bloomery_adobe); + registerRender(emptycrucible); registerRender(emptycruciblehot); registerRender(emptycruciblecracked); 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 5facb4a2..c81b3e29 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 @@ -24,8 +24,10 @@ public class ModCrafting { Random rand = new Random(); /***Forge***/ - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.firebox), + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.forge_brick), "X X", "XYX", "X X", 'X', Items.BRICK, 'Y', Blocks.FURNACE); + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.forge_adobe), + "X X", "XYX", "X X", 'X', PrimalItems.ADOBEBRICK_DRY, 'Y', Blocks.FURNACE); /***Bloomery***/ GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.bloomery_brick), "X X", "X X", "XXX", 'X', Items.BRICK); 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 ea86f5c9..72fcb546 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 @@ -16,10 +16,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.ModInfo; -import nmd.primal.forgecraft.blocks.BloomeryBase; -import nmd.primal.forgecraft.blocks.Crucible; -import nmd.primal.forgecraft.blocks.CrucibleHot; -import nmd.primal.forgecraft.blocks.IngotBall; +import nmd.primal.forgecraft.blocks.*; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; import nmd.primal.forgecraft.tiles.TileBaseCrucible; @@ -465,7 +462,7 @@ public class ItemStoneTongs extends Item { Pulls the Tool Parts from the Forge *****/ if(itemstack.getTagCompound().getInteger("type") == 0){ - if (world.getBlockState(pos).getBlock() == ModBlocks.firebox) { + if (world.getBlockState(pos).getBlock() instanceof Forge) { TileForge tile = (TileForge) world.getTileEntity(pos); for (int i = 2; i < tile.getSlotListSize(); i++) { if (tile.getSlotStack(i).getItem().equals(ModItems.ironchunkhot)) { diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java index 47b3a8a7..7605a4cf 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java @@ -1,6 +1,5 @@ package nmd.primal.forgecraft.items.weapons; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java index 14a8d5f5..dfcd7b2c 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileBloomeryRender.java @@ -9,7 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import nmd.primal.forgecraft.blocks.Bloomery; import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.tiles.TileBloomery; import org.lwjgl.opengl.GL11; 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 d7eb4433..95943013 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 @@ -12,17 +12,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.core.api.PrimalItems; import nmd.primal.core.api.PrimalStates; -import nmd.primal.core.common.helper.CommonUtils; -import nmd.primal.core.common.helper.ParticleHelper; -import nmd.primal.forgecraft.blocks.Bloomery; import nmd.primal.forgecraft.blocks.BloomeryBase; import nmd.primal.forgecraft.blocks.Crucible; -import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.crafting.BloomeryCrafting; import nmd.primal.forgecraft.init.ModItems; -import static nmd.primal.forgecraft.CommonUtils.getVanillaItemBurnTime; import static nmd.primal.core.common.helper.FireHelper.makeSmoke; +import static nmd.primal.forgecraft.CommonUtils.getVanillaItemBurnTime; /** * Created by mminaie on 1/22/17. @@ -52,7 +48,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { BlockPos abovePos = new BlockPos(this.getPos().getX(), this.getPos().getY()+1, this.getPos().getZ()); if (world.getBlockState(this.getPos()).getValue(PrimalStates.ACTIVE)) { if (this.getSlotStack(0) == ItemStack.EMPTY) { - world.setBlockState(this.getPos(), state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(this.getPos(), state.withProperty(PrimalStates.ACTIVE, false), 2); this.markDirty(); world.notifyBlockUpdate(pos, state, state, 2); } @@ -149,11 +145,11 @@ public class TileBloomery extends TileBaseSlot implements ITickable { this.setHeat(h - 25); } if(h < 10 ){ - world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, false), 2); } } if(stack.isEmpty()){ - world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, false), 2); } if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL_FAIR){ if(this.getHeat() > 1610){ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java index 25072568..12265a4f 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileForge.java @@ -2,6 +2,7 @@ package nmd.primal.forgecraft.tiles; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -10,12 +11,13 @@ import net.minecraft.util.ITickable; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import nmd.primal.core.common.helper.CommonUtils; +import nmd.primal.core.api.PrimalItems; +import nmd.primal.core.api.PrimalStates; import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.crafting.ForgeCrafting; -import static nmd.primal.forgecraft.CommonUtils.getVanillaItemBurnTime; import static nmd.primal.core.common.helper.FireHelper.makeSmoke; +import static nmd.primal.forgecraft.CommonUtils.getVanillaItemBurnTime; /** * Created by mminaie on 11/30/16. @@ -43,9 +45,9 @@ public class TileForge extends TileBaseSlot implements ITickable { this.iteration = 0; - if (world.getBlockState(this.getPos()).getValue(Forge.ACTIVE)) { + if (world.getBlockState(this.getPos()).getValue(PrimalStates.ACTIVE)) { if (this.getSlotStack(0) == ItemStack.EMPTY) { - world.setBlockState(this.getPos(), state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(this.getPos(), state.withProperty(PrimalStates.ACTIVE, false), 2); this.markDirty(); world.notifyBlockUpdate(pos, state, state, 2); } @@ -59,7 +61,7 @@ public class TileForge extends TileBaseSlot implements ITickable { private void slotZeroManager(World world){ if(this.getSlotStack(0) != ItemStack.EMPTY) { - Integer decrInt = (int) Math.floor(getVanillaItemBurnTime(this.getSlotStack(0)) / 20); + Integer decrInt = (int) Math.floor(getVanillaItemBurnTime(this.getSlotStack(0)) / 10); if(decrInt == 0) { decrInt = 1; } @@ -78,20 +80,40 @@ public class TileForge extends TileBaseSlot implements ITickable { } private void heatManager(Integer h, IBlockState state, ItemStack stack, World world, BlockPos pos){ - if(state.getValue(Forge.ACTIVE) == true){ + if(state.getValue(PrimalStates.ACTIVE) == true){ if(!stack.isEmpty()) { if(h > 0) { this.setHeat(h - 25); } if(h < 10 ){ - world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, false), 2); } } if(stack.isEmpty()){ - world.setBlockState(pos, state.withProperty(Forge.ACTIVE, false), 2); + world.setBlockState(pos, state.withProperty(PrimalStates.ACTIVE, false), 2); + } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL_FAIR){ + if(this.getHeat() > 1610){ + this.setHeat(1600); + } + } + if(this.getSlotStack(0).getItem() == Items.COAL && this.getSlotStack(0).getMetadata() == 1){ + if(this.getHeat() > 1210){ + this.setHeat(1200); + } + } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL_GOOD){ + if(this.getHeat() > 2110){ + this.setHeat(2100); + } + } + if(this.getSlotStack(0).getItem() == PrimalItems.CHARCOAL_HIGH){ + if(this.getHeat() > 3510){ + this.setHeat(3500); + } } } - if(state.getValue(Forge.ACTIVE) == false){ + if(state.getValue(PrimalStates.ACTIVE) == false){ if(h > 50){ this.setHeat(h - 50); } @@ -99,6 +121,13 @@ public class TileForge extends TileBaseSlot implements ITickable { this.setHeat(0); } } + if(world.getBlockState(pos).getBlock() instanceof Forge){ + Forge tempBlock = (Forge) world.getBlockState(pos).getBlock(); + if(this.getHeat() > tempBlock.getMaxHeat()){ + world.setBlockState(pos, Blocks.FIRE.getDefaultState(), 2); + //world.markTileEntityForRemoval(this); + } + } this.updateBlock(); this.markDirty(); } @@ -223,8 +252,12 @@ public class TileForge extends TileBaseSlot implements ITickable { return true; } } + if(stack.getItem() == PrimalItems.CHARCOAL_GOOD + || stack.getItem() == PrimalItems.CHARCOAL_HIGH + || stack.getItem() == PrimalItems.CHARCOAL_FAIR){ + return true; + } } - return false; } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java b/1.11/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java index 1aa23b55..b18bdbe9 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/util/AnvilHandler.java @@ -6,11 +6,9 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.core.api.PrimalItems; @@ -28,7 +26,6 @@ import nmd.primal.forgecraft.tiles.TileAnvil; import java.util.concurrent.ThreadLocalRandom; import static nmd.primal.forgecraft.blocks.CustomContainerFacing.FACING; -import static sun.audio.AudioPlayer.player; /** * Created by mminaie on 6/10/17. diff --git a/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java b/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java index ce990aa9..49c445dc 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/util/BreakerHandler.java @@ -7,18 +7,14 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.core.api.PrimalItems; -//import nmd.primal.forgecraft.CommonUtils; - -import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.blocks.CustomContainerFacing; import nmd.primal.forgecraft.tiles.TileBreaker; -import nmd.primal.forgecraft.blocks.CustomContainerFacing.*; - -import java.util.concurrent.ThreadLocalRandom; import static nmd.primal.core.common.helper.CommonUtils.randomCheck; +//import nmd.primal.forgecraft.CommonUtils; + /** * Created by mminaie on 6/11/17. */ diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_brick.json similarity index 77% rename from 1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json rename to 1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_brick.json index 5062bb44..4a150eb1 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/bloomery_brick.json @@ -1,12 +1,12 @@ { "variants": { - "active=false,facing=north": { "model": "forgecraft:bloomery" }, - "active=false,facing=east": { "model": "forgecraft:bloomery", "y": 90 }, - "active=false,facing=south": { "model": "forgecraft:bloomery", "y": 180 }, - "active=false,facing=west": { "model": "forgecraft:bloomery", "y": 270 }, - "active=true,facing=north": { "model": "forgecraft:bloomery_lit" }, - "active=true,facing=east": { "model": "forgecraft:bloomery_lit", "y": 90 }, - "active=true,facing=south": { "model": "forgecraft:bloomery_lit", "y": 180 }, - "active=true,facing=west": { "model": "forgecraft:bloomery_lit", "y": 270 } + "active=false,facing=north": { "model": "forgecraft:bloomery_brick" }, + "active=false,facing=east": { "model": "forgecraft:bloomery_brick", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:bloomery_brick", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:bloomery_brick", "y": 270 }, + "active=true,facing=north": { "model": "forgecraft:bloomery_brick_lit" }, + "active=true,facing=east": { "model": "forgecraft:bloomery_brick_lit", "y": 90 }, + "active=true,facing=south": { "model": "forgecraft:bloomery_brick_lit", "y": 180 }, + "active=true,facing=west": { "model": "forgecraft:bloomery_brick_lit", "y": 270 } } } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/firebox.json b/1.11/src/main/resources/assets/forgecraft/blockstates/firebox.json deleted file mode 100644 index d7ddbb0d..00000000 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/firebox.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=false,facing=north": { "model": "forgecraft:firebox" }, - "active=false,facing=east": { "model": "forgecraft:firebox", "y": 90 }, - "active=false,facing=south": { "model": "forgecraft:firebox", "y": 180 }, - "active=false,facing=west": { "model": "forgecraft:firebox", "y": 270 }, - "active=true,facing=north": { "model": "forgecraft:firebox_lit" }, - "active=true,facing=east": { "model": "forgecraft:firebox_lit", "y": 90 }, - "active=true,facing=south": { "model": "forgecraft:firebox_lit", "y": 180 }, - "active=true,facing=west": { "model": "forgecraft:firebox_lit", "y": 270 } - } -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json b/1.11/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json new file mode 100644 index 00000000..15ced0e0 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json @@ -0,0 +1,30 @@ +{ + "forge_marker": 1, + "variants": { + "active": { + "true": { + "textures": { + "particle": "primal:blocks/adobebrick", + "texture": "primal:blocks/adobebrick", + "texture1": "forgecraft:blocks/adobebrick_lit" + }, + "model": "forgecraft:forge_lit" + }, + "false": { + "textures": { + "particle": "primal:blocks/adobebrick", + "texture": "primal:blocks/adobebrick" + }, + "model": "forgecraft:forge" + } + }, + "facing": { + "north": {}, + "east": {"y": 90}, + "south": {"y": 180}, + "west":{"y": 270} + } + } +} + + diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/forge_brick.json b/1.11/src/main/resources/assets/forgecraft/blockstates/forge_brick.json new file mode 100644 index 00000000..1cc8f09a --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/forge_brick.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=false,facing=north": { "model": "forgecraft:forge" }, + "active=false,facing=east": { "model": "forgecraft:forge", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:forge", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:forge", "y": 270 }, + "active=true,facing=north": { "model": "forgecraft:forge_lit" }, + "active=true,facing=east": { "model": "forgecraft:forge_lit", "y": 90 }, + "active=true,facing=south": { "model": "forgecraft:forge_lit", "y": 180 }, + "active=true,facing=west": { "model": "forgecraft:forge_lit", "y": 270 } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang index debcf6f0..805bc0d5 100644 --- a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang +++ b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang @@ -1,7 +1,8 @@ itemGroup.forgecraft=ForgeCraft -tile.firebox.name=Forge +tile.forge_brick.name=Brick Forge +tile.forge_brick.name=Adobe Forge tile.bloomery.name=Bloomery tile.stoneanvil.name=Stone Anvil tile.pistonbellows.name=Wooden Piston Bellows diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/blockbreaker2.json b/1.11/src/main/resources/assets/forgecraft/models/block/blockbreaker2.json deleted file mode 100644 index e6350bda..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/blockbreaker2.json +++ /dev/null @@ -1,200 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "blocks/e_particle", - "texture": "blocks/e_texture", - "texture1": "blocks/checker_test", - "texture2": "blocks/e_texture" - }, - "elements": [ - { - "__comment": "Cube1", - "from": [ 0, 0, 0 ], - "to": [ 6, 2, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture" }, - "north": { "uv": [ 10, 14, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 14, 6, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube2", - "from": [ 6, 0, 2 ], - "to": [ 10, 2, 16 ], - "faces": { - "down": { "uv": [ 6, 0, 10, 14 ], "texture": "#texture" }, - "up": { "uv": [ 6, 2, 10, 16 ], "texture": "#texture" }, - "north": { "uv": [ 6, 14, 10, 16 ], "texture": "#texture" }, - "south": { "uv": [ 6, 14, 10, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube3", - "from": [ 10, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "down": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 14, 6, 16 ], "texture": "#texture" }, - "south": { "uv": [ 10, 14, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX5", - "from": [ 6, 0, 0 ], - "to": [ 6.001, 2, 2 ], - "faces": { - "east": { "uv": [ 14, 14, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX6", - "from": [ 10, 0, 0 ], - "to": [ 10.001, 2, 2 ], - "faces": { - "west": { "uv": [ 0, 14, 2, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube7", - "from": [ 0, 2, 8 ], - "to": [ 2, 4, 15 ], - "faces": { - "down": { "uv": [ 0, 1, 2, 8 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 2, 15 ], "texture": "#texture" }, - "north": { "uv": [ 14, 12, 16, 14 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "west": { "uv": [ 8, 12, 15, 14 ], "texture": "#texture" }, - "east": { "uv": [ 1, 12, 8, 14 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 0, 4, 9 ], - "to": [ 2, 6, 14 ], - "faces": { - "down": { "uv": [ 0, 2, 2, 7 ], "texture": "#texture" }, - "up": { "uv": [ 0, 9, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 14, 10, 16, 12 ], "texture": "#texture" }, - "south": { "uv": [ 0, 10, 2, 12 ], "texture": "#texture" }, - "west": { "uv": [ 9, 10, 14, 12 ], "texture": "#texture" }, - "east": { "uv": [ 2, 10, 7, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube9", - "from": [ 0, 6, 10 ], - "to": [ 2, 8, 13 ], - "faces": { - "down": { "uv": [ 0, 3, 2, 6 ], "texture": "#texture" }, - "up": { "uv": [ 0, 10, 2, 13 ], "texture": "#texture" }, - "north": { "uv": [ 14, 8, 16, 10 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 2, 10 ], "texture": "#texture" }, - "west": { "uv": [ 10, 8, 13, 10 ], "texture": "#texture" }, - "east": { "uv": [ 3, 8, 6, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube7", - "from": [ 14, 2, 8 ], - "to": [ 16, 4, 15 ], - "faces": { - "down": { "uv": [ 0, 0, 2, 7 ], "texture": "#texture" }, - "up": { "uv": [ 0, 9, 2, 16 ], "texture": "#texture" }, - "north": { "uv": [ 14, 12, 16, 14 ], "texture": "#texture" }, - "south": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, - "west": { "uv": [ 9, 12, 16, 14 ], "texture": "#texture" }, - "east": { "uv": [ 0, 12, 7, 14 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube8", - "from": [ 14, 4, 9 ], - "to": [ 16, 6, 14 ], - "faces": { - "down": { "uv": [ 0, 1, 2, 6 ], "texture": "#texture" }, - "up": { "uv": [ 0, 10, 2, 15 ], "texture": "#texture" }, - "north": { "uv": [ 14, 10, 16, 12 ], "texture": "#texture" }, - "south": { "uv": [ 0, 10, 2, 12 ], "texture": "#texture" }, - "west": { "uv": [ 10, 10, 15, 12 ], "texture": "#texture" }, - "east": { "uv": [ 1, 10, 6, 12 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube9", - "from": [ 14, 6, 10 ], - "to": [ 16, 8, 13 ], - "faces": { - "down": { "uv": [ 0, 2, 2, 5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 11, 2, 14 ], "texture": "#texture" }, - "north": { "uv": [ 14, 8, 16, 10 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 2, 10 ], "texture": "#texture" }, - "west": { "uv": [ 11, 8, 14, 10 ], "texture": "#texture" }, - "east": { "uv": [ 2, 8, 5, 10 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube13", - "from": [ 2, 6.5, 10.5 ], - "to": [ 14, 8, 12 ], - "faces": { - "down": { "uv": [ 2, 1, 14, 3 ], "texture": "#texture1" }, - "up": { "uv": [ 2, 13, 14, 15 ], "texture": "#texture1" }, - "north": { "uv": [ 2, 8, 14, 10 ], "texture": "#texture1" }, - "south": { "uv": [ 2, 8, 14, 10 ], "texture": "#texture1" } - } - }, - { - "__comment": "Cube14", - "from": [ 2, 5.5, 12.5 ], - "to": [ 3, 11.5, 13.5 ], - "faces": { - "down": { "uv": [ 15, 2.5, 16, 3.5 ], "texture": "#texture" }, - "up": { "uv": [ 14, 0, 15, 1 ], "texture": "#texture" }, - "north": { "uv": [ 11.5, 0, 12.5, 6 ], "texture": "#texture" }, - "south": { "uv": [ 13, 0, 14, 6 ], "texture": "#texture" }, - "west": { "uv": [ 14, 0, 15, 6 ], "texture": "#texture" }, - "east": { "uv": [ 15, 0, 16, 6 ], "texture": "#texture" } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 1, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 45, 0 ], - "translation": [ 0, 1, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "translation": [ 0, 1, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ -90, -90, 0 ], - "translation": [ 0, 0, -3 ], - "scale": [ 0.5, 0.5, 0.5 ] - } - } -} \ 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 e69de29b..00000000 diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json index 0d6745cd..a45f44f0 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json @@ -1,8 +1,8 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "blocks/stone_slab", - "texture": "blocks/stone_slab", + "particle": "forgecraft:blocks/stone_slab", + "texture": "forgecraft:blocks/stone_slab", "texture1": "primal:blocks/adobebrick", "texture2": "primal:blocks/adobebrick_mortar", "texture3": "forgecraft:blocks/adobebrick_lit" @@ -35,7 +35,7 @@ { "__comment": "1angle0", "from": [ 3.9995, -0.0008, 0.0006 ], - "to": [ 6.999499, 2.9992, 5.500599 ], + "to": [ 6.999498, 2.9992, 5.500599 ], "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, "faces": { "down": { "uv": [ 0, 8, 3, 16 ], "texture": "#texture1" }, @@ -402,7 +402,7 @@ { "__comment": "1angle0", "from": [ 3.9995, 7.0004, -0.0007 ], - "to": [ 6.999499, 10.0004, 5.4993 ], + "to": [ 6.999498, 10.0004, 5.4993 ], "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, "faces": { "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, @@ -475,7 +475,7 @@ "to": [ 17, 13.5004, 15.5003 ], "rotation": { "origin": [ 14, 10.5, 10 ], "axis": "y", "angle": -45 }, "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, @@ -536,7 +536,7 @@ "to": [ 12.9995, 13.499, 7.5 ], "rotation": { "origin": [ 10, 10.5, 2 ], "axis": "y", "angle": 45 }, "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, @@ -548,7 +548,7 @@ "from": [ -0.0004, 10.5, 3.9996 ], "to": [ 2.9996, 13.5, 11.9996 ], "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -560,7 +560,7 @@ "from": [ 12.9994, 10.4996, 3.9999 ], "to": [ 15.9994, 13.4996, 11.9999 ], "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, @@ -569,10 +569,10 @@ }, { "__comment": "1bricks2", - "from": [ 4.0005, 10.4999, 0 ], - "to": [ 12.0005, 13.4999, 3 ], + "from": [ 4, 10.5, 0 ], + "to": [ 12, 13.5, 3 ], "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3", "rotation": 90 }, "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, @@ -584,7 +584,7 @@ "from": [ 4.0003, 10.4998, 13.001 ], "to": [ 12.0003, 13.4998, 16.001 ], "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1", "rotation": 90 }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3", "rotation": 90 }, "north": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture3" }, "south": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1", "rotation": 90 }, @@ -597,7 +597,7 @@ "to": [ 7.0002, 13.4997, 5.4993 ], "rotation": { "origin": [ 4, 10.5, 0 ], "axis": "y", "angle": -45 }, "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, @@ -610,7 +610,7 @@ "to": [ 3.0003, 13.4993, 17.5003 ], "rotation": { "origin": [ 0, 10.5, 12 ], "axis": "y", "angle": 45 }, "faces": { - "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 3, 8 ], "texture": "#texture3" }, "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, "west": { "uv": [ 0, 13, 8, 16 ], "texture": "#texture1" }, diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json new file mode 100644 index 00000000..3fab6759 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json @@ -0,0 +1,676 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:blocks/brick", + "texture": "forgecraft:blocks/brick", + "texture1": "forgecraft:blocks/brick", + "texture2": "forgecraft:blocks/brick", + "texture3": "forgecraft:blocks/brick_lit" + }, + "elements": [ + { + "__comment": "1bricks1", + "from": [ 12.999, -0.0005, 4 ], + "to": [ 15.999, 2.999501, 12 ], + "faces": { + "down": { "uv": [ 12.999, 4, 15.999, 12 ], "texture": "#texture1" }, + "north": { "uv": [ 0.001000404, 13.0005, 3.001, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 12.999, 13.0005, 15.999, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 13.0005, 12, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 4, 13.0005, 12, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0001, -0.0009999999, 0.0005 ], + "to": [ 12.0001, 2.999, 3.0005 ], + "faces": { + "down": { "uv": [ 4.0001, 12.9995, 12.0001, 15.9995 ], "texture": "#texture1" }, + "north": { "uv": [ 3.9999, 13.001, 11.9999, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0001, 13.001, 12.0001, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 0.0005, 13.001, 3.0005, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9995, 13.001, 15.9995, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, -0.0008, 0.0006 ], + "to": [ 6.999499, 2.9992, 5.500599 ], + "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 3.999222, 10.49993, 6.999222, 15.99993 ], "texture": "#texture1" }, + "south": { "uv": [ 3.999222, 13.0008, 6.999222, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 7.073628E-05, 13.0008, 5.50007, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 10.49993, 13.0008, 15.99993, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0006, -0.0002, 11.9997 ], + "to": [ 2.999399, 2.9998, 17.4997 ], + "rotation": { "origin": [ 0, 0, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 2.999362, 3.999788 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13.0002, 2.999362, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 12.00021, 13.0002, 16, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 13.0002, 3.999788, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0004, 0, 10.0004 ], + "to": [ 17.0004, 3, 15.5004 ], + "rotation": { "origin": [ 14, 0, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 14, 0.4994345, 16, 5.999434 ], "texture": "#texture1" }, + "north": { "uv": [ 0, 13, 2, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 14, 13, 16, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 10.00057, 13, 15.50057, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0.4994345, 13, 5.999434, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999, 0.0006, 1.9995 ], + "to": [ 12.99899, 3.0006, 7.4995 ], + "rotation": { "origin": [ 10, 0, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 9.99894, 8.499646, 12.99893, 13.99965 ], "texture": "#texture1" }, + "north": { "uv": [ 3.00107, 12.9994, 6.00106, 15.9994 ], "texture": "#texture1" }, + "south": { "uv": [ 9.99894, 12.9994, 12.99893, 15.9994 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000354, 12.9994, 7.500354, 15.9994 ], "texture": "#texture1" }, + "east": { "uv": [ 8.499646, 12.9994, 13.99965, 15.9994 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 3.0003, 3.9992 ], + "to": [ 2.9999, 3.5003, 11.9992 ], + "faces": { + "north": { "uv": [ 13.0001, 12.4997, 16, 12.9997 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 12.4997, 2.9999, 12.9997 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9992, 12.4997, 11.9992, 12.9997 ], "texture": "#texture2" }, + "east": { "uv": [ 4.0008, 12.4997, 12.0008, 12.9997 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0008, 3, 3.9998 ], + "to": [ 16.0008, 3.5, 11.9998 ], + "faces": { + "north": { "uv": [ 0, 12.5, 2.9992, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 13.0008, 12.5, 16, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9998, 12.5, 11.9998, 13 ], "texture": "#texture2" }, + "east": { "uv": [ 4.0002, 12.5, 12.0002, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0008, 3.0004, -0.0009 ], + "to": [ 12.0008, 3.5004, 2.9991 ], + "faces": { + "north": { "uv": [ 3.9992, 12.4996, 11.9992, 12.9996 ], "texture": "#texture2" }, + "south": { "uv": [ 4.0008, 12.4996, 12.0008, 12.9996 ], "texture": "#texture2" }, + "west": { "uv": [ 0, 12.4996, 2.9991, 12.9996 ], "texture": "#texture2" }, + "east": { "uv": [ 13.0009, 12.4996, 16, 12.9996 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9997, 3, 13.0005 ], + "to": [ 11.9997, 3.5, 16.0005 ], + "faces": { + "down": { "uv": [ 3.9997, 0, 11.9997, 2.9995 ], "texture": "#texture2" }, + "north": { "uv": [ 4.0003, 12.5, 12.0003, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 3.9997, 12.5, 11.9997, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 13.0005, 12.5, 16, 13 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 12.5, 2.9995, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0007, 2.9999, -0.0004 ], + "to": [ 7.0007, 3.4999, 5.4996 ], + "rotation": { "origin": [ 4, 3, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000778, 12.5001, 7.000778, 13.0001 ], "texture": "#texture2" }, + "west": { "uv": [ 0.0002121299, 12.5001, 5.500212, 13.0001 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49979, 12.5001, 15.99979, 13.0001 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0001, 2.9997, 12.0008 ], + "to": [ 3.0001, 3.4997, 17.5008 ], + "rotation": { "origin": [ 0, 3, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.00063649, 12.5003, 3.000637, 13.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 12.00049, 12.5003, 16, 13.0003 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 12.5003, 3.999505, 13.0003 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0005, 2.9996, 9.9994 ], + "to": [ 17.0005, 3.4996, 15.4994 ], + "rotation": { "origin": [ 14, 3, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 0, 12.5004, 1.999223, 13.0004 ], "texture": "#texture2" }, + "south": { "uv": [ 14.00078, 12.5004, 16, 13.0004 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999929, 12.5004, 15.49993, 13.0004 ], "texture": "#texture2" }, + "east": { "uv": [ 0.5000706, 12.5004, 6.000071, 13.0004 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 10.0001, 3, 1.9997 ], + "to": [ 13.0001, 3.5, 7.4997 ], + "rotation": { "origin": [ 10, 3, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 3.000141, 12.5, 6.000141, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999859, 12.5, 12.99986, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 1.999717, 12.5, 7.499717, 13 ], "texture": "#texture2" }, + "east": { "uv": [ 8.500283, 12.5, 14.00028, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999599, 3.5, 2.0007 ], + "to": [ 12.9996, 6.5, 7.5007 ], + "rotation": { "origin": [ 10, 3.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 2.999787, 9.5, 5.999788, 12.5 ], "texture": "#texture1" }, + "south": { "uv": [ 10.00021, 9.5, 13.00021, 12.5 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000778, 9.5, 7.500778, 12.5 ], "texture": "#texture1" }, + "east": { "uv": [ 8.499222, 9.5, 13.99922, 12.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 3.4999, 4.0009 ], + "to": [ 2.9996, 6.4999, 12.0009 ], + "faces": { + "north": { "uv": [ 13.0004, 9.5001, 16, 12.5001 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 9.5001, 2.9996, 12.5001 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0009, 9.5001, 12.0009, 12.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 3.9991, 9.5001, 11.9991, 12.5001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9992, 3.5009, 4.0001 ], + "to": [ 15.9992, 6.5009, 12.0001 ], + "faces": { + "north": { "uv": [ 0.0008001328, 9.4991, 3.0008, 12.4991 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9992, 9.4991, 15.9992, 12.4991 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0001, 9.4991, 12.0001, 12.4991 ], "texture": "#texture1" }, + "east": { "uv": [ 3.9999, 9.4991, 11.9999, 12.4991 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 3.5001, 0.0001 ], + "to": [ 12.0003, 6.5001, 3.0001 ], + "faces": { + "north": { "uv": [ 3.9997, 9.4999, 11.9997, 12.4999 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0003, 9.4999, 12.0003, 12.4999 ], "texture": "#texture1" }, + "west": { "uv": [ 0.0001, 9.4999, 3.0001, 12.4999 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9999, 9.4999, 15.9999, 12.4999 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0007, 3.5001, 13.0008 ], + "to": [ 12.0007, 6.5001, 16.0008 ], + "faces": { + "north": { "uv": [ 3.9993, 9.4999, 11.9993, 12.4999 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0007, 9.4999, 12.0007, 12.4999 ], "texture": "#texture1" }, + "west": { "uv": [ 13.0008, 9.4999, 16, 12.4999 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 9.4999, 2.9992, 12.4999 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0007, 3.4999, -0.0008 ], + "to": [ 7.0007, 6.4999, 5.4992 ], + "rotation": { "origin": [ 4, 3.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.00106, 9.5001, 7.00106, 12.5001 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 9.5001, 5.499929, 12.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50007, 9.5001, 16, 12.5001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0008, 3.5004, 12.0007 ], + "to": [ 3.0008, 6.5004, 17.5007 ], + "rotation": { "origin": [ 0, 3.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.001060658, 9.499599, 3.001061, 12.4996 ], "texture": "#texture1" }, + "west": { "uv": [ 11.99993, 9.499599, 16, 12.4996 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 9.499599, 4.000071, 12.4996 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9991, 3.501, 9.9997 ], + "to": [ 16.9991, 6.501, 15.49969 ], + "rotation": { "origin": [ 14, 3.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 0, 9.499001, 2.000424, 12.499 ], "texture": "#texture1" }, + "south": { "uv": [ 13.99958, 9.499001, 16, 12.499 ], "texture": "#texture1" }, + "west": { "uv": [ 9.999151, 9.499001, 15.49914, 12.499 ], "texture": "#texture1" }, + "east": { "uv": [ 0.5008583, 9.499001, 6.000849, 12.499 ], "texture": "#texture1" } + } + }, + { + "__comment": "Box38", + "from": [ 2.0002, -0.0009, 2.0005 ], + "to": [ 14.0002, 0.9991, 14.0005 ], + "faces": { + "down": { "uv": [ 2.0002, 1.9995, 14.0002, 13.9995 ], "texture": "#texture1" }, + "up": { "uv": [ 2.0002, 2.0005, 14.0002, 14.0005 ], "texture": "#texture1" }, + "north": { "uv": [ 1.9998, 15.0009, 13.9998, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 2.0002, 15.0009, 14.0002, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 2.0005, 15.0009, 14.0005, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 1.9995, 15.0009, 13.9995, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9996, 6.9999, 9.9992 ], + "to": [ 16.9996, 9.999899, 15.4992 ], + "rotation": { "origin": [ 14, 7, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 0, 6.000101, 1.999717, 9.0001 ], "texture": "#texture1" }, + "south": { "uv": [ 14.00028, 6.000101, 16, 9.0001 ], "texture": "#texture1" }, + "west": { "uv": [ 9.999151, 6.000101, 15.49915, 9.0001 ], "texture": "#texture1" }, + "east": { "uv": [ 0.5008488, 6.000101, 6.000849, 9.0001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0004, 6.5008, 0.0002 ], + "to": [ 7.0004, 7.0008, 5.5002 ], + "rotation": { "origin": [ 4, 6.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000142, 8.9992, 7.000142, 9.4992 ], "texture": "#texture2" }, + "west": { "uv": [ 0.000424311, 8.9992, 5.500424, 9.4992 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49958, 8.9992, 15.99958, 9.4992 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0001, 6.5001, 12.0004 ], + "to": [ 2.999901, 7.0001, 17.5004 ], + "rotation": { "origin": [ 0, 6.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.0002118418, 8.9999, 3.000213, 9.4999 ], "texture": "#texture2" }, + "west": { "uv": [ 12.00035, 8.9999, 16, 9.4999 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 8.9999, 3.999647, 9.4999 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9995, 6.4997, 10.0003 ], + "to": [ 16.9995, 6.9997, 15.5003 ], + "rotation": { "origin": [ 14, 6.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 0, 9.000299, 2.000566, 9.500299 ], "texture": "#texture2" }, + "south": { "uv": [ 13.99943, 9.000299, 16, 9.500299 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999859, 9.000299, 15.49986, 9.500299 ], "texture": "#texture2" }, + "east": { "uv": [ 0.5001411, 9.000299, 6.000141, 9.500299 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.9991, 6.4991, 1.9997 ], + "to": [ 12.9991, 6.9991, 7.499701 ], + "rotation": { "origin": [ 10, 6.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 3.000849, 9.0009, 6.000849, 9.5009 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999151, 9.0009, 12.99915, 9.5009 ], "texture": "#texture2" }, + "west": { "uv": [ 2.000424, 9.0009, 7.500425, 9.5009 ], "texture": "#texture2" }, + "east": { "uv": [ 8.499575, 9.0009, 13.99958, 9.5009 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999499, 7.0002, 1.9993 ], + "to": [ 12.9995, 10.0002, 7.4993 ], + "rotation": { "origin": [ 10, 7, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 3.000848, 5.9998, 6.000849, 8.9998 ], "texture": "#texture1" }, + "south": { "uv": [ 9.999151, 5.9998, 12.99915, 8.9998 ], "texture": "#texture1" }, + "west": { "uv": [ 1.999859, 5.9998, 7.499859, 8.9998 ], "texture": "#texture1" }, + "east": { "uv": [ 8.500141, 5.9998, 14.00014, 8.9998 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0005, 6.9998, 4.0007 ], + "to": [ 2.9995, 9.9998, 12.0007 ], + "faces": { + "north": { "uv": [ 13.0005, 6.0002, 16, 9.0002 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 6.0002, 2.9995, 9.0002 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0007, 6.0002, 12.0007, 9.0002 ], "texture": "#texture1" }, + "east": { "uv": [ 3.9993, 6.0002, 11.9993, 9.0002 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9998, 6.9993, 3.9991 ], + "to": [ 15.9998, 9.9993, 11.9991 ], + "faces": { + "north": { "uv": [ 0.0002002716, 6.0007, 3.0002, 9.0007 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9998, 6.0007, 15.9998, 9.0007 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9991, 6.0007, 11.9991, 9.0007 ], "texture": "#texture1" }, + "east": { "uv": [ 4.0009, 6.0007, 12.0009, 9.0007 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4, 7.0003, 0.0006 ], + "to": [ 12, 10.0003, 3.0006 ], + "faces": { + "north": { "uv": [ 4, 5.9997, 12, 8.999701 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 5.9997, 12, 8.999701 ], "texture": "#texture1" }, + "west": { "uv": [ 0.0006, 5.9997, 3.0006, 8.999701 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9994, 5.9997, 15.9994, 8.999701 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9995, 6.9992, 13.0002 ], + "to": [ 11.9995, 9.9992, 16.0002 ], + "faces": { + "north": { "uv": [ 4.0005, 6.0008, 12.0005, 9.0008 ], "texture": "#texture1" }, + "south": { "uv": [ 3.9995, 6.0008, 11.9995, 9.0008 ], "texture": "#texture1" }, + "west": { "uv": [ 13.0002, 6.0008, 16, 9.0008 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 6.0008, 2.9998, 9.0008 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, 7.0004, -0.0007 ], + "to": [ 6.999499, 10.0004, 5.4993 ], + "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000142, 5.9996, 7.000141, 8.999599 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 5.9996, 5.499152, 8.999599 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50085, 5.9996, 16, 8.999599 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0005, 6.9994, 12.0007 ], + "to": [ 2.9995, 9.999399, 17.5007 ], + "rotation": { "origin": [ 0, 7, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.0001414193, 6.0006, 3.000141, 9.0006 ], "texture": "#texture1" }, + "west": { "uv": [ 12.00085, 6.0006, 16, 9.0006 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 6.0006, 3.999151, 9.0006 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9996, 6.4999, 13.0007 ], + "to": [ 11.9996, 6.9999, 16.0007 ], + "faces": { + "north": { "uv": [ 4.0004, 9.0001, 12.0004, 9.5001 ], "texture": "#texture2" }, + "south": { "uv": [ 3.9996, 9.0001, 11.9996, 9.5001 ], "texture": "#texture2" }, + "west": { "uv": [ 13.0007, 9.0001, 16, 9.5001 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 9.0001, 2.9993, 9.5001 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 3.9992, 6.5003, 0.0009 ], + "to": [ 11.9992, 7.0003, 3.0009 ], + "faces": { + "north": { "uv": [ 4.0008, 8.999701, 12.0008, 9.499701 ], "texture": "#texture2" }, + "south": { "uv": [ 3.9992, 8.999701, 11.9992, 9.499701 ], "texture": "#texture2" }, + "west": { "uv": [ 0.0009, 8.999701, 3.0009, 9.499701 ], "texture": "#texture2" }, + "east": { "uv": [ 12.9991, 8.999701, 15.9991, 9.499701 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0007, 6.5007, 4.0005 ], + "to": [ 16.0007, 7.0007, 12.00051 ], + "faces": { + "north": { "uv": [ 0, 8.9993, 2.9993, 9.4993 ], "texture": "#texture2" }, + "south": { "uv": [ 13.0007, 8.9993, 16, 9.4993 ], "texture": "#texture2" }, + "west": { "uv": [ 4.0005, 8.9993, 12.00051, 9.4993 ], "texture": "#texture2" }, + "east": { "uv": [ 3.99949, 8.9993, 11.9995, 9.4993 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 6.4992, 4.0009 ], + "to": [ 2.9999, 6.9992, 12.0009 ], + "faces": { + "north": { "uv": [ 13.0001, 9.0008, 16, 9.5008 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 9.0008, 2.9999, 9.5008 ], "texture": "#texture2" }, + "west": { "uv": [ 4.0009, 9.0008, 12.0009, 9.5008 ], "texture": "#texture2" }, + "east": { "uv": [ 3.9991, 9.0008, 11.9991, 9.5008 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 14, 10.5004, 10.0003 ], + "to": [ 17, 13.5004, 15.5003 ], + "rotation": { "origin": [ 14, 10.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "up": { "uv": [ 13.99979, 10.00021, 16, 15.50021 ], "texture": "#texture1" }, + "north": { "uv": [ 0, 2.4996, 2.000213, 5.4996 ], "texture": "#texture1" }, + "south": { "uv": [ 13.99979, 2.4996, 16, 5.4996 ], "texture": "#texture1" }, + "west": { "uv": [ 10.00021, 2.4996, 15.50021, 5.4996 ], "texture": "#texture1" }, + "east": { "uv": [ 0.4997873, 2.4996, 5.999787, 5.4996 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0002, 9.9991, -0.0001 ], + "to": [ 7.0002, 10.4991, 5.499899 ], + "rotation": { "origin": [ 4, 10, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000212, 5.5009, 7.000212, 6.0009 ], "texture": "#texture2" }, + "west": { "uv": [ 7.056558E-05, 5.5009, 5.50007, 6.0009 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49993, 5.5009, 15.99993, 6.0009 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0003, 10.0003, 11.9997 ], + "to": [ 2.9997, 10.5003, 17.4997 ], + "rotation": { "origin": [ 0, 10, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0, 5.4997, 2.999575, 5.9997 ], "texture": "#texture2" }, + "west": { "uv": [ 12, 5.4997, 16, 5.9997 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 5.4997, 4, 5.9997 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0008, 9.9999, 9.9991 ], + "to": [ 17.0008, 10.4999, 15.4991 ], + "rotation": { "origin": [ 14, 10, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 0, 5.5001, 1.998797, 6.0001 ], "texture": "#texture2" }, + "south": { "uv": [ 14.0012, 5.5001, 16, 6.0001 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999929, 5.5001, 15.49993, 6.0001 ], "texture": "#texture2" }, + "east": { "uv": [ 0.5000706, 5.5001, 6.000071, 6.0001 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.9992, 10.0004, 2 ], + "to": [ 12.9992, 10.5004, 7.500001 ], + "rotation": { "origin": [ 10, 10, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 3.000566, 5.4996, 6.000566, 5.9996 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999434, 5.4996, 12.99943, 5.9996 ], "texture": "#texture2" }, + "west": { "uv": [ 2.000566, 5.4996, 7.500566, 5.9996 ], "texture": "#texture2" }, + "east": { "uv": [ 8.499434, 5.4996, 13.99943, 5.9996 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999499, 10.499, 2 ], + "to": [ 12.9995, 13.499, 7.5 ], + "rotation": { "origin": [ 10, 10.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "up": { "uv": [ 9.999646, 2.000354, 12.99965, 7.500354 ], "texture": "#texture1" }, + "north": { "uv": [ 3.000353, 2.501, 6.000354, 5.501 ], "texture": "#texture1" }, + "south": { "uv": [ 9.999646, 2.501, 12.99965, 5.501 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000354, 2.501, 7.500354, 5.501 ], "texture": "#texture1" }, + "east": { "uv": [ 8.499646, 2.501, 13.99965, 5.501 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 10.5, 3.9996 ], + "to": [ 2.9996, 13.5, 11.9996 ], + "faces": { + "up": { "uv": [ 0, 3.999599, 2.9996, 11.9996 ], "texture": "#texture1" }, + "north": { "uv": [ 13.0004, 2.5, 16, 5.5 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 2.5, 2.9996, 5.5 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9996, 2.5, 11.9996, 5.5 ], "texture": "#texture1" }, + "east": { "uv": [ 4.0004, 2.5, 12.0004, 5.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9994, 10.4996, 3.9999 ], + "to": [ 15.9994, 13.4996, 11.9999 ], + "faces": { + "up": { "uv": [ 12.9994, 3.9999, 15.9994, 11.9999 ], "texture": "#texture1" }, + "north": { "uv": [ 0.0005998611, 2.5004, 3.0006, 5.5004 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9994, 2.5004, 15.9994, 5.5004 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9999, 2.5004, 11.9999, 5.5004 ], "texture": "#texture1" }, + "east": { "uv": [ 4.0001, 2.5004, 12.0001, 5.5004 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0005, 10.4999, 0 ], + "to": [ 12.0005, 13.4999, 3 ], + "faces": { + "up": { "uv": [ 4.0005, 0, 12.0005, 3 ], "texture": "#texture1" }, + "north": { "uv": [ 3.9995, 2.5001, 11.9995, 5.5001 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0005, 2.5001, 12.0005, 5.5001 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 2.5001, 3, 5.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 13, 2.5001, 16, 5.5001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0003, 10.4998, 13.001 ], + "to": [ 12.0003, 13.4998, 16.001 ], + "faces": { + "up": { "uv": [ 4.0003, 13.001, 12.0003, 16 ], "texture": "#texture1" }, + "north": { "uv": [ 3.9997, 2.5002, 11.9997, 5.5002 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0003, 2.5002, 12.0003, 5.5002 ], "texture": "#texture1" }, + "west": { "uv": [ 13.001, 2.5002, 16, 5.5002 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 2.5002, 2.999, 5.5002 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0002, 10.4997, -0.0007 ], + "to": [ 7.0002, 13.4997, 5.4993 ], + "rotation": { "origin": [ 4, 10.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "up": { "uv": [ 4.000636, 0, 7.000636, 5.499646 ], "texture": "#texture1" }, + "south": { "uv": [ 4.000636, 2.5003, 7.000636, 5.5003 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 2.5003, 5.499646, 5.5003 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50035, 2.5003, 16, 5.5003 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0003, 10.4993, 12.0003 ], + "to": [ 3.0003, 13.4993, 17.5003 ], + "rotation": { "origin": [ 0, 10.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "up": { "uv": [ 0.0004245522, 12, 3.000425, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0.0004245522, 2.5007, 3.000425, 5.5007 ], "texture": "#texture1" }, + "west": { "uv": [ 12, 2.5007, 16, 5.5007 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 2.5007, 4, 5.5007 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0001, 9.9997, 12.9993 ], + "to": [ 12.0001, 10.4997, 15.9993 ], + "faces": { + "north": { "uv": [ 3.9999, 5.5003, 11.9999, 6.0003 ], "texture": "#texture2" }, + "south": { "uv": [ 4.0001, 5.5003, 12.0001, 6.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 12.9993, 5.5003, 15.9993, 6.0003 ], "texture": "#texture2" }, + "east": { "uv": [ 0.0006999969, 5.5003, 3.0007, 6.0003 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 10.0008, -0.0009 ], + "to": [ 12.0003, 10.5008, 2.999099 ], + "faces": { + "north": { "uv": [ 3.9997, 5.4992, 11.9997, 5.9992 ], "texture": "#texture2" }, + "south": { "uv": [ 4.0003, 5.4992, 12.0003, 5.9992 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9995, 9.9997, 3.9993 ], + "to": [ 15.9995, 10.49969, 11.9993 ], + "faces": { + "north": { "uv": [ 0.0004997253, 5.50031, 3.0005, 6.0003 ], "texture": "#texture2" }, + "south": { "uv": [ 12.9995, 5.50031, 15.9995, 6.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9993, 5.50031, 11.9993, 6.0003 ], "texture": "#texture2" }, + "east": { "uv": [ 4.0007, 5.50031, 12.0007, 6.0003 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0.0005, 9.999599, 4 ], + "to": [ 3.0005, 10.4996, 12 ], + "faces": { + "north": { "uv": [ 12.9995, 5.5004, 15.9995, 6.000401 ], "texture": "#texture2" }, + "south": { "uv": [ 0.0005, 5.5004, 3.0005, 6.000401 ], "texture": "#texture2" }, + "west": { "uv": [ 4, 5.5004, 12, 6.000401 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 5.5004, 12, 6.000401 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0, 0, 4 ], + "to": [ 3, 3, 12 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 13, 12, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 4, 13, 12, 16 ], "texture": "#texture1" } + } + } + ], + "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/bloomery_brick_lit.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick_lit.json new file mode 100644 index 00000000..71b830ba --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick_lit.json @@ -0,0 +1,676 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "forgecraft:blocks/brick", + "texture": "forgecraft:blocks/brick", + "texture1": "forgecraft:blocks/brick", + "texture2": "forgecraft:blocks/brick", + "texture3": "forgecraft:blocks/brick_lit" + }, + "elements": [ + { + "__comment": "1bricks1", + "from": [ 12.999, -0.0005, 4 ], + "to": [ 15.999, 2.999501, 12 ], + "faces": { + "down": { "uv": [ 12.999, 4, 15.999, 12 ], "texture": "#texture1" }, + "north": { "uv": [ 0.001000404, 13.0005, 3.001, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 12.999, 13.0005, 15.999, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 13.0005, 12, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 4, 13.0005, 12, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0001, -0.0009999999, 0.0005 ], + "to": [ 12.0001, 2.999, 3.0005 ], + "faces": { + "down": { "uv": [ 4.0001, 12.9995, 12.0001, 15.9995 ], "texture": "#texture1" }, + "north": { "uv": [ 3.9999, 13.001, 11.9999, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0001, 13.001, 12.0001, 16 ], "texture": "#texture3" }, + "west": { "uv": [ 0.0005, 13.001, 3.0005, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9995, 13.001, 15.9995, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, -0.0008, 0.0006 ], + "to": [ 6.999497, 2.9992, 5.500599 ], + "rotation": { "origin": [ 4, 0, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 3.999222, 10.49993, 6.99922, 15.99993 ], "texture": "#texture1" }, + "south": { "uv": [ 3.999222, 13.0008, 6.99922, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 7.073628E-05, 13.0008, 5.50007, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 10.49993, 13.0008, 15.99993, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0006, -0.0002, 11.9997 ], + "to": [ 2.999399, 2.9998, 17.4997 ], + "rotation": { "origin": [ 0, 0, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 2.999362, 3.999788 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13.0002, 2.999362, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 12.00021, 13.0002, 16, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 13.0002, 3.999788, 16 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0004, 0, 10.0004 ], + "to": [ 17.0004, 3, 15.5004 ], + "rotation": { "origin": [ 14, 0, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "down": { "uv": [ 14, 0.4994345, 16, 5.999434 ], "texture": "#texture1" }, + "north": { "uv": [ 0, 13, 2, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 14, 13, 16, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 10.00057, 13, 15.50057, 16 ], "texture": "#texture3" }, + "east": { "uv": [ 0.4994345, 13, 5.999434, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999, 0.0006, 1.9995 ], + "to": [ 12.99899, 3.0006, 7.4995 ], + "rotation": { "origin": [ 10, 0, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 9.99894, 8.499646, 12.99893, 13.99965 ], "texture": "#texture1" }, + "north": { "uv": [ 3.00107, 12.9994, 6.00106, 15.9994 ], "texture": "#texture1" }, + "south": { "uv": [ 9.99894, 12.9994, 12.99893, 15.9994 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000354, 12.9994, 7.500354, 15.9994 ], "texture": "#texture3" }, + "east": { "uv": [ 8.499646, 12.9994, 13.99965, 15.9994 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 3.0003, 3.9992 ], + "to": [ 2.9999, 3.5003, 11.9992 ], + "faces": { + "north": { "uv": [ 13.0001, 12.4997, 16, 12.9997 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 12.4997, 2.9999, 12.9997 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9992, 12.4997, 11.9992, 12.9997 ], "texture": "#texture2" }, + "east": { "uv": [ 4.0008, 12.4997, 12.0008, 12.9997 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0008, 3, 3.9998 ], + "to": [ 16.0008, 3.5, 11.9998 ], + "faces": { + "north": { "uv": [ 0, 12.5, 2.9992, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 13.0008, 12.5, 16, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9998, 12.5, 11.9998, 13 ], "texture": "#texture3" }, + "east": { "uv": [ 4.0002, 12.5, 12.0002, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0008, 3.0004, -0.0009 ], + "to": [ 12.0008, 3.5004, 2.9991 ], + "faces": { + "north": { "uv": [ 3.9992, 12.4996, 11.9992, 12.9996 ], "texture": "#texture2" }, + "south": { "uv": [ 4.0008, 12.4996, 12.0008, 12.9996 ], "texture": "#texture3" }, + "west": { "uv": [ 0, 12.4996, 2.9991, 12.9996 ], "texture": "#texture2" }, + "east": { "uv": [ 13.0009, 12.4996, 16, 12.9996 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9997, 3, 13.0005 ], + "to": [ 11.9997, 3.5, 16.0005 ], + "faces": { + "down": { "uv": [ 3.9997, 0, 11.9997, 2.9995 ], "texture": "#texture2" }, + "north": { "uv": [ 4.0003, 12.5, 12.0003, 13 ], "texture": "#texture3" }, + "south": { "uv": [ 3.9997, 12.5, 11.9997, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 13.0005, 12.5, 16, 13 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 12.5, 2.9995, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0007, 2.9999, -0.0004 ], + "to": [ 7.0007, 3.4999, 5.4996 ], + "rotation": { "origin": [ 4, 3, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000778, 12.5001, 7.000778, 13.0001 ], "texture": "#texture2" }, + "west": { "uv": [ 0.0002121299, 12.5001, 5.500212, 13.0001 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49979, 12.5001, 15.99979, 13.0001 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0001, 2.9997, 12.0008 ], + "to": [ 3.0001, 3.4997, 17.5008 ], + "rotation": { "origin": [ 0, 3, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.00063649, 12.5003, 3.000637, 13.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 12.00049, 12.5003, 16, 13.0003 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 12.5003, 3.999505, 13.0003 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0005, 2.9996, 9.9994 ], + "to": [ 17.0005, 3.4996, 15.4994 ], + "rotation": { "origin": [ 14, 3, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 0, 12.5004, 1.999223, 13.0004 ], "texture": "#texture2" }, + "south": { "uv": [ 14.00078, 12.5004, 16, 13.0004 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999929, 12.5004, 15.49993, 13.0004 ], "texture": "#texture2" }, + "east": { "uv": [ 0.5000706, 12.5004, 6.000071, 13.0004 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 10.0001, 3, 1.9997 ], + "to": [ 13.0001, 3.5, 7.4997 ], + "rotation": { "origin": [ 10, 3, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 3.000141, 12.5, 6.000141, 13 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999859, 12.5, 12.99986, 13 ], "texture": "#texture2" }, + "west": { "uv": [ 1.999717, 12.5, 7.499717, 13 ], "texture": "#texture3" }, + "east": { "uv": [ 8.500283, 12.5, 14.00028, 13 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999599, 3.5, 2.0007 ], + "to": [ 12.9996, 6.5, 7.5007 ], + "rotation": { "origin": [ 10, 3.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 2.999787, 9.5, 5.999788, 12.5 ], "texture": "#texture1" }, + "south": { "uv": [ 10.00021, 9.5, 13.00021, 12.5 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000778, 9.5, 7.500778, 12.5 ], "texture": "#texture3" }, + "east": { "uv": [ 8.499222, 9.5, 13.99922, 12.5 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 3.4999, 4.0009 ], + "to": [ 2.9996, 6.4999, 12.0009 ], + "faces": { + "north": { "uv": [ 13.0004, 9.5001, 16, 12.5001 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 9.5001, 2.9996, 12.5001 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0009, 9.5001, 12.0009, 12.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 3.9991, 9.5001, 11.9991, 12.5001 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9992, 3.5009, 4.0001 ], + "to": [ 15.9992, 6.5009, 12.0001 ], + "faces": { + "north": { "uv": [ 0.0008001328, 9.4991, 3.0008, 12.4991 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9992, 9.4991, 15.9992, 12.4991 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0001, 9.4991, 12.0001, 12.4991 ], "texture": "#texture3" }, + "east": { "uv": [ 3.9999, 9.4991, 11.9999, 12.4991 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 3.5001, 0.0001 ], + "to": [ 12.0003, 6.5001, 3.0001 ], + "faces": { + "north": { "uv": [ 3.9997, 9.4999, 11.9997, 12.4999 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0003, 9.4999, 12.0003, 12.4999 ], "texture": "#texture3" }, + "west": { "uv": [ 0.0001, 9.4999, 3.0001, 12.4999 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9999, 9.4999, 15.9999, 12.4999 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0007, 3.5001, 13.0008 ], + "to": [ 12.0007, 6.5001, 16.0008 ], + "faces": { + "north": { "uv": [ 3.9993, 9.4999, 11.9993, 12.4999 ], "texture": "#texture3" }, + "south": { "uv": [ 4.0007, 9.4999, 12.0007, 12.4999 ], "texture": "#texture1" }, + "west": { "uv": [ 13.0008, 9.4999, 16, 12.4999 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 9.4999, 2.9992, 12.4999 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0007, 3.4999, -0.0008 ], + "to": [ 7.0007, 6.4999, 5.4992 ], + "rotation": { "origin": [ 4, 3.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.00106, 9.5001, 7.00106, 12.5001 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 9.5001, 5.499929, 12.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50007, 9.5001, 16, 12.5001 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0008, 3.5004, 12.0007 ], + "to": [ 3.0008, 6.5004, 17.5007 ], + "rotation": { "origin": [ 0, 3.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.001060658, 9.499599, 3.001061, 12.4996 ], "texture": "#texture1" }, + "west": { "uv": [ 11.99993, 9.499599, 16, 12.4996 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 9.499599, 4.000071, 12.4996 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9991, 3.501, 9.9997 ], + "to": [ 16.9991, 6.501, 15.49969 ], + "rotation": { "origin": [ 14, 3.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 0, 9.499001, 2.000424, 12.499 ], "texture": "#texture1" }, + "south": { "uv": [ 13.99958, 9.499001, 16, 12.499 ], "texture": "#texture1" }, + "west": { "uv": [ 9.999151, 9.499001, 15.49914, 12.499 ], "texture": "#texture3" }, + "east": { "uv": [ 0.5008583, 9.499001, 6.000849, 12.499 ], "texture": "#texture1" } + } + }, + { + "__comment": "Box38", + "from": [ 2.0002, -0.0009, 2.0005 ], + "to": [ 14.0002, 0.9991, 14.0005 ], + "faces": { + "down": { "uv": [ 2.0002, 1.9995, 14.0002, 13.9995 ], "texture": "#texture1" }, + "up": { "uv": [ 2.0002, 2.0005, 14.0002, 14.0005 ], "texture": "#texture3" }, + "north": { "uv": [ 1.9998, 15.0009, 13.9998, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 2.0002, 15.0009, 14.0002, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 2.0005, 15.0009, 14.0005, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 1.9995, 15.0009, 13.9995, 16 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9996, 6.9999, 9.9992 ], + "to": [ 16.9996, 9.999899, 15.4992 ], + "rotation": { "origin": [ 14, 7, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 0, 6.000101, 1.999717, 9.0001 ], "texture": "#texture1" }, + "south": { "uv": [ 14.00028, 6.000101, 16, 9.0001 ], "texture": "#texture1" }, + "west": { "uv": [ 9.999151, 6.000101, 15.49915, 9.0001 ], "texture": "#texture3" }, + "east": { "uv": [ 0.5008488, 6.000101, 6.000849, 9.0001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0004, 6.5008, 0.0002 ], + "to": [ 7.0004, 7.0008, 5.5002 ], + "rotation": { "origin": [ 4, 6.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000142, 8.9992, 7.000142, 9.4992 ], "texture": "#texture2" }, + "west": { "uv": [ 0.000424311, 8.9992, 5.500424, 9.4992 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49958, 8.9992, 15.99958, 9.4992 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0001, 6.5001, 12.0004 ], + "to": [ 2.999901, 7.0001, 17.5004 ], + "rotation": { "origin": [ 0, 6.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.0002118418, 8.9999, 3.000213, 9.4999 ], "texture": "#texture2" }, + "west": { "uv": [ 12.00035, 8.9999, 16, 9.4999 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 8.9999, 3.999647, 9.4999 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 13.9995, 6.4997, 10.0003 ], + "to": [ 16.9995, 6.9997, 15.5003 ], + "rotation": { "origin": [ 14, 6.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 0, 9.000299, 2.000566, 9.500299 ], "texture": "#texture2" }, + "south": { "uv": [ 13.99943, 9.000299, 16, 9.500299 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999859, 9.000299, 15.49986, 9.500299 ], "texture": "#texture3" }, + "east": { "uv": [ 0.5001411, 9.000299, 6.000141, 9.500299 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.9991, 6.4991, 1.9997 ], + "to": [ 12.9991, 6.9991, 7.499701 ], + "rotation": { "origin": [ 10, 6.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 3.000849, 9.0009, 6.000849, 9.5009 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999151, 9.0009, 12.99915, 9.5009 ], "texture": "#texture2" }, + "west": { "uv": [ 2.000424, 9.0009, 7.500425, 9.5009 ], "texture": "#texture3" }, + "east": { "uv": [ 8.499575, 9.0009, 13.99958, 9.5009 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999499, 7.0002, 1.9993 ], + "to": [ 12.9995, 10.0002, 7.4993 ], + "rotation": { "origin": [ 10, 7, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 3.000848, 5.9998, 6.000849, 8.9998 ], "texture": "#texture1" }, + "south": { "uv": [ 9.999151, 5.9998, 12.99915, 8.9998 ], "texture": "#texture1" }, + "west": { "uv": [ 1.999859, 5.9998, 7.499859, 8.9998 ], "texture": "#texture3" }, + "east": { "uv": [ 8.500141, 5.9998, 14.00014, 8.9998 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0005, 6.9998, 4.0007 ], + "to": [ 2.9995, 9.9998, 12.0007 ], + "faces": { + "north": { "uv": [ 13.0005, 6.0002, 16, 9.0002 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 6.0002, 2.9995, 9.0002 ], "texture": "#texture1" }, + "west": { "uv": [ 4.0007, 6.0002, 12.0007, 9.0002 ], "texture": "#texture1" }, + "east": { "uv": [ 3.9993, 6.0002, 11.9993, 9.0002 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9998, 6.9993, 3.9991 ], + "to": [ 15.9998, 9.9993, 11.9991 ], + "faces": { + "north": { "uv": [ 0.0002002716, 6.0007, 3.0002, 9.0007 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9998, 6.0007, 15.9998, 9.0007 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9991, 6.0007, 11.9991, 9.0007 ], "texture": "#texture3" }, + "east": { "uv": [ 4.0009, 6.0007, 12.0009, 9.0007 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4, 7.0003, 0.0006 ], + "to": [ 12, 10.0003, 3.0006 ], + "faces": { + "north": { "uv": [ 4, 5.9997, 12, 8.999701 ], "texture": "#texture1" }, + "south": { "uv": [ 4, 5.9997, 12, 8.999701 ], "texture": "#texture3" }, + "west": { "uv": [ 0.0006, 5.9997, 3.0006, 8.999701 ], "texture": "#texture1" }, + "east": { "uv": [ 12.9994, 5.9997, 15.9994, 8.999701 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9995, 6.9992, 13.0002 ], + "to": [ 11.9995, 9.9992, 16.0002 ], + "faces": { + "north": { "uv": [ 4.0005, 6.0008, 12.0005, 9.0008 ], "texture": "#texture3" }, + "south": { "uv": [ 3.9995, 6.0008, 11.9995, 9.0008 ], "texture": "#texture1" }, + "west": { "uv": [ 13.0002, 6.0008, 16, 9.0008 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 6.0008, 2.9998, 9.0008 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 3.9995, 7.0004, -0.0007 ], + "to": [ 6.999497, 10.0004, 5.4993 ], + "rotation": { "origin": [ 4, 7, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000142, 5.9996, 7.000139, 8.999599 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 5.9996, 5.499152, 8.999599 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50085, 5.9996, 16, 8.999599 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0005, 6.9994, 12.0007 ], + "to": [ 2.9995, 9.999399, 17.5007 ], + "rotation": { "origin": [ 0, 7, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0.0001414193, 6.000601, 3.000141, 9.0006 ], "texture": "#texture1" }, + "west": { "uv": [ 12.00085, 6.000601, 16, 9.0006 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 6.000601, 3.999151, 9.0006 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks3", + "from": [ 3.9996, 6.4999, 13.0007 ], + "to": [ 11.9996, 6.9999, 16.0007 ], + "faces": { + "north": { "uv": [ 4.0004, 9.0001, 12.0004, 9.5001 ], "texture": "#texture3" }, + "south": { "uv": [ 3.9996, 9.0001, 11.9996, 9.5001 ], "texture": "#texture2" }, + "west": { "uv": [ 13.0007, 9.0001, 16, 9.5001 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 9.0001, 2.9993, 9.5001 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 3.9992, 6.5003, 0.0009 ], + "to": [ 11.9992, 7.0003, 3.0009 ], + "faces": { + "north": { "uv": [ 4.0008, 8.999701, 12.0008, 9.499701 ], "texture": "#texture2" }, + "south": { "uv": [ 3.9992, 8.999701, 11.9992, 9.499701 ], "texture": "#texture3" }, + "west": { "uv": [ 0.0009, 8.999701, 3.0009, 9.499701 ], "texture": "#texture2" }, + "east": { "uv": [ 12.9991, 8.999701, 15.9991, 9.499701 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks1", + "from": [ 13.0007, 6.5007, 4.0005 ], + "to": [ 16.0007, 7.0007, 12.00051 ], + "faces": { + "north": { "uv": [ 0, 8.9993, 2.9993, 9.4993 ], "texture": "#texture2" }, + "south": { "uv": [ 13.0007, 8.9993, 16, 9.4993 ], "texture": "#texture2" }, + "west": { "uv": [ 4.0005, 8.9993, 12.00051, 9.4993 ], "texture": "#texture3" }, + "east": { "uv": [ 3.99949, 8.9993, 11.9995, 9.4993 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0001, 6.4992, 4.0009 ], + "to": [ 2.9999, 6.9992, 12.0009 ], + "faces": { + "north": { "uv": [ 13.0001, 9.0008, 16, 9.5008 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 9.0008, 2.9999, 9.5008 ], "texture": "#texture2" }, + "west": { "uv": [ 4.0009, 9.0008, 12.0009, 9.5008 ], "texture": "#texture2" }, + "east": { "uv": [ 3.9991, 9.0008, 11.9991, 9.5008 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 14, 10.5004, 10.0003 ], + "to": [ 17, 13.5004, 15.5003 ], + "rotation": { "origin": [ 14, 10.5, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "up": { "uv": [ 12, 9.5, 15, 15 ], "texture": "#texture3" }, + "north": { "uv": [ 0, 2.4996, 2.000213, 5.4996 ], "texture": "#texture1" }, + "south": { "uv": [ 13.99979, 2.4996, 16, 5.4996 ], "texture": "#texture1" }, + "west": { "uv": [ 10.00021, 2.4996, 15.50021, 5.4996 ], "texture": "#texture3" }, + "east": { "uv": [ 0.4997873, 2.4996, 5.999787, 5.4996 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0002, 9.9991, -0.0001 ], + "to": [ 7.0002, 10.4991, 5.499899 ], + "rotation": { "origin": [ 4, 10, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "south": { "uv": [ 4.000212, 5.5009, 7.000212, 6.0009 ], "texture": "#texture2" }, + "west": { "uv": [ 7.056558E-05, 5.5009, 5.50007, 6.0009 ], "texture": "#texture2" }, + "east": { "uv": [ 10.49993, 5.5009, 15.99993, 6.0009 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ -0.0003, 10.0003, 11.9997 ], + "to": [ 2.9997, 10.5003, 17.4997 ], + "rotation": { "origin": [ 0, 10, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "south": { "uv": [ 0, 5.4997, 2.999575, 5.9997 ], "texture": "#texture2" }, + "west": { "uv": [ 12, 5.4997, 16, 5.9997 ], "texture": "#texture2" }, + "east": { "uv": [ 0, 5.4997, 4, 5.9997 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle2", + "from": [ 14.0008, 9.9999, 9.9991 ], + "to": [ 17.0008, 10.4999, 15.4991 ], + "rotation": { "origin": [ 14, 10, 10 ], "axis": "y", "angle": -45 }, + "faces": { + "north": { "uv": [ 0, 5.5001, 1.998797, 6.0001 ], "texture": "#texture2" }, + "south": { "uv": [ 14.0012, 5.5001, 16, 6.0001 ], "texture": "#texture2" }, + "west": { "uv": [ 9.999929, 5.5001, 15.49993, 6.0001 ], "texture": "#texture3" }, + "east": { "uv": [ 0.5000706, 5.5001, 6.000071, 6.0001 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.9992, 10.0004, 2 ], + "to": [ 12.9992, 10.5004, 7.500001 ], + "rotation": { "origin": [ 10, 10, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "north": { "uv": [ 3.000566, 5.4996, 6.000566, 5.9996 ], "texture": "#texture2" }, + "south": { "uv": [ 9.999434, 5.4996, 12.99943, 5.9996 ], "texture": "#texture2" }, + "west": { "uv": [ 2.000566, 5.4996, 7.500566, 5.9996 ], "texture": "#texture3" }, + "east": { "uv": [ 8.499434, 5.4996, 13.99943, 5.9996 ], "texture": "#texture2" } + } + }, + { + "__comment": "1angle3", + "from": [ 9.999499, 10.499, 2 ], + "to": [ 12.9995, 13.499, 7.5 ], + "rotation": { "origin": [ 10, 10.5, 2 ], "axis": "y", "angle": 45 }, + "faces": { + "up": { "uv": [ 13, 0, 16, 5.5 ], "texture": "#texture3" }, + "north": { "uv": [ 3.000353, 2.501, 6.000354, 5.501 ], "texture": "#texture1" }, + "south": { "uv": [ 9.999646, 2.501, 12.99965, 5.501 ], "texture": "#texture1" }, + "west": { "uv": [ 2.000354, 2.501, 7.500354, 5.501 ], "texture": "#texture3" }, + "east": { "uv": [ 8.499646, 2.501, 13.99965, 5.501 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks0", + "from": [ -0.0004, 10.5, 3.9996 ], + "to": [ 2.9996, 13.5, 11.9996 ], + "faces": { + "up": { "uv": [ 1, 4, 3.9996, 12 ], "texture": "#texture3" }, + "north": { "uv": [ 13.0004, 2.5, 16, 5.5 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 2.5, 2.9996, 5.5 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9996, 2.5, 11.9996, 5.5 ], "texture": "#texture1" }, + "east": { "uv": [ 4.0004, 2.5, 12.0004, 5.5 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9994, 10.4996, 3.9999 ], + "to": [ 15.9994, 13.4996, 11.9999 ], + "faces": { + "up": { "uv": [ 12, 4, 15, 12 ], "texture": "#texture3" }, + "north": { "uv": [ 0.0005998611, 2.5004, 3.0006, 5.5004 ], "texture": "#texture1" }, + "south": { "uv": [ 12.9994, 2.5004, 15.9994, 5.5004 ], "texture": "#texture1" }, + "west": { "uv": [ 3.9999, 2.5004, 11.9999, 5.5004 ], "texture": "#texture3" }, + "east": { "uv": [ 4.0001, 2.5004, 12.0001, 5.5004 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0005, 10.4999, 0 ], + "to": [ 12.0005, 13.4999, 3 ], + "faces": { + "up": { "uv": [ 4.0005, 0, 12.0005, 3 ], "texture": "#texture3" }, + "north": { "uv": [ 3.9995, 2.5001, 11.9995, 5.5001 ], "texture": "#texture1" }, + "south": { "uv": [ 4.0005, 2.5001, 12.0005, 5.5001 ], "texture": "#texture3" }, + "west": { "uv": [ 0, 2.5001, 3, 5.5001 ], "texture": "#texture1" }, + "east": { "uv": [ 13, 2.5001, 16, 5.5001 ], "texture": "#texture1" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0003, 10.4998, 13.001 ], + "to": [ 12.0003, 13.4998, 16.001 ], + "faces": { + "up": { "uv": [ 4, 0, 12, 2.999 ], "texture": "#texture3", "rotation": 180 }, + "north": { "uv": [ 3.9997, 2.5002, 11.9997, 5.5002 ], "texture": "#texture3" }, + "south": { "uv": [ 4.0003, 2.5002, 12.0003, 5.5002 ], "texture": "#texture1" }, + "west": { "uv": [ 13.001, 2.5002, 16, 5.5002 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 2.5002, 2.999, 5.5002 ], "texture": "#texture1" } + } + }, + { + "__comment": "1angle0", + "from": [ 4.0002, 10.4997, -0.0007 ], + "to": [ 7.0002, 13.4997, 5.4993 ], + "rotation": { "origin": [ 4, 10.5, 0 ], "axis": "y", "angle": -45 }, + "faces": { + "up": { "uv": [ 2, 1, 5, 6.499646 ], "texture": "#texture3" }, + "south": { "uv": [ 4.000636, 2.5003, 7.000636, 5.5003 ], "texture": "#texture1" }, + "west": { "uv": [ 0, 2.5003, 5.499646, 5.5003 ], "texture": "#texture1" }, + "east": { "uv": [ 10.50035, 2.5003, 16, 5.5003 ], "texture": "#texture3" } + } + }, + { + "__comment": "1angle1", + "from": [ 0.0003, 10.4993, 12.0003 ], + "to": [ 3.0003, 13.4993, 17.5003 ], + "rotation": { "origin": [ 0, 10.5, 12 ], "axis": "y", "angle": 45 }, + "faces": { + "up": { "uv": [ 1, 11, 4, 15 ], "texture": "#texture3" }, + "south": { "uv": [ 0.0004245522, 2.5007, 3.000425, 5.5007 ], "texture": "#texture1" }, + "west": { "uv": [ 12, 2.5007, 16, 5.5007 ], "texture": "#texture1" }, + "east": { "uv": [ 0, 2.5007, 4, 5.5007 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks3", + "from": [ 4.0001, 9.9997, 12.9993 ], + "to": [ 12.0001, 10.4997, 15.9993 ], + "faces": { + "north": { "uv": [ 3.9999, 5.5003, 11.9999, 6.0003 ], "texture": "#texture3" }, + "south": { "uv": [ 4.0001, 5.5003, 12.0001, 6.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 12.9993, 5.5003, 15.9993, 6.0003 ], "texture": "#texture2" }, + "east": { "uv": [ 0.0006999969, 5.5003, 3.0007, 6.0003 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks2", + "from": [ 4.0003, 10.0008, -0.0009 ], + "to": [ 12.0003, 10.5008, 2.999099 ], + "faces": { + "north": { "uv": [ 3.9997, 5.4992, 11.9997, 5.9992 ], "texture": "#texture2" }, + "south": { "uv": [ 4.0003, 5.4992, 12.0003, 5.9992 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks1", + "from": [ 12.9995, 9.9997, 3.9993 ], + "to": [ 15.9995, 10.49969, 11.9993 ], + "faces": { + "north": { "uv": [ 0.0004997253, 5.50031, 3.0005, 6.0003 ], "texture": "#texture2" }, + "south": { "uv": [ 12.9995, 5.50031, 15.9995, 6.0003 ], "texture": "#texture2" }, + "west": { "uv": [ 3.9993, 5.50031, 11.9993, 6.0003 ], "texture": "#texture3" }, + "east": { "uv": [ 4.0007, 5.50031, 12.0007, 6.0003 ], "texture": "#texture2" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0.0005, 9.999599, 4 ], + "to": [ 3.0005, 10.4996, 12 ], + "faces": { + "north": { "uv": [ 12.9995, 5.5004, 15.9995, 6.000401 ], "texture": "#texture2" }, + "south": { "uv": [ 0.0005, 5.5004, 3.0005, 6.000401 ], "texture": "#texture2" }, + "west": { "uv": [ 4, 5.5004, 12, 6.000401 ], "texture": "#texture2" }, + "east": { "uv": [ 4, 5.5004, 12, 6.000401 ], "texture": "#texture3" } + } + }, + { + "__comment": "1bricks0", + "from": [ 0, 0, 4 ], + "to": [ 3, 3, 12 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 13, 13, 16, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 13, 3, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 4, 13, 12, 16 ], "texture": "#texture1" }, + "east": { "uv": [ 4, 13, 12, 16 ], "texture": "#texture3" } + } + } + ], + "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/bloomery_covered.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_covered.json deleted file mode 100644 index 14bfb232..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_covered.json +++ /dev/null @@ -1,234 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "forgecraft:blocks/brick", - "texture": "forgecraft:blocks/brick", - "texture1": "forgecraft:blocks/brick_lit", - "texture2": "forgecraft:blocks/stone_slab", - "texture3": "forgecraft: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": "#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" } - } - }, - { - "__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": "#texture2" }, - "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#texture2" }, - "north": { "uv": [ 14, 9, 2, 11 ], "texture": "#texture2" }, - "south": { "uv": [ 2, 4, 14, 6 ], "texture": "#texture2" }, - "west": { "uv": [ 4, 2, 6, 14 ], "texture": "#texture2", "rotation": 270 }, - "east": { "uv": [ 4, 1, 6, 13 ], "texture": "#texture2", "rotation": 270 } - } - } - ] -} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered.json deleted file mode 100644 index 928109a3..00000000 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit_covered.json +++ /dev/null @@ -1,234 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "forgecraft:blocks/brick", - "texture": "forgecraft:blocks/brick", - "texture1": "forgecraft:blocks/brick_lit", - "texture2": "forgecraft:blocks/stone_slab", - "texture3": "forgecraft: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/firebox.json b/1.11/src/main/resources/assets/forgecraft/models/block/forge.json similarity index 100% rename from 1.11/src/main/resources/assets/forgecraft/models/block/firebox.json rename to 1.11/src/main/resources/assets/forgecraft/models/block/forge.json diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/firebox_lit.json b/1.11/src/main/resources/assets/forgecraft/models/block/forge_lit.json similarity index 99% rename from 1.11/src/main/resources/assets/forgecraft/models/block/firebox_lit.json rename to 1.11/src/main/resources/assets/forgecraft/models/block/forge_lit.json index 17e1e1d1..f63373a2 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/firebox_lit.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/forge_lit.json @@ -1,6 +1,7 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { + "particle": "forgecraft:blocks/brick", "texture": "forgecraft:blocks/brick", "texture1": "forgecraft:blocks/brick_lit" }, diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/forge_adobe.json b/1.11/src/main/resources/assets/forgecraft/models/item/forge_adobe.json new file mode 100644 index 00000000..06754e40 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/forge_adobe.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "primal:blocks/adobebrick", + "texture": "primal:blocks/adobebrick" + }, + "parent": "forgecraft:block/forge" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/firebox.json b/1.11/src/main/resources/assets/forgecraft/models/item/forge_brick.json similarity index 76% rename from 1.11/src/main/resources/assets/forgecraft/models/item/firebox.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/forge_brick.json index 97bffee3..28e9008f 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/firebox.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/forge_brick.json @@ -4,5 +4,5 @@ "particle": "forgecraft:blocks/brick", "texture": "forgecraft:blocks/brick" }, - "parent": "forgecraft:block/firebox" + "parent": "forgecraft:block/forge" } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/adobebrick_lit.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/adobebrick_lit.png index 40cba9131eae21134700c372177756f25a33d4ae..65b6bc5b734c08d89da1dbf9a292348147a2ff04 100644 GIT binary patch delta 631 zcmV--0*L*h2EYZ7RDTc_E6ASb)BpeiO-V#SR5;5m(#=vEM-&C%uUoCrFdl>uAY%yS za%Gb&v&bvuLGof*=LwvjDu@l(7#mq&7!6{W&SJbib?!ZXq5u82>|h~`$MV@F-@Y)L zvMDGwJhbfZQzgzXgykoe4YSColH4{l@8#I@)Kk^M#kstH!hgk*pO1KKSz&J~-`w+h zm)#km5be)+Zdv!NSHkj4ejE)->J3*PgytQo6HfnTFY;naXwgYVB~LYB$!IEXCt-Cf zk2@Yq;qsh=D4e%wgf;ocLzZ{K`kiE}C-%e*aM!cB7d}_?k5uI8YYsc^4!BwJ{sTva zT)dK8pOUdD>3@5+3wiQVSl#k^D)0S5h=fjf_m<{{t43b@%KT9B5YaQQ$%#jlz5LKp zy&1@{A3moI%d;U2*xItr?>zS0^kQ9t(DBo_bM- z+|y#eVwCuF#rleIOWSc+5BY?Sn^rh`J5=7^OZsvEXMY7>Rzn_(Isct9>Zv0CoDRyW zI1rB)EU&2+lC6Te7=Za)`121gYEDX?OCE0Jt%+bP|Meu4--soLTZC3pRIk*$I?nx1hzc<);|9dk4z-xF(g=915MJv-%4Q%cMs@*G(% zX=|q6_wwAbiIU|tPa8tPXv2MCcSS0wri_ws^{>1h3zJ*9sTdc+>Z9C`{0}fy28O!x R0=@tM002ovPDHLkV1krGGphgq delta 730 zcmV<00ww*x1)>I!RDTCGA5QAg^#A|@uSrBfR5;58!E0_CRTzNb_k8Cv7vJKzsRK;~ z2&D8cD`00V1&N&?Bo=@WDkTC0grsd^#}nJ*nRDfN)ZO>r7Pme_JK=b<q}0Xf#bUl^I9|cWR5xf@qkYjF^-fK4UzJy!aod5*M|0+ zH)w%Gru*TZ_TLU44RZaOcDcZC62um&m7`b(Cy-U-lsnvKmnZ{?!gzNiNy1b@xSo*z z+F{6;Goh)s!@`xPQ-I!WTV_c1&lAh(d;W10+%q z^s5Td!s)&v95$pnl6|JVP}nh2NQ}G8>8CpqioEGDS`1@bQ@KdEJ>VR7>G}S^n9fM`hv1nxXKYtjg^MH0ejYxWkhC<*;R{cr{q*HGOsA! zll92y{eYWSRCS9V10s>+3U1~wQ%zY~)F>pYQF*{WWMn#bh*jhiaf=GFMkbb=gwhxE zszIAV?mUy_g6YZ-j|0ZmH0uUA915xk$~q(#s#6At77<0&6s#nQ(d_qu&`0FF#={QihwiMl8G8QL29+dUxs58qv5KnG&nYybcN M07*qoM6N<$g3>5qoB#j- 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 371793b63314fd3c36fe4ae28cd055e7bcc54913..1b1f1b2d447ff70ffe5070419ab771439165e27d 100644 GIT binary patch delta 341 zcmV-b0jmCj1D*qrQhx>#5HT_DIjqY700ApWL_t(I%Y9S3Zp0uEoJ1_hhd8;wf0pk^ zpKrDc>nt1rMN;^NTO2D}*|4zl;_d76<43Fj0BWf?7x%350DzKH>k}(5y1}|X=aIG* zK8)@EvF*5rTl+U$9Gfr4B=Vlk+x%FaK`~Q63JDWWtlNJfmp$nm_#Htb$g_0Vw{?~x;U}q)QQG* zAD#&GK|Pst&cc!w(Hi=DxG^KfsZ;$w{>?@$9=~g;FGnsA(q2QGv3&}( zVKC9qPDfQts3tqn<2>ZA&*$@_ssMn9z#074dj|mQy)#c$AvJ+XHQXI@&b+U+FviHc z@FTn4_l?$CCd@hE?ulfKf!;gz-dJlvA_8WHy?4Um6egH;U$W^>NRHnL9Wb@jXML=}@!8%Y)G4Jwo0774)LB5~)h z>q^@qB5BZx^D=P>6<1Zbdv4+R8Y>lUsjA}p?8qYWj|iMr*RA~pSh&@AU1$n|00000 LNkvXXu0mjfZ6=Z$ diff --git a/1.11/src/main/resources/mcmod.info b/1.11/src/main/resources/mcmod.info index fa8dfb56..cf05a795 100644 --- a/1.11/src/main/resources/mcmod.info +++ b/1.11/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.2.30", + "version": "1.2.40", "mcversion": "1.11.2", "url": "", "updateUrl": "", From 8aefcbbf094620968b2f1636e2550659e16e561e Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 18 Jun 2017 15:51:01 -0400 Subject: [PATCH 6/6] finished adobe brick bloom and forge blocks, refactored forge, bloomery, and anvil --- .../nmd/primal/forgecraft/ForgeCraft.java | 18 ++-- .../java/nmd/primal/forgecraft/ModInfo.java | 15 ---- .../assets/forgecraft/lang/en_us.lang | 89 ++++++++++++++++++- .../models/block/bloomery_adobe.json | 16 ++-- .../models/block/bloomery_brick.json | 16 ++-- .../models/item/bloomery_adobe.json | 10 +++ .../{bloomery.json => bloomery_brick.json} | 2 +- 7 files changed, 122 insertions(+), 44 deletions(-) create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json rename 1.11/src/main/resources/assets/forgecraft/models/item/{bloomery.json => bloomery_brick.json} (73%) 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 c9e67995..37911ee1 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java @@ -16,10 +16,12 @@ import nmd.primal.forgecraft.proxy.CommonProxy; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.Locale; + //import nmd.primal.forgecraft.common.init.*; @Mod( modid = ModInfo.MOD_ID, - name = ModInfo.MOD_NAME, + name = ModInfo.MOD_ID, version = ModInfo.MOD_VERSION, acceptedMinecraftVersions = ModInfo.MC_VERSIONS, dependencies = ModInfo.DEPENDENCIES @@ -38,6 +40,8 @@ public class ForgeCraft @EventHandler public void preInit(FMLPreInitializationEvent event) { + Locale.setDefault(Locale.ENGLISH); + NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ModInfo.MOD_CHANNEL); NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); @@ -54,6 +58,7 @@ public class ForgeCraft //ModEvents.registerClientEvents(); // ModItems.registerRenders(); proxy.preInit(); + } @EventHandler @@ -73,15 +78,4 @@ public class ForgeCraft //this.proxy.postInit(event); } - /*@EventHandler - public void serverStarting(FMLServerStartingEvent event) - { - //event.registerServerCommand(new PrimalCommand()); - } - - //public File getConfigDirectory() - //{ - // return CONFIG_DIRECTORY; - //} - */ } \ No newline at end of file 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 4297d66b..84aae25e 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -83,19 +83,4 @@ public class ModInfo { return new ItemStack(ModItems.forgehammer); } }; - - /* - public static CreativeTabs TAB_PRIMAL = new CreativeTabs(MOD_ID) - { - - @Override - @SideOnly(Side.CLIENT) - public ItemStack getTabIconItem() { - return new ItemStack(PrimalItems.FLINT_HATCHET); - } - - }; - */ - - } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang index 805bc0d5..03f2fb0a 100644 --- a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang +++ b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang @@ -1,30 +1,81 @@ itemGroup.forgecraft=ForgeCraft +tile.bloomery_adobe.name=Adobe Bloomery +tile.bloomery_brick.name=Brick Bloomery tile.forge_brick.name=Brick Forge -tile.forge_brick.name=Adobe Forge -tile.bloomery.name=Bloomery +tile.forge_adobe.name=Adobe Forge + +tile.blockbreaker.name= Block Breaker + tile.stoneanvil.name=Stone Anvil +tile.ironanvil.name=Iron Anvil + tile.pistonbellows.name=Wooden Piston Bellows + +tile.emptycruciblehot.name=Empty Hot Crucible tile.emptycrucible.name=Empty Crucible tile.emptycruciblehit.name=Hot Empty Crucible tile.emptycruciblecracked.name= Cracked Empty Crucible tile.emptycruciblecrackedhot.name=Cracked Hot Empty Crucible + tile.rawironcrucible.name=Filled Iron Crucible tile.hotironcrucible.name=Hot Iron Crucible tile.hotcookedironcrucible.name=Hot Cooked Iron Crucible tile.coolironcrucible.name=Cool Iron Crucible tile.failedironcrucible.name=Failed Iron Crucible tile.failedironcruciblehot.name=Failed Iron Crucible Hot -tile.ironball.name=Raw Iron Ingot -tile.ironchunk.name=Iron Chunk + +tile.rawcleanironcrucible.name=Filled Clean Iron Crucible +tile.hotcleanironcrucible.name=Hot Clean Iron Crucible +tile.hotcookedcleanironcrucible.name=Hot Cooked Clean Iron Crucible +tile.coolcleanironcrucible.name=Cool Clean Iron Crucible +tile.failedcleanironcrucible.name=Failed Clean Iron Crucible +tile.failedcleanironcrucible.name=Failed Clean Iron Crucible Hot + +tile.rawsteelcrucible.name=Filled Steel Crucible +tile.hotsteelcrucible.name=Hot Steel Crucible +tile.hotcookedsteelcrucible.name=Hot Cooked Steel Crucible +tile.coolsteelcrucible.name=Cool Steel Crucible +tile.failedsteelcrucible.name=Failed Steel Crucible +tile.failedsteelcruciblehot.name=Failed Steel Crucible Hot + +tile.rawwootzcrucible.name=Filled Wootz Crucible +tile.hotwootzcrucible.name=Hot Wootz Crucible +tile.hotcookedwootzcrucible.name=Hot Cooked Wootz Crucible +tile.coolwootzcrucible.name=Cool Wootz Crucible +tile.failedwootzcrucible.name=Failed Wootz Crucible +tile.failedwootzcruciblehot.name=Failed Wootz Crucible Hot + + +tile.ironball.name=Wrought Iron Ingot +tile.ironchunk.name=Wrought Iron Chunk +tile.ironcleanball.name=Clean Iron Ingot +tile.ironcleanchunk.name=Clean Iron Chunk +tile.steelball.name=Steel Ingot +tile.steelchunk.name=Steel Chunk +tile.wootzball.name=Damascus Steel Ingot +tile.wootzchunk.name=Damascus Steel Chunk item.bellowshandle.name=Bellows Handle item.softcrucible.name=Soft Crucible item.stonetongs.name=Stone Tongs item.forgehammer.name=Forge Hammer + + item.ironingothot.name=Iron Ingot Hot item.ironchunkhot.name=Iron Chunk Hot + +item.cleanironingothot.name=Clean Iron Ingot Hot +item.cleanironchunkhot.name=Clean Iron Chunk Hot + +item.steelingothot.name=Steel Ingot Hot +item.steelchunkhot.name=Steel Chunk Hot + +item.wootzingothot.name=Damascus Steel Ingot Hot +item.wootzchunkhot.name=Damascus Steel Chunk Hot + + item.ironpickaxehead.name=Iron Pickaxe Head item.ironaxehead.name=Iron Axe Head item.ironshovelhead.name=Iron Shovel Head @@ -35,6 +86,36 @@ item.ironshovel.name=Iron Shovel item.ironhoe.name=Iron Hoe item.ironsword.name=Iron Sword +item.cleanironpickaxehead.name=Clean Iron Pickaxe Head +item.cleanironaxehead.name=Clean Iron Axe Head +item.cleanironshovelhead.name=Clean Iron Shovel Head +item.cleanironhoehead.name=Clean Iron Hoe Head +item.cleanironpickaxe.name=Clean Iron Pickaxe +item.cleanironaxe.name=Clean Iron Axe +item.cleanironshovel.name=Clean Iron Shovel +item.cleanironhoe.name=Clean Iron Hoe +#item.cleanironsword.name=Clean Iron Sword + +item.steelpickaxehead.name=Steel Pickaxe Head +item.steelaxehead.name=Steel Axe Head +item.steelshovelhead.name=Steel Shovel Head +item.steelhoehead.name=Steel Hoe Head +item.steelpickaxe.name=Steel Pickaxe +item.steelaxe.name=Steel Axe +item.steelshovel.name=Steel Shovel +item.steelhoe.name=Steel Hoe +#item.steelsword.name=Steel Sword + +item.wootzpickaxehead.name=Damascus Steel Pickaxe Head +item.wootzaxehead.name=Damascus Steel Axe Head +item.wootzshovelhead.name=Damascus Steel Shovel Head +item.wootzhoehead.name=Damascus Steel Hoe Head +item.wootzpickaxe.name=Damascus Steel Pickaxe +item.wootzaxe.name=Damascus Steel Axe +item.wootzshovel.name=Damascus Steel Shovel +item.wootzhoe.name=Damascus Steel Hoe +#item.wootzsword.name=Damascus Steel Sword + # -- configuration -- # forgecraft.config.title=ForgeCraft Config diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json index c9d9c7b0..699a93c4 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json @@ -673,20 +673,24 @@ ], "display": { "thirdperson_righthand": { - "translation": [ 0.1, 1.1, -2.35 ] + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0 ], + "scale": [ 0.375, 0.375, 0.375 ] }, "firstperson_righthand": { - "translation": [ 0, 4, 0 ] + "rotation": [ 0, 45, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] }, "gui": { - "translation": [ 0, 4, 0 ] + "rotation": [ 30, 225, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] }, "ground": { - "translation": [ 0, 4, 0 ] + "translation": [ 0, 3, 0 ], + "scale": [ 0.25, 0.25, 0.25 ] }, "fixed": { - "rotation": [ 45, 45, 0 ], - "translation": [ 0, 4, 0 ] + "scale": [ 0.5, 0.5, 0.5 ] } } } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json index 3fab6759..27668537 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_brick.json @@ -657,20 +657,24 @@ ], "display": { "thirdperson_righthand": { - "translation": [ 0.1, 1.1, -2.35 ] + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0 ], + "scale": [ 0.375, 0.375, 0.375 ] }, "firstperson_righthand": { - "translation": [ 0, 4, 0 ] + "rotation": [ 0, 45, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] }, "gui": { - "translation": [ 0, 4, 0 ] + "rotation": [ 30, 225, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] }, "ground": { - "translation": [ 0, 4, 0 ] + "translation": [ 0, 3, 0 ], + "scale": [ 0.25, 0.25, 0.25 ] }, "fixed": { - "rotation": [ 45, 45, 0 ], - "translation": [ 0, 4, 0 ] + "scale": [ 0.5, 0.5, 0.5 ] } } } \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json b/1.11/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json new file mode 100644 index 00000000..f73f4f2d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json @@ -0,0 +1,10 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/brick", + "texture": "forgecraft:blocks/brick", + "texture1": "forgecraft:blocks/brick", + "texture2": "forgecraft:blocks/brick" + }, + "parent": "forgecraft:block/bloomery_adobe" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/bloomery.json b/1.11/src/main/resources/assets/forgecraft/models/item/bloomery_brick.json similarity index 73% rename from 1.11/src/main/resources/assets/forgecraft/models/item/bloomery.json rename to 1.11/src/main/resources/assets/forgecraft/models/item/bloomery_brick.json index 6e512dbf..8a1a9570 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/bloomery.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/bloomery_brick.json @@ -4,5 +4,5 @@ "particle": "forgecraft:blocks/brick", "texture": "forgecraft:blocks/brick" }, - "parent": "forgecraft:block/bloomery" + "parent": "forgecraft:block/bloomery_brick" } \ No newline at end of file