diff --git a/src/main/java/com/simibubi/create/AllBlockSpoutingBehaviours.java b/src/main/java/com/simibubi/create/AllBlockSpoutingBehaviours.java new file mode 100644 index 0000000000..555ed9ad3a --- /dev/null +++ b/src/main/java/com/simibubi/create/AllBlockSpoutingBehaviours.java @@ -0,0 +1,50 @@ +package com.simibubi.create; + +import java.util.List; +import java.util.function.Predicate; + +import com.simibubi.create.api.behaviour.spouting.BlockSpoutingBehaviour; +import com.simibubi.create.api.behaviour.spouting.CauldronSpoutingBehavior; +import com.simibubi.create.api.behaviour.spouting.StateChangingBehavior; +import com.simibubi.create.compat.Mods; +import com.simibubi.create.compat.tconstruct.SpoutCasting; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.FarmBlock; +import net.minecraft.world.level.block.LayeredCauldronBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.level.material.Fluids; + + +public class AllBlockSpoutingBehaviours { + + static void registerDefaults() { + Predicate isWater = fluid -> fluid.isSame(Fluids.WATER); + BlockSpoutingBehaviour toMud = StateChangingBehavior.setTo(250, isWater, Blocks.MUD); + + for (Block dirt : List.of(Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.ROOTED_DIRT)) { + BlockSpoutingBehaviour.BY_BLOCK.register(dirt, toMud); + } + + BlockSpoutingBehaviour.BY_BLOCK.register(Blocks.FARMLAND, StateChangingBehavior.incrementingState(100, isWater, FarmBlock.MOISTURE)); + BlockSpoutingBehaviour.BY_BLOCK.register(Blocks.WATER_CAULDRON, StateChangingBehavior.incrementingState(250, isWater, LayeredCauldronBlock.LEVEL)); + BlockSpoutingBehaviour.BY_BLOCK.register(Blocks.CAULDRON, CauldronSpoutingBehavior.INSTANCE); + + if (!Mods.TCONSTRUCT.isLoaded()) + return; + + for (String name : List.of("table", "basin")) { + ResourceLocation id = Mods.TCONSTRUCT.rl(name); + if (BuiltInRegistries.BLOCK_ENTITY_TYPE.containsKey(id)) { + BlockEntityType table = BuiltInRegistries.BLOCK_ENTITY_TYPE.get(id); + BlockSpoutingBehaviour.BY_BLOCK_ENTITY.register(table, SpoutCasting.INSTANCE); + } else { + Create.LOGGER.warn("Block entity {} wasn't found. Outdated compat?", id); + } + } + } +} diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index ea50373c71..1495c648da 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -881,7 +881,7 @@ public class AllBlocks { .properties(p -> p.forceSolidOff()) .transform(pickaxeOnly()) .blockstate(BlockStateGen.pipe()) - .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO)) + .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO)) .item() .transform(customItemModel()) .register(); @@ -920,7 +920,7 @@ public class AllBlocks { .build(); }, BlockStateProperties.WATERLOGGED); }) - .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO)) + .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO)) .loot((p, b) -> p.dropOther(b, FLUID_PIPE.get())) .register(); @@ -929,7 +929,7 @@ public class AllBlocks { .properties(p -> p.mapColor(MapColor.STONE)) .transform(pickaxeOnly()) .blockstate(BlockStateGen.directionalBlockProviderIgnoresWaterlogged(true)) - .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO)) + .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO)) .transform(CStress.setImpact(4.0)) .item() .transform(customItemModel()) @@ -941,7 +941,7 @@ public class AllBlocks { .properties(p -> p.mapColor(MapColor.TERRACOTTA_YELLOW)) .transform(pickaxeOnly()) .blockstate(new SmartFluidPipeGenerator()::generate) - .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO)) + .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO)) .item() .transform(customItemModel()) .register(); @@ -953,7 +953,7 @@ public class AllBlocks { .blockstate((c, p) -> BlockStateGen.directionalAxisBlock(c, p, (state, vertical) -> AssetLookup.partialBaseModel(c, p, vertical ? "vertical" : "horizontal", state.getValue(FluidValveBlock.ENABLED) ? "open" : "closed"))) - .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withoutAO)) + .onRegister(CreateRegistrate.blockModel(() -> PipeAttachmentModel::withAO)) .item() .transform(customItemModel()) .register(); diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index 4972f3c94c..95f9f211e7 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -9,7 +9,6 @@ import org.slf4j.Logger; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.mojang.logging.LogUtils; -import com.simibubi.create.api.behaviour.spouting.BlockSpoutingBehaviour; import com.simibubi.create.compat.Mods; import com.simibubi.create.compat.computercraft.ComputerCraftProxy; import com.simibubi.create.compat.curios.Curios; @@ -169,7 +168,7 @@ public class Create { // These registrations use Create's registered objects directly so they must run after registration has finished. BoilerHeaters.registerDefaults(); AllPortalTracks.registerDefaults(); - BlockSpoutingBehaviour.registerDefaults(); + AllBlockSpoutingBehaviours.registerDefaults(); AllMovementBehaviours.registerDefaults(); AllInteractionBehaviours.registerDefaults(); AllContraptionMovementSettings.registerDefaults(); diff --git a/src/main/java/com/simibubi/create/api/behaviour/spouting/BlockSpoutingBehaviour.java b/src/main/java/com/simibubi/create/api/behaviour/spouting/BlockSpoutingBehaviour.java index ed86eec0f2..c3c7123d2f 100644 --- a/src/main/java/com/simibubi/create/api/behaviour/spouting/BlockSpoutingBehaviour.java +++ b/src/main/java/com/simibubi/create/api/behaviour/spouting/BlockSpoutingBehaviour.java @@ -1,32 +1,19 @@ package com.simibubi.create.api.behaviour.spouting; -import java.util.List; -import java.util.function.Predicate; - import org.jetbrains.annotations.Nullable; -import com.simibubi.create.Create; import com.simibubi.create.api.registry.SimpleRegistry; -import com.simibubi.create.compat.Mods; -import com.simibubi.create.compat.tconstruct.SpoutCasting; import com.simibubi.create.content.fluids.spout.SpoutBlockEntity; import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.FarmBlock; -import net.minecraft.world.level.block.LayeredCauldronBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.Fluids; - import net.neoforged.neoforge.fluids.FluidStack; + /** * Interface for custom block-filling behavior for spouts. *

@@ -58,32 +45,6 @@ public interface BlockSpoutingBehaviour { return BY_BLOCK_ENTITY.get(be.getType()); } - static void registerDefaults() { - Predicate isWater = fluid -> fluid.isSame(Fluids.WATER); - BlockSpoutingBehaviour toMud = StateChangingBehavior.setTo(250, isWater, Blocks.MUD); - - for (Block dirt : List.of(Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.ROOTED_DIRT)) { - BY_BLOCK.register(dirt, toMud); - } - - BY_BLOCK.register(Blocks.FARMLAND, StateChangingBehavior.incrementingState(100, isWater, FarmBlock.MOISTURE)); - BY_BLOCK.register(Blocks.WATER_CAULDRON, StateChangingBehavior.incrementingState(250, isWater, LayeredCauldronBlock.LEVEL)); - BY_BLOCK.register(Blocks.CAULDRON, CauldronSpoutingBehavior.INSTANCE); - - if (!Mods.TCONSTRUCT.isLoaded()) - return; - - for (String name : List.of("table", "basin")) { - ResourceLocation id = Mods.TCONSTRUCT.rl(name); - if (BuiltInRegistries.BLOCK_ENTITY_TYPE.containsKey(id)) { - BlockEntityType table = BuiltInRegistries.BLOCK_ENTITY_TYPE.get(id); - BY_BLOCK_ENTITY.register(table, SpoutCasting.INSTANCE); - } else { - Create.LOGGER.warn("Block entity {} wasn't found. Outdated compat?", id); - } - } - } - /** * While idle, spouts will query the behavior provided by the block below it. * If one is present, this method will be called every tick with simulate == true. diff --git a/src/main/java/com/simibubi/create/content/contraptions/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/Contraption.java index d54048e2db..6bd983bb36 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/Contraption.java @@ -1008,7 +1008,7 @@ public abstract class Contraption { } @Nullable - private static BlockEntity readBlockEntity(Level level, StructureBlockInfo info, CompoundTag tag) { + protected BlockEntity readBlockEntity(Level level, StructureBlockInfo info, CompoundTag tag) { BlockState state = info.state(); BlockPos pos = info.pos(); CompoundTag nbt = info.nbt(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfo.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfo.java index fd4987bd5d..07760d6390 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfo.java +++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderInfo.java @@ -1,7 +1,6 @@ package com.simibubi.create.content.contraptions.render; import org.apache.commons.lang3.tuple.Pair; -import org.jetbrains.annotations.Nullable; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.content.contraptions.Contraption; @@ -23,11 +22,10 @@ import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.RenderShape; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; + import net.neoforged.neoforge.client.model.data.ModelData; -import net.neoforged.neoforge.client.model.data.ModelDataManager; public class ContraptionRenderInfo { public static final SuperByteBufferCache.Compartment> CONTRAPTION = new SuperByteBufferCache.Compartment<>(); @@ -89,25 +87,15 @@ public class ContraptionRenderInfo { int minBuildHeight = contraptionWorld.getMinBuildHeight(); int height = contraptionWorld.getHeight(); VirtualRenderWorld renderWorld = new VirtualRenderWorld(level, minBuildHeight, height, origin) { - @Override public boolean supportsVisualization() { return VisualizationManager.supportsVisualization(level); } - + @Override public ModelData getModelData(BlockPos pos) { - BlockEntity blockEntity = getBlockEntity(pos); - if (blockEntity == null) - return super.getModelData(pos); - return blockEntity.getModelData(); + return c.modelData.getOrDefault(pos, ModelData.EMPTY); } - - @Override - public @Nullable ModelDataManager getModelDataManager() { - return null; - } - }; renderWorld.setBlockEntities(c.presentBlockEntities.values()); @@ -136,8 +124,7 @@ public class ContraptionRenderInfo { BlockState state = blocks.lookup().apply(pos); if (state.getRenderShape() == RenderShape.MODEL) { BakedModel model = dispatcher.getBlockModel(state); - ModelData modelData = contraption.modelData.getOrDefault(pos, ModelData.EMPTY); - modelData = model.getModelData(renderWorld, pos, state, modelData); + ModelData modelData = model.getModelData(renderWorld, pos, state, renderWorld.getModelData(pos)); long randomSeed = state.getSeed(pos); random.setSeed(randomSeed); if (model.getRenderTypes(state, random, modelData).contains(layer)) { diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonPacket.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonPacket.java index e1bfb63a41..20e460d0cd 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonPacket.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonPacket.java @@ -19,7 +19,7 @@ public class PotatoCannonPacket extends ShootGadgetPacket { public static final StreamCodec STREAM_CODEC = StreamCodec.composite( CatnipStreamCodecs.VEC3, packet -> packet.location, CatnipStreamCodecs.VEC3, packet -> packet.motion, - ItemStack.STREAM_CODEC, packet -> packet.item, + ItemStack.OPTIONAL_STREAM_CODEC, packet -> packet.item, CatnipStreamCodecs.HAND, packet -> packet.hand, ByteBufCodecs.FLOAT, packet -> packet.pitch, ByteBufCodecs.BOOL, packet -> packet.self, diff --git a/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperRequestScreen.java b/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperRequestScreen.java index 60ea70defe..dfc6886f30 100644 --- a/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperRequestScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperRequestScreen.java @@ -1080,12 +1080,12 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen= cols || rmb) return true; itemsToOrder.add(existingOrder = new BigItemStack(itemStack.copyWithCount(1), 0)); - playUiSound(SoundEvents.WOOL_STEP, 0.5f, 1.2f); - playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.5f, 0.8f); + playUiSound(SoundEvents.WOOL_STEP, 0.75f, 1.2f); + playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.75f, 0.8f); } int current = existingOrder.count; @@ -1132,8 +1132,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen= cols || remove) return true; itemsToOrder.add(existingOrder = new BigItemStack(entry.stack.copyWithCount(1), 0)); - playUiSound(SoundEvents.WOOL_STEP, 0.5f, 1.2f); - playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.5f, 0.8f); + playUiSound(SoundEvents.WOOL_STEP, 0.75f, 1.2f); + playUiSound(SoundEvents.BAMBOO_WOOD_STEP, 0.75f, 0.8f); } int current = existingOrder.count; @@ -1198,8 +1198,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen bogey) { - boolean captureBE = bogey.captureBlockEntityForTrain(); + if (blockState.getBlock() instanceof AbstractBogeyBlock) { bogeys++; if (bogeys == 2) secondBogeyPos = pos; - return Pair.of(new StructureBlockInfo(pos, blockState, captureBE ? getBlockEntityNBT(world, pos) : null), - captureBE ? world.getBlockEntity(pos) : null); } MovingInteractionBehaviour behaviour = MovingInteractionBehaviour.REGISTRY.get(blockState); @@ -187,6 +184,14 @@ public class CarriageContraption extends Contraption { return super.capture(world, pos); } + + @Override + protected BlockEntity readBlockEntity(Level level, StructureBlockInfo info, CompoundTag tag) { + if (info.state().getBlock() instanceof AbstractBogeyBlock bogey && !bogey.captureBlockEntityForTrain()) + return null; // Bogeys are typically rendered by the carriage contraption, not the BE + + return super.readBlockEntity(level, info, tag); + } @Override public CompoundTag writeNBT(HolderLookup.Provider registries, boolean spawnPacket) { diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java index b85e65b2ab..18a298b5fe 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBox.java @@ -147,8 +147,7 @@ public class ValueBox extends ChasingAABBOutline { ItemRenderer itemRenderer = Minecraft.getInstance() .getItemRenderer(); BakedModel modelWithOverrides = itemRenderer.getModel(stack, null, null, 0); - boolean blockItem = modelWithOverrides.isGui3d() && modelWithOverrides.getRenderPasses(stack, false) - .size() <= 1; + boolean blockItem = modelWithOverrides.isGui3d(); float scale = 1.5f; ms.translate(-font.width(count), 0, 0); diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java index 2a20d8fdb5..33d65c4c5b 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueBoxRenderer.java @@ -28,8 +28,7 @@ public class ValueBoxRenderer { Minecraft mc = Minecraft.getInstance(); ItemRenderer itemRenderer = mc.getItemRenderer(); BakedModel modelWithOverrides = itemRenderer.getModel(filter, null, null, 0); - boolean blockItem = - modelWithOverrides.isGui3d() && modelWithOverrides.getRenderPasses(filter, false).size() <= 1; + boolean blockItem = modelWithOverrides.isGui3d(); float scale = (!blockItem ? .5f : 1f) + 1 / 64f; float zOffset = (!blockItem ? -.15f : 0) + customZOffset(filter.getItem()); ms.scale(scale, scale, scale); diff --git a/src/main/resources/assets/create/models/block/chain_conveyor/item.json b/src/main/resources/assets/create/models/block/chain_conveyor/item.json index 448b6aa5ba..6853fde911 100644 --- a/src/main/resources/assets/create/models/block/chain_conveyor/item.json +++ b/src/main/resources/assets/create/models/block/chain_conveyor/item.json @@ -10,9 +10,9 @@ "scale":[ 0.4, 0.4, 0.4 ] }, "fixed": { - "rotation": [ 90, 0, 0 ], + "rotation": [ 270, 180, 0 ], "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] + "scale":[ 0.375, 0.375, 0.375 ] } } } diff --git a/src/main/resources/assets/create/models/block/clutch/item.json b/src/main/resources/assets/create/models/block/clutch/item.json index f548e51c12..3a7e0053dd 100644 --- a/src/main/resources/assets/create/models/block/clutch/item.json +++ b/src/main/resources/assets/create/models/block/clutch/item.json @@ -61,6 +61,12 @@ } } ], + "display": { + "fixed": { + "rotation": [0, 90, 0], + "scale": [0.5, 0.5, 0.5] + } + }, "groups": [ 0, 1, diff --git a/src/main/resources/assets/create/models/block/diodes/latch_off.json b/src/main/resources/assets/create/models/block/diodes/latch_off.json index 0349ede2ff..a3bf709250 100644 --- a/src/main/resources/assets/create/models/block/diodes/latch_off.json +++ b/src/main/resources/assets/create/models/block/diodes/latch_off.json @@ -99,7 +99,7 @@ }, "fixed": { "rotation": [ 270, 0, 0 ], - "translation": [ 0, 0, -3], + "translation": [ 0, 0, -5], "scale":[ 0.5, 0.5, 0.5 ] } } diff --git a/src/main/resources/assets/create/models/block/diodes/latch_on.json b/src/main/resources/assets/create/models/block/diodes/latch_on.json index 053f08539f..d5bee97c2e 100644 --- a/src/main/resources/assets/create/models/block/diodes/latch_on.json +++ b/src/main/resources/assets/create/models/block/diodes/latch_on.json @@ -101,7 +101,7 @@ }, "fixed": { "rotation": [ 270, 0, 0 ], - "translation": [ 0, 0, -3], + "translation": [ 0, 0, -5], "scale":[ 0.5, 0.5, 0.5 ] } } diff --git a/src/main/resources/assets/create/models/block/diodes/pulse_extender.json b/src/main/resources/assets/create/models/block/diodes/pulse_extender.json index 13e98e74f4..caad10b943 100644 --- a/src/main/resources/assets/create/models/block/diodes/pulse_extender.json +++ b/src/main/resources/assets/create/models/block/diodes/pulse_extender.json @@ -94,7 +94,7 @@ }, "fixed": { "rotation": [270, 0, 0], - "translation": [0, 0, -3], + "translation": [0, 0, -5], "scale": [0.5, 0.5, 0.5] } } diff --git a/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json b/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json index 86710126f1..9652f86e85 100644 --- a/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json +++ b/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json @@ -68,7 +68,7 @@ }, "fixed": { "rotation": [270, 0, 0], - "translation": [0, 0, -3], + "translation": [0, 0, -5], "scale": [0.5, 0.5, 0.5] } } diff --git a/src/main/resources/assets/create/models/block/diodes/pulse_timer.json b/src/main/resources/assets/create/models/block/diodes/pulse_timer.json index afc6082c94..4b80fdec6c 100644 --- a/src/main/resources/assets/create/models/block/diodes/pulse_timer.json +++ b/src/main/resources/assets/create/models/block/diodes/pulse_timer.json @@ -68,7 +68,7 @@ }, "fixed": { "rotation": [270, 0, 0], - "translation": [0, 0, -3], + "translation": [0, 0, -5], "scale": [0.5, 0.5, 0.5] } } diff --git a/src/main/resources/assets/create/models/block/display_link/block.json b/src/main/resources/assets/create/models/block/display_link/block.json index 41a5a48823..ad2fb9699e 100644 --- a/src/main/resources/assets/create/models/block/display_link/block.json +++ b/src/main/resources/assets/create/models/block/display_link/block.json @@ -136,6 +136,8 @@ "scale": [0.625, 0.625, 0.625] }, "fixed": { + "rotation": [270, 0, 0], + "translation": [0, 0, -4], "scale": [0.5, 0.5, 0.5] } } diff --git a/src/main/resources/assets/create/models/block/elevator_pulley/item.json b/src/main/resources/assets/create/models/block/elevator_pulley/item.json index f5c2abfac4..2db279e953 100644 --- a/src/main/resources/assets/create/models/block/elevator_pulley/item.json +++ b/src/main/resources/assets/create/models/block/elevator_pulley/item.json @@ -214,6 +214,12 @@ } } ], + "display": { + "fixed": { + "rotation": [0, 90, 0], + "scale": [0.5, 0.5, 0.5] + } + }, "groups": [ { "name": "Frame", diff --git a/src/main/resources/assets/create/models/block/encased_chain_drive/item.json b/src/main/resources/assets/create/models/block/encased_chain_drive/item.json index b4bb407438..f5b5f81a69 100644 --- a/src/main/resources/assets/create/models/block/encased_chain_drive/item.json +++ b/src/main/resources/assets/create/models/block/encased_chain_drive/item.json @@ -80,6 +80,12 @@ } } ], + "display": { + "fixed": { + "rotation": [0, 90, 0], + "scale": [0.5, 0.5, 0.5] + } + }, "groups": [ 0, 1, diff --git a/src/main/resources/assets/create/models/block/factory_gauge/item.json b/src/main/resources/assets/create/models/block/factory_gauge/item.json index 6dd16b6606..f1dbe3ac44 100644 --- a/src/main/resources/assets/create/models/block/factory_gauge/item.json +++ b/src/main/resources/assets/create/models/block/factory_gauge/item.json @@ -112,7 +112,9 @@ "translation": [0, 14.25, 0] }, "fixed": { - "scale": [0.5, 0.5, 0.5] + "rotation": [-90, 0, 0], + "translation": [0, 0, -6.5], + "scale": [0.75, 0.75, 0.75] } }, "groups": [ diff --git a/src/main/resources/assets/create/models/block/fluid_valve/item.json b/src/main/resources/assets/create/models/block/fluid_valve/item.json index 622e7600dd..6847b74ed5 100644 --- a/src/main/resources/assets/create/models/block/fluid_valve/item.json +++ b/src/main/resources/assets/create/models/block/fluid_valve/item.json @@ -128,6 +128,7 @@ "scale": [0.625, 0.625, 0.625] }, "fixed": { + "rotation": [90, 0, 0], "scale": [0.5, 0.5, 0.5] } }, diff --git a/src/main/resources/assets/create/models/block/flywheel/item.json b/src/main/resources/assets/create/models/block/flywheel/item.json index 95cd9a1e3b..3555c38994 100644 --- a/src/main/resources/assets/create/models/block/flywheel/item.json +++ b/src/main/resources/assets/create/models/block/flywheel/item.json @@ -11,8 +11,8 @@ }, "fixed": { "rotation": [ 90, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.4, 0.4, 0.4 ] + "translation": [ 0, 0, -1], + "scale":[ 0.375, 0.375, 0.375 ] } } } diff --git a/src/main/resources/assets/create/models/block/gearshift/item.json b/src/main/resources/assets/create/models/block/gearshift/item.json index 74da5fe42e..c0eb9698a2 100644 --- a/src/main/resources/assets/create/models/block/gearshift/item.json +++ b/src/main/resources/assets/create/models/block/gearshift/item.json @@ -80,6 +80,12 @@ } } ], + "display": { + "fixed": { + "rotation": [0, 90, 0], + "scale": [0.5, 0.5, 0.5] + } + }, "groups": [ 0, 1, diff --git a/src/main/resources/assets/create/models/block/haunted_bell.json b/src/main/resources/assets/create/models/block/haunted_bell.json index 7acde1c600..0268802b67 100644 --- a/src/main/resources/assets/create/models/block/haunted_bell.json +++ b/src/main/resources/assets/create/models/block/haunted_bell.json @@ -92,5 +92,12 @@ "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] } - ] + ], + "display": { + "fixed": { + "rotation": [0, 0, 0], + "translation": [0, 0, -1], + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_arm/item.json b/src/main/resources/assets/create/models/block/mechanical_arm/item.json index f2f84a75a8..4bbbecd5ba 100644 --- a/src/main/resources/assets/create/models/block/mechanical_arm/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_arm/item.json @@ -264,7 +264,7 @@ }, "fixed": { "rotation": [0, 90, 0], - "translation": [0, 2.25, -0.75], + "translation": [0, 4.25, -0.75], "scale": [0.45, 0.45, 0.45] } }, diff --git a/src/main/resources/assets/create/models/block/nixie_tube/block.json b/src/main/resources/assets/create/models/block/nixie_tube/block.json index d7a82dd56e..4ee27630a3 100644 --- a/src/main/resources/assets/create/models/block/nixie_tube/block.json +++ b/src/main/resources/assets/create/models/block/nixie_tube/block.json @@ -77,5 +77,11 @@ } ] } + }, + "display": { + "fixed": { + "rotation": [0, 90, 0], + "scale": [0.5, 0.5, 0.5] + } } } diff --git a/src/main/resources/assets/create/models/block/peculiar_bell.json b/src/main/resources/assets/create/models/block/peculiar_bell.json index 1c828adf22..7d4266aada 100644 --- a/src/main/resources/assets/create/models/block/peculiar_bell.json +++ b/src/main/resources/assets/create/models/block/peculiar_bell.json @@ -90,5 +90,12 @@ "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] } - ] + ], + "display": { + "fixed": { + "rotation": [0, 0, 0], + "translation": [0, 0, -1], + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/portable_fluid_interface/item.json b/src/main/resources/assets/create/models/block/portable_fluid_interface/item.json index 7520a46564..ada436fa4c 100644 --- a/src/main/resources/assets/create/models/block/portable_fluid_interface/item.json +++ b/src/main/resources/assets/create/models/block/portable_fluid_interface/item.json @@ -102,7 +102,7 @@ "translation": [0, 22.25, 0] }, "fixed": { - "translation": [0, -1.25, 0], + "translation": [0, 0, 0], "scale": [0.5, 0.5, 0.5] } }, diff --git a/src/main/resources/assets/create/models/block/portable_storage_interface/item.json b/src/main/resources/assets/create/models/block/portable_storage_interface/item.json index 03e12c87ce..2263fc3f47 100644 --- a/src/main/resources/assets/create/models/block/portable_storage_interface/item.json +++ b/src/main/resources/assets/create/models/block/portable_storage_interface/item.json @@ -210,7 +210,7 @@ "translation": [0, 22.25, 0] }, "fixed": { - "translation": [0, -1.25, 0], + "translation": [0, 0, 0], "scale": [0.5, 0.5, 0.5] } }, diff --git a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json index ef6d72fb41..25978d0a9e 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json +++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json @@ -99,6 +99,8 @@ "scale": [0.625, 0.625, 0.625] }, "fixed": { + "rotation": [270, 90, 0], + "translation": [0, 0, -4], "scale": [0.5, 0.5, 0.5] } } diff --git a/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json b/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json index c6aecc103f..33ff0185f8 100644 --- a/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json +++ b/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json @@ -80,6 +80,12 @@ } } ], + "display": { + "fixed": { + "rotation": [0, 90, 0], + "scale": [0.5, 0.5, 0.5] + } + }, "groups": [ { "name": "encased_shaft", diff --git a/src/main/resources/assets/create/models/block/smart_fluid_pipe/item.json b/src/main/resources/assets/create/models/block/smart_fluid_pipe/item.json index 1b18e17fd1..aa9dd1fa66 100644 --- a/src/main/resources/assets/create/models/block/smart_fluid_pipe/item.json +++ b/src/main/resources/assets/create/models/block/smart_fluid_pipe/item.json @@ -112,6 +112,7 @@ "scale": [0.625, 0.625, 0.625] }, "fixed": { + "rotation": [0, 90, 0], "scale": [0.5, 0.5, 0.5] } } diff --git a/src/main/resources/assets/create/models/block/stock_link/block_vertical.json b/src/main/resources/assets/create/models/block/stock_link/block_vertical.json index e3410ea711..e529b84148 100644 --- a/src/main/resources/assets/create/models/block/stock_link/block_vertical.json +++ b/src/main/resources/assets/create/models/block/stock_link/block_vertical.json @@ -148,6 +148,8 @@ "scale": [0.625, 0.625, 0.625] }, "fixed": { + "rotation": [270, 0, 0], + "translation": [0, 0, -4], "scale": [0.5, 0.5, 0.5] } } diff --git a/src/main/resources/assets/create/models/block/table_cloth/item.json b/src/main/resources/assets/create/models/block/table_cloth/item.json index 1b5822d47b..2b304589ac 100644 --- a/src/main/resources/assets/create/models/block/table_cloth/item.json +++ b/src/main/resources/assets/create/models/block/table_cloth/item.json @@ -202,7 +202,8 @@ "scale": [0.625, 0.625, 0.625] }, "fixed": { - "translation": [0, 5.75, 0], + "rotation": [270, 0, 0], + "translation": [0, 0, -6], "scale": [0.5, 0.5, 0.5] } }, diff --git a/src/main/resources/assets/create/models/block/threshold_switch/block_wall.json b/src/main/resources/assets/create/models/block/threshold_switch/block_wall.json index 60981d9a6f..31cbb8007b 100644 --- a/src/main/resources/assets/create/models/block/threshold_switch/block_wall.json +++ b/src/main/resources/assets/create/models/block/threshold_switch/block_wall.json @@ -37,6 +37,10 @@ "gui": { "rotation": [30, -135, 0], "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "rotation": [0, 90, 0], + "scale": [0.5, 0.5, 0.5] } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/valve_handle.json b/src/main/resources/assets/create/models/block/valve_handle.json index 7e011428de..aa7c706d55 100644 --- a/src/main/resources/assets/create/models/block/valve_handle.json +++ b/src/main/resources/assets/create/models/block/valve_handle.json @@ -6,5 +6,24 @@ "textures": { "3": "create:block/valve_handle/valve_handle_copper", "particle": "#3" + }, + "display": { + "fixed": { + "rotation": [ + 270, + 0, + 0 + ], + "translation": [ + 0, + 0, + -2 + ], + "scale": [ + 0.5, + 0.5, + 0.5 + ] + } } } diff --git a/src/main/resources/assets/create/models/item/wand_of_symmetry/item.json b/src/main/resources/assets/create/models/item/wand_of_symmetry/item.json index fc85f85084..09d30c17f7 100644 --- a/src/main/resources/assets/create/models/item/wand_of_symmetry/item.json +++ b/src/main/resources/assets/create/models/item/wand_of_symmetry/item.json @@ -122,7 +122,8 @@ }, "fixed": { "rotation": [0, 90, 0], - "translation": [0, -5, 0] + "translation": [0, -2.5, -0.75], + "scale": [0.5, 0.5, 0.5] } } } diff --git a/src/main/resources/assets/create/models/item/wrench/item.json b/src/main/resources/assets/create/models/item/wrench/item.json index 61e6730740..ce20f0ccfc 100644 --- a/src/main/resources/assets/create/models/item/wrench/item.json +++ b/src/main/resources/assets/create/models/item/wrench/item.json @@ -134,8 +134,8 @@ "scale": [1.09453, 1.09453, 1.09453] }, "fixed": { - "rotation": [0, 160.5, 0], - "translation": [0.5, 0.5, 0] + "rotation": [0, 180, 0], + "translation": [0.5, 0.5, -0.75] } }, "groups": [