From e902d269f45741b47afd7ee13974f413037dc36d Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Mon, 20 Jan 2020 13:41:41 +0100 Subject: [PATCH] A less messy mess Part I - Reworked Particle Registry to fix sidedness issues - Removed some unused models, blocks and textures - Added missing loot tables - Fixed all models falsely inheriting from block/cube - Updated Forge - Restored server functionality --- build.gradle | 4 +- .../java/com/simibubi/create/AllBlocks.java | 8 +- .../com/simibubi/create/AllParticles.java | 32 +++---- .../com/simibubi/create/CreateClient.java | 3 +- .../particle/AirFlowParticle.java | 7 -- .../particle/AirFlowParticleData.java | 20 +++- .../particle/ICustomParticle.java | 21 +++++ .../particle/RotationIndicatorParticle.java | 7 -- .../RotationIndicatorParticleData.java | 21 ++++- .../block/extractor/ExtractorBlock.java | 6 ++ .../block/extractor/LinkedExtractorBlock.java | 6 ++ .../transposer/LinkedTransposerBlock.java | 6 ++ .../block/transposer/TransposerBlock.java | 6 ++ .../create/blockstates/belt_animation.json | 9 -- .../assets/create/blockstates/shop_shelf.json | 12 --- .../blockstates/translation_chassis.json | 59 ++++-------- .../translation_chassis_secondary.json | 59 ++++-------- .../assets/create/models/block/belt.json | 22 ----- .../models/block/belt/belt_textures.json | 16 ---- .../models/block/belt/downward_end.json | 2 +- .../models/block/belt/downward_middle.json | 2 +- .../models/block/belt/downward_start.json | 2 +- .../models/block/belt/horizontal_end.json | 2 +- .../models/block/belt/horizontal_middle.json | 2 +- .../models/block/belt/horizontal_start.json | 2 +- .../create/models/block/belt/upward_end.json | 2 +- .../models/block/belt/upward_middle.json | 2 +- .../models/block/belt/upward_start.json | 2 +- .../create/models/block/belt_pulley.json | 2 +- .../assets/create/models/block/cogwheel.json | 2 +- .../models/block/cogwheel_shaftless.json | 2 +- .../assets/create/models/block/contact.json | 2 +- .../create/models/block/creative_crate.json | 2 +- .../block/encased_belt/end_horizontal.json | 2 +- .../block/encased_belt/end_vertical.json | 2 +- .../block/encased_belt/middle_horizontal.json | 2 +- .../block/encased_belt/middle_vertical.json | 2 +- .../models/block/encased_belt/single.json | 2 +- .../create/models/block/encased_shaft.json | 2 +- .../create/models/block/gauge/item_speed.json | 2 +- .../models/block/gauge/item_stress.json | 2 +- .../assets/create/models/block/gearbox.json | 2 +- .../create/models/block/gearshift_off.json | 2 +- .../create/models/block/large_wheels.json | 2 +- .../models/block/mechanical_piston.json | 2 +- .../models/block/mechanical_piston/base.json | 2 +- .../block/mechanical_piston/base_rotated.json | 2 +- .../base_with_extension.json | 2 +- .../base_with_extension_rotated.json | 2 +- .../models/block/mechanical_piston/pole.json | 2 +- .../models/block/mechanical_piston/temp.json | 70 -------------- .../models/block/mechanical_piston_head.json | 2 +- .../create/models/block/mixer_base.json | 2 +- .../create/models/block/mixer_head.json | 2 +- .../create/models/block/mixer_pole.json | 2 +- .../assets/create/models/block/motor.json | 2 +- .../create/models/block/schematic_table.json | 2 +- .../assets/create/models/block/shaft.json | 2 +- .../create/models/block/shaft_half.json | 2 +- .../create/models/block/shop_shelf.json | 91 ------------------- .../models/block/translation_chassis/alt.json | 8 ++ .../translation_chassis/alt_both_sticky.json | 8 ++ .../alt_bottom_sticky.json | 8 ++ .../translation_chassis/alt_top_sticky.json | 8 ++ .../regular.json} | 0 .../regular_both_sticky.json} | 2 +- .../regular_bottom_sticky.json} | 2 +- .../regular_top_sticky.json} | 2 +- .../assets/create/models/block/turntable.json | 2 +- .../create/models/item/mechanical_mixer.json | 2 +- .../create/models/item/schematicannon.json | 2 +- .../models/item/translation_chassis.json | 2 +- .../item/translation_chassis_secondary.json | 5 +- ...linked_extractor.json => belt_tunnel.json} | 2 +- .../loot_tables/blocks/cart_assembler.json | 19 ++++ .../create/loot_tables/blocks/copper_ore.json | 19 ++++ .../loot_tables/blocks/framed_glass.json | 29 ++++++ .../loot_tables/blocks/linked_transposer.json | 19 ++++ .../loot_tables/blocks/logistical_casing.json | 19 ++++ .../blocks/mechanical_crafter.json | 19 ++++ .../{vertical_extractor.json => saw.json} | 2 +- .../loot_tables/blocks/speed_gauge.json | 19 ++++ .../loot_tables/blocks/stress_gauge.json | 19 ++++ .../blocks/translation_chassis_secondary.json | 19 ++++ .../create/loot_tables/blocks/transposer.json | 19 ++++ .../create/loot_tables/blocks/zinc_ore.json | 19 ++++ 86 files changed, 448 insertions(+), 389 deletions(-) create mode 100644 src/main/java/com/simibubi/create/modules/contraptions/particle/ICustomParticle.java delete mode 100644 src/main/resources/assets/create/blockstates/belt_animation.json delete mode 100644 src/main/resources/assets/create/blockstates/shop_shelf.json delete mode 100644 src/main/resources/assets/create/models/block/belt.json delete mode 100644 src/main/resources/assets/create/models/block/belt/belt_textures.json delete mode 100644 src/main/resources/assets/create/models/block/mechanical_piston/temp.json delete mode 100644 src/main/resources/assets/create/models/block/shop_shelf.json create mode 100644 src/main/resources/assets/create/models/block/translation_chassis/alt.json create mode 100644 src/main/resources/assets/create/models/block/translation_chassis/alt_both_sticky.json create mode 100644 src/main/resources/assets/create/models/block/translation_chassis/alt_bottom_sticky.json create mode 100644 src/main/resources/assets/create/models/block/translation_chassis/alt_top_sticky.json rename src/main/resources/assets/create/models/block/{translation_chassis.json => translation_chassis/regular.json} (100%) rename src/main/resources/assets/create/models/block/{translation_chassis_both_sticky.json => translation_chassis/regular_both_sticky.json} (80%) rename src/main/resources/assets/create/models/block/{translation_chassis_bottom_sticky.json => translation_chassis/regular_bottom_sticky.json} (80%) rename src/main/resources/assets/create/models/block/{translation_chassis_top_sticky.json => translation_chassis/regular_top_sticky.json} (80%) rename src/main/resources/data/create/loot_tables/blocks/{vertical_linked_extractor.json => belt_tunnel.json} (85%) create mode 100644 src/main/resources/data/create/loot_tables/blocks/cart_assembler.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/copper_ore.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/framed_glass.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/linked_transposer.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/logistical_casing.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/mechanical_crafter.json rename src/main/resources/data/create/loot_tables/blocks/{vertical_extractor.json => saw.json} (87%) create mode 100644 src/main/resources/data/create/loot_tables/blocks/speed_gauge.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/stress_gauge.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/translation_chassis_secondary.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/transposer.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/zinc_ore.json diff --git a/build.gradle b/build.gradle index b90664233..df3668ac9 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ archivesBaseName = 'create' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: '20191221-1.14.3' + mappings channel: 'snapshot', version: '20200119-1.14.3' runs { client { @@ -71,7 +71,7 @@ repositories { } dependencies { - minecraft 'net.minecraftforge:forge:1.14.4-28.1.107' + minecraft 'net.minecraftforge:forge:1.14.4-28.1.115' // compile against the JEI API but do not include it at runtime compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.26:api") diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 248dd66a4..ffd001116 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -10,7 +10,7 @@ import com.simibubi.create.foundation.block.RenderUtilityDirectionalBlock; import com.simibubi.create.foundation.block.connected.CTSpriteShifter; import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.foundation.world.CopperOreBlock; +import com.simibubi.create.foundation.world.OxidizingBlock; import com.simibubi.create.modules.IModule; import com.simibubi.create.modules.contraptions.components.actors.DrillBlock; import com.simibubi.create.modules.contraptions.components.actors.DrillBlock.DrillHeadBlock; @@ -94,6 +94,7 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.ToolType; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.registries.IForgeRegistry; @@ -118,7 +119,6 @@ public enum AllBlocks { GEARBOX(new GearboxBlock()), BELT(new BeltBlock()), BELT_PULLEY(new RenderUtilityAxisBlock()), - BELT_ANIMATION(new RenderUtilityBlock()), MOTOR(new MotorBlock()), WATER_WHEEL(new WaterWheelBlock()), ENCASED_FAN(new EncasedFanBlock()), @@ -237,8 +237,8 @@ public enum AllBlocks { VOLCANIC_ROCK(new VolcanicRockBlock()), __MATERIALS__(), - COPPER_ORE(new CopperOreBlock()), - ZINC_ORE(new Block(Properties.from(Blocks.GOLD_ORE))), + COPPER_ORE(new OxidizingBlock(Properties.from(Blocks.IRON_ORE), 1)), + ZINC_ORE(new Block(Properties.from(Blocks.GOLD_ORE).harvestLevel(2).harvestTool(ToolType.PICKAXE))), ; diff --git a/src/main/java/com/simibubi/create/AllParticles.java b/src/main/java/com/simibubi/create/AllParticles.java index 6ef5147a5..3dabf05e2 100644 --- a/src/main/java/com/simibubi/create/AllParticles.java +++ b/src/main/java/com/simibubi/create/AllParticles.java @@ -3,32 +3,33 @@ package com.simibubi.create; import java.util.function.Supplier; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.contraptions.particle.AirFlowParticle; -import com.simibubi.create.modules.contraptions.particle.RotationIndicatorParticle; +import com.simibubi.create.modules.contraptions.particle.AirFlowParticleData; +import com.simibubi.create.modules.contraptions.particle.ICustomParticle; +import com.simibubi.create.modules.contraptions.particle.RotationIndicatorParticleData; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.ParticleManager; -import net.minecraft.client.particle.ParticleManager.IParticleMetaFactory; import net.minecraft.particles.IParticleData; import net.minecraft.particles.ParticleType; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.registries.IForgeRegistry; public enum AllParticles { - ROTATION_INDICATOR(RotationIndicatorParticle.Type::new, RotationIndicatorParticle.Factory::new), - AIR_FLOW(AirFlowParticle.Type::new, AirFlowParticle.Factory::new), + ROTATION_INDICATOR(RotationIndicatorParticleData::new), + AIR_FLOW(AirFlowParticleData::new), ; private ParticleEntry entry; - private AllParticles(Supplier> typeFactory, - IParticleMetaFactory particleFactory) { + private AllParticles(Supplier> typeFactory) { String asId = Lang.asId(this.name().toLowerCase()); - entry = new ParticleEntry(new ResourceLocation(Create.ID, asId), typeFactory, particleFactory); + entry = new ParticleEntry(new ResourceLocation(Create.ID, asId), typeFactory); } public static void register(RegistryEvent.Register> event) { @@ -36,9 +37,10 @@ public enum AllParticles { particle.entry.register(event.getRegistry()); } + @OnlyIn(Dist.CLIENT) public static void registerFactories(ParticleFactoryRegisterEvent event) { ParticleManager particles = Minecraft.getInstance().particles; - for (AllParticles particle : values()) + for (AllParticles particle : values()) particle.entry.registerFactory(particles); } @@ -51,16 +53,13 @@ public enum AllParticles { } private class ParticleEntry { - Supplier> typeFactory; - IParticleMetaFactory particleFactory; + Supplier> typeFactory; ParticleType type; ResourceLocation id; - public ParticleEntry(ResourceLocation id, Supplier> typeFactory, - IParticleMetaFactory particleFactory) { + public ParticleEntry(ResourceLocation id, Supplier> typeFactory) { this.id = id; this.typeFactory = typeFactory; - this.particleFactory = particleFactory; } ParticleType getType() { @@ -75,14 +74,15 @@ public enum AllParticles { void makeType() { if (type == null) { - type = typeFactory.get(); + type = typeFactory.get().createType(); type.setRegistryName(id); } } + @OnlyIn(Dist.CLIENT) void registerFactory(ParticleManager particles) { makeType(); - particles.registerFactory(type, particleFactory); + particles.registerFactory(type, typeFactory.get().getFactory()); } } diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index 13720b920..502895bd8 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -105,6 +105,8 @@ public class CreateClient { public static void onTextureStitch(TextureStitchEvent.Pre event) { if (!event.getMap().getBasePath().equals("textures")) return; + + event.addSprite(new ResourceLocation(Create.ID, "block/belt_animated")); for (AllBlocks allBlocks : AllBlocks.values()) { Block block = allBlocks.get(); if (!(block instanceof IHaveConnectedTextures)) @@ -112,7 +114,6 @@ public class CreateClient { for (SpriteShiftEntry spriteShiftEntry : ((IHaveConnectedTextures) block).getBehaviour().getAllCTShifts()) event.addSprite(spriteShiftEntry.getTargetResourceLocation()); } - } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java b/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java index e24311cc6..312c541f3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticle.java @@ -12,7 +12,6 @@ import net.minecraft.client.particle.IParticleRenderType; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.SimpleAnimatedParticle; import net.minecraft.particles.BlockParticleData; -import net.minecraft.particles.ParticleType; import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -151,12 +150,6 @@ public class AirFlowParticle extends SimpleAnimatedParticle { setSprite(field_217584_C.get(index, 8)); } - public static class Type extends ParticleType { - public Type() { - super(false, AirFlowParticleData.DESERIALIZER); - } - } - public static class Factory implements IParticleFactory { private final IAnimatedSprite spriteSet; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticleData.java b/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticleData.java index 56ba97113..7a0940aec 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticleData.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/particle/AirFlowParticleData.java @@ -6,12 +6,15 @@ import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.simibubi.create.AllParticles; +import net.minecraft.client.particle.ParticleManager.IParticleMetaFactory; import net.minecraft.network.PacketBuffer; import net.minecraft.particles.IParticleData; import net.minecraft.particles.ParticleType; import net.minecraft.util.math.Vec3i; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -public class AirFlowParticleData implements IParticleData { +public class AirFlowParticleData implements IParticleData, ICustomParticle { public static final IParticleData.IDeserializer DESERIALIZER = new IParticleData.IDeserializer() { public AirFlowParticleData deserialize(ParticleType particleTypeIn, StringReader reader) @@ -43,6 +46,10 @@ public class AirFlowParticleData implements IParticleData { this.posY = posY; this.posZ = posZ; } + + public AirFlowParticleData() { + this(0, 0, 0); + } @Override public ParticleType getType() { @@ -61,4 +68,15 @@ public class AirFlowParticleData implements IParticleData { return String.format(Locale.ROOT, "%s %d %d %d", AllParticles.ROTATION_INDICATOR.parameter(), posX, posY, posZ); } + @Override + public IDeserializer getDeserializer() { + return DESERIALIZER; + } + + @Override + @OnlyIn(Dist.CLIENT) + public IParticleMetaFactory getFactory() { + return AirFlowParticle.Factory::new; + } + } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/modules/contraptions/particle/ICustomParticle.java b/src/main/java/com/simibubi/create/modules/contraptions/particle/ICustomParticle.java new file mode 100644 index 000000000..08f6cf896 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/particle/ICustomParticle.java @@ -0,0 +1,21 @@ +package com.simibubi.create.modules.contraptions.particle; + +import net.minecraft.client.particle.ParticleManager.IParticleMetaFactory; +import net.minecraft.particles.IParticleData; +import net.minecraft.particles.IParticleData.IDeserializer; +import net.minecraft.particles.ParticleType; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +public interface ICustomParticle { + + public IDeserializer getDeserializer(); + + public default ParticleType createType() { + return new ParticleType(false, getDeserializer()); + } + + @OnlyIn(Dist.CLIENT) + public IParticleMetaFactory getFactory(); + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/particle/RotationIndicatorParticle.java b/src/main/java/com/simibubi/create/modules/contraptions/particle/RotationIndicatorParticle.java index 051a1ec00..4fae3183f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/particle/RotationIndicatorParticle.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/particle/RotationIndicatorParticle.java @@ -13,7 +13,6 @@ import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.SimpleAnimatedParticle; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.particles.ParticleType; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -77,12 +76,6 @@ public class RotationIndicatorParticle extends SimpleAnimatedParticle { posZ = position.z; } - public static class Type extends ParticleType { - public Type() { - super(false, RotationIndicatorParticleData.DESERIALIZER); - } - } - public static class Factory implements IParticleFactory { private final IAnimatedSprite spriteSet; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/particle/RotationIndicatorParticleData.java b/src/main/java/com/simibubi/create/modules/contraptions/particle/RotationIndicatorParticleData.java index 4c6c33b35..cfcf3819d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/particle/RotationIndicatorParticleData.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/particle/RotationIndicatorParticleData.java @@ -6,12 +6,15 @@ import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.simibubi.create.AllParticles; +import net.minecraft.client.particle.ParticleManager.IParticleMetaFactory; import net.minecraft.network.PacketBuffer; import net.minecraft.particles.IParticleData; import net.minecraft.particles.ParticleType; import net.minecraft.util.Direction.Axis; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; -public class RotationIndicatorParticleData implements IParticleData { +public class RotationIndicatorParticleData implements IParticleData, ICustomParticle { public static final IParticleData.IDeserializer DESERIALIZER = new IParticleData.IDeserializer() { public RotationIndicatorParticleData deserialize(ParticleType particleTypeIn, @@ -55,6 +58,10 @@ public class RotationIndicatorParticleData implements IParticleData { this.axis = axis; } + public RotationIndicatorParticleData() { + this(0, 0, 0, 0, 0, '0'); + } + @Override public ParticleType getType() { return AllParticles.ROTATION_INDICATOR.get(); @@ -71,6 +78,7 @@ public class RotationIndicatorParticleData implements IParticleData { buffer.writeFloat(radius1); buffer.writeFloat(radius2); buffer.writeInt(lifeSpan); + buffer.writeChar(axis); } @Override @@ -79,4 +87,15 @@ public class RotationIndicatorParticleData implements IParticleData { color, speed, radius1, radius2, lifeSpan, axis); } + @Override + public IDeserializer getDeserializer() { + return DESERIALIZER; + } + + @Override + @OnlyIn(Dist.CLIENT) + public IParticleMetaFactory getFactory() { + return RotationIndicatorParticle.Factory::new; + } + } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java index 6cf6ca55f..582ac4efe 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java @@ -14,6 +14,7 @@ import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer.Builder; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -112,6 +113,11 @@ public class ExtractorBlock extends BeltAttachableLogisticalBlock { protected boolean isVertical() { return true; } + + @Override + public ResourceLocation getLootTable() { + return AllBlocks.EXTRACTOR.get().getLootTable(); + } } } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java index fba60ced7..ed54f8377 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java @@ -10,6 +10,7 @@ import com.simibubi.create.modules.logistics.block.belts.AttachedLogisticalBlock import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockReader; @@ -75,6 +76,11 @@ public class LinkedExtractorBlock extends ExtractorBlock { protected boolean isVertical() { return true; } + + @Override + public ResourceLocation getLootTable() { + return AllBlocks.LINKED_EXTRACTOR.get().getLootTable(); + } } } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java index 749e1f77a..c8cb4d3b6 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java @@ -5,6 +5,7 @@ import com.simibubi.create.AllBlocks; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockReader; public class LinkedTransposerBlock extends TransposerBlock { @@ -34,6 +35,11 @@ public class LinkedTransposerBlock extends TransposerBlock { protected boolean isVertical() { return true; } + + @Override + public ResourceLocation getLootTable() { + return AllBlocks.LINKED_TRANSPOSER.get().getLootTable(); + } } } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java index e0e44197d..945a25252 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java @@ -12,6 +12,7 @@ import net.minecraft.state.StateContainer.Builder; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; @@ -101,6 +102,11 @@ public class TransposerBlock extends BeltAttachableLogisticalBlock { protected boolean isVertical() { return true; } + + @Override + public ResourceLocation getLootTable() { + return AllBlocks.TRANSPOSER.get().getLootTable(); + } } } diff --git a/src/main/resources/assets/create/blockstates/belt_animation.json b/src/main/resources/assets/create/blockstates/belt_animation.json deleted file mode 100644 index 5735632c4..000000000 --- a/src/main/resources/assets/create/blockstates/belt_animation.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "forgemarker": 1, - "defaults": { - "model": "create:block/belt/belt_textures" - }, - "variants": { - "": { "model": "create:block/belt/belt_textures" } - } -} diff --git a/src/main/resources/assets/create/blockstates/shop_shelf.json b/src/main/resources/assets/create/blockstates/shop_shelf.json deleted file mode 100644 index 3a72db05f..000000000 --- a/src/main/resources/assets/create/blockstates/shop_shelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forgemarker": 1, - "defaults": { - "model": "create:block/shop_shelf" - }, - "variants": { - "facing=north": { "model": "create:block/shop_shelf", "y": 180 }, - "facing=south": { "model": "create:block/shop_shelf" }, - "facing=east": { "model": "create:block/shop_shelf", "y": 270 }, - "facing=west": { "model": "create:block/shop_shelf", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/translation_chassis.json b/src/main/resources/assets/create/blockstates/translation_chassis.json index c1f72124a..a558e2ed2 100644 --- a/src/main/resources/assets/create/blockstates/translation_chassis.json +++ b/src/main/resources/assets/create/blockstates/translation_chassis.json @@ -1,41 +1,22 @@ { - "forge_marker": 1, - "defaults": { - "model": "block/cube_bottom_top", - "textures": { - "side": "create:block/translation_chassis_side" - }, - "transform": "forge:default-block" - }, - "variants": { - "axis": { - "x": { "x": 90, "y": 90 }, - "y": { }, - "z": { "x": 90, "y": 180 } - }, - "sticky_top": { - "false": { - "textures": { - "top": "create:block/translation_chassis_top" - } - }, - "true": { - "textures": { - "top": "create:block/translation_chassis_top_sticky" - } - } - }, - "sticky_bottom": { - "false": { - "textures": { - "bottom": "create:block/translation_chassis_top" - } - }, - "true": { - "textures": { - "bottom": "create:block/translation_chassis_top_sticky" - } - } - } - } + "forge_marker": 1, + "variants": { + + "sticky_top=false,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/regular", "x": 90, "y": 90 }, + "sticky_top=false,sticky_bottom=false,axis=y": { "model": "create:block/translation_chassis/regular" }, + "sticky_top=false,sticky_bottom=false,axis=z": { "model": "create:block/translation_chassis/regular", "x": 90, "y": 180 }, + + "sticky_top=false,sticky_bottom=true,axis=x": { "model": "create:block/translation_chassis/regular_bottom_sticky", "x": 90, "y": 90 }, + "sticky_top=false,sticky_bottom=true,axis=y": { "model": "create:block/translation_chassis/regular_bottom_sticky" }, + "sticky_top=false,sticky_bottom=true,axis=z": { "model": "create:block/translation_chassis/regular_bottom_sticky", "x": 90, "y": 180 }, + + "sticky_top=true,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/regular_top_sticky", "x": 90, "y": 90 }, + "sticky_top=true,sticky_bottom=false,axis=y": { "model": "create:block/translation_chassis/regular_top_sticky" }, + "sticky_top=true,sticky_bottom=false,axis=z": { "model": "create:block/translation_chassis/regular_top_sticky", "x": 90, "y": 180 }, + + "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 b12587893..6790e4009 100644 --- a/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json +++ b/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json @@ -1,41 +1,22 @@ { - "forge_marker": 1, - "defaults": { - "model": "block/cube_bottom_top", - "textures": { - "side": "create:block/translation_chassis_side_alt" - }, - "transform": "forge:default-block" - }, - "variants": { - "axis": { - "x": { "x": 90, "y": 90 }, - "y": { }, - "z": { "x": 90, "y": 180 } - }, - "sticky_top": { - "false": { - "textures": { - "top": "create:block/translation_chassis_top" - } - }, - "true": { - "textures": { - "top": "create:block/translation_chassis_top_sticky" - } - } - }, - "sticky_bottom": { - "false": { - "textures": { - "bottom": "create:block/translation_chassis_top" - } - }, - "true": { - "textures": { - "bottom": "create:block/translation_chassis_top_sticky" - } - } - } - } + "forge_marker": 1, + "variants": { + + "sticky_top=false,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/alt", "x": 90, "y": 90 }, + "sticky_top=false,sticky_bottom=false,axis=y": { "model": "create:block/translation_chassis/alt" }, + "sticky_top=false,sticky_bottom=false,axis=z": { "model": "create:block/translation_chassis/alt", "x": 90, "y": 180 }, + + "sticky_top=false,sticky_bottom=true,axis=x": { "model": "create:block/translation_chassis/alt_bottom_sticky", "x": 90, "y": 90 }, + "sticky_top=false,sticky_bottom=true,axis=y": { "model": "create:block/translation_chassis/alt_bottom_sticky" }, + "sticky_top=false,sticky_bottom=true,axis=z": { "model": "create:block/translation_chassis/alt_bottom_sticky", "x": 90, "y": 180 }, + + "sticky_top=true,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/alt_top_sticky", "x": 90, "y": 90 }, + "sticky_top=true,sticky_bottom=false,axis=y": { "model": "create:block/translation_chassis/alt_top_sticky" }, + "sticky_top=true,sticky_bottom=false,axis=z": { "model": "create:block/translation_chassis/alt_top_sticky", "x": 90, "y": 180 }, + + "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/models/block/belt.json b/src/main/resources/assets/create/models/block/belt.json deleted file mode 100644 index d1358f457..000000000 --- a/src/main/resources/assets/create/models/block/belt.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", - "textures": { - "0": "create:block/belt" - }, - "elements": [ - { - "name": "Belt", - "from": [ 1.0, 0.0, 0.0 ], - "to": [ 15.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 2.0 ], "rotation": 180 }, - "east": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 16.0 ], "rotation": 90 }, - "south": { "texture": "#0", "uv": [ 1.0, 14.0, 15.0, 16.0 ]}, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 16.0 ], "rotation": 270 }, - "up": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 1.0, 0.0, 15.0, 16.0 ], "rotation": 180 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/belt_textures.json b/src/main/resources/assets/create/models/block/belt/belt_textures.json deleted file mode 100644 index 60edee6c3..000000000 --- a/src/main/resources/assets/create/models/block/belt/belt_textures.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "0": "create:block/belt_animated" - }, - "elements": [ - { - "name": "Cheese", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 1.0, 1.0, 1.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt/downward_end.json b/src/main/resources/assets/create/models/block/belt/downward_end.json index caa528528..3ab4a791c 100644 --- a/src/main/resources/assets/create/models/block/belt/downward_end.json +++ b/src/main/resources/assets/create/models/block/belt/downward_end.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/belt", "0": "create:block/belt" diff --git a/src/main/resources/assets/create/models/block/belt/downward_middle.json b/src/main/resources/assets/create/models/block/belt/downward_middle.json index 6df1312f3..c1dd92010 100644 --- a/src/main/resources/assets/create/models/block/belt/downward_middle.json +++ b/src/main/resources/assets/create/models/block/belt/downward_middle.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/belt", "0": "create:block/belt" diff --git a/src/main/resources/assets/create/models/block/belt/downward_start.json b/src/main/resources/assets/create/models/block/belt/downward_start.json index c49ccce75..b17d62965 100644 --- a/src/main/resources/assets/create/models/block/belt/downward_start.json +++ b/src/main/resources/assets/create/models/block/belt/downward_start.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/belt", "0": "create:block/belt" diff --git a/src/main/resources/assets/create/models/block/belt/horizontal_end.json b/src/main/resources/assets/create/models/block/belt/horizontal_end.json index 228167eee..f96cea473 100644 --- a/src/main/resources/assets/create/models/block/belt/horizontal_end.json +++ b/src/main/resources/assets/create/models/block/belt/horizontal_end.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/belt", "0": "create:block/belt" diff --git a/src/main/resources/assets/create/models/block/belt/horizontal_middle.json b/src/main/resources/assets/create/models/block/belt/horizontal_middle.json index 4d3ada53e..a80ee37c3 100644 --- a/src/main/resources/assets/create/models/block/belt/horizontal_middle.json +++ b/src/main/resources/assets/create/models/block/belt/horizontal_middle.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/belt", "0": "create:block/belt" diff --git a/src/main/resources/assets/create/models/block/belt/horizontal_start.json b/src/main/resources/assets/create/models/block/belt/horizontal_start.json index 5f320e4fb..00014a924 100644 --- a/src/main/resources/assets/create/models/block/belt/horizontal_start.json +++ b/src/main/resources/assets/create/models/block/belt/horizontal_start.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/belt", "0": "create:block/belt" diff --git a/src/main/resources/assets/create/models/block/belt/upward_end.json b/src/main/resources/assets/create/models/block/belt/upward_end.json index 5dd6f2cdb..e07160dd7 100644 --- a/src/main/resources/assets/create/models/block/belt/upward_end.json +++ b/src/main/resources/assets/create/models/block/belt/upward_end.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/belt", "0": "create:block/belt" diff --git a/src/main/resources/assets/create/models/block/belt/upward_middle.json b/src/main/resources/assets/create/models/block/belt/upward_middle.json index 21b48ed92..3c7b313f7 100644 --- a/src/main/resources/assets/create/models/block/belt/upward_middle.json +++ b/src/main/resources/assets/create/models/block/belt/upward_middle.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/belt", "0": "create:block/belt" diff --git a/src/main/resources/assets/create/models/block/belt/upward_start.json b/src/main/resources/assets/create/models/block/belt/upward_start.json index 6b8a6242d..b6a3245a9 100644 --- a/src/main/resources/assets/create/models/block/belt/upward_start.json +++ b/src/main/resources/assets/create/models/block/belt/upward_start.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/belt", "0": "create:block/belt" diff --git a/src/main/resources/assets/create/models/block/belt_pulley.json b/src/main/resources/assets/create/models/block/belt_pulley.json index 6aa444674..9ed34cdb1 100644 --- a/src/main/resources/assets/create/models/block/belt_pulley.json +++ b/src/main/resources/assets/create/models/block/belt_pulley.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "block/dark_oak_log", "0": "create:block/axis", diff --git a/src/main/resources/assets/create/models/block/cogwheel.json b/src/main/resources/assets/create/models/block/cogwheel.json index 8862d2534..44ce191be 100644 --- a/src/main/resources/assets/create/models/block/cogwheel.json +++ b/src/main/resources/assets/create/models/block/cogwheel.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "block/stripped_spruce_log", "0": "create:block/axis", diff --git a/src/main/resources/assets/create/models/block/cogwheel_shaftless.json b/src/main/resources/assets/create/models/block/cogwheel_shaftless.json index 3568cf503..10cac44dc 100644 --- a/src/main/resources/assets/create/models/block/cogwheel_shaftless.json +++ b/src/main/resources/assets/create/models/block/cogwheel_shaftless.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "block/stripped_spruce_log", "1": "block/stripped_spruce_log", diff --git a/src/main/resources/assets/create/models/block/contact.json b/src/main/resources/assets/create/models/block/contact.json index a7cdc9e2d..29e376ae3 100644 --- a/src/main/resources/assets/create/models/block/contact.json +++ b/src/main/resources/assets/create/models/block/contact.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/contact_side", "0": "create:block/brass_casing", diff --git a/src/main/resources/assets/create/models/block/creative_crate.json b/src/main/resources/assets/create/models/block/creative_crate.json index 875fed8eb..e67b2c589 100644 --- a/src/main/resources/assets/create/models/block/creative_crate.json +++ b/src/main/resources/assets/create/models/block/creative_crate.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/creative_crate_side", "1": "create:block/creative_crate_top", diff --git a/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json b/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json index 3f5cdffc7..c56339095 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json +++ b/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/encased_belt", "2": "create:block/encased_belt_end", diff --git a/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json b/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json index 4cd2928a2..ead988ad3 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json +++ b/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "textures": { "1": "create:block/encased_belt", "2": "create:block/encased_belt_end", diff --git a/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json b/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json index cd1e43d3e..44282d677 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json +++ b/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/encased_belt", "1": "create:block/encased_belt_middle", diff --git a/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json b/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json index 0ab6f44ba..c83bea661 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json +++ b/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/encased_belt", "1": "create:block/encased_belt_middle", diff --git a/src/main/resources/assets/create/models/block/encased_belt/single.json b/src/main/resources/assets/create/models/block/encased_belt/single.json index 3d273fe4c..4fe835d94 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/single.json +++ b/src/main/resources/assets/create/models/block/encased_belt/single.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/encased_belt", "1": "create:block/gearbox", diff --git a/src/main/resources/assets/create/models/block/encased_shaft.json b/src/main/resources/assets/create/models/block/encased_shaft.json index 3296f9ab6..df42d5497 100644 --- a/src/main/resources/assets/create/models/block/encased_shaft.json +++ b/src/main/resources/assets/create/models/block/encased_shaft.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/gearbox_top", "1": "create:block/gearbox", diff --git a/src/main/resources/assets/create/models/block/gauge/item_speed.json b/src/main/resources/assets/create/models/block/gauge/item_speed.json index 272337e00..4acb891eb 100644 --- a/src/main/resources/assets/create/models/block/gauge/item_speed.json +++ b/src/main/resources/assets/create/models/block/gauge/item_speed.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/axis", "1": "create:block/axis_top", diff --git a/src/main/resources/assets/create/models/block/gauge/item_stress.json b/src/main/resources/assets/create/models/block/gauge/item_stress.json index 923184577..f059867f7 100644 --- a/src/main/resources/assets/create/models/block/gauge/item_stress.json +++ b/src/main/resources/assets/create/models/block/gauge/item_stress.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/axis", "1": "create:block/axis_top", diff --git a/src/main/resources/assets/create/models/block/gearbox.json b/src/main/resources/assets/create/models/block/gearbox.json index d84cf1ca3..893db5ca3 100644 --- a/src/main/resources/assets/create/models/block/gearbox.json +++ b/src/main/resources/assets/create/models/block/gearbox.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/gearbox_top", "1": "create:block/gearbox", diff --git a/src/main/resources/assets/create/models/block/gearshift_off.json b/src/main/resources/assets/create/models/block/gearshift_off.json index 7c69551d5..0b48bdd71 100644 --- a/src/main/resources/assets/create/models/block/gearshift_off.json +++ b/src/main/resources/assets/create/models/block/gearshift_off.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/gearshift_off", "1": "create:block/gearbox", diff --git a/src/main/resources/assets/create/models/block/large_wheels.json b/src/main/resources/assets/create/models/block/large_wheels.json index 33cee30f2..3f1503bd0 100644 --- a/src/main/resources/assets/create/models/block/large_wheels.json +++ b/src/main/resources/assets/create/models/block/large_wheels.json @@ -1,5 +1,5 @@ { - "parent": "block/cube", + "parent": "block/block", "display": { "gui": { "rotation": [ 30, 225, 0 ], diff --git a/src/main/resources/assets/create/models/block/mechanical_piston.json b/src/main/resources/assets/create/models/block/mechanical_piston.json index e0451a3f6..dfc0f6c17 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/gearbox_top", "0": "create:block/gearbox_top", diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/base.json b/src/main/resources/assets/create/models/block/mechanical_piston/base.json index 91ea4023c..f0df0d203 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/base.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/base.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/gearbox_top", "0": "create:block/gearbox_top", diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/base_rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/base_rotated.json index 4e92869ee..92d6298fd 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/base_rotated.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/base_rotated.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/gearbox_top", "0": "create:block/gearbox_top", diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension.json b/src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension.json index dfc3d5498..facc70252 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/gearbox_top", "0": "create:block/gearbox_top", diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension_rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension_rotated.json index 5c3702a86..93ef108ad 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension_rotated.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension_rotated.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/gearbox_top", "0": "create:block/gearbox_top", diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/pole.json b/src/main/resources/assets/create/models/block/mechanical_piston/pole.json index 38c8d8020..ec53edd91 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/pole.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/pole.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "block/piston_top", "0": "block/piston_side", diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/temp.json b/src/main/resources/assets/create/models/block/mechanical_piston/temp.json deleted file mode 100644 index 12872d3fe..000000000 --- a/src/main/resources/assets/create/models/block/mechanical_piston/temp.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "blocks/gearbox_top", - "1": "blocks/piston_bottom", - "2": "blocks/gearbox", - "3": "blocks/piston_side", - "4": "blocks/piston_top", - "5": "blocks/piston_inner" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Inner", - "from": [ 1.0, 2.0, 2.0 ], - "to": [ 15.0, 12.0, 14.0 ], - "faces": { - "east": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "west": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] } - } - }, - { - "name": "Side", - "from": [ 0.0, 2.0, 0.0 ], - "to": [ 16.0, 12.0, 2.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 9.0 ] }, - "east": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] } - } - }, - { - "name": "Side2", - "from": [ 0.0, 2.0, 14.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] } - } - }, - { - "name": "Top", - "from": [ 0.0, 12.0, 0.0 ], - "to": [ 16.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "up": { "texture": "#4", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#5", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_piston_head.json b/src/main/resources/assets/create/models/block/mechanical_piston_head.json index 91c709702..3f30584c3 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston_head.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston_head.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "block/piston_top", "0": "block/piston_side", diff --git a/src/main/resources/assets/create/models/block/mixer_base.json b/src/main/resources/assets/create/models/block/mixer_base.json index ab4f92b93..c266f74ba 100644 --- a/src/main/resources/assets/create/models/block/mixer_base.json +++ b/src/main/resources/assets/create/models/block/mixer_base.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "ambientocclusion": false, "textures": { "2": "block/spruce_log_top", diff --git a/src/main/resources/assets/create/models/block/mixer_head.json b/src/main/resources/assets/create/models/block/mixer_head.json index be4452e33..18b1f1e2e 100644 --- a/src/main/resources/assets/create/models/block/mixer_head.json +++ b/src/main/resources/assets/create/models/block/mixer_head.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "ambientocclusion": false, "textures": { "6": "create:block/mixer_head", diff --git a/src/main/resources/assets/create/models/block/mixer_pole.json b/src/main/resources/assets/create/models/block/mixer_pole.json index 5355b5b23..08ff4d057 100644 --- a/src/main/resources/assets/create/models/block/mixer_pole.json +++ b/src/main/resources/assets/create/models/block/mixer_pole.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "ambientocclusion": false, "textures": { "6": "create:block/mixer_head", diff --git a/src/main/resources/assets/create/models/block/motor.json b/src/main/resources/assets/create/models/block/motor.json index 58b5ba9c6..6624e6d77 100644 --- a/src/main/resources/assets/create/models/block/motor.json +++ b/src/main/resources/assets/create/models/block/motor.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "block/iron_block", "0": "block/chiseled_stone_bricks", diff --git a/src/main/resources/assets/create/models/block/schematic_table.json b/src/main/resources/assets/create/models/block/schematic_table.json index 383b6ac35..70f25af30 100644 --- a/src/main/resources/assets/create/models/block/schematic_table.json +++ b/src/main/resources/assets/create/models/block/schematic_table.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "create:block/schematic_table_side", "1": "create:block/schematic_table_top", diff --git a/src/main/resources/assets/create/models/block/shaft.json b/src/main/resources/assets/create/models/block/shaft.json index 68d9c8008..c873dafe2 100644 --- a/src/main/resources/assets/create/models/block/shaft.json +++ b/src/main/resources/assets/create/models/block/shaft.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/axis", "0": "create:block/axis", diff --git a/src/main/resources/assets/create/models/block/shaft_half.json b/src/main/resources/assets/create/models/block/shaft_half.json index cb71924da..b07a098a8 100644 --- a/src/main/resources/assets/create/models/block/shaft_half.json +++ b/src/main/resources/assets/create/models/block/shaft_half.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "create:block/axis", "0": "create:block/axis", diff --git a/src/main/resources/assets/create/models/block/shop_shelf.json b/src/main/resources/assets/create/models/block/shop_shelf.json deleted file mode 100644 index c330f4852..000000000 --- a/src/main/resources/assets/create/models/block/shop_shelf.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", - "textures": { - "particle": "block/stripped_spruce_log", - "0": "block/stripped_spruce_log_top", - "1": "block/stripped_spruce_log", - "2": "block/dark_oak_planks", - "3": "block/spruce_planks", - "4": "block/andesite" - }, - "elements": [ - { - "name": "Body", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 14.0, 14.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 1.0, 16.0, 15.0 ] }, - "east": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 1.0, 16.0, 15.0 ] }, - "west": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 1.0, 16.0, 15.0 ] } - } - }, - { - "name": "Top", - "from": [ 0.0, 14.0, 0.0 ], - "to": [ 16.0, 16.0, 15.0 ], - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 6.0, 16.0, 8.0 ] }, - "east": { "texture": "#2", "uv": [ 1.0, 6.0, 16.0, 8.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 6.0, 16.0, 8.0 ] }, - "west": { "texture": "#2", "uv": [ 1.0, 6.0, 16.0, 8.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 1.0, 16.0, 16.0 ], "rotation": 180 } - } - }, - { - "name": "Drawer Body", - "from": [ 1.0, 8.0, 8.0 ], - "to": [ 15.0, 13.0, 15.0 ], - "faces": { - "north": { "texture": "#3", "uv": [ 1.0, 3.0, 15.0, 8.0 ] }, - "east": { "texture": "#3", "uv": [ 7.0, 3.0, 14.0, 8.0 ] }, - "south": { "texture": "#3", "uv": [ 1.0, 7.0, 15.0, 12.0 ] }, - "west": { "texture": "#3", "uv": [ 1.0, 3.0, 8.0, 8.0 ] }, - "up": { "texture": "#3", "uv": [ 1.0, 5.0, 15.0, 12.0 ] }, - "down": { "texture": "#3", "uv": [ 1.0, 3.0, 15.0, 10.0 ] } - } - }, - { - "name": "Drawer Knob", - "from": [ 6.0, 11.0, 14.5 ], - "to": [ 10.0, 12.0, 15.5 ], - "faces": { - "north": { "texture": "#4", "uv": [ 6.0, 6.0, 10.0, 7.0 ] }, - "east": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#4", "uv": [ 6.0, 7.0, 10.0, 8.0 ] }, - "west": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#4", "uv": [ 4.0, 3.0, 8.0, 4.0 ] }, - "down": { "texture": "#4", "uv": [ 6.0, 2.0, 10.0, 3.0 ] } - } - }, - { - "name": "Another Drawer Body", - "from": [ 1.0, 2.0, 8.0 ], - "to": [ 15.0, 7.0, 15.0 ], - "faces": { - "north": { "texture": "#3", "uv": [ 1.0, 0.0, 15.0, 5.0 ] }, - "east": { "texture": "#3", "uv": [ 7.0, 3.0, 14.0, 8.0 ] }, - "south": { "texture": "#3", "uv": [ 1.0, 7.0, 15.0, 12.0 ] }, - "west": { "texture": "#3", "uv": [ 1.0, 3.0, 8.0, 8.0 ] }, - "up": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 8.0 ] }, - "down": { "texture": "#3", "uv": [ 1.0, 3.0, 15.0, 10.0 ] } - } - }, - { - "name": "Another Drawer Knob", - "from": [ 6.0, 5.0, 14.5 ], - "to": [ 10.0, 6.0, 15.5 ], - "faces": { - "north": { "texture": "#4", "uv": [ 6.0, 6.0, 10.0, 7.0 ] }, - "east": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "south": { "texture": "#4", "uv": [ 6.0, 7.0, 10.0, 8.0 ] }, - "west": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "up": { "texture": "#4", "uv": [ 4.0, 3.0, 8.0, 4.0 ] }, - "down": { "texture": "#4", "uv": [ 6.0, 2.0, 10.0, 3.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/translation_chassis/alt.json b/src/main/resources/assets/create/models/block/translation_chassis/alt.json new file mode 100644 index 000000000..04896f3fe --- /dev/null +++ b/src/main/resources/assets/create/models/block/translation_chassis/alt.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "create:block/translation_chassis_top", + "top": "create:block/translation_chassis_top", + "side": "create:block/translation_chassis_side_alt" + } +} diff --git a/src/main/resources/assets/create/models/block/translation_chassis/alt_both_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/alt_both_sticky.json new file mode 100644 index 000000000..2b4591a7e --- /dev/null +++ b/src/main/resources/assets/create/models/block/translation_chassis/alt_both_sticky.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "create:block/translation_chassis_top_sticky", + "top": "create:block/translation_chassis_top_sticky", + "side": "create:block/translation_chassis_side_alt" + } +} diff --git a/src/main/resources/assets/create/models/block/translation_chassis/alt_bottom_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/alt_bottom_sticky.json new file mode 100644 index 000000000..133e30bdd --- /dev/null +++ b/src/main/resources/assets/create/models/block/translation_chassis/alt_bottom_sticky.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "create:block/translation_chassis_top_sticky", + "top": "create:block/translation_chassis_top", + "side": "create:block/translation_chassis_side_alt" + } +} diff --git a/src/main/resources/assets/create/models/block/translation_chassis/alt_top_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/alt_top_sticky.json new file mode 100644 index 000000000..bf694a51c --- /dev/null +++ b/src/main/resources/assets/create/models/block/translation_chassis/alt_top_sticky.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "top": "create:block/translation_chassis_top_sticky", + "bottom": "create:block/translation_chassis_top", + "side": "create:block/translation_chassis_side_alt" + } +} diff --git a/src/main/resources/assets/create/models/block/translation_chassis.json b/src/main/resources/assets/create/models/block/translation_chassis/regular.json similarity index 100% rename from src/main/resources/assets/create/models/block/translation_chassis.json rename to src/main/resources/assets/create/models/block/translation_chassis/regular.json diff --git a/src/main/resources/assets/create/models/block/translation_chassis_both_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/regular_both_sticky.json similarity index 80% rename from src/main/resources/assets/create/models/block/translation_chassis_both_sticky.json rename to src/main/resources/assets/create/models/block/translation_chassis/regular_both_sticky.json index f62a84597..a2f302279 100644 --- a/src/main/resources/assets/create/models/block/translation_chassis_both_sticky.json +++ b/src/main/resources/assets/create/models/block/translation_chassis/regular_both_sticky.json @@ -1,5 +1,5 @@ { - "parent": "create:block/translation_chassis", + "parent": "block/cube_bottom_top", "textures": { "bottom": "create:block/translation_chassis_top_sticky", "top": "create:block/translation_chassis_top_sticky", diff --git a/src/main/resources/assets/create/models/block/translation_chassis_bottom_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/regular_bottom_sticky.json similarity index 80% rename from src/main/resources/assets/create/models/block/translation_chassis_bottom_sticky.json rename to src/main/resources/assets/create/models/block/translation_chassis/regular_bottom_sticky.json index 8898976fb..a2792d24b 100644 --- a/src/main/resources/assets/create/models/block/translation_chassis_bottom_sticky.json +++ b/src/main/resources/assets/create/models/block/translation_chassis/regular_bottom_sticky.json @@ -1,5 +1,5 @@ { - "parent": "create:block/translation_chassis", + "parent": "block/cube_bottom_top", "textures": { "bottom": "create:block/translation_chassis_top_sticky", "top": "create:block/translation_chassis_top", diff --git a/src/main/resources/assets/create/models/block/translation_chassis_top_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/regular_top_sticky.json similarity index 80% rename from src/main/resources/assets/create/models/block/translation_chassis_top_sticky.json rename to src/main/resources/assets/create/models/block/translation_chassis/regular_top_sticky.json index 91bbe956b..b68ef5675 100644 --- a/src/main/resources/assets/create/models/block/translation_chassis_top_sticky.json +++ b/src/main/resources/assets/create/models/block/translation_chassis/regular_top_sticky.json @@ -1,5 +1,5 @@ { - "parent": "create:block/translation_chassis", + "parent": "block/cube_bottom_top", "textures": { "top": "create:block/translation_chassis_top_sticky", "bottom": "create:block/translation_chassis_top", diff --git a/src/main/resources/assets/create/models/block/turntable.json b/src/main/resources/assets/create/models/block/turntable.json index 7737a7f1d..b13e9ee73 100644 --- a/src/main/resources/assets/create/models/block/turntable.json +++ b/src/main/resources/assets/create/models/block/turntable.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "particle": "block/stripped_spruce_log", "0": "create:block/axis", diff --git a/src/main/resources/assets/create/models/item/mechanical_mixer.json b/src/main/resources/assets/create/models/item/mechanical_mixer.json index b865a1f18..49fa250bf 100644 --- a/src/main/resources/assets/create/models/item/mechanical_mixer.json +++ b/src/main/resources/assets/create/models/item/mechanical_mixer.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/cube", + "parent": "block/block", "ambientocclusion": false, "textures": { "1": "block/stripped_spruce_log", diff --git a/src/main/resources/assets/create/models/item/schematicannon.json b/src/main/resources/assets/create/models/item/schematicannon.json index 405c9e5a4..310dc867e 100644 --- a/src/main/resources/assets/create/models/item/schematicannon.json +++ b/src/main/resources/assets/create/models/item/schematicannon.json @@ -1,6 +1,6 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/cube", + "parent": "block/block", "textures": { "0": "block/stonecutter_side", "1": "block/stonecutter_bottom", diff --git a/src/main/resources/assets/create/models/item/translation_chassis.json b/src/main/resources/assets/create/models/item/translation_chassis.json index 186d53604..12043aef2 100644 --- a/src/main/resources/assets/create/models/item/translation_chassis.json +++ b/src/main/resources/assets/create/models/item/translation_chassis.json @@ -1,3 +1,3 @@ { - "parent": "create:block/translation_chassis" + "parent": "create:block/translation_chassis/regular" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/translation_chassis_secondary.json b/src/main/resources/assets/create/models/item/translation_chassis_secondary.json index cbc4dfcd3..46c11db07 100644 --- a/src/main/resources/assets/create/models/item/translation_chassis_secondary.json +++ b/src/main/resources/assets/create/models/item/translation_chassis_secondary.json @@ -1,6 +1,3 @@ { - "parent": "create:block/translation_chassis", - "textures": { - "side": "create:block/translation_chassis_side_alt" - } + "parent": "create:block/translation_chassis/alt" } \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/vertical_linked_extractor.json b/src/main/resources/data/create/loot_tables/blocks/belt_tunnel.json similarity index 85% rename from src/main/resources/data/create/loot_tables/blocks/vertical_linked_extractor.json rename to src/main/resources/data/create/loot_tables/blocks/belt_tunnel.json index 3faa7e519..727739640 100644 --- a/src/main/resources/data/create/loot_tables/blocks/vertical_linked_extractor.json +++ b/src/main/resources/data/create/loot_tables/blocks/belt_tunnel.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:linked_extractor" + "name": "create:belt_tunnel" } ], "conditions": [ diff --git a/src/main/resources/data/create/loot_tables/blocks/cart_assembler.json b/src/main/resources/data/create/loot_tables/blocks/cart_assembler.json new file mode 100644 index 000000000..9261035c8 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/cart_assembler.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:cart_assembler" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/copper_ore.json b/src/main/resources/data/create/loot_tables/blocks/copper_ore.json new file mode 100644 index 000000000..b0c1a6f02 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/copper_ore.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:copper_ore" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/framed_glass.json b/src/main/resources/data/create/loot_tables/blocks/framed_glass.json new file mode 100644 index 000000000..b6fe4b2ce --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/framed_glass.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:framed_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/linked_transposer.json b/src/main/resources/data/create/loot_tables/blocks/linked_transposer.json new file mode 100644 index 000000000..31ecac893 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/linked_transposer.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:linked_transposer" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/logistical_casing.json b/src/main/resources/data/create/loot_tables/blocks/logistical_casing.json new file mode 100644 index 000000000..dc75291c9 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/logistical_casing.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:logistical_casing" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/mechanical_crafter.json b/src/main/resources/data/create/loot_tables/blocks/mechanical_crafter.json new file mode 100644 index 000000000..2e5a435a5 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/mechanical_crafter.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:mechanical_crafter" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/vertical_extractor.json b/src/main/resources/data/create/loot_tables/blocks/saw.json similarity index 87% rename from src/main/resources/data/create/loot_tables/blocks/vertical_extractor.json rename to src/main/resources/data/create/loot_tables/blocks/saw.json index 3a44e834b..909ce575f 100644 --- a/src/main/resources/data/create/loot_tables/blocks/vertical_extractor.json +++ b/src/main/resources/data/create/loot_tables/blocks/saw.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:extractor" + "name": "create:saw" } ], "conditions": [ diff --git a/src/main/resources/data/create/loot_tables/blocks/speed_gauge.json b/src/main/resources/data/create/loot_tables/blocks/speed_gauge.json new file mode 100644 index 000000000..e517d29c4 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/speed_gauge.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:speed_gauge" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/stress_gauge.json b/src/main/resources/data/create/loot_tables/blocks/stress_gauge.json new file mode 100644 index 000000000..aa1ddccb1 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/stress_gauge.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:stress_gauge" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/translation_chassis_secondary.json b/src/main/resources/data/create/loot_tables/blocks/translation_chassis_secondary.json new file mode 100644 index 000000000..2c25fe45c --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/translation_chassis_secondary.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:translation_chassis_secondary" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/transposer.json b/src/main/resources/data/create/loot_tables/blocks/transposer.json new file mode 100644 index 000000000..846ecd381 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/transposer.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:transposer" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/zinc_ore.json b/src/main/resources/data/create/loot_tables/blocks/zinc_ore.json new file mode 100644 index 000000000..d0639bf0f --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/zinc_ore.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:zinc_ore" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file