diff --git a/build.gradle b/build.gradle index ef678b734e..8b36fdb653 100644 --- a/build.gradle +++ b/build.gradle @@ -352,11 +352,12 @@ publishMods { modLoaders.add("forge") modLoaders.add("neoforge") - curseforge { - accessToken = providers.environmentVariable("CURSEFORGE_TOKEN") - projectId = "328085" - minecraftVersions.add(minecraft_version) - } + // TODO - Uncomment post update 6 +// curseforge { +// accessToken = providers.environmentVariable("CURSEFORGE_TOKEN") +// projectId = "328085" +// minecraftVersions.add(minecraft_version) +// } modrinth { accessToken = providers.environmentVariable("MODRINTH_TOKEN") 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..13ce541b17 --- /dev/null +++ b/src/main/java/com/simibubi/create/AllBlockSpoutingBehaviours.java @@ -0,0 +1,49 @@ +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.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; + +import net.minecraftforge.registries.ForgeRegistries; + +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 (ForgeRegistries.BLOCK_ENTITY_TYPES.containsKey(id)) { + BlockEntityType table = ForgeRegistries.BLOCK_ENTITY_TYPES.getValue(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 bc286d0d13..215badde06 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -876,7 +876,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(); @@ -915,7 +915,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(); @@ -924,7 +924,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()) @@ -936,7 +936,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(); @@ -948,7 +948,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 c34e4ce306..0037fc9960 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -7,7 +7,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 f1d9ebe32f..588c82c9d9 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,31 +1,18 @@ 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.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.minecraftforge.fluids.FluidStack; -import net.minecraftforge.registries.ForgeRegistries; /** * 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 (ForgeRegistries.BLOCK_ENTITY_TYPES.containsKey(id)) { - BlockEntityType table = ForgeRegistries.BLOCK_ENTITY_TYPES.getValue(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 8e5c1df2f4..d3a8d748f7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/Contraption.java @@ -992,7 +992,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/bearing/BearingContraption.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingContraption.java index 40a3dd1d93..9ea3c3b0d0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingContraption.java @@ -49,7 +49,7 @@ public class BearingContraption extends Contraption { @Override public ContraptionType getType() { - return AllContraptionTypes.BEARING.get(); + return AllContraptionTypes.BEARING.value(); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkContraption.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkContraption.java index ff5572f501..0b1da18ec1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/ClockworkContraption.java @@ -26,7 +26,7 @@ public class ClockworkContraption extends Contraption { @Override public ContraptionType getType() { - return AllContraptionTypes.CLOCKWORK.get(); + return AllContraptionTypes.CLOCKWORK.value(); } private void ignoreBlocks(Set blocks, BlockPos anchor) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedContraption.java index 7ec9b44c7b..4a51822129 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedContraption.java @@ -38,7 +38,7 @@ public class StabilizedContraption extends Contraption { @Override public ContraptionType getType() { - return AllContraptionTypes.STABILIZED.get(); + return AllContraptionTypes.STABILIZED.value(); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java index 6ff637e28c..f997d3a118 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContraption.java @@ -174,7 +174,7 @@ public class ElevatorContraption extends PulleyContraption { @Override public ContraptionType getType() { - return AllContraptionTypes.ELEVATOR.get(); + return AllContraptionTypes.ELEVATOR.value(); } public void setClientYTarget(int clientYTarget) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraption.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraption.java index 3dc6adcbfe..825ae9e51b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraption.java @@ -50,7 +50,7 @@ public class GantryContraption extends TranslatingContraption { @Override public ContraptionType getType() { - return AllContraptionTypes.GANTRY.get(); + return AllContraptionTypes.GANTRY.value(); } public Direction getFacing() { diff --git a/src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java index 213cfa77a1..e602bb42e9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/mounted/MountedContraption.java @@ -49,7 +49,7 @@ public class MountedContraption extends Contraption { @Override public ContraptionType getType() { - return AllContraptionTypes.MOUNTED.get(); + return AllContraptionTypes.MOUNTED.value(); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java index 9f90f524a5..dd1f43a3e6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/piston/PistonContraption.java @@ -48,7 +48,7 @@ public class PistonContraption extends TranslatingContraption { @Override public ContraptionType getType() { - return AllContraptionTypes.PISTON.get(); + return AllContraptionTypes.PISTON.value(); } public PistonContraption() { diff --git a/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyContraption.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyContraption.java index 267c8b6d0c..f318cb7d09 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyContraption.java @@ -15,7 +15,7 @@ public class PulleyContraption extends TranslatingContraption { @Override public ContraptionType getType() { - return AllContraptionTypes.PULLEY.get(); + return AllContraptionTypes.PULLEY.value(); } public PulleyContraption() {} diff --git a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java index 934ceb33e9..10d87f2c1a 100644 --- a/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java +++ b/src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlock.java @@ -138,7 +138,7 @@ public class WhistleBlock extends Block implements IBE, IWre for (int i = 1; i <= 6; i++) { BlockState blockState = pLevel.getBlockState(currentPos); float pVolume = (soundtype.getVolume() + 1.0F) / 2.0F; - SoundEvent growSound = SoundEvents.NOTE_BLOCK_XYLOPHONE.get(); + SoundEvent growSound = SoundEvents.NOTE_BLOCK_XYLOPHONE.value(); SoundEvent hitSound = soundtype.getHitSound(); if (AllBlocks.STEAM_WHISTLE_EXTENSION.has(blockState)) { diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java index cb6045e082..4758b32532 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java @@ -24,12 +24,12 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.registries.ForgeRegistries; public class AllPotatoProjectileBlockHitActions { - + static { register("plant_crop", PlantCrop.CODEC); register("place_block_on_ground", PlaceBlockOnGround.CODEC); } - + public static void init() { } @@ -61,12 +61,12 @@ public class AllPotatoProjectileBlockHitActions { if (!level.getBlockState(placePos) .canBeReplaced()) return false; - if (!(cropBlock.get() instanceof IPlantable)) + if (!(cropBlock.value() instanceof IPlantable)) return false; BlockState blockState = level.getBlockState(hitPos); - if (!blockState.canSustainPlant(level, hitPos, face, (IPlantable) cropBlock.get())) + if (!blockState.canSustainPlant(level, hitPos, face, (IPlantable) cropBlock.value())) return false; - level.setBlock(placePos, cropBlock.get() + level.setBlock(placePos, cropBlock.value() .defaultBlockState(), 3); return true; } @@ -111,7 +111,7 @@ public class AllPotatoProjectileBlockHitActions { y = Math.max(y, placePos.getY()); FallingBlockEntity falling = FallingBlockEntityAccessor.create$callInit(level, placePos.getX() + 0.5, y, - placePos.getZ() + 0.5, block.get().defaultBlockState()); + placePos.getZ() + 0.5, block.value().defaultBlockState()); falling.time = 1; level.addFreshEntity(falling); } diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java index 312c717f39..4cd1817ddb 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java @@ -72,7 +72,7 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP return null; } - return new Ammo(ammoStack, optionalType.get().get()); + return new Ammo(ammoStack, optionalType.get().value()); } @Override diff --git a/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java b/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java index cc8f4f353b..9433c0aa61 100644 --- a/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java +++ b/src/main/java/com/simibubi/create/content/fluids/potion/PotionMixingRecipes.java @@ -21,6 +21,7 @@ import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.PotionBrewing; import net.minecraft.world.item.alchemy.Potions; import net.minecraft.world.item.crafting.Ingredient; + import net.minecraftforge.common.brewing.BrewingRecipe; import net.minecraftforge.common.brewing.BrewingRecipeRegistry; import net.minecraftforge.common.brewing.IBrewingRecipe; @@ -52,19 +53,19 @@ public class PotionMixingRecipes { for (Item container : allowedSupportedContainers) { BottleType bottleType = PotionFluidHandler.bottleTypeFromItem(container); for (PotionBrewing.Mix mix : PotionBrewing.POTION_MIXES) { - FluidStack fromFluid = PotionFluidHandler.getFluidFromPotion(mix.from.get(), bottleType, 1000); - FluidStack toFluid = PotionFluidHandler.getFluidFromPotion(mix.to.get(), bottleType, 1000); + FluidStack fromFluid = PotionFluidHandler.getFluidFromPotion(mix.from.value(), bottleType, 1000); + FluidStack toFluid = PotionFluidHandler.getFluidFromPotion(mix.to.value(), bottleType, 1000); mixingRecipes.add(createRecipe("potion_mixing_vanilla_" + recipeIndex++, mix.ingredient, fromFluid, toFluid)); } } for (PotionBrewing.Mix mix : PotionBrewing.CONTAINER_MIXES) { - Item from = mix.from.get(); + Item from = mix.from.value(); if (!allowedSupportedContainers.contains(from)) { continue; } - Item to = mix.to.get(); + Item to = mix.to.value(); if (!allowedSupportedContainers.contains(to)) { continue; } diff --git a/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java index 35f308e42a..d37a33f94b 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/clock/CuckooClockBlockEntity.java @@ -8,10 +8,10 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.damageTypes.CreateDamageSources; import net.createmod.catnip.animation.AnimationTickHolder; -import net.createmod.catnip.nbt.NBTHelper; -import net.createmod.catnip.math.VecHelper; import net.createmod.catnip.animation.LerpedFloat; import net.createmod.catnip.animation.LerpedFloat.Chaser; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; @@ -82,9 +82,9 @@ public class CuckooClockBlockEntity extends KineticBlockEntity { moveHands(hours, minutes); if (AnimationTickHolder.getTicks() % 6 == 0) - playSound(SoundEvents.NOTE_BLOCK_HAT.get(), 1 / 16f, 2f); + playSound(SoundEvents.NOTE_BLOCK_HAT.value(), 1 / 16f, 2f); else if (AnimationTickHolder.getTicks() % 3 == 0) - playSound(SoundEvents.NOTE_BLOCK_HAT.get(), 1 / 16f, 1.5f); + playSound(SoundEvents.NOTE_BLOCK_HAT.value(), 1 / 16f, 1.5f); } return; } @@ -117,9 +117,9 @@ public class CuckooClockBlockEntity extends KineticBlockEntity { if (animationType == Animation.NONE) { if (AnimationTickHolder.getTicks() % 32 == 0) - playSound(SoundEvents.NOTE_BLOCK_HAT.get(), 1 / 16f, 2f); + playSound(SoundEvents.NOTE_BLOCK_HAT.value(), 1 / 16f, 2f); else if (AnimationTickHolder.getTicks() % 16 == 0) - playSound(SoundEvents.NOTE_BLOCK_HAT.get(), 1 / 16f, 1.5f); + playSound(SoundEvents.NOTE_BLOCK_HAT.value(), 1 / 16f, 1.5f); } else { boolean isSurprise = animationType == Animation.SURPRISE; @@ -131,9 +131,9 @@ public class CuckooClockBlockEntity extends KineticBlockEntity { // sounds if (value == 1) - playSound(SoundEvents.NOTE_BLOCK_CHIME.get(), 2, .5f); + playSound(SoundEvents.NOTE_BLOCK_CHIME.value(), 2, .5f); if (value == 21) - playSound(SoundEvents.NOTE_BLOCK_CHIME.get(), 2, 0.793701f); + playSound(SoundEvents.NOTE_BLOCK_CHIME.value(), 2, 0.793701f); if (value > 30 && isSurprise) { Vec3 pos = VecHelper.offsetRandomly(VecHelper.getCenterOf(this.worldPosition), level.random, .5f); diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelScreen.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelScreen.java index eb39a2148c..0a8022dfa8 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelScreen.java @@ -46,6 +46,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeType; + import net.minecraftforge.common.crafting.IShapedRecipe; import net.minecraftforge.items.ItemHandlerHelper; @@ -128,7 +129,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen { if (ingredient.test(bigItemStack.stack)) craftingIngredient = new BigItemStack(bigItemStack.stack, 1); craftingIngredients.add(craftingIngredient); - + if (width < 3 && (i + 1) % width == 0) for (int j = 0; j < 3 - width; j++) craftingIngredients.add(emptyIngredient); @@ -136,7 +137,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen { while (craftingIngredients.size() < 9) craftingIngredients.add(emptyIngredient); - + return craftingIngredients; } @@ -191,7 +192,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen { }); newInputButton.setToolTip(CreateLang.translate("gui.factory_panel.connect_input") .component()); - + relocateButton = new IconButton(x + 31, y + 67, AllIcons.I_MOVE_GAUGE); relocateButton.withCallback(() -> { FactoryPanelConnectionHandler.startRelocating(behaviour); @@ -199,7 +200,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen { }); relocateButton.setToolTip(CreateLang.translate("gui.factory_panel.relocate") .component()); - + if (!restocker) { addRenderableWidget(newInputButton); addRenderableWidget(relocateButton); @@ -440,7 +441,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen { mouseX, mouseY); return; } - + if (itemStack.stack.isEmpty()) { graphics.renderComponentTooltip(font, List.of(CreateLang.translate("gui.factory_panel.empty_panel") .color(ScrollInput.HEADER_RGB) @@ -566,7 +567,7 @@ public class FactoryPanelScreen extends AbstractSimiScreen { playButtonSound(); return true; } - + // remove redstone connections itemX = x + 9; itemY = y + windowHeight - 24; @@ -583,14 +584,14 @@ public class FactoryPanelScreen extends AbstractSimiScreen { public void playButtonSound() { Minecraft.getInstance() .getSoundManager() - .play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK.get(), 1.0f, 0.25f)); + .play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK.value(), 1.0f, 0.25f)); } @Override public boolean mouseScrolled(double mouseX, double mouseY, double pDelta) { int x = guiLeft; int y = guiTop; - + if (addressBox.mouseScrolled(mouseX, mouseY, pDelta)) return true; diff --git a/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperCategoryScreen.java b/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperCategoryScreen.java index 2c5e351ff2..a54327388e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperCategoryScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/stockTicker/StockKeeperCategoryScreen.java @@ -119,7 +119,7 @@ public class StockKeeperCategoryScreen extends AbstractSimiContainerScreen= blockEntity.categories.size()) continue; - + if (!entry.hidden) { hiddenCategories.add(indexOf); - playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 0.75f, 1.5f); + playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 1f, 1.5f); } - + else { hiddenCategories.remove(indexOf); - playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 0.75f, 0.675f); + playUiSound(SoundEvents.ITEM_FRAME_ROTATE_ITEM, 1f, 0.675f); } - + refreshSearchNextTick = true; moveToTopNextTick = false; return true; @@ -1122,8 +1123,8 @@ 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 +1133,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen hoveredSlot = getHoveredSlot((int) mouseX, (int) mouseY); boolean noHover = hoveredSlot == noneHovered; @@ -1189,8 +1190,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; @@ -1199,8 +1200,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(boolean spawnPacket) { CompoundTag tag = super.writeNBT(spawnPacket); @@ -231,7 +236,7 @@ public class CarriageContraption extends Contraption { @Override public ContraptionType getType() { - return AllContraptionTypes.CARRIAGE.get(); + return AllContraptionTypes.CARRIAGE.value(); } public Direction getAssemblyDirection() { 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 a7f6a31be0..c14e9478aa 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 @@ -146,8 +146,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/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsBehaviour.java index 782df92539..a3efe92110 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/ValueSettingsBehaviour.java @@ -78,7 +78,7 @@ public interface ValueSettingsBehaviour extends ClipboardCloneable { origin.getWorld() .playSound(null, origin.getPos(), SoundEvents.ITEM_FRAME_ADD_ITEM, SoundSource.BLOCKS, 0.25f, 2f); origin.getWorld() - .playSound(null, origin.getPos(), SoundEvents.NOTE_BLOCK_IRON_XYLOPHONE.get(), SoundSource.BLOCKS, 0.03f, + .playSound(null, origin.getPos(), SoundEvents.NOTE_BLOCK_IRON_XYLOPHONE.value(), SoundSource.BLOCKS, 0.03f, 1.125f); } @@ -87,13 +87,13 @@ public interface ValueSettingsBehaviour extends ClipboardCloneable { default boolean bypassesInput(ItemStack mainhandItem) { return false; } - + default boolean mayInteract(Player player) { return true; } - + default int netId() { return 0; } - + } 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 20cb590207..65bd4b1b78 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 ] } } } \ No newline at end of file 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 f064a4c329..9fd753eeb7 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 8d0da2de90..2c00a3498c 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 c136af24de..250e715ad3 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 054c1efd06..6ca850cd02 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 ] } } } \ No newline at end of file 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 1c3ee0c7f8..64aef3bdb8 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 c38e371910..61bd304ae7 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] + } } } \ No newline at end of file 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 3d5defe3fa..1bad10a38f 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 41805ff3ff..6553d85071 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 28e9229be7..8b7cc218f2 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 + ] + } } } \ No newline at end of file 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 745d4acc48..089ea52b81 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 abcf12d893..68b762f297 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": [