diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index aabfb8089..69fcfb0c4 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -28,7 +28,7 @@ public class Create { public static final String ID = "create"; public static final String NAME = "Create"; - public static final String VERSION = "0.0.5"; + public static final String VERSION = "0.1.0"; public static Logger logger = LogManager.getLogger(); public static ItemGroup creativeTab = new CreateItemGroup(); @@ -77,6 +77,8 @@ public class Create { } public static void tick() { + if (schematicReceiver == null) + schematicReceiver = new ServerSchematicLoader(); schematicReceiver.tick(); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java index 004383143..b591fad53 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/BeltFunnelBlock.java @@ -35,9 +35,11 @@ import net.minecraft.world.World; public class BeltFunnelBlock extends HorizontalBlock implements IBeltAttachment, IWithTileEntity { - public static final VoxelShape SHAPE_NORTH = makeCuboidShape(4, 2, -1, 12, 10, 5), - SHAPE_SOUTH = makeCuboidShape(4, 2, 11, 12, 10, 17), SHAPE_WEST = makeCuboidShape(-1, 2, 4, 5, 10, 12), - SHAPE_EAST = makeCuboidShape(11, 2, 4, 17, 10, 12); + public static final VoxelShape + SHAPE_NORTH = makeCuboidShape(3, -4, -1, 13, 8, 5), + SHAPE_SOUTH = makeCuboidShape(3, -4, 11, 13, 8, 17), + SHAPE_WEST = makeCuboidShape(-1, -4, 3, 5, 8, 13), + SHAPE_EAST = makeCuboidShape(11, -4, 3, 17, 8, 13); public BeltFunnelBlock() { super(Properties.from(Blocks.ANDESITE)); diff --git a/src/main/resources/assets/create/models/block/belt_funnel.json b/src/main/resources/assets/create/models/block/belt_funnel.json index 10bd2f156..8ba5f3c81 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel.json +++ b/src/main/resources/assets/create/models/block/belt_funnel.json @@ -1,23 +1,22 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", "textures": { + "particle": "create:block/belt_funnel", "belt_funnel": "create:block/belt_funnel", - "belt": "create:block/belt", - "particle": "create:block/belt_funnel" + "brass_casing": "create:block/brass_casing" }, "elements": [ { "name": "Bottom", - "from": [ 3, 0, -1 ], - "to": [ 13, 1, 5 ], + "from": [ 3, -4.1, -1 ], + "to": [ 13, -3.1, 5 ], "faces": { - "north": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] }, - "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 }, - "south": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 }, - "up": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] }, - "down": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] } + "north": { "texture": "#belt_funnel", "uv": [ 0, 11, 10, 12 ] }, + "east": { "texture": "#belt_funnel", "uv": [ 10, 11, 16, 12 ] }, + "south": { "texture": "#belt_funnel", "uv": [ 0, 11, 10, 12 ] }, + "west": { "texture": "#belt_funnel", "uv": [ 10, 11, 16, 12 ], "rotation": 180 }, + "up": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 13 ], "rotation": 90 }, + "down": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 12 ], "rotation": 90 } } }, { @@ -26,44 +25,33 @@ "to": [ 13, 8, 5 ], "faces": { "north": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] }, - "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 }, + "east": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 1 ] }, "south": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 }, - "up": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] }, - "down": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] } + "west": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 1 ], "rotation": 180 }, + "up": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 12 ], "rotation": 90 }, + "down": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 13 ], "rotation": 90 } } }, { "name": "Side", - "from": [ 3, 1, -1 ], + "from": [ 3, -3.1, -1 ], "to": [ 4, 7, 5 ], "faces": { - "north": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 7 ] }, - "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 }, - "south": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 7 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 } - } - }, - { - "name": "Side", - "from": [ 12, 1, -1 ], - "to": [ 13, 7, 5 ], - "faces": { - "north": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 7 ] }, - "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 }, - "south": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 7 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 } + "north": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 11.1 ] }, + "east": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] }, + "south": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 11.1 ] }, + "west": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] } } }, { "name": "Center", - "from": [ 4, 1, -1 ], + "from": [ 4, -3.1, -1 ], "to": [ 12, 7, 4 ], "faces": { - "north": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 14 ] }, - "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 }, - "south": { "texture": "#belt_funnel", "uv": [ 1, 1, 9, 7 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 } + "north": { "texture": "#brass_casing", "uv": [ 4, 3, 12, 13.1 ] }, + "east": { "texture": "#belt_funnel", "uv": [ 9, 3, 10, 9 ], "rotation": 90 }, + "south": { "texture": "#belt_funnel", "uv": [ 1, 1, 9, 11.1 ] }, + "west": { "texture": "#belt_funnel", "uv": [ 0, 2, 1, 8 ], "rotation": 90 } } }, { @@ -73,24 +61,34 @@ "rotation": { "origin": [ 8, 8, 0 ], "axis": "x", "angle": -22.5 }, "faces": { "north": { "texture": "#belt_funnel", "uv": [ 1, 7, 9, 9 ], "rotation": 180 }, - "east": { "texture": "#belt_funnel", "uv": [ 0, 9.6, 1.8, 14 ], "rotation": 90 }, - "south": { "texture": "#belt_funnel", "uv": [ 1, 7, 9, 9 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 2, 12.4 ], "rotation": 90 }, - "up": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 12.4 ], "rotation": 180 }, + "east": { "texture": "#belt_funnel", "uv": [ 11, 4.6, 16, 6.6 ], "rotation": 180 }, + "south": { "texture": "#belt_funnel", "uv": [ 9, 2, 11, 10 ], "rotation": 90 }, + "west": { "texture": "#belt_funnel", "uv": [ 10, 5, 15, 7.4 ], "rotation": 180 }, + "up": { "texture": "#belt_funnel", "uv": [ 11, 2, 16, 9.4 ], "rotation": 90 }, "down": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 12.8 ] } } }, { "name": "Ramp", - "from": [ 4, -0.9, 4 ], - "to": [ 12, 1.1, 11 ], - "rotation": { "origin": [ 8, 1, 5 ], "axis": "x", "angle": 45.0 }, + "from": [ 4, -4, -8 ], + "to": [ 12, 3, -1 ], + "rotation": { "origin": [ 8, -4, -1 ], "axis": "x", "angle": 45.0 }, "faces": { - "north": { "texture": "#belt", "uv": [ 0, 0, 8, 2 ] }, - "east": { "texture": "#belt", "uv": [ 14, 3, 16, 10 ], "rotation": 90 }, - "west": { "texture": "#belt", "uv": [ 0, 3, 2, 10 ], "rotation": 270 }, - "up": { "texture": "#belt", "uv": [ 4, 1, 12, 8 ] }, - "down": { "texture": "#belt", "uv": [ 0, 0, 8, 7 ] } + "north": { "texture": "#brass_casing", "uv": [ 4, 5, 12, 12 ] }, + "east": { "texture": "#brass_casing", "uv": [ 4, 9, 11, 16 ], "rotation": 90 }, + "west": { "texture": "#brass_casing", "uv": [ 5, 9, 12, 16 ], "rotation": 270 }, + "down": { "texture": "#brass_casing", "uv": [ 4, 0, 12, 7 ] } + } + }, + { + "name": "Side", + "from": [ 12, -3.1, -1 ], + "to": [ 13, 7, 5 ], + "faces": { + "north": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 11.1 ] }, + "east": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ], "rotation": 180 }, + "south": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 11.1 ] }, + "west": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] } } } ] diff --git a/src/main/resources/assets/create/models/block/belt_pulley.json b/src/main/resources/assets/create/models/block/belt_pulley.json index 23dde8be4..6aa444674 100644 --- a/src/main/resources/assets/create/models/block/belt_pulley.json +++ b/src/main/resources/assets/create/models/block/belt_pulley.json @@ -2,11 +2,11 @@ "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "block/cube", "textures": { - "particle": "block/stripped_spruce_log", + "particle": "block/dark_oak_log", "0": "create:block/axis", "1": "create:block/axis_top", - "2": "block/stripped_spruce_log", - "3": "block/stripped_spruce_log_top" + "2": "block/dark_oak_log", + "3": "block/dark_oak_log" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/item/belt_funnel.json b/src/main/resources/assets/create/models/item/belt_funnel.json index 9a9b66c76..12c0bd838 100644 --- a/src/main/resources/assets/create/models/item/belt_funnel.json +++ b/src/main/resources/assets/create/models/item/belt_funnel.json @@ -1,45 +1,49 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "display": { + "textures": { + "particle": "create:block/belt_funnel", + "belt_funnel": "create:block/belt_funnel", + "brass_casing": "create:block/brass_casing" + }, + "display": { "gui": { "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] + "translation": [ 2, 2, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 2 ], + "scale": [ 0.25, 0.25, 0.25 ] }, "fixed": { "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, -3.5], - "scale":[ 0.5, 0.5, 0.5 ] + "translation": [ 0, 3, -2.75 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 2.5, 0 ], + "scale": [ 0.4, 0.4, 0.4 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 45, 0 ], + "translation": [ 0, 2.5, 0 ], + "scale": [ 0.375, 0.375, 0.375 ] } }, - "textures": { - "belt_funnel": "create:block/belt_funnel", - "symbols": "create:item/symbols" - }, "elements": [ - { - "name": "Indicator", - "from": [ 8, 7, 13 ], - "to": [ 16, 15, 13 ], - "shade": false, - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": -45.0 }, - "faces": { - "north": { "texture": "#symbols", "uv": [ 0, 8, 8, 16 ] }, - "south": { "texture": "#symbols", "uv": [ 0, 8, 8, 16 ] } - } - }, { "name": "Bottom", - "from": [ 3, 0, -1 ], - "to": [ 13, 1, 5 ], + "from": [ 3, -4.1, -1 ], + "to": [ 13, -3.1, 5 ], "faces": { - "north": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] }, - "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 }, - "south": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 }, - "up": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] }, - "down": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] } + "north": { "texture": "#belt_funnel", "uv": [ 0, 11, 10, 12 ] }, + "east": { "texture": "#belt_funnel", "uv": [ 10, 11, 16, 12 ] }, + "south": { "texture": "#belt_funnel", "uv": [ 0, 11, 10, 12 ] }, + "west": { "texture": "#belt_funnel", "uv": [ 10, 11, 16, 12 ], "rotation": 180 }, + "up": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 13 ], "rotation": 90 }, + "down": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 12 ], "rotation": 90 } } }, { @@ -48,44 +52,33 @@ "to": [ 13, 8, 5 ], "faces": { "north": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] }, - "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 }, + "east": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 1 ] }, "south": { "texture": "#belt_funnel", "uv": [ 0, 0, 10, 1 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 }, - "up": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] }, - "down": { "texture": "#belt_funnel", "uv": [ 0, 8, 10, 14 ] } + "west": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 1 ], "rotation": 180 }, + "up": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 12 ], "rotation": 90 }, + "down": { "texture": "#belt_funnel", "uv": [ 10, 0, 16, 13 ], "rotation": 90 } } }, { "name": "Side", - "from": [ 3, 1, -1 ], + "from": [ 3, -3.1, -1 ], "to": [ 4, 7, 5 ], "faces": { - "north": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 7 ] }, - "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 }, - "south": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 7 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 } - } - }, - { - "name": "Side", - "from": [ 12, 1, -1 ], - "to": [ 13, 7, 5 ], - "faces": { - "north": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 7 ] }, - "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 }, - "south": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 7 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 } + "north": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 11.1 ] }, + "east": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] }, + "south": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 11.1 ] }, + "west": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] } } }, { "name": "Center", - "from": [ 4, 1, -1 ], + "from": [ 4, -3.1, -1 ], "to": [ 12, 7, 4 ], "faces": { - "north": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 14 ] }, - "east": { "texture": "#belt_funnel", "uv": [ 9, 8, 10, 14 ], "rotation": 90 }, - "south": { "texture": "#belt_funnel", "uv": [ 1, 1, 9, 7 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 1, 14 ], "rotation": 90 } + "north": { "texture": "#brass_casing", "uv": [ 4, 3, 12, 13.1 ] }, + "east": { "texture": "#belt_funnel", "uv": [ 9, 3, 10, 9 ], "rotation": 90 }, + "south": { "texture": "#belt_funnel", "uv": [ 1, 1, 9, 11.1 ] }, + "west": { "texture": "#belt_funnel", "uv": [ 0, 2, 1, 8 ], "rotation": 90 } } }, { @@ -95,12 +88,23 @@ "rotation": { "origin": [ 8, 8, 0 ], "axis": "x", "angle": -22.5 }, "faces": { "north": { "texture": "#belt_funnel", "uv": [ 1, 7, 9, 9 ], "rotation": 180 }, - "east": { "texture": "#belt_funnel", "uv": [ 0, 9.6, 1.8, 14 ], "rotation": 90 }, - "south": { "texture": "#belt_funnel", "uv": [ 1, 7, 9, 9 ] }, - "west": { "texture": "#belt_funnel", "uv": [ 0, 8, 2, 12.4 ], "rotation": 90 }, - "up": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 12.4 ], "rotation": 180 }, + "east": { "texture": "#belt_funnel", "uv": [ 11, 4.6, 16, 6.6 ], "rotation": 180 }, + "south": { "texture": "#belt_funnel", "uv": [ 9, 2, 11, 10 ], "rotation": 90 }, + "west": { "texture": "#belt_funnel", "uv": [ 10, 5, 15, 7.4 ], "rotation": 180 }, + "up": { "texture": "#belt_funnel", "uv": [ 11, 2, 16, 9.4 ], "rotation": 90 }, "down": { "texture": "#belt_funnel", "uv": [ 1, 8, 9, 12.8 ] } } + }, + { + "name": "Side", + "from": [ 12, -3.1, -1 ], + "to": [ 13, 7, 5 ], + "faces": { + "north": { "texture": "#belt_funnel", "uv": [ 0, 1, 1, 11.1 ] }, + "east": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ], "rotation": 180 }, + "south": { "texture": "#belt_funnel", "uv": [ 9, 1, 10, 11.1 ] }, + "west": { "texture": "#belt_funnel", "uv": [ 10, 1, 16, 11 ] } + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/extractor.json b/src/main/resources/assets/create/models/item/extractor.json index ff105c6db..4738b69ac 100644 --- a/src/main/resources/assets/create/models/item/extractor.json +++ b/src/main/resources/assets/create/models/item/extractor.json @@ -13,22 +13,10 @@ } }, "textures": { - "extractor": "create:block/extractor", - "symbols": "create:item/symbols" + "extractor": "create:block/extractor" }, "elements": [ { - "name": "Indicator", - "from": [ 8, 7, 13 ], - "to": [ 16, 15, 13 ], - "shade": false, - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": -45.0 }, - "faces": { - "north": { "texture": "#symbols", "uv": [ 0, 0, 8, 8 ] }, - "south": { "texture": "#symbols", "uv": [ 0, 0, 8, 8 ] } - } - }, - { "name": "Bottom", "from": [ 4, 2, -1 ], "to": [ 12, 3, 5 ], diff --git a/src/main/resources/assets/create/models/item/linked_extractor.json b/src/main/resources/assets/create/models/item/linked_extractor.json index 23049b3ea..119fdddc3 100644 --- a/src/main/resources/assets/create/models/item/linked_extractor.json +++ b/src/main/resources/assets/create/models/item/linked_extractor.json @@ -14,22 +14,10 @@ }, "textures": { "redstone_antenna": "create:block/redstone_antenna", - "extractor": "create:block/extractor", - "symbols": "create:item/symbols" + "extractor": "create:block/extractor" }, "elements": [ { - "name": "Indicator", - "from": [ 8, 7, 13 ], - "to": [ 16, 15, 13 ], - "shade": false, - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": -45.0 }, - "faces": { - "north": { "texture": "#symbols", "uv": [ 0, 0, 8, 8 ] }, - "south": { "texture": "#symbols", "uv": [ 0, 0, 8, 8 ] } - } - }, - { "name": "Bottom", "from": [ 4, 2, -1 ], "to": [ 12, 3, 5 ], diff --git a/src/main/resources/assets/create/textures/block/belt_funnel.png b/src/main/resources/assets/create/textures/block/belt_funnel.png index 0e505629c..ad263e88c 100644 Binary files a/src/main/resources/assets/create/textures/block/belt_funnel.png and b/src/main/resources/assets/create/textures/block/belt_funnel.png differ diff --git a/src/main/resources/assets/create/textures/item/symbols.png b/src/main/resources/assets/create/textures/item/symbols.png deleted file mode 100644 index 37722a2e9..000000000 Binary files a/src/main/resources/assets/create/textures/item/symbols.png and /dev/null differ