diff --git a/src/main/java/com/simibubi/create/compat/jei/DoubleItemIcon.java b/src/main/java/com/simibubi/create/compat/jei/DoubleItemIcon.java index dd1e33185..176209d17 100644 --- a/src/main/java/com/simibubi/create/compat/jei/DoubleItemIcon.java +++ b/src/main/java/com/simibubi/create/compat/jei/DoubleItemIcon.java @@ -56,6 +56,7 @@ public class DoubleItemIcon implements IDrawable { RenderSystem.popMatrix(); RenderSystem.popMatrix(); + RenderSystem.enableBlend(); } } diff --git a/src/main/java/com/simibubi/create/foundation/gui/ScreenElementRenderer.java b/src/main/java/com/simibubi/create/foundation/gui/ScreenElementRenderer.java index 43cdbbeee..251605a41 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/ScreenElementRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/gui/ScreenElementRenderer.java @@ -19,8 +19,8 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -84,11 +84,11 @@ public class ScreenElementRenderer { } RenderSystem.scaled(50, -50, 50); - IRenderTypeBuffer.Impl buffer = mc.getBufferBuilders().getEntityVertexConsumers(); + IRenderTypeBuffer.Impl buffer = mc.getBufferBuilders().getEntityVertexConsumers(); RenderType renderType = RenderTypeLookup.getEntityBlockLayer(blockToRender); IVertexBuilder vb = buffer.getBuffer(renderType); MatrixStack ms = new MatrixStack(); - mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); + mc.getTextureManager().bindTexture(PlayerContainer.BLOCK_ATLAS_TEXTURE); RenderSystem.pushMatrix(); if (fire) { @@ -107,14 +107,16 @@ public class ScreenElementRenderer { } } RenderSystem.popMatrix(); + buffer.draw(renderType); if (blockToRender != null && !blockToRender.getFluidState().isEmpty()) { + renderType = RenderTypeLookup.getFluidLayer(blockToRender.getFluidState()); + vb = buffer.getBuffer(renderType); RenderHelper.disableStandardItemLighting(); RenderSystem.translatef(0, -300, 0); blockRenderer.renderFluid(new BlockPos(0, 300, 0), mc.world, vb, blockToRender.getFluidState()); + buffer.draw(renderType); } - - buffer.draw(renderType); RenderSystem.disableAlphaTest(); RenderSystem.disableRescaleNormal(); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java index 577bb20b5..2f00638b5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java @@ -63,7 +63,7 @@ public class MechanicalCrafterTileEntityRenderer extends SafeTileEntityRenderer< ms.pop(); renderFast(te, partialTicks, ms, buffer); - TessellatorHelper.draw(); + //TessellatorHelper.draw(); } public void renderItems(MechanicalCrafterTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer, int light, int overlay) { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java index 3d43cb6a9..2bb47b76c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java @@ -54,6 +54,7 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; +import net.minecraft.world.WorldType; import net.minecraft.world.storage.loot.LootParameters; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -393,7 +394,7 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE items) { super.fillItemGroup(group, items); - AllItems.BELT_CONNECTOR.get().fillItemGroup(group, items); } public static boolean isShaft(BlockState state) { diff --git a/src/main/resources/assets/create/blockstates/belt_funnel.json b/src/main/resources/assets/create/blockstates/belt_funnel.json index 36fd7025c..25d3e3483 100644 --- a/src/main/resources/assets/create/blockstates/belt_funnel.json +++ b/src/main/resources/assets/create/blockstates/belt_funnel.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, "variants": { - "belt": { - "true": { "model": "create:block/funnel/horizontal_belt" }, - "false": { "model": "create:block/funnel/horizontal" } - }, - "facing": { - "south": { "y": 180 }, - "east": { "y": 90 }, - "north": { "y": 0 }, - "west": { "y": 270 } - } + "belt=true,facing=south": { "model": "create:block/funnel/horizontal_belt", "y": 180 }, + "belt=true,facing=east": { "model": "create:block/funnel/horizontal_belt", "y": 90 }, + "belt=true,facing=north": { "model": "create:block/funnel/horizontal_belt" }, + "belt=true,facing=west": { "model": "create:block/funnel/horizontal_belt", "y": 270 }, + "belt=false,facing=south": { "model": "create:block/funnel/horizontal_belt", "y": 180 }, + "belt=false,facing=east": { "model": "create:block/funnel/horizontal_belt", "y": 90 }, + "belt=false,facing=north": { "model": "create:block/funnel/horizontal_belt" }, + "belt=false,facing=west": { "model": "create:block/funnel/horizontal_belt", "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/belt_tunnel.json b/src/main/resources/assets/create/blockstates/belt_tunnel.json index 28fb1709d..46dc42caf 100644 --- a/src/main/resources/assets/create/blockstates/belt_tunnel.json +++ b/src/main/resources/assets/create/blockstates/belt_tunnel.json @@ -1,18 +1,20 @@ { - "forge_marker": 1, "variants": { - "shape": { - "straight": { "model": "create:block/belt_tunnel/straight" }, - "window": { "model": "create:block/belt_tunnel/straight_windowed" }, - "halfshade": { "model": "create:block/belt_tunnel/straight_halfshade" }, - "fullshade": { "model": "create:block/belt_tunnel/straight_fullshade" }, - "t_left": { "model": "create:block/belt_tunnel/t_left" }, - "t_right": { "model": "create:block/belt_tunnel/t_right" }, - "cross": { "model": "create:block/belt_tunnel/cross" } - }, - "axis": { - "x": { }, - "z": { "y": 90 } + "shape=straight,axis=x": { "model": "create:block/belt_tunnel/straight" }, + "shape=window,axis=x": { "model": "create:block/belt_tunnel/straight_windowed" }, + "shape=halfshade,axis=x": { "model": "create:block/belt_tunnel/straight_halfshade" }, + "shape=fullshade,axis=x": { "model": "create:block/belt_tunnel/straight_fullshade" }, + "shape=t_left,axis=x": { "model": "create:block/belt_tunnel/t_left" }, + "shape=t_right,axis=x": { "model": "create:block/belt_tunnel/t_right" }, + "shape=cross,axis=x": { "model": "create:block/belt_tunnel/cross" }, + + "shape=straight,axis=z": { "model": "create:block/belt_tunnel/straight", "y": 90 }, + "shape=window,axis=z": { "model": "create:block/belt_tunnel/straight_windowed", "y": 90 }, + "shape=halfshade,axis=z": { "model": "create:block/belt_tunnel/straight_halfshade", "y": 90 }, + "shape=fullshade,axis=z": { "model": "create:block/belt_tunnel/straight_fullshade", "y": 90 }, + "shape=t_left,axis=z": { "model": "create:block/belt_tunnel/t_left", "y": 90 }, + "shape=t_right,axis=z": { "model": "create:block/belt_tunnel/t_right", "y": 90 }, + "shape=cross,axis=z": { "model": "create:block/belt_tunnel/cross", "y": 90 } } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/cart_assembler.json b/src/main/resources/assets/create/blockstates/cart_assembler.json index 373c4a9d3..30acbf36d 100644 --- a/src/main/resources/assets/create/blockstates/cart_assembler.json +++ b/src/main/resources/assets/create/blockstates/cart_assembler.json @@ -1,20 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/cart_assembler" - }, "variants": { - "shape": { - "north_south": { }, - "east_west": { "y": 90 } - }, - "powered": { - "false": { }, - "true": { - "textures": { - "clutch_off": "create:block/clutch_on" - } - } - } + "shape=north_south,powered=false": { "model": "create:block/cart_assembler" }, + "shape=east_west,powered=false": { "model": "create:block/cart_assembler", "y": 90 }, + "shape=north_south,powered=true": { "model": "create:block/cart_assembler_powered" }, + "shape=east_west,powered=true": { "model": "create:block/cart_assembler_powered", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/clockwork_bearing.json b/src/main/resources/assets/create/blockstates/clockwork_bearing.json index 3eca6ae5e..147dbfe4e 100644 --- a/src/main/resources/assets/create/blockstates/clockwork_bearing.json +++ b/src/main/resources/assets/create/blockstates/clockwork_bearing.json @@ -1,16 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/bearing/clockwork" - }, "variants": { - "facing" : { - "up" : { }, - "down" : { "x": 180 }, - "north" : { "x": 90 }, - "east" : { "x": 90, "y": 90 }, - "south" : { "x": 90, "y": 180 }, - "west" : { "x": 90, "y": 270 } - } + "facing=up" : { "model": "create:block/bearing/clockwork" }, + "facing=down" : { "model": "create:block/bearing/clockwork", "x": 180 }, + "facing=north" : { "model": "create:block/bearing/clockwork", "x": 90 }, + "facing=east" : { "model": "create:block/bearing/clockwork", "x": 90, "y": 90 }, + "facing=south" : { "model": "create:block/bearing/clockwork", "x": 90, "y": 180 }, + "facing=west" : { "model": "create:block/bearing/clockwork", "x": 90, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/clutch.json b/src/main/resources/assets/create/blockstates/clutch.json index e18f6dd35..68465673e 100644 --- a/src/main/resources/assets/create/blockstates/clutch.json +++ b/src/main/resources/assets/create/blockstates/clutch.json @@ -1,14 +1,10 @@ { - "forge_marker": 1, - "variants": { - "powered" : { - "true": { "model": "create:block/clutch_on" }, - "false": { "model": "create:block/clutch_off" } - }, - "axis": { - "y": { "x": 90 }, - "x": { "y": 90 }, - "z": {} - } - } -} \ No newline at end of file + "variants": { + "powered=true,axis=x": { "model": "create:block/clutch_on", "y": 90 }, + "powered=true,axis=y": { "model": "create:block/clutch_on", "x": 90 }, + "powered=true,axis=z": { "model": "create:block/clutch_on" }, + "powered=false,axis=x": { "model": "create:block/clutch_off", "y": 90 }, + "powered=false,axis=y": { "model": "create:block/clutch_off", "x": 90 }, + "powered=false,axis=z": { "model": "create:block/clutch_off" } + } +} diff --git a/src/main/resources/assets/create/blockstates/cocoa_log.json b/src/main/resources/assets/create/blockstates/cocoa_log.json index 1339f1013..d067f5d33 100644 --- a/src/main/resources/assets/create/blockstates/cocoa_log.json +++ b/src/main/resources/assets/create/blockstates/cocoa_log.json @@ -1,15 +1,13 @@ { - "forge_marker": 1, "variants": { - "age": { - "0": { "model": "create:block/cocoa_log_0" }, - "1": { "model": "create:block/cocoa_log_1" }, - "2": { "model": "create:block/cocoa_log_2" } - }, - "axis": { - "y": {}, - "x": { "x": 90, "y": 90 }, - "z": { "x": 90 } - } + "age=0,axis=y": { "model": "create:block/cocoa_log_0" }, + "age=1,axis=y": { "model": "create:block/cocoa_log_1" }, + "age=2,axis=y": { "model": "create:block/cocoa_log_2" }, + "age=0,axis=x": { "model": "create:block/cocoa_log_0", "x": 90, "y": 90 }, + "age=1,axis=x": { "model": "create:block/cocoa_log_1", "x": 90, "y": 90 }, + "age=2,axis=x": { "model": "create:block/cocoa_log_2", "x": 90, "y": 90 }, + "age=0,axis=z": { "model": "create:block/cocoa_log_0", "x": 90 }, + "age=1,axis=z": { "model": "create:block/cocoa_log_1", "x": 90 }, + "age=2,axis=z": { "model": "create:block/cocoa_log_2", "x": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/contact.json b/src/main/resources/assets/create/blockstates/contact.json index 02e597cf8..d44b78d45 100644 --- a/src/main/resources/assets/create/blockstates/contact.json +++ b/src/main/resources/assets/create/blockstates/contact.json @@ -1,17 +1,16 @@ { - "forge_marker": 1, - "variants": { - "powered": { - "true": { "model": "create:block/contact_powered" }, - "false": { "model": "create:block/contact" } - }, - "facing": { - "north": { "x": 90 }, - "south": { "x": 90, "y": 180 }, - "west": { "x": 90, "y": 270 }, - "up": { }, - "down": { "x": 180 }, - "east": { "x": 90, "y": 90 } - } - } -} \ No newline at end of file + "variants": { + "powered=true,facing=north": { "model": "create:block/contact_powered", "x": 90 }, + "powered=true,facing=east": { "model": "create:block/contact_powered", "x": 90, "y": 90 }, + "powered=true,facing=south": { "model": "create:block/contact_powered", "x": 90, "y": 180 }, + "powered=true,facing=west": { "model": "create:block/contact_powered", "x": 90, "y": 270 }, + "powered=true,facing=up": { "model": "create:block/contact_powered" }, + "powered=true,facing=down": { "model": "create:block/contact_powered", "x": 180 }, + "powered=false,facing=north": { "model": "create:block/contact", "x": 90 }, + "powered=false,facing=east": { "model": "create:block/contact", "x": 90, "y": 90 }, + "powered=false,facing=south": { "model": "create:block/contact", "x": 90, "y": 180 }, + "powered=false,facing=west": { "model": "create:block/contact", "x": 90, "y": 270 }, + "powered=false,facing=up": { "model": "create:block/contact" }, + "powered=false,facing=down": { "model": "create:block/contact", "x": 180 } + } +} diff --git a/src/main/resources/assets/create/blockstates/copper_block.json b/src/main/resources/assets/create/blockstates/copper_block.json index d397e73d9..b7f7903d4 100644 --- a/src/main/resources/assets/create/blockstates/copper_block.json +++ b/src/main/resources/assets/create/blockstates/copper_block.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, - "variants": { - "oxidization": { - "0": { "model": "create:block/oxidized/copper_block/0" }, - "1": { "model": "create:block/oxidized/copper_block/1" }, - "2": { "model": "create:block/oxidized/copper_block/2" }, - "3": { "model": "create:block/oxidized/copper_block/3" }, - "4": { "model": "create:block/oxidized/copper_block/4" }, - "5": { "model": "create:block/oxidized/copper_block/5" }, - "6": { "model": "create:block/oxidized/copper_block/6" }, - "7": { "model": "create:block/oxidized/copper_block/7" } - } + "variants": { + "oxidization=0": { "model": "create:block/oxidized/copper_block/0" }, + "oxidization=1": { "model": "create:block/oxidized/copper_block/1" }, + "oxidization=2": { "model": "create:block/oxidized/copper_block/2" }, + "oxidization=3": { "model": "create:block/oxidized/copper_block/3" }, + "oxidization=4": { "model": "create:block/oxidized/copper_block/4" }, + "oxidization=5": { "model": "create:block/oxidized/copper_block/5" }, + "oxidization=6": { "model": "create:block/oxidized/copper_block/6" }, + "oxidization=7": { "model": "create:block/oxidized/copper_block/7" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/copper_ore.json b/src/main/resources/assets/create/blockstates/copper_ore.json index 5fba428c6..322ba6928 100644 --- a/src/main/resources/assets/create/blockstates/copper_ore.json +++ b/src/main/resources/assets/create/blockstates/copper_ore.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, - "variants": { - "oxidization": { - "0": { "model": "create:block/oxidized/copper_ore/0" }, - "1": { "model": "create:block/oxidized/copper_ore/1" }, - "2": { "model": "create:block/oxidized/copper_ore/2" }, - "3": { "model": "create:block/oxidized/copper_ore/3" }, - "4": { "model": "create:block/oxidized/copper_ore/4" }, - "5": { "model": "create:block/oxidized/copper_ore/5" }, - "6": { "model": "create:block/oxidized/copper_ore/6" }, - "7": { "model": "create:block/oxidized/copper_ore/7" } - } + "variants": { + "oxidization=0": { "model": "create:block/oxidized/copper_ore/0" }, + "oxidization=1": { "model": "create:block/oxidized/copper_ore/1" }, + "oxidization=2": { "model": "create:block/oxidized/copper_ore/2" }, + "oxidization=3": { "model": "create:block/oxidized/copper_ore/3" }, + "oxidization=4": { "model": "create:block/oxidized/copper_ore/4" }, + "oxidization=5": { "model": "create:block/oxidized/copper_ore/5" }, + "oxidization=6": { "model": "create:block/oxidized/copper_ore/6" }, + "oxidization=7": { "model": "create:block/oxidized/copper_ore/7" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/copper_shingles.json b/src/main/resources/assets/create/blockstates/copper_shingles.json index bd2c12125..b0c1bdf97 100644 --- a/src/main/resources/assets/create/blockstates/copper_shingles.json +++ b/src/main/resources/assets/create/blockstates/copper_shingles.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, - "variants": { - "oxidization": { - "0": { "model": "create:block/oxidized/copper_shingles/0" }, - "1": { "model": "create:block/oxidized/copper_shingles/1" }, - "2": { "model": "create:block/oxidized/copper_shingles/2" }, - "3": { "model": "create:block/oxidized/copper_shingles/3" }, - "4": { "model": "create:block/oxidized/copper_shingles/4" }, - "5": { "model": "create:block/oxidized/copper_shingles/5" }, - "6": { "model": "create:block/oxidized/copper_shingles/6" }, - "7": { "model": "create:block/oxidized/copper_shingles/7" } - } + "variants": { + "oxidization=0": { "model": "create:block/oxidized/copper_shingles/0" }, + "oxidization=1": { "model": "create:block/oxidized/copper_shingles/1" }, + "oxidization=2": { "model": "create:block/oxidized/copper_shingles/2" }, + "oxidization=3": { "model": "create:block/oxidized/copper_shingles/3" }, + "oxidization=4": { "model": "create:block/oxidized/copper_shingles/4" }, + "oxidization=5": { "model": "create:block/oxidized/copper_shingles/5" }, + "oxidization=6": { "model": "create:block/oxidized/copper_shingles/6" }, + "oxidization=7": { "model": "create:block/oxidized/copper_shingles/7" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/cuckoo_clock.json b/src/main/resources/assets/create/blockstates/cuckoo_clock.json index 6131f66cd..d377391b9 100644 --- a/src/main/resources/assets/create/blockstates/cuckoo_clock.json +++ b/src/main/resources/assets/create/blockstates/cuckoo_clock.json @@ -1,14 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/cuckoo_clock/casing" - }, "variants": { - "facing": { - "north": { "y": 90 }, - "south": { "y": 270 }, - "east": { "y": 180 }, - "west": { "y": 0 } + "facing=north": { "model": "create:block/cuckoo_clock/casing", "y": 90 }, + "facing=south": { "model": "create:block/cuckoo_clock/casing", "y": 270 }, + "facing=east": { "model": "create:block/cuckoo_clock/casing", "y": 180 }, + "facing=west": { "model": "create:block/cuckoo_clock/casing", "y": 0 } } - } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/dark_scoria_bricks_slab.json b/src/main/resources/assets/create/blockstates/dark_scoria_bricks_slab.json index 805e2c877..6b5ea33f9 100644 --- a/src/main/resources/assets/create/blockstates/dark_scoria_bricks_slab.json +++ b/src/main/resources/assets/create/blockstates/dark_scoria_bricks_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/dark_scoria_bricks_slab_top" }, - "bottom": { "model":"create:block/palettes/dark_scoria_bricks_slab" }, - "double": { "model":"create:block/palettes/dark_scoria_bricks" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/dark_scoria_bricks_slab_top" }, + "type=bottom": { "model":"create:block/palettes/dark_scoria_bricks_slab" }, + "type=double": { "model":"create:block/palettes/dark_scoria_bricks" } + } +} diff --git a/src/main/resources/assets/create/blockstates/dark_scoria_tiles_slab.json b/src/main/resources/assets/create/blockstates/dark_scoria_tiles_slab.json index d8c1225ba..2d5511916 100644 --- a/src/main/resources/assets/create/blockstates/dark_scoria_tiles_slab.json +++ b/src/main/resources/assets/create/blockstates/dark_scoria_tiles_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/dark_scoria_tiles_slab_top" }, - "bottom": { "model":"create:block/palettes/dark_scoria_tiles_slab" }, - "double": { "model":"create:block/palettes/dark_scoria_tiles" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/dark_scoria_tiles_slab_top" }, + "type=bottom": { "model":"create:block/palettes/dark_scoria_tiles_slab" }, + "type=double": { "model":"create:block/palettes/dark_scoria_tiles" } + } +} diff --git a/src/main/resources/assets/create/blockstates/deployer.json b/src/main/resources/assets/create/blockstates/deployer.json index fe3dd53ec..105b12a12 100644 --- a/src/main/resources/assets/create/blockstates/deployer.json +++ b/src/main/resources/assets/create/blockstates/deployer.json @@ -1,5 +1,4 @@ { - "forge_marker": 1, "variants": { "facing=east,axis_along_first=false": { "model": "create:block/deployer/horizontal", "x": 0, "y": 270 }, "facing=west,axis_along_first=false": { "model": "create:block/deployer/horizontal", "x": 0, "y": 90 }, @@ -7,7 +6,7 @@ "facing=down,axis_along_first=false": { "model": "create:block/deployer/horizontal", "x": 270, "y": 90 }, "facing=south,axis_along_first=false": { "model": "create:block/deployer/vertical", "x": 0, "y": 0 }, "facing=north,axis_along_first=false": { "model": "create:block/deployer/vertical", "x": 0, "y": 180 }, - + "facing=east,axis_along_first=true": { "model": "create:block/deployer/vertical", "x": 0, "y": 270 }, "facing=west,axis_along_first=true": { "model": "create:block/deployer/vertical", "x": 0, "y": 90 }, "facing=up,axis_along_first=true": { "model": "create:block/deployer/horizontal", "x": 90, "y": 0 }, @@ -15,4 +14,4 @@ "facing=south,axis_along_first=true": { "model": "create:block/deployer/horizontal", "x": 0, "y": 0 }, "facing=north,axis_along_first=true": { "model": "create:block/deployer/horizontal", "x": 0, "y": 180 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/diorite_layers.json b/src/main/resources/assets/create/blockstates/diorite_layers.json index dd73eefb3..08e2649c4 100644 --- a/src/main/resources/assets/create/blockstates/diorite_layers.json +++ b/src/main/resources/assets/create/blockstates/diorite_layers.json @@ -1,5 +1,5 @@ { - "variants": { + "variants": { "": { "model": "create:block/palettes/diorite_layers" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/dolomite_bricks_slab.json b/src/main/resources/assets/create/blockstates/dolomite_bricks_slab.json index fb5a720bf..f9c65ad13 100644 --- a/src/main/resources/assets/create/blockstates/dolomite_bricks_slab.json +++ b/src/main/resources/assets/create/blockstates/dolomite_bricks_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/dolomite_bricks_slab_top" }, - "bottom": { "model":"create:block/palettes/dolomite_bricks_slab" }, - "double": { "model":"create:block/palettes/dolomite_bricks" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/dolomite_bricks_slab_top" }, + "type=bottom": { "model":"create:block/palettes/dolomite_bricks_slab" }, + "type=double": { "model":"create:block/palettes/dolomite_bricks" } + } +} diff --git a/src/main/resources/assets/create/blockstates/dolomite_slab.json b/src/main/resources/assets/create/blockstates/dolomite_slab.json index 8a7c3108b..7cefa0a2a 100644 --- a/src/main/resources/assets/create/blockstates/dolomite_slab.json +++ b/src/main/resources/assets/create/blockstates/dolomite_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/dolomite_slab_top" }, - "bottom": { "model":"create:block/palettes/dolomite_slab" }, - "double": { "model":"create:block/palettes/dolomite" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/dolomite_slab_top" }, + "type=bottom": { "model":"create:block/palettes/dolomite_slab" }, + "type=double": { "model":"create:block/palettes/dolomite" } + } +} diff --git a/src/main/resources/assets/create/blockstates/drill.json b/src/main/resources/assets/create/blockstates/drill.json index e7aa10c50..7b581954e 100644 --- a/src/main/resources/assets/create/blockstates/drill.json +++ b/src/main/resources/assets/create/blockstates/drill.json @@ -1,16 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/drill_base" - }, "variants": { - "facing": { - "north": { "y": 180 }, - "south": { }, - "west": { "y": 90 }, - "up": { "x": 90 }, - "down": { "x": 270 }, - "east": { "y": 270 } - } + "facing=north": { "model": "create:block/drill_base", "y": 180 }, + "facing=south": { "model": "create:block/drill_base" }, + "facing=west": { "model": "create:block/drill_base", "y": 90 }, + "facing=up": { "model": "create:block/drill_base", "x": 90 }, + "facing=down": { "model": "create:block/drill_base", "x": 270 }, + "facing=east": { "model": "create:block/drill_base", "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/encased_fan.json b/src/main/resources/assets/create/blockstates/encased_fan.json index 988875525..eb8b62b19 100644 --- a/src/main/resources/assets/create/blockstates/encased_fan.json +++ b/src/main/resources/assets/create/blockstates/encased_fan.json @@ -1,16 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/encased_fan/casing" - }, "variants": { - "facing": { - "north": { "y": 0 }, - "south": { "y": 180 }, - "west": { "y": 270 }, - "up": { "x": 270 }, - "down": { "x": 90 }, - "east": { "y": 90 } - } + "facing=north": { "model": "create:block/encased_fan/casing", "y": 0 }, + "facing=south": { "model": "create:block/encased_fan/casing", "y": 180 }, + "facing=west": { "model": "create:block/encased_fan/casing", "y": 270 }, + "facing=up": { "model": "create:block/encased_fan/casing", "x": 270 }, + "facing=down": { "model": "create:block/encased_fan/casing", "x": 90 }, + "facing=east": { "model": "create:block/encased_fan/casing", "y": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/extractor.json b/src/main/resources/assets/create/blockstates/extractor.json index be1a12d74..380fa0777 100644 --- a/src/main/resources/assets/create/blockstates/extractor.json +++ b/src/main/resources/assets/create/blockstates/extractor.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, - "variants": { - "powered": { - "true": { "model": "create:block/extractor/horizontal_powered" }, - "false": { "model": "create:block/extractor/horizontal" } - }, - "facing": { - "south": { "y": 180 }, - "east": { "y": 90 }, - "north": { "y": 0 }, - "west": { "y": 270 } - } - } -} \ No newline at end of file + "variants": { + "powered=true,facing=north": { "model": "create:block/extractor/horizontal_powered", "y": 180 }, + "powered=true,facing=east": { "model": "create:block/extractor/horizontal_powered", "y": 90 }, + "powered=true,facing=south": { "model": "create:block/extractor/horizontal_powered", "y": 0 }, + "powered=true,facing=west": { "model": "create:block/extractor/horizontal_powered", "y": 270 }, + "powered=false,facing=north": { "model": "create:block/extractor/horizontal", "y": 180 }, + "powered=false,facing=east": { "model": "create:block/extractor/horizontal", "y": 90 }, + "powered=false,facing=south": { "model": "create:block/extractor/horizontal", "y": 0 }, + "powered=false,facing=west": { "model": "create:block/extractor/horizontal", "y": 270 } + } +} diff --git a/src/main/resources/assets/create/blockstates/flexpeater.json b/src/main/resources/assets/create/blockstates/flexpeater.json index c81feb60b..6ac61f5f0 100644 --- a/src/main/resources/assets/create/blockstates/flexpeater.json +++ b/src/main/resources/assets/create/blockstates/flexpeater.json @@ -1,24 +1,23 @@ { - "forge_marker": 1, "variants": { "powered=false,powering=false,facing=north": { "model": "create:block/repeaters/flexpeater", "y": 180 }, "powered=false,powering=false,facing=east": { "model": "create:block/repeaters/flexpeater", "y": 270 }, "powered=false,powering=false,facing=south": { "model": "create:block/repeaters/flexpeater", "y": 0 }, "powered=false,powering=false,facing=west": { "model": "create:block/repeaters/flexpeater", "y": 90 }, - + "powered=true,powering=false,facing=north": { "model": "create:block/repeaters/flexpeater_powered", "y": 180 }, "powered=true,powering=false,facing=east": { "model": "create:block/repeaters/flexpeater_powered", "y": 270 }, "powered=true,powering=false,facing=south": { "model": "create:block/repeaters/flexpeater_powered", "y": 0 }, "powered=true,powering=false,facing=west": { "model": "create:block/repeaters/flexpeater_powered", "y": 90 }, - + "powered=false,powering=true,facing=north": { "model": "create:block/repeaters/flexpeater_powering", "y": 180 }, "powered=false,powering=true,facing=east": { "model": "create:block/repeaters/flexpeater_powering", "y": 270 }, "powered=false,powering=true,facing=south": { "model": "create:block/repeaters/flexpeater_powering", "y": 0 }, "powered=false,powering=true,facing=west": { "model": "create:block/repeaters/flexpeater_powering", "y": 90 }, - + "powered=true,powering=true,facing=north": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 180 }, "powered=true,powering=true,facing=east": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 270 }, "powered=true,powering=true,facing=south": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 0 }, "powered=true,powering=true,facing=west": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/flexpulsepeater.json b/src/main/resources/assets/create/blockstates/flexpulsepeater.json index 7344fa21b..fb2a1196b 100644 --- a/src/main/resources/assets/create/blockstates/flexpulsepeater.json +++ b/src/main/resources/assets/create/blockstates/flexpulsepeater.json @@ -1,24 +1,23 @@ { - "forge_marker": 1, "variants": { "powered=false,powering=false,facing=north": { "model": "create:block/repeaters/flexpulsepeater", "y": 180 }, "powered=false,powering=false,facing=east": { "model": "create:block/repeaters/flexpulsepeater", "y": 270 }, "powered=false,powering=false,facing=south": { "model": "create:block/repeaters/flexpulsepeater", "y": 0 }, "powered=false,powering=false,facing=west": { "model": "create:block/repeaters/flexpulsepeater", "y": 90 }, - + "powered=true,powering=false,facing=north": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 180 }, "powered=true,powering=false,facing=east": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 270 }, "powered=true,powering=false,facing=south": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 0 }, "powered=true,powering=false,facing=west": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 90 }, - + "powered=false,powering=true,facing=north": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 180 }, "powered=false,powering=true,facing=east": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 270 }, "powered=false,powering=true,facing=south": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 0 }, "powered=false,powering=true,facing=west": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 90 }, - + "powered=true,powering=true,facing=north": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 180 }, "powered=true,powering=true,facing=east": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 270 }, "powered=true,powering=true,facing=south": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 0 }, "powered=true,powering=true,facing=west": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/flywheel.json b/src/main/resources/assets/create/blockstates/flywheel.json index 8a469a059..287528b2d 100644 --- a/src/main/resources/assets/create/blockstates/flywheel.json +++ b/src/main/resources/assets/create/blockstates/flywheel.json @@ -1,18 +1,16 @@ { - "forge_marker": 1, - "defaults": { - }, "variants": { - "facing": { - "north": { "y": 270 }, - "south": { "y": 90 }, - "east": { "y": 0 }, - "west": { "y": 180 } - }, - "connection": { - "none": { "model": "create:block/flywheel/casing_no_connection" }, - "left": { "model": "create:block/flywheel/casing_left" }, - "right": { "model": "create:block/flywheel/casing_right" } + "connection=none,facing=north": { "model": "create:block/flywheel/casing_no_connection", "y": 270 }, + "connection=none,facing=south": { "model": "create:block/flywheel/casing_no_connection", "y": 90 }, + "connection=none,facing=east": { "model": "create:block/flywheel/casing_no_connection", "y": 0 }, + "connection=none,facing=west": { "model": "create:block/flywheel/casing_no_connection", "y": 180 }, + "connection=left,facing=north": { "model": "create:block/flywheel/casing_left", "y": 270 }, + "connection=left,facing=south": { "model": "create:block/flywheel/casing_left", "y": 90 }, + "connection=left,facing=east": { "model": "create:block/flywheel/casing_left", "y": 0 }, + "connection=left,facing=west": { "model": "create:block/flywheel/casing_left", "y": 180 }, + "connection=right,facing=north": { "model": "create:block/flywheel/casing_right", "y": 270 }, + "connection=right,facing=south": { "model": "create:block/flywheel/casing_right", "y": 90 }, + "connection=right,facing=east": { "model": "create:block/flywheel/casing_right", "y": 0 }, + "connection=right,facing=west": { "model": "create:block/flywheel/casing_right", "y": 180 } } - } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/furnace_engine.json b/src/main/resources/assets/create/blockstates/furnace_engine.json index e2abdd163..97798781d 100644 --- a/src/main/resources/assets/create/blockstates/furnace_engine.json +++ b/src/main/resources/assets/create/blockstates/furnace_engine.json @@ -1,14 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/furnace_engine/body" - }, "variants": { - "facing": { - "north": { "y": 180 }, - "south": { "y": 0 }, - "west": { "y": 90 }, - "east": { "y": 270 } - } + "facing=north": { "model": "create:block/furnace_engine/body", "y": 180 }, + "facing=south": { "model": "create:block/furnace_engine/body", "y": 0 }, + "facing=west": { "model": "create:block/furnace_engine/body", "y": 90 }, + "facing=east": { "model": "create:block/furnace_engine/body", "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/gabbro_slab.json b/src/main/resources/assets/create/blockstates/gabbro_slab.json index 1a1b587b2..acd013e06 100644 --- a/src/main/resources/assets/create/blockstates/gabbro_slab.json +++ b/src/main/resources/assets/create/blockstates/gabbro_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/gabbro_slab_top" }, - "bottom": { "model":"create:block/palettes/gabbro_slab" }, - "double": { "model":"create:block/palettes/gabbro" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/gabbro_slab_top" }, + "type=bottom": { "model":"create:block/palettes/gabbro_slab" }, + "type=double": { "model":"create:block/palettes/gabbro" } + } +} diff --git a/src/main/resources/assets/create/blockstates/gearbox.json b/src/main/resources/assets/create/blockstates/gearbox.json index 81109efe4..912915654 100644 --- a/src/main/resources/assets/create/blockstates/gearbox.json +++ b/src/main/resources/assets/create/blockstates/gearbox.json @@ -1,11 +1,7 @@ { - "forgemarker": 1, - "defaults": { - "model": "create:block/gearbox" - }, - "variants": { + "variants": { "axis=y": { "model": "create:block/gearbox" }, - "axis=z": { "model": "create:block/gearbox", "x": 90 }, - "axis=x": { "model": "create:block/gearbox", "x": 90, "y": 90 } + "axis=z": { "model": "create:block/gearbox", "x": 90 }, + "axis=x": { "model": "create:block/gearbox", "x": 90, "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/gearshift.json b/src/main/resources/assets/create/blockstates/gearshift.json index 3bbde498e..08d484215 100644 --- a/src/main/resources/assets/create/blockstates/gearshift.json +++ b/src/main/resources/assets/create/blockstates/gearshift.json @@ -1,14 +1,10 @@ { - "forge_marker": 1, - "variants": { - "powered" : { - "true": { "model": "create:block/gearshift_on" }, - "false": { "model": "create:block/gearshift_off" } - }, - "axis": { - "x": { "y": 90 }, - "y": { "x": 90 }, - "z": {} - } + "variants": { + "powered=true,axis=x": { "model": "create:block/gearshift_on", "y": 90 }, + "powered=true,axis=y": { "model": "create:block/gearshift_on", "x": 90 }, + "powered=true,axis=z": { "model": "create:block/gearshift_on" }, + "powered=false,axis=x": { "model": "create:block/gearshift_off", "y": 90 }, + "powered=false,axis=y": { "model": "create:block/gearshift_off", "x": 90 }, + "powered=false,axis=z": { "model": "create:block/gearshift_off" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/hand_crank.json b/src/main/resources/assets/create/blockstates/hand_crank.json index f17657692..9cba26df5 100644 --- a/src/main/resources/assets/create/blockstates/hand_crank.json +++ b/src/main/resources/assets/create/blockstates/hand_crank.json @@ -1,16 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/hand_crank/block" - }, "variants": { - "facing": { - "north": { "y": 0 }, - "south": { "y": 180 }, - "west": { "y": 270 }, - "up": { "x": 270 }, - "down": { "x": 90 }, - "east": { "y": 90 } - } + "facing=north":{ "model": "create:block/hand_crank/block" }, + "facing=south":{ "model": "create:block/hand_crank/block", "y": 180 }, + "facing=west": { "model": "create:block/hand_crank/block", "y": 270 }, + "facing=up": { "model": "create:block/hand_crank/block", "x": 270 }, + "facing=down": { "model": "create:block/hand_crank/block", "x": 90 }, + "facing=east": { "model": "create:block/hand_crank/block", "y": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/harvester.json b/src/main/resources/assets/create/blockstates/harvester.json index a689b3c59..eb5f9c000 100644 --- a/src/main/resources/assets/create/blockstates/harvester.json +++ b/src/main/resources/assets/create/blockstates/harvester.json @@ -1,14 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/harvester" - }, "variants": { - "facing": { - "north": { "y": 180 }, - "south": {}, - "east": { "y": 270 }, - "west": { "y": 90 } - } + "facing=north": { "model": "create:block/harvester", "y": 180 }, + "facing=south": { "model": "create:block/harvester" }, + "facing=east": { "model": "create:block/harvester", "y": 270 }, + "facing=west": { "model": "create:block/harvester", "y": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json b/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json index 4e5db95dc..d2e573d99 100644 --- a/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json +++ b/src/main/resources/assets/create/blockstates/indented_gabbro_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/indented_gabbro_slab_top" }, - "bottom": { "model":"create:block/palettes/indented_gabbro_slab" }, - "double": { "model":"create:block/palettes/indented_gabbro" } - } + "variants": { + "type=top": { "model":"create:block/palettes/indented_gabbro_slab_top" }, + "type=bottom": { "model":"create:block/palettes/indented_gabbro_slab" }, + "type=double": { "model":"create:block/palettes/indented_gabbro" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/limesand.json b/src/main/resources/assets/create/blockstates/limesand.json index bba383dc3..04e82892b 100644 --- a/src/main/resources/assets/create/blockstates/limesand.json +++ b/src/main/resources/assets/create/blockstates/limesand.json @@ -1,7 +1,10 @@ { - "forge_marker": 1, - "defaults": { "model": "create:block/palettes/limesand" }, - "variants": { - "": [{ "y": 0 }, { "y": 90 }, { "y": 180 }, { "y": 270 }] - } + "variants": { + "": [ + { "model": "create:block/palettes/limesand", "y": 0 }, + { "model": "create:block/palettes/limesand", "y": 90 }, + { "model": "create:block/palettes/limesand", "y": 180 }, + { "model": "create:block/palettes/limesand", "y": 270 } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/limestone_bricks_slab.json b/src/main/resources/assets/create/blockstates/limestone_bricks_slab.json index 7893da168..f63272b5a 100644 --- a/src/main/resources/assets/create/blockstates/limestone_bricks_slab.json +++ b/src/main/resources/assets/create/blockstates/limestone_bricks_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/limestone_bricks_slab_top" }, - "bottom": { "model":"create:block/palettes/limestone_bricks_slab" }, - "double": { "model":"create:block/palettes/limestone_bricks" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/limestone_bricks_slab_top" }, + "type=bottom": { "model":"create:block/palettes/limestone_bricks_slab" }, + "type=double": { "model":"create:block/palettes/limestone_bricks" } + } +} diff --git a/src/main/resources/assets/create/blockstates/limestone_slab.json b/src/main/resources/assets/create/blockstates/limestone_slab.json index 4a176b7ae..5934ddbb9 100644 --- a/src/main/resources/assets/create/blockstates/limestone_slab.json +++ b/src/main/resources/assets/create/blockstates/limestone_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/limestone_slab_top" }, - "bottom": { "model":"create:block/palettes/limestone_slab" }, - "double": { "model":"create:block/palettes/limestone" } - } + "variants": { + "type=top": { "model":"create:block/palettes/limestone_slab_top" }, + "type=bottom": { "model":"create:block/palettes/limestone_slab" }, + "type=double": { "model":"create:block/palettes/limestone" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/linked_extractor.json b/src/main/resources/assets/create/blockstates/linked_extractor.json index 3772599b4..639fd051d 100644 --- a/src/main/resources/assets/create/blockstates/linked_extractor.json +++ b/src/main/resources/assets/create/blockstates/linked_extractor.json @@ -1,15 +1,13 @@ { - "forge_marker": 1, "variants": { - "powered": { - "true": { "model": "create:block/extractor/horizontal_wireless_powered" }, - "false": { "model": "create:block/extractor/horizontal_wireless" } - }, - "facing": { - "south": { "y": 180 }, - "east": { "y": 90 }, - "north": { "y": 0 }, - "west": { "y": 270 } - } + "powered=true,facing=south": { "model": "create:block/extractor/horizontal_wireless_powered", "y": 180 }, + "powered=true,facing=east": { "model": "create:block/extractor/horizontal_wireless_powered", "y": 90 }, + "powered=true,facing=north": { "model": "create:block/extractor/horizontal_wireless_powered", "y": 0 }, + "powered=true,facing=west": { "model": "create:block/extractor/horizontal_wireless_powered", "y": 270 }, + + "powered=false,facing=south": { "model": "create:block/extractor/horizontal_wireless", "y": 180 }, + "powered=false,facing=east": { "model": "create:block/extractor/horizontal_wireless", "y": 90 }, + "powered=false,facing=north": { "model": "create:block/extractor/horizontal_wireless", "y": 0 }, + "powered=false,facing=west": { "model": "create:block/extractor/horizontal_wireless", "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/linked_transposer.json b/src/main/resources/assets/create/blockstates/linked_transposer.json index 55e413b81..7a8cd68f3 100644 --- a/src/main/resources/assets/create/blockstates/linked_transposer.json +++ b/src/main/resources/assets/create/blockstates/linked_transposer.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, - "variants": { - "powered": { - "true": { "model": "create:block/transposer/linked_powered" }, - "false": { "model": "create:block/transposer/linked" } - }, - "facing": { - "north": { "y": 0 }, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 } - } - } -} \ No newline at end of file + "variants": { + "powered=true,facing=north": { "model": "create:block/transposer/linked_powered", "y": 0 }, + "powered=true,facing=south": { "model": "create:block/transposer/linked_powered", "y": 180 }, + "powered=true,facing=west": { "model": "create:block/transposer/linked_powered", "y": 270 }, + "powered=true,facing=east": { "model": "create:block/transposer/linked_powered", "y": 90 }, + "powered=false,facing=north": { "model": "create:block/transposer/linked", "y": 0 }, + "powered=false,facing=south": { "model": "create:block/transposer/linked", "y": 180 }, + "powered=false,facing=west": { "model": "create:block/transposer/linked", "y": 270 }, + "powered=false,facing=east": { "model": "create:block/transposer/linked", "y": 90 } + } +} diff --git a/src/main/resources/assets/create/blockstates/logistical_controller.json b/src/main/resources/assets/create/blockstates/logistical_controller.json index be2a52a7d..53243b74e 100644 --- a/src/main/resources/assets/create/blockstates/logistical_controller.json +++ b/src/main/resources/assets/create/blockstates/logistical_controller.json @@ -1,23 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/logistical_controller" - }, "variants": { - "type": { - "storage": { }, - "calculation": { }, - "supply": { }, - "transactions": { }, - "request": { } - }, - "facing": { - "north": { "y": 180 }, - "south": { }, - "west": { "y": 90 }, - "up": { "x": 90 }, - "down": { "x": 270 }, - "east": { "y": 270 } - } + "facing=north": { "model": "create:block/logistical_controller", "y": 180 }, + "facing=south": { "model": "create:block/logistical_controller" }, + "facing=west": { "model": "create:block/logistical_controller", "y": 90 }, + "facing=up": { "model": "create:block/logistical_controller", "x": 90 }, + "facing=down": { "model": "create:block/logistical_controller", "x": 270 }, + "facing=east": { "model": "create:block/logistical_controller", "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/logistical_index.json b/src/main/resources/assets/create/blockstates/logistical_index.json index e4e136932..bfba422b7 100644 --- a/src/main/resources/assets/create/blockstates/logistical_index.json +++ b/src/main/resources/assets/create/blockstates/logistical_index.json @@ -1,14 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/logistical_index" - }, - "variants": { - "facing": { - "north": { "y": 180 }, - "south": { }, - "east": { "y": 270 }, - "west": { "y": 90 } - } + "variants": { + "facing=north": { "model": "create:block/logistical_index", "y": 180 }, + "facing=south": { "model": "create:block/logistical_index" }, + "facing=east": { "model": "create:block/logistical_index", "y": 270 }, + "facing=west": { "model": "create:block/logistical_index", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/logisticians_table.json b/src/main/resources/assets/create/blockstates/logisticians_table.json index 92f089689..8e93f0139 100644 --- a/src/main/resources/assets/create/blockstates/logisticians_table.json +++ b/src/main/resources/assets/create/blockstates/logisticians_table.json @@ -1,14 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/logisticians_table" - }, - "variants": { - "facing": { - "north": { "y": 180 }, - "south": { }, - "east": { "y": 270 }, - "west": { "y": 90 } - } + "variants": { + "facing=north": { "model": "create:block/logisticians_table", "y": 180 }, + "facing=south": { "model": "create:block/logisticians_table" }, + "facing=east": { "model": "create:block/logisticians_table", "y": 270 }, + "facing=west": { "model": "create:block/logisticians_table", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/mechanical_bearing.json b/src/main/resources/assets/create/blockstates/mechanical_bearing.json index 54f9c1964..2fe5eabe9 100644 --- a/src/main/resources/assets/create/blockstates/mechanical_bearing.json +++ b/src/main/resources/assets/create/blockstates/mechanical_bearing.json @@ -1,16 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/bearing/regular" - }, - "variants": { - "facing" : { - "up" : { }, - "down" : { "x": 180 }, - "north" : { "x": 90 }, - "east" : { "x": 90, "y": 90 }, - "south" : { "x": 90, "y": 180 }, - "west" : { "x": 90, "y": 270 } - } + "variants": { + "facing=up" : { "model": "create:block/bearing/regular" }, + "facing=down" : { "model": "create:block/bearing/regular", "x": 180 }, + "facing=north" : { "model": "create:block/bearing/regular", "x": 90 }, + "facing=east" : { "model": "create:block/bearing/regular", "x": 90, "y": 90 }, + "facing=south" : { "model": "create:block/bearing/regular", "x": 90, "y": 180 }, + "facing=west" : { "model": "create:block/bearing/regular", "x": 90, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/mechanical_crafter.json b/src/main/resources/assets/create/blockstates/mechanical_crafter.json index 1fd617a5c..b9ca34cb7 100644 --- a/src/main/resources/assets/create/blockstates/mechanical_crafter.json +++ b/src/main/resources/assets/create/blockstates/mechanical_crafter.json @@ -1,20 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/crafter/casing" - }, "variants": { - "pointing": { - "up": {}, - "left": {}, - "down": {}, - "right": {} - }, - "facing": { - "north": { "y": 90 }, - "south": { "y": 270 }, - "west": { "y": 0 }, - "east": { "y": 180 } - } + "facing=north": { "model": "create:block/crafter/casing", "y": 90 }, + "facing=south": { "model": "create:block/crafter/casing", "y": 270 }, + "facing=west": { "model": "create:block/crafter/casing", "y": 0 }, + "facing=east": { "model": "create:block/crafter/casing", "y": 180 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/mechanical_piston_head.json b/src/main/resources/assets/create/blockstates/mechanical_piston_head.json index e84deb411..061c185fa 100644 --- a/src/main/resources/assets/create/blockstates/mechanical_piston_head.json +++ b/src/main/resources/assets/create/blockstates/mechanical_piston_head.json @@ -1,21 +1,17 @@ { - "forgemarker": 1, - "defaults": { - "model": "create:block/mechanical_piston_head" - }, - "variants": { - "type=normal,facing=south": { "model": "create:block/mechanical_piston_head", "x": 90, "y": 180 }, + "variants": { + "type=normal,facing=south": { "model": "create:block/mechanical_piston_head", "x": 90, "y": 180 }, "type=normal,facing=north": { "model": "create:block/mechanical_piston_head", "x": 90 }, - "type=normal,facing=west": { "model": "create:block/mechanical_piston_head", "x": 90, "y": 270 }, + "type=normal,facing=west": { "model": "create:block/mechanical_piston_head", "x": 90, "y": 270 }, "type=normal,facing=up": { "model": "create:block/mechanical_piston_head" }, - "type=normal,facing=down": { "model": "create:block/mechanical_piston_head", "x": 180 }, - "type=normal,facing=east": { "model": "create:block/mechanical_piston_head", "x": 90, "y": 90 }, - + "type=normal,facing=down": { "model": "create:block/mechanical_piston_head", "x": 180 }, + "type=normal,facing=east": { "model": "create:block/mechanical_piston_head", "x": 90, "y": 90 }, + "type=sticky,facing=south": { "model": "create:block/mechanical_piston_head_sticky", "x": 90, "y": 180 }, "type=sticky,facing=north": { "model": "create:block/mechanical_piston_head_sticky", "x": 90 }, - "type=sticky,facing=west": { "model": "create:block/mechanical_piston_head_sticky", "x": 90, "y": 270 }, + "type=sticky,facing=west": { "model": "create:block/mechanical_piston_head_sticky", "x": 90, "y": 270 }, "type=sticky,facing=up": { "model": "create:block/mechanical_piston_head_sticky" }, - "type=sticky,facing=down": { "model": "create:block/mechanical_piston_head_sticky", "x": 180 }, - "type=sticky,facing=east": { "model": "create:block/mechanical_piston_head_sticky", "x": 90, "y": 90 } + "type=sticky,facing=down": { "model": "create:block/mechanical_piston_head_sticky", "x": 180 }, + "type=sticky,facing=east": { "model": "create:block/mechanical_piston_head_sticky", "x": 90, "y": 90 } } } diff --git a/src/main/resources/assets/create/blockstates/minecart_anchor.json b/src/main/resources/assets/create/blockstates/minecart_anchor.json index cf049ee70..3db12c94b 100644 --- a/src/main/resources/assets/create/blockstates/minecart_anchor.json +++ b/src/main/resources/assets/create/blockstates/minecart_anchor.json @@ -1,12 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/minecart_anchor" - }, - "variants": { - "axis": { - "x": { "y": 90 }, - "z": { } - } + "variants": { + "axis=x": { "model": "create:block/minecart_anchor", "y": 90 }, + "axis=z": { "model": "create:block/minecart_anchor" } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/mysterious_cuckoo_clock.json b/src/main/resources/assets/create/blockstates/mysterious_cuckoo_clock.json index 6131f66cd..d377391b9 100644 --- a/src/main/resources/assets/create/blockstates/mysterious_cuckoo_clock.json +++ b/src/main/resources/assets/create/blockstates/mysterious_cuckoo_clock.json @@ -1,14 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/cuckoo_clock/casing" - }, "variants": { - "facing": { - "north": { "y": 90 }, - "south": { "y": 270 }, - "east": { "y": 180 }, - "west": { "y": 0 } + "facing=north": { "model": "create:block/cuckoo_clock/casing", "y": 90 }, + "facing=south": { "model": "create:block/cuckoo_clock/casing", "y": 270 }, + "facing=east": { "model": "create:block/cuckoo_clock/casing", "y": 180 }, + "facing=west": { "model": "create:block/cuckoo_clock/casing", "y": 0 } } - } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/nozzle.json b/src/main/resources/assets/create/blockstates/nozzle.json index 1f74be701..40733046b 100644 --- a/src/main/resources/assets/create/blockstates/nozzle.json +++ b/src/main/resources/assets/create/blockstates/nozzle.json @@ -1,16 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/nozzle/block" - }, "variants": { - "facing": { - "north": { "y": 0 }, - "south": { "y": 180 }, - "west": { "y": 270 }, - "up": { "x": 270 }, - "down": { "x": 90 }, - "east": { "y": 90 } - } + "facing=north": { "model": "create:block/nozzle/block", "y": 0 }, + "facing=south": { "model": "create:block/nozzle/block", "y": 180 }, + "facing=west": { "model": "create:block/nozzle/block", "y": 270 }, + "facing=up": { "model": "create:block/nozzle/block", "x": 270 }, + "facing=down": { "model": "create:block/nozzle/block", "x": 90 }, + "facing=east": { "model": "create:block/nozzle/block", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/package_funnel.json b/src/main/resources/assets/create/blockstates/package_funnel.json index d27dbcaba..7db7c69df 100644 --- a/src/main/resources/assets/create/blockstates/package_funnel.json +++ b/src/main/resources/assets/create/blockstates/package_funnel.json @@ -1,16 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/package_funnel" - }, "variants": { - "facing": { - "north": { "y": 180 }, - "south": { }, - "west": { "y": 90 }, - "up": { "model": "create:block/package_funnel_vertical", "x": 90 }, - "down": { "model": "create:block/package_funnel_vertical", "x": 270 }, - "east": { "y": 270 } - } + "facing=north": { "model": "create:block/package_funnel", "y": 180 }, + "facing=south": { "model": "create:block/package_funnel" }, + "facing=west": { "model": "create:block/package_funnel", "y": 90 }, + "facing=up": { "model": "create:block/package_funnel_vertical", "x": 90 }, + "facing=down": { "model": "create:block/package_funnel_vertical", "x": 270 }, + "facing=east": { "model": "create:block/package_funnel", "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/paved_gabbro_bricks_slab.json b/src/main/resources/assets/create/blockstates/paved_gabbro_bricks_slab.json index 765a75864..30dfaf3d5 100644 --- a/src/main/resources/assets/create/blockstates/paved_gabbro_bricks_slab.json +++ b/src/main/resources/assets/create/blockstates/paved_gabbro_bricks_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/paved_gabbro_bricks_slab_top" }, - "bottom": { "model":"create:block/palettes/paved_gabbro_bricks_slab" }, - "double": { "model":"create:block/palettes/paved_gabbro_bricks" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/paved_gabbro_bricks_slab_top" }, + "type=bottom": { "model":"create:block/palettes/paved_gabbro_bricks_slab" }, + "type=double": { "model":"create:block/palettes/paved_gabbro_bricks" } + } +} diff --git a/src/main/resources/assets/create/blockstates/piston_pole.json b/src/main/resources/assets/create/blockstates/piston_pole.json index 02e2a5448..f38c11480 100644 --- a/src/main/resources/assets/create/blockstates/piston_pole.json +++ b/src/main/resources/assets/create/blockstates/piston_pole.json @@ -1,10 +1,10 @@ { - "variants": { + "variants": { "facing=up": { "model": "create:block/mechanical_piston/pole" }, "facing=down": { "model": "create:block/mechanical_piston/pole" , "x": 180 }, - "facing=south": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 180 }, - "facing=north": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 0 }, - "facing=east": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 90 }, - "facing=west": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 270 } + "facing=south": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 180 }, + "facing=north": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 0 }, + "facing=east": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 90 }, + "facing=west": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/plough.json b/src/main/resources/assets/create/blockstates/plough.json index 1805fe595..35b68345d 100644 --- a/src/main/resources/assets/create/blockstates/plough.json +++ b/src/main/resources/assets/create/blockstates/plough.json @@ -1,14 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/plough" - }, - "variants": { - "facing": { - "north": { "y": 180 }, - "south": {}, - "east": { "y": 270 }, - "west": { "y": 90 } - } + "variants": { + "facing=north": { "model": "create:block/plough", "y": 180 }, + "facing=south": { "model": "create:block/plough" }, + "facing=east": { "model": "create:block/plough", "y": 270 }, + "facing=west": { "model": "create:block/plough", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/polished_limestone_slab.json b/src/main/resources/assets/create/blockstates/polished_limestone_slab.json index c1226742f..f7c6a16e3 100644 --- a/src/main/resources/assets/create/blockstates/polished_limestone_slab.json +++ b/src/main/resources/assets/create/blockstates/polished_limestone_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/polished_limestone_slab_top" }, - "bottom": { "model":"create:block/palettes/polished_limestone_slab" }, - "double": { "model":"create:block/palettes/polished_limestone_double_slab" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/polished_limestone_slab_top" }, + "type=bottom": { "model":"create:block/palettes/polished_limestone_slab" }, + "type=double": { "model":"create:block/palettes/polished_limestone_double_slab" } + } +} diff --git a/src/main/resources/assets/create/blockstates/polished_scoria_slab.json b/src/main/resources/assets/create/blockstates/polished_scoria_slab.json index 6e7dfeaa8..48c008fba 100644 --- a/src/main/resources/assets/create/blockstates/polished_scoria_slab.json +++ b/src/main/resources/assets/create/blockstates/polished_scoria_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/polished_scoria_slab_top" }, - "bottom": { "model":"create:block/palettes/polished_scoria_slab" }, - "double": { "model":"create:block/palettes/polished_scoria_double_slab" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/polished_scoria_slab_top" }, + "type=bottom": { "model":"create:block/palettes/polished_scoria_slab" }, + "type=double": { "model":"create:block/palettes/polished_scoria_double_slab" } + } +} diff --git a/src/main/resources/assets/create/blockstates/polished_weathered_limestone_slab.json b/src/main/resources/assets/create/blockstates/polished_weathered_limestone_slab.json index 9419f4175..7ddabd886 100644 --- a/src/main/resources/assets/create/blockstates/polished_weathered_limestone_slab.json +++ b/src/main/resources/assets/create/blockstates/polished_weathered_limestone_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/polished_weathered_limestone_slab_top" }, - "bottom": { "model":"create:block/palettes/polished_weathered_limestone_slab" }, - "double": { "model":"create:block/palettes/polished_weathered_limestone_double_slab" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/polished_weathered_limestone_slab_top" }, + "type=bottom": { "model":"create:block/palettes/polished_weathered_limestone_slab" }, + "type=double": { "model":"create:block/palettes/polished_weathered_limestone_double_slab" } + } +} diff --git a/src/main/resources/assets/create/blockstates/portable_storage_interface.json b/src/main/resources/assets/create/blockstates/portable_storage_interface.json index 038574ca8..16eeab7b1 100644 --- a/src/main/resources/assets/create/blockstates/portable_storage_interface.json +++ b/src/main/resources/assets/create/blockstates/portable_storage_interface.json @@ -1,16 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/portable_storage_interface" - }, "variants": { - "facing": { - "north": { "x": 90 }, - "south": { "x": 90, "y": 180 }, - "west": { "x": 90, "y": 270 }, - "up": { }, - "down": { "x": 180 }, - "east": { "x": 90, "y": 90 } - } + "facing=north": { "model": "create:block/portable_storage_interface", "x": 90 }, + "facing=south": { "model": "create:block/portable_storage_interface", "x": 90, "y": 180 }, + "facing=west": { "model": "create:block/portable_storage_interface", "x": 90, "y": 270 }, + "facing=up": { "model": "create:block/portable_storage_interface" }, + "facing=down": { "model": "create:block/portable_storage_interface", "x": 180 }, + "facing=east": { "model": "create:block/portable_storage_interface", "x": 90, "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/redstone_latch.json b/src/main/resources/assets/create/blockstates/redstone_latch.json index 2ca364252..d261d4611 100644 --- a/src/main/resources/assets/create/blockstates/redstone_latch.json +++ b/src/main/resources/assets/create/blockstates/redstone_latch.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, "variants": { - "powering": { - "true": { "model": "create:block/repeaters/redstone_latch_powered" }, - "false": { "model": "create:block/repeaters/redstone_latch" } - }, - "facing": { - "north": { "y": 180 }, - "east": { "y": 270 }, - "south": { "y": 0 }, - "west": { "y": 90 } - } + "powering=true,facing=north": { "model": "create:block/repeaters/redstone_latch_powered", "y": 180 }, + "powering=true,facing=east": { "model": "create:block/repeaters/redstone_latch_powered", "y": 270 }, + "powering=true,facing=south": { "model": "create:block/repeaters/redstone_latch_powered", "y": 0 }, + "powering=true,facing=west": { "model": "create:block/repeaters/redstone_latch_powered", "y": 90 }, + "powering=false,facing=north": { "model": "create:block/repeaters/redstone_latch", "y": 180 }, + "powering=false,facing=east": { "model": "create:block/repeaters/redstone_latch", "y": 270 }, + "powering=false,facing=south": { "model": "create:block/repeaters/redstone_latch", "y": 0 }, + "powering=false,facing=west": { "model": "create:block/repeaters/redstone_latch", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/rope_pulley.json b/src/main/resources/assets/create/blockstates/rope_pulley.json index 8739b33a1..b312e0b2d 100644 --- a/src/main/resources/assets/create/blockstates/rope_pulley.json +++ b/src/main/resources/assets/create/blockstates/rope_pulley.json @@ -1,12 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/pulley/casing" - }, - "variants": { - "axis": { - "z": { }, - "x": { "y": 90 } - } + "variants": { + "axis=z": { "model": "create:block/pulley/casing" }, + "axis=x": { "model": "create:block/pulley/casing", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/rotation_speed_controller.json b/src/main/resources/assets/create/blockstates/rotation_speed_controller.json index 4a9d07776..438b75866 100644 --- a/src/main/resources/assets/create/blockstates/rotation_speed_controller.json +++ b/src/main/resources/assets/create/blockstates/rotation_speed_controller.json @@ -1,12 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/rotation_speed_controller" - }, - "variants": { - "axis": { - "z": { }, - "x": { "y": 90 } - } + "variants": { + "axis=z": { "model": "create:block/rotation_speed_controller" }, + "axis=x": { "model": "create:block/rotation_speed_controller", "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/scoria_slab.json b/src/main/resources/assets/create/blockstates/scoria_slab.json index f222802e3..4c8982c89 100644 --- a/src/main/resources/assets/create/blockstates/scoria_slab.json +++ b/src/main/resources/assets/create/blockstates/scoria_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/scoria_slab_top" }, - "bottom": { "model":"create:block/palettes/scoria_slab" }, - "double": { "model":"create:block/palettes/scoria" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/scoria_slab_top" }, + "type=bottom": { "model":"create:block/palettes/scoria_slab" }, + "type=double": { "model":"create:block/palettes/scoria" } + } +} diff --git a/src/main/resources/assets/create/blockstates/speed_gauge.json b/src/main/resources/assets/create/blockstates/speed_gauge.json index ee071ca12..3ee2fb580 100644 --- a/src/main/resources/assets/create/blockstates/speed_gauge.json +++ b/src/main/resources/assets/create/blockstates/speed_gauge.json @@ -1,5 +1,4 @@ { - "forge_marker": 1, "variants": { "facing=east,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 0, "y": 0 }, "facing=west,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 0, "y": 180 }, @@ -7,12 +6,12 @@ "facing=down,axis_along_first=false": { "model": "create:block/gauge/base", "x": 180, "y": 0 }, "facing=south,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 90, "y": 90 }, "facing=north,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 90, "y": 270 }, - - "facing=east,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 90, "y": 0 }, + + "facing=east,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 90, "y": 0 }, "facing=west,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 90, "y": 180 }, "facing=up,axis_along_first=true": { "model": "create:block/gauge/base", "x": 0, "y": 90 }, "facing=down,axis_along_first=true": { "model": "create:block/gauge/base", "x": 180, "y": 90 }, "facing=south,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 0, "y": 90 }, "facing=north,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 0, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/sticky_mechanical_piston.json b/src/main/resources/assets/create/blockstates/sticky_mechanical_piston.json index 66d2ce022..1bde6f94d 100644 --- a/src/main/resources/assets/create/blockstates/sticky_mechanical_piston.json +++ b/src/main/resources/assets/create/blockstates/sticky_mechanical_piston.json @@ -1,8 +1,4 @@ { - "forgemarker": 1, - "defaults": { - "model": "create:block/mechanical_piston_sticky" - }, "variants": { "axis_along_first=false,state=retracted,facing=south": { "model": "create:block/mechanical_piston_sticky", "x": 90, "y": 180 }, "axis_along_first=false,state=retracted,facing=north": { "model": "create:block/mechanical_piston_sticky", "x": 90 }, @@ -10,36 +6,36 @@ "axis_along_first=false,state=retracted,facing=up": { "model": "create:block/mechanical_piston_sticky" }, "axis_along_first=false,state=retracted,facing=down": { "model": "create:block/mechanical_piston_sticky", "x": 180 }, "axis_along_first=false,state=retracted,facing=east": { "model": "create:block/mechanical_piston/rotated_sticky", "x": 90, "y": 90 }, - + "axis_along_first=false,state=moving,facing=south": { "model": "create:block/mechanical_piston/base", "x": 90, "y": 180 }, "axis_along_first=false,state=moving,facing=north": { "model": "create:block/mechanical_piston/base", "x": 90 }, "axis_along_first=false,state=moving,facing=west": { "model": "create:block/mechanical_piston/base_rotated", "x": 90, "y": 270 }, "axis_along_first=false,state=moving,facing=up": { "model": "create:block/mechanical_piston/base" }, "axis_along_first=false,state=moving,facing=down": { "model": "create:block/mechanical_piston/base", "x": 180 }, "axis_along_first=false,state=moving,facing=east": { "model": "create:block/mechanical_piston/base_rotated", "x": 90, "y": 90 }, - + "axis_along_first=false,state=extended,facing=south": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90, "y": 180 }, "axis_along_first=false,state=extended,facing=north": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90 }, "axis_along_first=false,state=extended,facing=west": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90, "y": 270 }, "axis_along_first=false,state=extended,facing=up": { "model": "create:block/mechanical_piston/base_with_extension" }, "axis_along_first=false,state=extended,facing=down": { "model": "create:block/mechanical_piston/base_with_extension", "x": 180 }, "axis_along_first=false,state=extended,facing=east": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90, "y": 90 }, - - + + "axis_along_first=true,state=retracted,facing=south": { "model": "create:block/mechanical_piston/rotated_sticky", "x": 90, "y": 180 }, "axis_along_first=true,state=retracted,facing=north": { "model": "create:block/mechanical_piston/rotated_sticky", "x": 90 }, "axis_along_first=true,state=retracted,facing=west": { "model": "create:block/mechanical_piston_sticky", "x": 90, "y": 270 }, "axis_along_first=true,state=retracted,facing=up": { "model": "create:block/mechanical_piston/rotated_sticky" }, "axis_along_first=true,state=retracted,facing=down": { "model": "create:block/mechanical_piston/rotated_sticky", "x": 180 }, "axis_along_first=true,state=retracted,facing=east": { "model": "create:block/mechanical_piston_sticky", "x": 90, "y": 90 }, - + "axis_along_first=true,state=moving,facing=south": { "model": "create:block/mechanical_piston/base_rotated", "x": 90, "y": 180 }, "axis_along_first=true,state=moving,facing=north": { "model": "create:block/mechanical_piston/base_rotated", "x": 90 }, "axis_along_first=true,state=moving,facing=west": { "model": "create:block/mechanical_piston/base", "x": 90, "y": 270 }, "axis_along_first=true,state=moving,facing=up": { "model": "create:block/mechanical_piston/base_rotated" }, "axis_along_first=true,state=moving,facing=down": { "model": "create:block/mechanical_piston/base_rotated", "x": 180 }, "axis_along_first=true,state=moving,facing=east": { "model": "create:block/mechanical_piston/base", "x": 90, "y": 90 }, - + "axis_along_first=true,state=extended,facing=south": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90, "y": 180 }, "axis_along_first=true,state=extended,facing=north": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90 }, "axis_along_first=true,state=extended,facing=west": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90, "y": 270 }, diff --git a/src/main/resources/assets/create/blockstates/stockswitch.json b/src/main/resources/assets/create/blockstates/stockswitch.json index 15107fc1e..4d5967e5a 100644 --- a/src/main/resources/assets/create/blockstates/stockswitch.json +++ b/src/main/resources/assets/create/blockstates/stockswitch.json @@ -1,23 +1,32 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/stockpile_switch" - }, "variants": { - "indicator": { - "0": { "model": "create:block/stockpile_switch" }, - "1": { "model": "create:block/stockpile_switch_1" }, - "2": { "model": "create:block/stockpile_switch_2" }, - "3": { "model": "create:block/stockpile_switch_3" }, - "4": { "model": "create:block/stockpile_switch_4" }, - "5": { "model": "create:block/stockpile_switch_5" }, - "6": { "model": "create:block/stockpile_switch_6" } - }, - "facing": { - "south": { "y": 270 }, - "east": { "y": 180 }, - "north": { "y": 90 }, - "west": { "y": 0 } - } + "indicator=0,facing=south": { "model": "create:block/stockpile_switch", "y": 270 }, + "indicator=1,facing=south": { "model": "create:block/stockpile_switch_1", "y": 270 }, + "indicator=2,facing=south": { "model": "create:block/stockpile_switch_2", "y": 270 }, + "indicator=3,facing=south": { "model": "create:block/stockpile_switch_3", "y": 270 }, + "indicator=4,facing=south": { "model": "create:block/stockpile_switch_4", "y": 270 }, + "indicator=5,facing=south": { "model": "create:block/stockpile_switch_5", "y": 270 }, + "indicator=6,facing=south": { "model": "create:block/stockpile_switch_6", "y": 270 }, + "indicator=0,facing=east": { "model": "create:block/stockpile_switch", "y": 180 }, + "indicator=1,facing=east": { "model": "create:block/stockpile_switch_1", "y": 180 }, + "indicator=2,facing=east": { "model": "create:block/stockpile_switch_2", "y": 180 }, + "indicator=3,facing=east": { "model": "create:block/stockpile_switch_3", "y": 180 }, + "indicator=4,facing=east": { "model": "create:block/stockpile_switch_4", "y": 180 }, + "indicator=5,facing=east": { "model": "create:block/stockpile_switch_5", "y": 180 }, + "indicator=6,facing=east": { "model": "create:block/stockpile_switch_6", "y": 180 }, + "indicator=0,facing=north": { "model": "create:block/stockpile_switch", "y": 90 }, + "indicator=1,facing=north": { "model": "create:block/stockpile_switch_1", "y": 90 }, + "indicator=2,facing=north": { "model": "create:block/stockpile_switch_2", "y": 90 }, + "indicator=3,facing=north": { "model": "create:block/stockpile_switch_3", "y": 90 }, + "indicator=4,facing=north": { "model": "create:block/stockpile_switch_4", "y": 90 }, + "indicator=5,facing=north": { "model": "create:block/stockpile_switch_5", "y": 90 }, + "indicator=6,facing=north": { "model": "create:block/stockpile_switch_6", "y": 90 }, + "indicator=0,facing=west": { "model": "create:block/stockpile_switch", "y": 0 }, + "indicator=1,facing=west": { "model": "create:block/stockpile_switch_1", "y": 0 }, + "indicator=2,facing=west": { "model": "create:block/stockpile_switch_2", "y": 0 }, + "indicator=3,facing=west": { "model": "create:block/stockpile_switch_3", "y": 0 }, + "indicator=4,facing=west": { "model": "create:block/stockpile_switch_4", "y": 0 }, + "indicator=5,facing=west": { "model": "create:block/stockpile_switch_5", "y": 0 }, + "indicator=6,facing=west": { "model": "create:block/stockpile_switch_6", "y": 0 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/stress_gauge.json b/src/main/resources/assets/create/blockstates/stress_gauge.json index ee071ca12..3ee2fb580 100644 --- a/src/main/resources/assets/create/blockstates/stress_gauge.json +++ b/src/main/resources/assets/create/blockstates/stress_gauge.json @@ -1,5 +1,4 @@ { - "forge_marker": 1, "variants": { "facing=east,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 0, "y": 0 }, "facing=west,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 0, "y": 180 }, @@ -7,12 +6,12 @@ "facing=down,axis_along_first=false": { "model": "create:block/gauge/base", "x": 180, "y": 0 }, "facing=south,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 90, "y": 90 }, "facing=north,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 90, "y": 270 }, - - "facing=east,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 90, "y": 0 }, + + "facing=east,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 90, "y": 0 }, "facing=west,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 90, "y": 180 }, "facing=up,axis_along_first=true": { "model": "create:block/gauge/base", "x": 0, "y": 90 }, "facing=down,axis_along_first=true": { "model": "create:block/gauge/base", "x": 180, "y": 90 }, "facing=south,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 0, "y": 90 }, "facing=north,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 0, "y": 270 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/symmetry_plane.json b/src/main/resources/assets/create/blockstates/symmetry_plane.json index 48859198d..ffff56c62 100644 --- a/src/main/resources/assets/create/blockstates/symmetry_plane.json +++ b/src/main/resources/assets/create/blockstates/symmetry_plane.json @@ -1,7 +1,6 @@ { - "forgemarker": 1, - "variants": { + "variants": { "align=xy": { "model": "create:block/symmetry_plane" }, - "align=yz": { "model": "create:block/symmetry_plane", "y": 90 } + "align=yz": { "model": "create:block/symmetry_plane", "y": 90 } } } diff --git a/src/main/resources/assets/create/blockstates/symmetry_tripleplane.json b/src/main/resources/assets/create/blockstates/symmetry_tripleplane.json index 2574d1eaf..8b24d5ea5 100644 --- a/src/main/resources/assets/create/blockstates/symmetry_tripleplane.json +++ b/src/main/resources/assets/create/blockstates/symmetry_tripleplane.json @@ -1,6 +1,5 @@ { - "forgemarker": 1, - "variants": { + "variants": { "": { "model": "create:block/symmetry_tripleplane" } } } diff --git a/src/main/resources/assets/create/blockstates/toggle_latch.json b/src/main/resources/assets/create/blockstates/toggle_latch.json index 11ec7dfe6..b7c7670c3 100644 --- a/src/main/resources/assets/create/blockstates/toggle_latch.json +++ b/src/main/resources/assets/create/blockstates/toggle_latch.json @@ -1,5 +1,4 @@ { - "forge_marker": 1, "variants": { "powered=false,powering=false,facing=north": { "model": "create:block/repeaters/toggle_latch", "y": 180 }, "powered=false,powering=false,facing=east": { "model": "create:block/repeaters/toggle_latch", "y": 270 }, diff --git a/src/main/resources/assets/create/blockstates/translation_chassis.json b/src/main/resources/assets/create/blockstates/translation_chassis.json index a558e2ed2..9bc46f235 100644 --- a/src/main/resources/assets/create/blockstates/translation_chassis.json +++ b/src/main/resources/assets/create/blockstates/translation_chassis.json @@ -1,5 +1,4 @@ { - "forge_marker": 1, "variants": { "sticky_top=false,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/regular", "x": 90, "y": 90 }, @@ -17,6 +16,6 @@ "sticky_top=true,sticky_bottom=true,axis=x": { "model": "create:block/translation_chassis/regular_both_sticky", "x": 90, "y": 90 }, "sticky_top=true,sticky_bottom=true,axis=y": { "model": "create:block/translation_chassis/regular_both_sticky" }, "sticky_top=true,sticky_bottom=true,axis=z": { "model": "create:block/translation_chassis/regular_both_sticky", "x": 90, "y": 180 } - + } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json b/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json index 6790e4009..efc93504e 100644 --- a/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json +++ b/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json @@ -1,5 +1,4 @@ { - "forge_marker": 1, "variants": { "sticky_top=false,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/alt", "x": 90, "y": 90 }, @@ -17,6 +16,6 @@ "sticky_top=true,sticky_bottom=true,axis=x": { "model": "create:block/translation_chassis/alt_both_sticky", "x": 90, "y": 90 }, "sticky_top=true,sticky_bottom=true,axis=y": { "model": "create:block/translation_chassis/alt_both_sticky" }, "sticky_top=true,sticky_bottom=true,axis=z": { "model": "create:block/translation_chassis/alt_both_sticky", "x": 90, "y": 180 } - + } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/transposer.json b/src/main/resources/assets/create/blockstates/transposer.json index b4260b79a..12877a743 100644 --- a/src/main/resources/assets/create/blockstates/transposer.json +++ b/src/main/resources/assets/create/blockstates/transposer.json @@ -1,15 +1,12 @@ { - "forge_marker": 1, - "variants": { - "powered": { - "true": { "model": "create:block/transposer/default_powered" }, - "false": { "model": "create:block/transposer/default" } - }, - "facing": { - "north": { "y": 0 }, - "south": { "y": 180 }, - "west": { "y": 270 }, - "east": { "y": 90 } - } - } -} \ No newline at end of file + "variants": { + "powered=true,facing=north": { "model": "create:block/transposer/default_powered", "y": 0 }, + "powered=true,facing=east": { "model": "create:block/transposer/default_powered", "y": 90 }, + "powered=true,facing=south": { "model": "create:block/transposer/default_powered", "y": 180 }, + "powered=true,facing=west": { "model": "create:block/transposer/default_powered", "y": 270 }, + "powered=false,facing=north": { "model": "create:block/transposer/default", "y": 0 }, + "powered=false,facing=east": { "model": "create:block/transposer/default", "y": 90 }, + "powered=false,facing=south": { "model": "create:block/transposer/default", "y": 180 }, + "powered=false,facing=west": { "model": "create:block/transposer/default", "y": 270 } + } +} diff --git a/src/main/resources/assets/create/blockstates/turntable.json b/src/main/resources/assets/create/blockstates/turntable.json index 334cfe1b8..81e633d84 100644 --- a/src/main/resources/assets/create/blockstates/turntable.json +++ b/src/main/resources/assets/create/blockstates/turntable.json @@ -1,8 +1,4 @@ { - "forgemarker": 1, - "defaults": { - "model": "create:block/turntable" - }, "variants": { "": { "model": "create:block/turntable" } } diff --git a/src/main/resources/assets/create/blockstates/vertical_extractor.json b/src/main/resources/assets/create/blockstates/vertical_extractor.json index c3cc50c14..69dd523fa 100644 --- a/src/main/resources/assets/create/blockstates/vertical_extractor.json +++ b/src/main/resources/assets/create/blockstates/vertical_extractor.json @@ -1,8 +1,4 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/extractor/vertical" - }, "variants": { "powered=true,upward=false,facing=south": { "model": "create:block/extractor/vertical_powered", "y": 180 }, @@ -13,15 +9,15 @@ "powered=true,upward=true,facing=east": { "model": "create:block/extractor/vertical_powered", "y": 270, "x": 180 }, "powered=true,upward=true,facing=north": { "model": "create:block/extractor/vertical_powered", "y": 180, "x": 180 }, "powered=true,upward=true,facing=west": { "model": "create:block/extractor/vertical_powered", "y": 90, "x": 180 }, - - "powered=false,upward=false,facing=south": { "y": 180 }, - "powered=false,upward=false,facing=east": { "y": 90 }, - "powered=false,upward=false,facing=north": { "y": 0 }, - "powered=false,upward=false,facing=west": { "y": 270 }, - "powered=false,upward=true,facing=south": { "y": 0, "x": 180 }, - "powered=false,upward=true,facing=east": { "y": 270, "x": 180 }, - "powered=false,upward=true,facing=north": { "y": 180, "x": 180 }, - "powered=false,upward=true,facing=west": { "y": 90, "x": 180 } + + "powered=false,upward=false,facing=south": { "model": "create:block/extractor/vertical", "y": 180 }, + "powered=false,upward=false,facing=east": { "model": "create:block/extractor/vertical", "y": 90 }, + "powered=false,upward=false,facing=north": { "model": "create:block/extractor/vertical", "y": 0 }, + "powered=false,upward=false,facing=west": { "model": "create:block/extractor/vertical", "y": 270 }, + "powered=false,upward=true,facing=south": { "model": "create:block/extractor/vertical", "y": 0, "x": 180 }, + "powered=false,upward=true,facing=east": { "model": "create:block/extractor/vertical", "y": 270, "x": 180 }, + "powered=false,upward=true,facing=north": { "model": "create:block/extractor/vertical", "y": 180, "x": 180 }, + "powered=false,upward=true,facing=west": { "model": "create:block/extractor/vertical", "y": 90, "x": 180 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/vertical_funnel.json b/src/main/resources/assets/create/blockstates/vertical_funnel.json index 9a0324467..575ae26c5 100644 --- a/src/main/resources/assets/create/blockstates/vertical_funnel.json +++ b/src/main/resources/assets/create/blockstates/vertical_funnel.json @@ -1,16 +1,12 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/funnel/vertical" - }, "variants": { - "upward=true,facing=south": { "y": 180, "x": 270 }, - "upward=true,facing=east": { "y": 90, "x": 270 }, - "upward=true,facing=north": { "y": 0, "x": 270 }, - "upward=true,facing=west": { "y": 270, "x": 270 }, - "upward=false,facing=south": { "y": 0, "x": 90 }, - "upward=false,facing=east": { "y": 270, "x": 90 }, - "upward=false,facing=north": { "y": 180, "x": 90 }, - "upward=false,facing=west": { "y": 90, "x": 90 } + "upward=true,facing=south": { "model": "create:block/funnel/vertical", "y": 180, "x": 270 }, + "upward=true,facing=east": { "model": "create:block/funnel/vertical", "y": 90, "x": 270 }, + "upward=true,facing=north": { "model": "create:block/funnel/vertical", "y": 0, "x": 270 }, + "upward=true,facing=west": { "model": "create:block/funnel/vertical", "y": 270, "x": 270 }, + "upward=false,facing=south": { "model": "create:block/funnel/vertical", "y": 0, "x": 90 }, + "upward=false,facing=east": { "model": "create:block/funnel/vertical", "y": 270, "x": 90 }, + "upward=false,facing=north": { "model": "create:block/funnel/vertical", "y": 180, "x": 90 }, + "upward=false,facing=west": { "model": "create:block/funnel/vertical", "y": 90, "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/vertical_linked_extractor.json b/src/main/resources/assets/create/blockstates/vertical_linked_extractor.json index 7c4e84a8f..dd02dc3b9 100644 --- a/src/main/resources/assets/create/blockstates/vertical_linked_extractor.json +++ b/src/main/resources/assets/create/blockstates/vertical_linked_extractor.json @@ -1,8 +1,4 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/extractor/vertical_wireless" - }, "variants": { "powered=true,upward=false,facing=south": { "model": "create:block/extractor/vertical_wireless_powered", "y": 180 }, @@ -14,14 +10,14 @@ "powered=true,upward=true,facing=north": { "model": "create:block/extractor/vertical_wireless_powered", "y": 180, "x": 180 }, "powered=true,upward=true,facing=west": { "model": "create:block/extractor/vertical_wireless_powered", "y": 90, "x": 180 }, - "powered=false,upward=false,facing=south": { "y": 180 }, - "powered=false,upward=false,facing=east": { "y": 90 }, - "powered=false,upward=false,facing=north": { "y": 0 }, - "powered=false,upward=false,facing=west": { "y": 270 }, - "powered=false,upward=true,facing=south": { "y": 0, "x": 180 }, - "powered=false,upward=true,facing=east": { "y": 270, "x": 180 }, - "powered=false,upward=true,facing=north": { "y": 180, "x": 180 }, - "powered=false,upward=true,facing=west": { "y": 90, "x": 180 } + "powered=false,upward=false,facing=south": { "model": "create:block/extractor/vertical_wireless", "y": 180 }, + "powered=false,upward=false,facing=east": { "model": "create:block/extractor/vertical_wireless", "y": 90 }, + "powered=false,upward=false,facing=north": { "model": "create:block/extractor/vertical_wireless", "y": 0 }, + "powered=false,upward=false,facing=west": { "model": "create:block/extractor/vertical_wireless", "y": 270 }, + "powered=false,upward=true,facing=south": { "model": "create:block/extractor/vertical_wireless", "y": 0, "x": 180 }, + "powered=false,upward=true,facing=east": { "model": "create:block/extractor/vertical_wireless", "y": 270, "x": 180 }, + "powered=false,upward=true,facing=north": { "model": "create:block/extractor/vertical_wireless", "y": 180, "x": 180 }, + "powered=false,upward=true,facing=west": { "model": "create:block/extractor/vertical_wireless", "y": 90, "x": 180 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/vertical_linked_transposer.json b/src/main/resources/assets/create/blockstates/vertical_linked_transposer.json index bf41f5359..2171c9f7b 100644 --- a/src/main/resources/assets/create/blockstates/vertical_linked_transposer.json +++ b/src/main/resources/assets/create/blockstates/vertical_linked_transposer.json @@ -1,8 +1,4 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/transposer/vertical_linked" - }, "variants": { "powered=true,upward=true,facing=south": { "model": "create:block/transposer/vertical_linked_powered", "y": 180, "x": 270 }, @@ -13,15 +9,15 @@ "powered=true,upward=false,facing=east": { "model": "create:block/transposer/vertical_linked_powered", "y": 270, "x": 90 }, "powered=true,upward=false,facing=north": { "model": "create:block/transposer/vertical_linked_powered", "y": 180, "x": 90 }, "powered=true,upward=false,facing=west": { "model": "create:block/transposer/vertical_linked_powered", "y": 90, "x": 90 }, - - "powered=false,upward=true,facing=south": { "y": 180, "x": 270 }, - "powered=false,upward=true,facing=east": { "y": 90, "x": 270 }, - "powered=false,upward=true,facing=north": { "y": 0, "x": 270 }, - "powered=false,upward=true,facing=west": { "y": 270, "x": 270 }, - "powered=false,upward=false,facing=south": { "y": 0, "x": 90 }, - "powered=false,upward=false,facing=east": { "y": 270, "x": 90 }, - "powered=false,upward=false,facing=north": { "y": 180, "x": 90 }, - "powered=false,upward=false,facing=west": { "y": 90, "x": 90 } + + "powered=false,upward=true,facing=south": { "model": "create:block/transposer/vertical_linked", "y": 180, "x": 270 }, + "powered=false,upward=true,facing=east": { "model": "create:block/transposer/vertical_linked", "y": 90, "x": 270 }, + "powered=false,upward=true,facing=north": { "model": "create:block/transposer/vertical_linked", "y": 0, "x": 270 }, + "powered=false,upward=true,facing=west": { "model": "create:block/transposer/vertical_linked", "y": 270, "x": 270 }, + "powered=false,upward=false,facing=south": { "model": "create:block/transposer/vertical_linked", "y": 0, "x": 90 }, + "powered=false,upward=false,facing=east": { "model": "create:block/transposer/vertical_linked", "y": 270, "x": 90 }, + "powered=false,upward=false,facing=north": { "model": "create:block/transposer/vertical_linked", "y": 180, "x": 90 }, + "powered=false,upward=false,facing=west": { "model": "create:block/transposer/vertical_linked", "y": 90, "x": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/vertical_transposer.json b/src/main/resources/assets/create/blockstates/vertical_transposer.json index 7d3aa6b91..e6f460e70 100644 --- a/src/main/resources/assets/create/blockstates/vertical_transposer.json +++ b/src/main/resources/assets/create/blockstates/vertical_transposer.json @@ -1,8 +1,4 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/transposer/default" - }, "variants": { "powered=true,upward=true,facing=south": { "model": "create:block/transposer/default_powered", "y": 180, "x": 270 }, @@ -13,15 +9,15 @@ "powered=true,upward=false,facing=east": { "model": "create:block/transposer/default_powered", "y": 270, "x": 90 }, "powered=true,upward=false,facing=north": { "model": "create:block/transposer/default_powered", "y": 180, "x": 90 }, "powered=true,upward=false,facing=west": { "model": "create:block/transposer/default_powered", "y": 90, "x": 90 }, - - "powered=false,upward=true,facing=south": { "y": 180, "x": 270 }, - "powered=false,upward=true,facing=east": { "y": 90, "x": 270 }, - "powered=false,upward=true,facing=north": { "y": 0, "x": 270 }, - "powered=false,upward=true,facing=west": { "y": 270, "x": 270 }, - "powered=false,upward=false,facing=south": { "y": 0, "x": 90 }, - "powered=false,upward=false,facing=east": { "y": 270, "x": 90 }, - "powered=false,upward=false,facing=north": { "y": 180, "x": 90 }, - "powered=false,upward=false,facing=west": { "y": 90, "x": 90 } + + "powered=false,upward=true,facing=south": { "model": "create:block/transposer/default", "y": 180, "x": 270 }, + "powered=false,upward=true,facing=east": { "model": "create:block/transposer/default", "y": 90, "x": 270 }, + "powered=false,upward=true,facing=north": { "model": "create:block/transposer/default", "y": 0, "x": 270 }, + "powered=false,upward=true,facing=west": { "model": "create:block/transposer/default", "y": 270, "x": 270 }, + "powered=false,upward=false,facing=south": { "model": "create:block/transposer/default", "y": 0, "x": 90 }, + "powered=false,upward=false,facing=east": { "model": "create:block/transposer/default", "y": 270, "x": 90 }, + "powered=false,upward=false,facing=north": { "model": "create:block/transposer/default", "y": 180, "x": 90 }, + "powered=false,upward=false,facing=west": { "model": "create:block/transposer/default", "y": 90, "x": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/water_wheel.json b/src/main/resources/assets/create/blockstates/water_wheel.json index 17a156d98..c04c4bc9d 100644 --- a/src/main/resources/assets/create/blockstates/water_wheel.json +++ b/src/main/resources/assets/create/blockstates/water_wheel.json @@ -1,14 +1,8 @@ { - "forge_marker": 1, - "defaults": { - "model": "create:block/water_wheel" - }, "variants": { - "facing": { - "north": { "x": 90 }, - "east": { "x": 90, "y": 90 }, - "south": { "x": 90, "y": 180 }, - "west": { "x": 90, "y": 270 } - } + "facing=north": { "model": "create:block/water_wheel", "x": 90 }, + "facing=east": { "model": "create:block/water_wheel", "x": 90, "y": 90 }, + "facing=south": { "model": "create:block/water_wheel", "x": 90, "y": 180 }, + "facing=west": { "model": "create:block/water_wheel", "x": 90, "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_slab.json b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_slab.json index e2e245b76..d3844ebf4 100644 --- a/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_slab.json +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_bricks_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/weathered_limestone_bricks_slab_top" }, - "bottom": { "model":"create:block/palettes/weathered_limestone_bricks_slab" }, - "double": { "model":"create:block/palettes/weathered_limestone_bricks" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/weathered_limestone_bricks_slab_top" }, + "type=bottom": { "model":"create:block/palettes/weathered_limestone_bricks_slab" }, + "type=double": { "model":"create:block/palettes/weathered_limestone_bricks" } + } +} diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_pillar.json b/src/main/resources/assets/create/blockstates/weathered_limestone_pillar.json index fa782385a..0c622185b 100644 --- a/src/main/resources/assets/create/blockstates/weathered_limestone_pillar.json +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_pillar.json @@ -1,7 +1,7 @@ { - "variants": { - "axis=z": { "model": "create:block/palettes/weathered_limestone_pillar", "x": 90 }, + "variants": { + "axis=z": { "model": "create:block/palettes/weathered_limestone_pillar", "x": 90 }, "axis=y": { "model": "create:block/palettes/weathered_limestone_pillar" }, - "axis=x": { "model": "create:block/palettes/weathered_limestone_pillar", "x": 90, "y": 90 } + "axis=x": { "model": "create:block/palettes/weathered_limestone_pillar", "x": 90, "y": 90 } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/blockstates/weathered_limestone_slab.json b/src/main/resources/assets/create/blockstates/weathered_limestone_slab.json index 078dbb787..fe32aaff0 100644 --- a/src/main/resources/assets/create/blockstates/weathered_limestone_slab.json +++ b/src/main/resources/assets/create/blockstates/weathered_limestone_slab.json @@ -1,13 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "uvlock": true - }, - "variants": { - "type": { - "top": { "model":"create:block/palettes/weathered_limestone_slab_top" }, - "bottom": { "model":"create:block/palettes/weathered_limestone_slab" }, - "double": { "model":"create:block/palettes/weathered_limestone" } - } - } -} \ No newline at end of file + "variants": { + "type=top": { "model":"create:block/palettes/weathered_limestone_slab_top" }, + "type=bottom": { "model":"create:block/palettes/weathered_limestone_slab" }, + "type=double": { "model":"create:block/palettes/weathered_limestone" } + } +} diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/ethereal_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/ethereal_log.json deleted file mode 100644 index 3505bfdd1..000000000 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/ethereal_log.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "biomesoplenty" - } - ], - "type": "create:cutting", - "ingredients": [ - { - "item": "biomesoplenty:ethereal_log" - } - ], - "results": [ - { - "item": "biomesoplenty:stripped_ethereal_log", - "count": 1 - } - ], - "processingTime": 50 -} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 867ef98d9..76a2c3d19 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "create resources", - "pack_format": 4 + "pack_format": 5 } }