From 5935afa6373672815229c930c345c49c62168b0a Mon Sep 17 00:00:00 2001 From: SeppeOngena <48645469+SeppeOngena@users.noreply.github.com> Date: Wed, 20 May 2026 18:52:38 +0200 Subject: [PATCH 1/5] Add config options for liquid blaze burner Add max heat capacity and max liquid capacity settings to the config file. --- .../LiquidBlazeBurnerBlockEntity.java | 5 +++-- .../com/mrh0/createaddition/config/CommonConfig.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java index f358e35f..9cb6bfb6 100644 --- a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java +++ b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java @@ -4,6 +4,7 @@ import java.util.Optional; import com.mrh0.createaddition.CreateAddition; +import com.mrh0.createaddition.config.CommonConfig; import com.mrh0.createaddition.index.CABlockEntities; import com.mrh0.createaddition.index.CALang; import com.mrh0.createaddition.index.CARecipes; @@ -59,7 +60,7 @@ import static com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HEAT_LEVEL; public class LiquidBlazeBurnerBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, IObserveBlockEntity { - public static final int MAX_HEAT_CAPACITY = 10000; + public static int MAX_HEAT_CAPACITY = CommonConfig.LIQUID_BLAZE_BURNER_MAX_HEAT_CAPACITY.get(); protected FuelType activeFuel; protected int remainingBurnTime; @@ -111,7 +112,7 @@ public static void registerCapability(RegisterCapabilitiesEvent event) { } protected SmartFluidTank createInventory() { - return new SmartFluidTank(4000, this::onFluidStackChanged); + return new SmartFluidTank(CommonConfig.LIQUID_BLAZE_BURNER_MAX_LIQUID_CAPACITY.get(), this::onFluidStackChanged); } protected void onFluidStackChanged(FluidStack newFluidStack) { diff --git a/src/main/java/com/mrh0/createaddition/config/CommonConfig.java b/src/main/java/com/mrh0/createaddition/config/CommonConfig.java index d05e0617..0974b4a2 100644 --- a/src/main/java/com/mrh0/createaddition/config/CommonConfig.java +++ b/src/main/java/com/mrh0/createaddition/config/CommonConfig.java @@ -23,6 +23,7 @@ public class CommonConfig { public static final String CATAGORY_ACCUMULATOR = "accumulator"; public static final String CATAGORY_PEI = "portable_energy_interface"; public static final String CATAGORY_TESLA_COIL = "tesla_coil"; + public static final String CATEGORY_LIQUID_BLAZE_BURNER = "liquid_blaze_burner"; public static final String CATAGORY_MISC = "misc"; public static final String CATAGORY_COMPATIBILITY = "compatibility"; @@ -82,6 +83,9 @@ public class CommonConfig { public static ModConfigSpec.IntValue TESLA_COIL_HURT_EFFECT_TIME_PLAYER; public static ModConfigSpec.IntValue TESLA_COIL_HURT_FIRE_COOLDOWN; + public static ModConfigSpec.IntValue LIQUID_BLAZE_BURNER_MAX_LIQUID_CAPACITY; + public static ModConfigSpec.IntValue LIQUID_BLAZE_BURNER_MAX_HEAT_CAPACITY; + public static ModConfigSpec.IntValue DIAMOND_GRIT_SANDPAPER_USES; public static ModConfigSpec.DoubleValue BARBED_WIRE_DAMAGE; @@ -235,6 +239,14 @@ public class CommonConfig { .defineInRange("tesla_coil_fire_cooldown", 20, 0, Integer.MAX_VALUE); COMMON_BUILDER.pop(); + COMMON_BUILDER.comment("Liquid Blaze Burner").push(CATEGORY_LIQUID_BLAZE_BURNER); + LIQUID_BLAZE_BURNER_MAX_LIQUID_CAPACITY = COMMON_BUILDER.comment("Liquid Blaze Burner internal liquid storage capacity (in mB). A value less than 1000 prevents players from refilling with a bucket.") + .defineInRange("liquid_blaze_burner_max_liquid_capacity",4000,100,Integer.MAX_VALUE); + + LIQUID_BLAZE_BURNER_MAX_HEAT_CAPACITY = COMMON_BUILDER.comment("Liquid Blaze Burner internal heat capacity (in ticks).") + .defineInRange("liquid_blaze_burner_max_heat_capacity",10000,0,Integer.MAX_VALUE); + COMMON_BUILDER.pop(); + COMMON_BUILDER.comment("Misc").push(CATAGORY_MISC); DIAMOND_GRIT_SANDPAPER_USES = COMMON_BUILDER.comment("Diamond Grit Sandpaper durability (number of uses).") From bcea84ead8d57c549e45ed3cd9c5b4a68a2f1be7 Mon Sep 17 00:00:00 2001 From: SeppeOngena <48645469+SeppeOngena@users.noreply.github.com> Date: Wed, 20 May 2026 21:31:05 +0200 Subject: [PATCH 2/5] Fix biofuel and blaze cake burn times --- .../data/createaddition/recipe/liquid_burning/biofuel.json | 4 ++-- .../liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/generated/resources/data/createaddition/recipe/liquid_burning/biofuel.json b/src/generated/resources/data/createaddition/recipe/liquid_burning/biofuel.json index fed76a68..ccf7033b 100644 --- a/src/generated/resources/data/createaddition/recipe/liquid_burning/biofuel.json +++ b/src/generated/resources/data/createaddition/recipe/liquid_burning/biofuel.json @@ -1,6 +1,6 @@ { "type": "createaddition:liquid_burning", - "burn_time": 2400, + "burn_time": 24000, "ingredients": [ { "type": "neoforge:tag", @@ -10,4 +10,4 @@ ], "results": [], "superheated": true -} \ No newline at end of file +} diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java index 9cb6bfb6..d035fb83 100644 --- a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java +++ b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java @@ -326,7 +326,7 @@ protected boolean tryUpdateFuel(ItemStack itemStack, boolean forceOverflow, bool if(tryUpdateLiquid(itemStack, simulate)) return true; if (AllItemTags.BLAZE_BURNER_FUEL_SPECIAL.matches(itemStack)) { - newBurnTime = 1000; + newBurnTime = 3200; newFuel = FuelType.SPECIAL; } else { newBurnTime = itemStack.getBurnTime(null); From ed65d783c293873141745bc0866ca86d87012f46 Mon Sep 17 00:00:00 2001 From: SeppeOngena <48645469+SeppeOngena@users.noreply.github.com> Date: Thu, 21 May 2026 20:24:46 +0200 Subject: [PATCH 3/5] Added value sliders for liquid blaze burners - Added new liquid capacity and heat capacity interactable value sliders, capped by the config value - Changed heat capacity range in the config file to 0t - 60 minutes and liquid capacity to 100 mB - 10B compared to previous commit which was uncapped on the higher end - Changed brazier block model and texture to support the rendered value slots (from create's ValueBoxTransform.Dual). --- .../LiquidBlazeBurnerBlock.java | 2 +- .../LiquidBlazeBurnerBlockEntity.java | 71 ++- .../LiquidBlazeScrollSlot.java | 34 ++ .../LiquidBlazeScrollValueBehaviourHeat.java | 96 ++++ ...LiquidBlazeScrollValueBehaviourLiquid.java | 92 ++++ .../createaddition/config/CommonConfig.java | 4 +- .../assets/createaddition/lang/en_us.json | 3 +- .../block/liquid_blaze_burner/block.json | 4 +- .../liquid_blaze_burner/liquid_blaze_cage.mtl | 3 + .../liquid_blaze_burner/liquid_blaze_cage.obj | 455 ++++++++++++++++++ .../block/liquid_blaze_heater_brazier.png | Bin 0 -> 1042 bytes 11 files changed, 750 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollSlot.java create mode 100644 src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourHeat.java create mode 100644 src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourLiquid.java create mode 100644 src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.mtl create mode 100644 src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.obj create mode 100644 src/main/resources/assets/createaddition/textures/block/liquid_blaze_heater_brazier.png diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlock.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlock.java index 46857b4b..033856f7 100644 --- a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlock.java +++ b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlock.java @@ -50,7 +50,7 @@ public LiquidBlazeBurnerBlock(Properties properties) { registerDefaultState(defaultBlockState().setValue(HEAT_LEVEL, BlazeBurnerBlock.HeatLevel.NONE)); } - public static final MapCodec CODEC = simpleCodec(BlazeBurnerBlock::new); + public static final MapCodec CODEC = simpleCodec(LiquidBlazeBurnerBlock::new); @Override protected MapCodec codec() { diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java index d035fb83..4a060ad6 100644 --- a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java +++ b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java @@ -22,6 +22,7 @@ import com.simibubi.create.content.processing.burner.BlazeBurnerBlock; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; +import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; import com.simibubi.create.foundation.fluid.SmartFluidTank; import net.createmod.catnip.animation.LerpedFloat; @@ -60,7 +61,7 @@ import static com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HEAT_LEVEL; public class LiquidBlazeBurnerBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, IObserveBlockEntity { - public static int MAX_HEAT_CAPACITY = CommonConfig.LIQUID_BLAZE_BURNER_MAX_HEAT_CAPACITY.get(); + public int MAX_HEAT_CAPACITY = CommonConfig.LIQUID_BLAZE_BURNER_MAX_HEAT_CAPACITY.get(); protected FuelType activeFuel; protected int remainingBurnTime; @@ -71,6 +72,8 @@ public class LiquidBlazeBurnerBlockEntity extends SmartBlockEntity implements IH protected boolean hat; public final boolean stockKeeper = false; BlazeBurnerBlock.HeatLevel heatLevel; + private ScrollValueBehaviour HEAT_CAPACITY; + private ScrollValueBehaviour LIQUID_CAPACITY; public LiquidBlazeBurnerBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); @@ -89,8 +92,37 @@ public LiquidBlazeBurnerBlockEntity(BlockEntityType type, BlockPos pos, Block } @Override - public void addBehaviours(List list) { + public void addBehaviours(List behaviours) { + LIQUID_CAPACITY = new LiquidBlazeScrollValueBehaviourLiquid(Component.translatable(CreateAddition.MODID + ".tooltip.liquid_burning.liquid_capacity"), this, + new LiquidBlazeScrollSlot(false)).between(0, defaultLiquidValue()); + LIQUID_CAPACITY.withFormatter(this::formatLiquid); + LIQUID_CAPACITY.withCallback(v -> syncTankCapacity()); + LIQUID_CAPACITY.setValue(defaultLiquidValue()); + behaviours.add(LIQUID_CAPACITY); + + HEAT_CAPACITY = new LiquidBlazeScrollValueBehaviourHeat(Component.translatable(CreateAddition.MODID + ".tooltip.liquid_burning.heat_capacity"), this, + new LiquidBlazeScrollSlot(true)).between(0, defaultHeatValue()); + HEAT_CAPACITY.withFormatter(this::formatHeat); + HEAT_CAPACITY.withCallback(v -> MAX_HEAT_CAPACITY = v); + HEAT_CAPACITY.setValue(defaultHeatValue()); + behaviours.add(HEAT_CAPACITY); + } + + protected int defaultHeatValue() { + return CommonConfig.LIQUID_BLAZE_BURNER_MAX_HEAT_CAPACITY.get(); + } + + protected int defaultLiquidValue() { + return CommonConfig.LIQUID_BLAZE_BURNER_MAX_LIQUID_CAPACITY.get(); + } + private void syncTankCapacity(){ + if (tankInventory == null || LIQUID_CAPACITY == null) return; + int capacity = LIQUID_CAPACITY.getValue(); + tankInventory.setCapacity(capacity); + if (tankInventory.getFluidAmount() > capacity) + tankInventory.drain(tankInventory.getFluidAmount() - capacity, IFluidHandler.FluidAction.EXECUTE); + notifyUpdate(); } public BlazeBurnerBlock.HeatLevel getHeatLevelForRender() { @@ -116,8 +148,8 @@ protected SmartFluidTank createInventory() { } protected void onFluidStackChanged(FluidStack newFluidStack) { - if (!hasLevel()) return; + syncTankCapacity(); update(newFluidStack); } @@ -188,10 +220,17 @@ public boolean isCreative() { return isCreative; } + private boolean firstTick = true; @Override public void tick() { super.tick(); + if (firstTick) { + firstTick = false; + syncTankCapacity(); + if (HEAT_CAPACITY != null) MAX_HEAT_CAPACITY = HEAT_CAPACITY.getValue(); + } + if (level == null) return; if (level.isClientSide) { tickAnimation(); @@ -210,7 +249,7 @@ public void tick() { if (activeFuel == FuelType.SPECIAL) { activeFuel = FuelType.NORMAL; - remainingBurnTime = MAX_HEAT_CAPACITY / 2; + remainingBurnTime = HEAT_CAPACITY.getValue() / 2; } else activeFuel = FuelType.NONE; updateBlockState(); @@ -265,18 +304,34 @@ public void write(CompoundTag tag, HolderLookup.Provider registries, boolean cli if (goggles) tag.putBoolean("Goggles", true); if (hat) tag.putBoolean("TrainHat", true); tag.put("TankContent", tankInventory.writeToNBT(registries, new CompoundTag())); + tag.putInt("TankCapacity", tankInventory.getCapacity()); super.write(tag, registries, clientPacket); } @Override protected void read(CompoundTag tag, HolderLookup.Provider registries, boolean clientPacket) { + super.read(tag, registries, clientPacket); activeFuel = FuelType.values()[tag.getInt("fuelLevel")]; remainingBurnTime = tag.getInt("burnTimeRemaining"); isCreative = tag.getBoolean("isCreative"); goggles = tag.contains("Goggles"); hat = tag.contains("TrainHat"); tankInventory.readFromNBT(registries, tag.getCompound("TankContent")); - super.read(tag, registries, clientPacket); + if (tag.contains("TankCapacity")) tankInventory.setCapacity(tag.getInt("TankCapacity")); + } + + private String formatHeat(int value) { + if (value < 60) + return value + "t"; + if (value < 20 * 60) + return (value / 20) + "s"; + return (value / 20 / 60) + "m"; + } + + private String formatLiquid(int value) { + if (value < 1000) + return value + "mB"; + return (value / 1000) + "B"; } public BlazeBurnerBlock.HeatLevel getHeatLevelFromBlock() { @@ -343,8 +398,8 @@ else if (AllItemTags.BLAZE_BURNER_FUEL_REGULAR.matches(itemStack)) { if (activeFuel == FuelType.SPECIAL && remainingBurnTime > 20) return false; if (newFuel == activeFuel) { - if (remainingBurnTime + newBurnTime > MAX_HEAT_CAPACITY && !forceOverflow) return false; - newBurnTime = Mth.clamp(remainingBurnTime + newBurnTime, 0, MAX_HEAT_CAPACITY); + if (remainingBurnTime + newBurnTime > HEAT_CAPACITY.getValue() && !forceOverflow) return false; + newBurnTime = Mth.clamp(remainingBurnTime + newBurnTime, 0, HEAT_CAPACITY.getValue()); } if (simulate) return true; @@ -408,7 +463,7 @@ protected BlazeBurnerBlock.HeatLevel getHeatLevelFromFuelType(FuelType fuel) { level = BlazeBurnerBlock.HeatLevel.SEETHING; break; case NORMAL: - boolean lowPercent = (double) remainingBurnTime / MAX_HEAT_CAPACITY < 0.0125; + boolean lowPercent = (double) remainingBurnTime / HEAT_CAPACITY.getValue() < 0.0125; level = lowPercent ? BlazeBurnerBlock.HeatLevel.FADING : BlazeBurnerBlock.HeatLevel.KINDLED; break; case NONE: diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollSlot.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollSlot.java new file mode 100644 index 00000000..a2f13676 --- /dev/null +++ b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollSlot.java @@ -0,0 +1,34 @@ +package com.mrh0.createaddition.blocks.liquid_blaze_burner; + +import com.mojang.blaze3d.vertex.PoseStack; +import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; + +import dev.engine_room.flywheel.lib.transform.TransformStack; +import net.createmod.catnip.math.VecHelper; +import net.createmod.catnip.math.AngleHelper; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.Direction.Axis; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.phys.Vec3; + +public class LiquidBlazeScrollSlot extends ValueBoxTransform.Dual { + + public LiquidBlazeScrollSlot(boolean isHeatSlot) { + super(isHeatSlot); + } + + @Override + public Vec3 getLocalOffset(LevelAccessor level, BlockPos pos, BlockState state) { + return VecHelper.voxelSpace(first ? 4 : 12, 0.1, 8); + } + + @Override + public void rotate(LevelAccessor level, BlockPos pos, BlockState state, PoseStack ms) { + TransformStack.of(ms) + .rotateYDegrees(180) + .rotateXDegrees(270); + } +} diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourHeat.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourHeat.java new file mode 100644 index 00000000..d1f179d0 --- /dev/null +++ b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourHeat.java @@ -0,0 +1,96 @@ +package com.mrh0.createaddition.blocks.liquid_blaze_burner; + +import com.mrh0.createaddition.config.CommonConfig; + +import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; +import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard; +import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter; +import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; +import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType; +import com.simibubi.create.foundation.utility.CreateLang; + +import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; + +public class LiquidBlazeScrollValueBehaviourHeat extends ScrollValueBehaviour { + + public static final BehaviourType TYPE = new BehaviourType<>(); + + @Override + public BehaviourType getType() { + return TYPE; + } + + public LiquidBlazeScrollValueBehaviourHeat(Component label, SmartBlockEntity be, ValueBoxTransform slot) { + super(label, be, slot); + } + + @Override + public ValueSettingsBoard createBoard(Player player, BlockHitResult hitResult) { + int maxTicks = CommonConfig.LIQUID_BLAZE_BURNER_MAX_HEAT_CAPACITY.get(); + int maxMinutes = maxTicks / (60 * 20); + return new ValueSettingsBoard(label,Math.max(maxMinutes, 60), 10, + CreateLang.translatedOptions("generic.unit", "ticks", "seconds", "minutes"), + new ValueSettingsFormatter(this::formatSettings)); + } + + @Override + public void write(CompoundTag nbt, HolderLookup.Provider registries, boolean clientPacket) { + nbt.putInt("HeatCapacityValue", value); + } + + @Override + public void read(CompoundTag nbt, HolderLookup.Provider registries, boolean clientPacket) { + value = nbt.getInt("HeatCapacityValue"); + } + + @Override + public void setValueSettings(Player player, ValueSettings valueSetting, boolean ctrlHeld) { + int value = valueSetting.value(); + int multiplier = switch (valueSetting.row()) { + case 0 -> 1; + case 1 -> 20; + default -> 60 * 20; + }; + if (!valueSetting.equals(getValueSettings())) + playFeedbackSound(this); + setValue(Math.max(2, Math.max(1, value) * multiplier)); + } + + @Override + public ValueSettings getValueSettings() { + int row = 0; + int value = this.value; + + if (value > 60 * 20) { + value = value / (60 * 20); + row = 2; + } else if (value > 60) { + value = value / 20; + row = 1; + } + + return new ValueSettings(row, value); + } + + public MutableComponent formatSettings(ValueSettings settings) { + int value = Math.max(1, settings.value()); + return Component.literal(switch (settings.row()) { + case 0 -> Math.max(2, value) + "t"; + case 1 -> "0:" + (value < 10 ? "0" : "") + value; + default -> value + ":00"; + }); + } + + public int netId() { + return 1; + } +} diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourLiquid.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourLiquid.java new file mode 100644 index 00000000..e2343b8a --- /dev/null +++ b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourLiquid.java @@ -0,0 +1,92 @@ +package com.mrh0.createaddition.blocks.liquid_blaze_burner; + +import com.mrh0.createaddition.config.CommonConfig; + +import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; +import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard; +import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter; +import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; +import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType; +import com.simibubi.create.foundation.utility.CreateLang; + +import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; + +public class LiquidBlazeScrollValueBehaviourLiquid extends ScrollValueBehaviour { + + public static final BehaviourType TYPE = new BehaviourType<>(); + + @Override + public BehaviourType getType() { + return TYPE; + } + + + + public LiquidBlazeScrollValueBehaviourLiquid(Component label, SmartBlockEntity be, ValueBoxTransform slot) { + super(label, be, slot); + } + + @Override + public ValueSettingsBoard createBoard(Player player, BlockHitResult hitResult) { + int maxMilliBuckets = CommonConfig.LIQUID_BLAZE_BURNER_MAX_LIQUID_CAPACITY.get(); + int maxBuckets = maxMilliBuckets / 1000; + return new ValueSettingsBoard(label,Math.max(maxBuckets, 10),1, + CreateLang.translatedOptions("generic.unit", "millibuckets","buckets"), + new ValueSettingsFormatter(this::formatSettings)); + } + + @Override + public void write(CompoundTag nbt, HolderLookup.Provider registries, boolean clientPacket) { + nbt.putInt("LiquidCapacityValue", value); + } + + @Override + public void read(CompoundTag nbt, HolderLookup.Provider registries, boolean clientPacket) { + value = nbt.getInt("LiquidCapacityValue"); + } + + @Override + public void setValueSettings(Player player, ValueSettings valueSetting, boolean ctrlHeld) { + int value = valueSetting.value(); + int multiplier = switch (valueSetting.row()) { + case 0 -> 100; + default -> 1000; + }; + if (!valueSetting.equals(getValueSettings())) + playFeedbackSound(this); + setValue(Math.max(100, value*multiplier)); + } + + @Override + public ValueSettings getValueSettings() { + int row = 0; + int value = this.value; + + if (value >= 1000) { + return new ValueSettings(1,value / 1000); + } + + return new ValueSettings(1,value / 100); + } + + public MutableComponent formatSettings(ValueSettings settings) { + int value = Math.max(1, settings.value()); + return Component.literal(switch (settings.row()) { + case 0 -> value*100 + "mB"; + default -> value + "B"; + }); + } + + public int netId() { + return 2; + } +} diff --git a/src/main/java/com/mrh0/createaddition/config/CommonConfig.java b/src/main/java/com/mrh0/createaddition/config/CommonConfig.java index 0974b4a2..f4c0855d 100644 --- a/src/main/java/com/mrh0/createaddition/config/CommonConfig.java +++ b/src/main/java/com/mrh0/createaddition/config/CommonConfig.java @@ -241,10 +241,10 @@ public class CommonConfig { COMMON_BUILDER.comment("Liquid Blaze Burner").push(CATEGORY_LIQUID_BLAZE_BURNER); LIQUID_BLAZE_BURNER_MAX_LIQUID_CAPACITY = COMMON_BUILDER.comment("Liquid Blaze Burner internal liquid storage capacity (in mB). A value less than 1000 prevents players from refilling with a bucket.") - .defineInRange("liquid_blaze_burner_max_liquid_capacity",4000,100,Integer.MAX_VALUE); + .defineInRange("liquid_blaze_burner_max_liquid_capacity",4000,100,10000); LIQUID_BLAZE_BURNER_MAX_HEAT_CAPACITY = COMMON_BUILDER.comment("Liquid Blaze Burner internal heat capacity (in ticks).") - .defineInRange("liquid_blaze_burner_max_heat_capacity",10000,0,Integer.MAX_VALUE); + .defineInRange("liquid_blaze_burner_max_heat_capacity",10000,0,72000); COMMON_BUILDER.pop(); diff --git a/src/main/resources/assets/createaddition/lang/en_us.json b/src/main/resources/assets/createaddition/lang/en_us.json index 8f8e24cb..c263e204 100644 --- a/src/main/resources/assets/createaddition/lang/en_us.json +++ b/src/main/resources/assets/createaddition/lang/en_us.json @@ -19,7 +19,8 @@ "createaddition.tooltip.liquid_burning.info": "Liquid Blaze Burner Info:", "createaddition.tooltip.liquid_burning.time_remaining": "Burn Time Remaining:", - + "createaddition.tooltip.liquid_burning.heat_capacity": "Heat Capacity", + "createaddition.tooltip.liquid_burning.liquid_capacity": "Liquid Capacity", "createaddition.tooltip.charging.info": "Tesla Coil Info:", "createaddition.tooltip.charging.time_remaining": "Charge Time Remaining:", diff --git a/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/block.json b/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/block.json index e19e3e62..797864bc 100644 --- a/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/block.json +++ b/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/block.json @@ -2,9 +2,9 @@ "parent": "block/block", "loader": "neoforge:obj", "flip_v": true, - "model": "create:models/block/blaze_burner/blaze_cage.obj", + "model": "createaddition:models/block/liquid_blaze_burner/liquid_blaze_cage.obj", "textures": { - "0": "create:block/blaze_heater_brazier", + "0": "createaddition:block/liquid_blaze_heater_brazier", "particle": "create:block/dark_metal_block" }, "display": { diff --git a/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.mtl b/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.mtl new file mode 100644 index 00000000..050ff19f --- /dev/null +++ b/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.mtl @@ -0,0 +1,3 @@ +# Made in Blockbench 5.1.4 +newmtl m_0743a24e-8bbd-39c3-d16f-1cacd6588c2e +map_Kd #0 diff --git a/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.obj b/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.obj new file mode 100644 index 00000000..a92771c4 --- /dev/null +++ b/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.obj @@ -0,0 +1,455 @@ +# Made in Blockbench 5.1.4 +mtllib liquid_blaze_cage.mtl + +o cube +v 0.125 0 0.875 +v 0.125 0.25 0.875 +v 0.125 0.25 0.125 +v 0.125 0 0.125 +v 0.875 0.25 0.125 +v 0.875 0 0.125 +v 0.875 0.25 0.875 +v 0.875 0 0.875 +v 0.9375 0.3125 0.9375 +v 0.9375 0.875 0.9375 +v 0.0625 0.875 0.9375 +v 0.0625 0.3125 0.9375 +v 0.0625 0.25 0.875 +v 0.9375 0.25 0.875 +v 0.9375 0.9375 1 +v 0.0625 0.9375 1 +v 0.9375 0.3125 0.0625 +v 0.9375 0.875 0.0625 +v 0.9375 0.875 0.9375 +v 0.9375 0.3125 0.9375 +v 0.875 0.25 0.9375 +v 0.875 0.25 0.0625 +v 1 0.9375 0.0625 +v 1 0.9375 0.9375 +v 0.0625 0.3125 0.0625 +v 0.0625 0.875 0.0625 +v 0.9375 0.875 0.0625 +v 0.9375 0.3125 0.0625 +v 0.9375 0.25 0.125 +v 0.0625 0.25 0.125 +v 0.0625 0.9375 0 +v 0.9375 0.9375 0 +v 0.0625 0.3125 0.9375 +v 0.0625 0.875 0.9375 +v 0.0625 0.875 0.0625 +v 0.0625 0.3125 0.0625 +v 0.125 0.25 0.0625 +v 0.125 0.25 0.9375 +v 0 0.9375 0.9375 +v 0 0.9375 0.0625 +v 0.875 0 0.875 +v 1 0 1 +v 1 0.3125 1 +v 0.875 0.3125 0.875 +v 0.875 0 0.125 +v 1 0 0 +v 1 0.3125 0 +v 0.875 0.3125 0.125 +v 0.125 0 0.125 +v 0 0 0 +v 0 0.3125 0 +v 0.125 0.3125 0.125 +v 0.125 0 0.875 +v 0 0 1 +v 0 0.3125 1 +v 0.125 0.3125 0.875 +v 0.9375 0.3125 0.9375 +v 0.0625 0.3125 0.9375 +v 0.0625 0.875 0.9375 +v 0.9375 0.875 0.9375 +v 0.9375 0.25 0.875 +v 0.0625 0.25 0.875 +v 0.0625 0.9375 1 +v 0.9375 0.9375 1 +v 0.9375 0.3125 0.0625 +v 0.9375 0.3125 0.9375 +v 0.9375 0.875 0.9375 +v 0.9375 0.875 0.0625 +v 0.875 0.25 0.0625 +v 0.875 0.25 0.9375 +v 1 0.9375 0.9375 +v 1 0.9375 0.0625 +v 0.0625 0.3125 0.0625 +v 0.9375 0.3125 0.0625 +v 0.9375 0.875 0.0625 +v 0.0625 0.875 0.0625 +v 0.0625 0.25 0.125 +v 0.9375 0.25 0.125 +v 0.9375 0.9375 0 +v 0.0625 0.9375 0 +v 0.0625 0.3125 0.9375 +v 0.0625 0.3125 0.0625 +v 0.0625 0.875 0.0625 +v 0.0625 0.875 0.9375 +v 0.125 0.25 0.9375 +v 0.125 0.25 0.0625 +v 0 0.9375 0.0625 +v 0 0.9375 0.9375 +v 0.875 0 0.875 +v 0.875 0.3125 0.875 +v 1 0.3125 1 +v 1 0 1 +v 0.875 0 0.125 +v 0.875 0.3125 0.125 +v 1 0.3125 0 +v 1 0 0 +v 0.125 0 0.125 +v 0.125 0.3125 0.125 +v 0 0.3125 0 +v 0 0 0 +v 0.125 0 0.875 +v 0.125 0.3125 0.875 +v 0 0.3125 1 +v 0 0 1 +v 0.125 0 0.3125 +v 0.125 0.125 0.3125 +v 0.125 0.125 0.6875 +v 0.125 0 0.6875 +v 0.875 0 0.6875 +v 0.875 0.125 0.6875 +v 0.875 0.125 0.3125 +v 0.875 0 0.3125 +v 0.9375 0 0.6875 +v 0.9375 0.125 0.6875 +v 0.9375 0.125 0.3125 +v 0.9375 0 0.3125 +v 0.0625 0.125 0.3125 +v 0.0625 0 0.3125 +v 0.0625 0.125 0.6875 +v 0.0625 0 0.6875 +vt 0.9375 0.375 +vt 0.9375 0.5 +vt 0.5625 0.5 +vt 0.5625 0.375 +vt 0.9375 0.375 +vt 0.9375 0.5 +vt 0.5625 0.5 +vt 0.5625 0.375 +vt 0.5625 0 +vt 0.9375 0 +vt 0.9375 0.375 +vt 0.5625 0.375 +vt 0.5625 0.5625 +vt 0.9375 0.5625 +vt 0.9375 0.9375 +vt 0.5625 0.9375 +vt 0.46875 0.53125 +vt 0.46875 0.8125 +vt 0.03125 0.8125 +vt 0.03125 0.53125 +vt 0.03125 0.5 +vt 0.46875 0.5 +vt 0.46875 0.53125 +vt 0.03125 0.53125 +vt 0.03125 0.8125 +vt 0.46875 0.8125 +vt 0.46875 0.84375 +vt 0.03125 0.84375 +vt 0.46875 0.53125 +vt 0.46875 0.8125 +vt 0.03125 0.8125 +vt 0.03125 0.53125 +vt 0.03125 0.5 +vt 0.46875 0.5 +vt 0.46875 0.53125 +vt 0.03125 0.53125 +vt 0.03125 0.8125 +vt 0.46875 0.8125 +vt 0.46875 0.84375 +vt 0.03125 0.84375 +vt 0.46875 0.53125 +vt 0.46875 0.8125 +vt 0.03125 0.8125 +vt 0.03125 0.53125 +vt 0.03125 0.5 +vt 0.46875 0.5 +vt 0.46875 0.53125 +vt 0.03125 0.53125 +vt 0.03125 0.8125 +vt 0.46875 0.8125 +vt 0.46875 0.84375 +vt 0.03125 0.84375 +vt 0.46875 0.53125 +vt 0.46875 0.8125 +vt 0.03125 0.8125 +vt 0.03125 0.53125 +vt 0.03125 0.5 +vt 0.46875 0.5 +vt 0.46875 0.53125 +vt 0.03125 0.53125 +vt 0.03125 0.8125 +vt 0.46875 0.8125 +vt 0.46875 0.84375 +vt 0.03125 0.84375 +vt 0.90625 0.34375 +vt 1 0.34375 +vt 1 0.5 +vt 0.90625 0.5 +vt 0.90625 0.34375 +vt 1 0.34375 +vt 1 0.5 +vt 0.90625 0.5 +vt 0.90625 0.34375 +vt 1 0.34375 +vt 1 0.5 +vt 0.90625 0.5 +vt 0.90625 0.34375 +vt 1 0.34375 +vt 1 0.5 +vt 0.90625 0.5 +vt 0.46875 0.53125 +vt 0.03125 0.53125 +vt 0.03125 0.8125 +vt 0.46875 0.8125 +vt 0.03125 0.5 +vt 0.03125 0.53125 +vt 0.46875 0.53125 +vt 0.46875 0.5 +vt 0.03125 0.8125 +vt 0.03125 0.84375 +vt 0.46875 0.84375 +vt 0.46875 0.8125 +vt 0.46875 0.53125 +vt 0.03125 0.53125 +vt 0.03125 0.8125 +vt 0.46875 0.8125 +vt 0.03125 0.5 +vt 0.03125 0.53125 +vt 0.46875 0.53125 +vt 0.46875 0.5 +vt 0.03125 0.8125 +vt 0.03125 0.84375 +vt 0.46875 0.84375 +vt 0.46875 0.8125 +vt 0.46875 0.53125 +vt 0.03125 0.53125 +vt 0.03125 0.8125 +vt 0.46875 0.8125 +vt 0.03125 0.5 +vt 0.03125 0.53125 +vt 0.46875 0.53125 +vt 0.46875 0.5 +vt 0.03125 0.8125 +vt 0.03125 0.84375 +vt 0.46875 0.84375 +vt 0.46875 0.8125 +vt 0.46875 0.53125 +vt 0.03125 0.53125 +vt 0.03125 0.8125 +vt 0.46875 0.8125 +vt 0.03125 0.5 +vt 0.03125 0.53125 +vt 0.46875 0.53125 +vt 0.46875 0.5 +vt 0.03125 0.8125 +vt 0.03125 0.84375 +vt 0.46875 0.84375 +vt 0.46875 0.8125 +vt 0.90625 0.34375 +vt 0.90625 0.5 +vt 1 0.5 +vt 1 0.34375 +vt 0.90625 0.34375 +vt 0.90625 0.5 +vt 1 0.5 +vt 1 0.34375 +vt 0.90625 0.34375 +vt 0.90625 0.5 +vt 1 0.5 +vt 1 0.34375 +vt 0.90625 0.34375 +vt 0.90625 0.5 +vt 1 0.5 +vt 1 0.34375 +vt 0.9375 0.375 +vt 0.9375 0.5 +vt 0.84375 0.4375 +vt 0.84375 0.375 +vt 0.9375 0.5 +vt 0.5625 0.5 +vt 0.65625 0.4375 +vt 0.84375 0.4375 +vt 0.65625 0.4375 +vt 0.5625 0.5 +vt 0.5625 0.375 +vt 0.65625 0.375 +vt 0.46875 0.28125 +vt 0.46875 0.09375 +vt 0.53125 0.09375 +vt 0.53125 0.28125 +vt 0.9375 0.375 +vt 0.9375 0.5 +vt 0.84375 0.4375 +vt 0.84375 0.375 +vt 0.9375 0.5 +vt 0.5625 0.5 +vt 0.65625 0.4375 +vt 0.84375 0.4375 +vt 0.65625 0.4375 +vt 0.5625 0.5 +vt 0.5625 0.375 +vt 0.65625 0.375 +vt 0.46875 0.28125 +vt 0.46875 0.09375 +vt 0.53125 0.09375 +vt 0.53125 0.28125 +vt 0.46875 0.09375 +vt 0.46875 0.28125 +vt 0.4375 0.28125 +vt 0.4375 0.09375 +vt 0.53125 0.09375 +vt 0.46875 0.09375 +vt 0.46875 0.0625 +vt 0.53125 0.0625 +vt 0.96875 0.09375 +vt 0.96875 0.28125 +vt 0.9375 0.28125 +vt 0.9375 0.09375 +vt 0.46875 0.28125 +vt 0.53125 0.28125 +vt 0.53125 0.3125 +vt 0.46875 0.3125 +vt 0.53125 0.0625 +vt 0.53125 0.09375 +vt 0.46875 0.09375 +vt 0.46875 0.0625 +vt 0.4375 0.09375 +vt 0.46875 0.09375 +vt 0.46875 0.28125 +vt 0.4375 0.28125 +vt 0.46875 0.3125 +vt 0.46875 0.28125 +vt 0.53125 0.28125 +vt 0.53125 0.3125 +vt 0.4375 0.28125 +vt 0.4375 0.09375 +vt 0.46875 0.09375 +vt 0.46875 0.28125 +vt 0.53125 0.09375 +vt 0.46875 0.09375 +vt 0.46875 0.0625 +vt 0.53125 0.0625 +vt 0.53125 0.28125 +vt 0.53125 0.09375 +vt 0.5625 0.09375 +vt 0.5625 0.28125 +vt 0.46875 0.28125 +vt 0.53125 0.28125 +vt 0.53125 0.3125 +vt 0.46875 0.3125 +vn 0 0 -1 +vn 0 0 1 +vn 0 -1 0 +vn 0 1 0 +vn 0 0 1 +vn 0 -0.7071067811865476 0.7071067811865476 +vn 0 -0.7071067811865476 0.7071067811865476 +vn 1 0 0 +vn 0.7071067811865476 -0.7071067811865476 0 +vn 0.7071067811865476 -0.7071067811865476 0 +vn 0 0 -1 +vn 0 -0.7071067811865476 -0.7071067811865476 +vn 0 -0.7071067811865476 -0.7071067811865476 +vn -1 0 0 +vn -0.7071067811865476 -0.7071067811865476 0 +vn -0.7071067811865476 -0.7071067811865476 0 +vn -0.7071067811865476 0 0.7071067811865476 +vn 0.7071067811865476 0 0.7071067811865476 +vn 0.7071067811865476 0 -0.7071067811865476 +vn -0.7071067811865476 0 -0.7071067811865476 +vn 0 0 -1 +vn 0 0.7071067811865476 -0.7071067811865476 +vn 0 0.7071067811865476 -0.7071067811865476 +vn -1 0 0 +vn -0.7071067811865476 0.7071067811865476 0 +vn -0.7071067811865476 0.7071067811865476 0 +vn 0 0 1 +vn 0 0.7071067811865476 0.7071067811865476 +vn 0 0.7071067811865476 0.7071067811865476 +vn 1 0 0 +vn 0.7071067811865476 0.7071067811865476 0 +vn 0.7071067811865476 0.7071067811865476 0 +vn 0.7071067811865476 0 -0.7071067811865476 +vn -0.7071067811865476 0 -0.7071067811865476 +vn -0.7071067811865476 0 0.7071067811865476 +vn 0.7071067811865476 0 0.7071067811865476 +vn -1 0 0 +vn -1 0 0 +vn -1 0 0 +vn -1 0 0 +vn 1 0 0 +vn 1 0 0 +vn 1 0 0 +vn 1 0 0 +vn 0 1 0 +vn 0 0 1 +vn 0 -1 0 +vn 0 0 -1 +vn 0 0 1 +vn 0 1 0 +vn 0 0 -1 +vn 0 1 0 +vn 0 0 -1 +vn 0 -1 0 +vn 0 0 1 +usemtl m_0743a24e-8bbd-39c3-d16f-1cacd6588c2e +f 4/1/1 3/2/1 5/3/1 6/4/1 +f 8/5/2 7/6/2 2/7/2 1/8/2 +f 4/9/3 6/10/3 8/11/3 1/12/3 +f 5/13/4 3/14/4 2/15/4 7/16/4 +f 9/17/5 10/18/5 11/19/5 12/20/5 +f 9/21/6 12/22/6 13/23/6 14/24/6 +f 11/25/7 10/26/7 15/27/7 16/28/7 +f 17/29/8 18/30/8 19/31/8 20/32/8 +f 17/33/9 20/34/9 21/35/9 22/36/9 +f 19/37/10 18/38/10 23/39/10 24/40/10 +f 25/41/11 26/42/11 27/43/11 28/44/11 +f 25/45/12 28/46/12 29/47/12 30/48/12 +f 27/49/13 26/50/13 31/51/13 32/52/13 +f 33/53/14 34/54/14 35/55/14 36/56/14 +f 33/57/15 36/58/15 37/59/15 38/60/15 +f 35/61/16 34/62/16 39/63/16 40/64/16 +f 41/65/17 42/66/17 43/67/17 44/68/17 +f 45/69/18 46/70/18 47/71/18 48/72/18 +f 49/73/19 50/74/19 51/75/19 52/76/19 +f 53/77/20 54/78/20 55/79/20 56/80/20 +f 57/81/21 58/82/21 59/83/21 60/84/21 +f 57/85/22 61/86/22 62/87/22 58/88/22 +f 59/89/23 63/90/23 64/91/23 60/92/23 +f 65/93/24 66/94/24 67/95/24 68/96/24 +f 65/97/25 69/98/25 70/99/25 66/100/25 +f 67/101/26 71/102/26 72/103/26 68/104/26 +f 73/105/27 74/106/27 75/107/27 76/108/27 +f 73/109/28 77/110/28 78/111/28 74/112/28 +f 75/113/29 79/114/29 80/115/29 76/116/29 +f 81/117/30 82/118/30 83/119/30 84/120/30 +f 81/121/31 85/122/31 86/123/31 82/124/31 +f 83/125/32 87/126/32 88/127/32 84/128/32 +f 89/129/33 90/130/33 91/131/33 92/132/33 +f 93/133/34 94/134/34 95/135/34 96/136/34 +f 97/137/35 98/138/35 99/139/35 100/140/35 +f 101/141/36 102/142/36 103/143/36 104/144/36 +f 1/145/37 2/146/37 107/147/37 108/148/37 +f 2/149/38 3/150/38 106/151/38 107/152/38 +f 106/153/39 3/154/39 4/155/39 105/156/39 +f 119/157/40 117/158/40 118/159/40 120/160/40 +f 6/161/41 5/162/41 111/163/41 112/164/41 +f 5/165/42 7/166/42 110/167/42 111/168/42 +f 110/169/43 7/170/43 8/171/43 109/172/43 +f 115/173/44 114/174/44 113/175/44 116/176/44 +f 114/177/45 115/178/45 111/179/45 110/180/45 +f 113/181/46 114/182/46 110/183/46 109/184/46 +f 116/185/47 113/186/47 109/187/47 112/188/47 +f 115/189/48 116/190/48 112/191/48 111/192/48 +f 109/193/49 113/194/49 114/195/49 110/196/49 +f 110/197/50 114/198/50 115/199/50 111/200/50 +f 111/201/51 115/202/51 116/203/51 112/204/51 +f 117/205/52 119/206/52 107/207/52 106/208/52 +f 118/209/53 117/210/53 106/211/53 105/212/53 +f 120/213/54 118/214/54 105/215/54 108/216/54 +f 119/217/55 120/218/55 108/219/55 107/220/55 \ No newline at end of file diff --git a/src/main/resources/assets/createaddition/textures/block/liquid_blaze_heater_brazier.png b/src/main/resources/assets/createaddition/textures/block/liquid_blaze_heater_brazier.png new file mode 100644 index 0000000000000000000000000000000000000000..03f48990138d5592f3039810408be67e14f455f2 GIT binary patch literal 1042 zcmV+t1nv8YP)5^eFHYEO!TSP_y)2<6QhYFk_Zb*q!FnU zNw73j@wNsQ*ZGZ{W~dF4+a@NGe4LqczB%Wce|LI8{_)@cBcL!b8Gy;#cY@iuxd7`z zeQc?eiIq$)A9QMW^0{1%PmC9A(>pqnL@Xw$WYYF) z^}6jJn$`KVw`YCIrDFxKClR9@3*0t+;QF*p0!49s!#3-lXKi_RS13-0;?=`LK^%SM z(zXINimP5Cd08TT5uv?VDtcHK>VpH97zx_J7Eq8?z;0D4vR|v&Eg49q>=wCWtN>1H z%q-j5%JOgdE~Bjt2QFjULbl8PGh3FM!W0Dr5k;J~!U|Y@xAfP-IzVlwG0a|zd^S zn}DD5fKR#9vjQGGd=y-Y$LOC6a2ey0n|@Q?_r-NZN`%VSI1fbFBYDA zvFJs)d+&bhTcCt?3kNP^+GA03kjvLIGCVUQ2idU}@WrR6Z6A(1&I*_{-|kE%Be`r^ zm>GQvxxhyZ4qW!wILg%| z-B>Gt1Qf#p3SnKiK9{Q;R)=o`tM>TmlRsWVe8k|u)p0EW>IiH1t2G%IObJ(XZM|gM z^cDDs(TA&bdM1FAP2z^R4J609P#+w)^g-_gnAeWPJD)3Z7U1Y_0=A=P0`z)e&jPas zJn4w(nE;aBn#c=CXGa92%$dLf+5jHd-YVG_w<`h6g5L@xRD39wq*C6osF{Q5wi{-f zl&3bd0QQfiWu@@#@!_;2*q}!gUJx*aG5k3I6bX2`zvmBqR}to7a>+@cjm^Q^1E{;&2K2 z&7a`~FcY?cM1a|kn#YVH^xHwvnEBBI2QG0$gglKB+lR}d$L z9}AZl<3kJJL1H;MgxqQD$Y@&n&E3c5$MeE!uu8P?0eBQ=4C6x!APMii`?hoM`MP1b z|7x{OpK%JfT?x=cSeCgHI{DxOV!r?Y0RR6{5^uHu000I_L_t&o0A&V~b1ir2vH$=8 M07*qoM6N<$f=SNiqyPW_ literal 0 HcmV?d00001 From 6b58a3a70b7072c36a10642d6483f06ff3da3fe4 Mon Sep 17 00:00:00 2001 From: SeppeOngena <48645469+SeppeOngena@users.noreply.github.com> Date: Thu, 21 May 2026 23:13:55 +0200 Subject: [PATCH 4/5] Moved liquid blaze burner scroll slots closer Base Create blaze burner cage can be used again, just different texture --- .../LiquidBlazeScrollSlot.java | 2 +- .../block/liquid_blaze_burner/block.json | 2 +- .../liquid_blaze_burner/liquid_blaze_cage.mtl | 3 - .../liquid_blaze_burner/liquid_blaze_cage.obj | 455 ------------------ .../block/liquid_blaze_heater_brazier.png | Bin 1042 -> 990 bytes 5 files changed, 2 insertions(+), 460 deletions(-) delete mode 100644 src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.mtl delete mode 100644 src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.obj diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollSlot.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollSlot.java index a2f13676..9f654aa9 100644 --- a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollSlot.java +++ b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollSlot.java @@ -22,7 +22,7 @@ public LiquidBlazeScrollSlot(boolean isHeatSlot) { @Override public Vec3 getLocalOffset(LevelAccessor level, BlockPos pos, BlockState state) { - return VecHelper.voxelSpace(first ? 4 : 12, 0.1, 8); + return VecHelper.voxelSpace(first ? 5 : 11, 0, 8); } @Override diff --git a/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/block.json b/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/block.json index 797864bc..1146a828 100644 --- a/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/block.json +++ b/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/block.json @@ -2,7 +2,7 @@ "parent": "block/block", "loader": "neoforge:obj", "flip_v": true, - "model": "createaddition:models/block/liquid_blaze_burner/liquid_blaze_cage.obj", + "model": "create:models/block/blaze_burner/blaze_cage.obj", "textures": { "0": "createaddition:block/liquid_blaze_heater_brazier", "particle": "create:block/dark_metal_block" diff --git a/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.mtl b/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.mtl deleted file mode 100644 index 050ff19f..00000000 --- a/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.mtl +++ /dev/null @@ -1,3 +0,0 @@ -# Made in Blockbench 5.1.4 -newmtl m_0743a24e-8bbd-39c3-d16f-1cacd6588c2e -map_Kd #0 diff --git a/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.obj b/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.obj deleted file mode 100644 index a92771c4..00000000 --- a/src/main/resources/assets/createaddition/models/block/liquid_blaze_burner/liquid_blaze_cage.obj +++ /dev/null @@ -1,455 +0,0 @@ -# Made in Blockbench 5.1.4 -mtllib liquid_blaze_cage.mtl - -o cube -v 0.125 0 0.875 -v 0.125 0.25 0.875 -v 0.125 0.25 0.125 -v 0.125 0 0.125 -v 0.875 0.25 0.125 -v 0.875 0 0.125 -v 0.875 0.25 0.875 -v 0.875 0 0.875 -v 0.9375 0.3125 0.9375 -v 0.9375 0.875 0.9375 -v 0.0625 0.875 0.9375 -v 0.0625 0.3125 0.9375 -v 0.0625 0.25 0.875 -v 0.9375 0.25 0.875 -v 0.9375 0.9375 1 -v 0.0625 0.9375 1 -v 0.9375 0.3125 0.0625 -v 0.9375 0.875 0.0625 -v 0.9375 0.875 0.9375 -v 0.9375 0.3125 0.9375 -v 0.875 0.25 0.9375 -v 0.875 0.25 0.0625 -v 1 0.9375 0.0625 -v 1 0.9375 0.9375 -v 0.0625 0.3125 0.0625 -v 0.0625 0.875 0.0625 -v 0.9375 0.875 0.0625 -v 0.9375 0.3125 0.0625 -v 0.9375 0.25 0.125 -v 0.0625 0.25 0.125 -v 0.0625 0.9375 0 -v 0.9375 0.9375 0 -v 0.0625 0.3125 0.9375 -v 0.0625 0.875 0.9375 -v 0.0625 0.875 0.0625 -v 0.0625 0.3125 0.0625 -v 0.125 0.25 0.0625 -v 0.125 0.25 0.9375 -v 0 0.9375 0.9375 -v 0 0.9375 0.0625 -v 0.875 0 0.875 -v 1 0 1 -v 1 0.3125 1 -v 0.875 0.3125 0.875 -v 0.875 0 0.125 -v 1 0 0 -v 1 0.3125 0 -v 0.875 0.3125 0.125 -v 0.125 0 0.125 -v 0 0 0 -v 0 0.3125 0 -v 0.125 0.3125 0.125 -v 0.125 0 0.875 -v 0 0 1 -v 0 0.3125 1 -v 0.125 0.3125 0.875 -v 0.9375 0.3125 0.9375 -v 0.0625 0.3125 0.9375 -v 0.0625 0.875 0.9375 -v 0.9375 0.875 0.9375 -v 0.9375 0.25 0.875 -v 0.0625 0.25 0.875 -v 0.0625 0.9375 1 -v 0.9375 0.9375 1 -v 0.9375 0.3125 0.0625 -v 0.9375 0.3125 0.9375 -v 0.9375 0.875 0.9375 -v 0.9375 0.875 0.0625 -v 0.875 0.25 0.0625 -v 0.875 0.25 0.9375 -v 1 0.9375 0.9375 -v 1 0.9375 0.0625 -v 0.0625 0.3125 0.0625 -v 0.9375 0.3125 0.0625 -v 0.9375 0.875 0.0625 -v 0.0625 0.875 0.0625 -v 0.0625 0.25 0.125 -v 0.9375 0.25 0.125 -v 0.9375 0.9375 0 -v 0.0625 0.9375 0 -v 0.0625 0.3125 0.9375 -v 0.0625 0.3125 0.0625 -v 0.0625 0.875 0.0625 -v 0.0625 0.875 0.9375 -v 0.125 0.25 0.9375 -v 0.125 0.25 0.0625 -v 0 0.9375 0.0625 -v 0 0.9375 0.9375 -v 0.875 0 0.875 -v 0.875 0.3125 0.875 -v 1 0.3125 1 -v 1 0 1 -v 0.875 0 0.125 -v 0.875 0.3125 0.125 -v 1 0.3125 0 -v 1 0 0 -v 0.125 0 0.125 -v 0.125 0.3125 0.125 -v 0 0.3125 0 -v 0 0 0 -v 0.125 0 0.875 -v 0.125 0.3125 0.875 -v 0 0.3125 1 -v 0 0 1 -v 0.125 0 0.3125 -v 0.125 0.125 0.3125 -v 0.125 0.125 0.6875 -v 0.125 0 0.6875 -v 0.875 0 0.6875 -v 0.875 0.125 0.6875 -v 0.875 0.125 0.3125 -v 0.875 0 0.3125 -v 0.9375 0 0.6875 -v 0.9375 0.125 0.6875 -v 0.9375 0.125 0.3125 -v 0.9375 0 0.3125 -v 0.0625 0.125 0.3125 -v 0.0625 0 0.3125 -v 0.0625 0.125 0.6875 -v 0.0625 0 0.6875 -vt 0.9375 0.375 -vt 0.9375 0.5 -vt 0.5625 0.5 -vt 0.5625 0.375 -vt 0.9375 0.375 -vt 0.9375 0.5 -vt 0.5625 0.5 -vt 0.5625 0.375 -vt 0.5625 0 -vt 0.9375 0 -vt 0.9375 0.375 -vt 0.5625 0.375 -vt 0.5625 0.5625 -vt 0.9375 0.5625 -vt 0.9375 0.9375 -vt 0.5625 0.9375 -vt 0.46875 0.53125 -vt 0.46875 0.8125 -vt 0.03125 0.8125 -vt 0.03125 0.53125 -vt 0.03125 0.5 -vt 0.46875 0.5 -vt 0.46875 0.53125 -vt 0.03125 0.53125 -vt 0.03125 0.8125 -vt 0.46875 0.8125 -vt 0.46875 0.84375 -vt 0.03125 0.84375 -vt 0.46875 0.53125 -vt 0.46875 0.8125 -vt 0.03125 0.8125 -vt 0.03125 0.53125 -vt 0.03125 0.5 -vt 0.46875 0.5 -vt 0.46875 0.53125 -vt 0.03125 0.53125 -vt 0.03125 0.8125 -vt 0.46875 0.8125 -vt 0.46875 0.84375 -vt 0.03125 0.84375 -vt 0.46875 0.53125 -vt 0.46875 0.8125 -vt 0.03125 0.8125 -vt 0.03125 0.53125 -vt 0.03125 0.5 -vt 0.46875 0.5 -vt 0.46875 0.53125 -vt 0.03125 0.53125 -vt 0.03125 0.8125 -vt 0.46875 0.8125 -vt 0.46875 0.84375 -vt 0.03125 0.84375 -vt 0.46875 0.53125 -vt 0.46875 0.8125 -vt 0.03125 0.8125 -vt 0.03125 0.53125 -vt 0.03125 0.5 -vt 0.46875 0.5 -vt 0.46875 0.53125 -vt 0.03125 0.53125 -vt 0.03125 0.8125 -vt 0.46875 0.8125 -vt 0.46875 0.84375 -vt 0.03125 0.84375 -vt 0.90625 0.34375 -vt 1 0.34375 -vt 1 0.5 -vt 0.90625 0.5 -vt 0.90625 0.34375 -vt 1 0.34375 -vt 1 0.5 -vt 0.90625 0.5 -vt 0.90625 0.34375 -vt 1 0.34375 -vt 1 0.5 -vt 0.90625 0.5 -vt 0.90625 0.34375 -vt 1 0.34375 -vt 1 0.5 -vt 0.90625 0.5 -vt 0.46875 0.53125 -vt 0.03125 0.53125 -vt 0.03125 0.8125 -vt 0.46875 0.8125 -vt 0.03125 0.5 -vt 0.03125 0.53125 -vt 0.46875 0.53125 -vt 0.46875 0.5 -vt 0.03125 0.8125 -vt 0.03125 0.84375 -vt 0.46875 0.84375 -vt 0.46875 0.8125 -vt 0.46875 0.53125 -vt 0.03125 0.53125 -vt 0.03125 0.8125 -vt 0.46875 0.8125 -vt 0.03125 0.5 -vt 0.03125 0.53125 -vt 0.46875 0.53125 -vt 0.46875 0.5 -vt 0.03125 0.8125 -vt 0.03125 0.84375 -vt 0.46875 0.84375 -vt 0.46875 0.8125 -vt 0.46875 0.53125 -vt 0.03125 0.53125 -vt 0.03125 0.8125 -vt 0.46875 0.8125 -vt 0.03125 0.5 -vt 0.03125 0.53125 -vt 0.46875 0.53125 -vt 0.46875 0.5 -vt 0.03125 0.8125 -vt 0.03125 0.84375 -vt 0.46875 0.84375 -vt 0.46875 0.8125 -vt 0.46875 0.53125 -vt 0.03125 0.53125 -vt 0.03125 0.8125 -vt 0.46875 0.8125 -vt 0.03125 0.5 -vt 0.03125 0.53125 -vt 0.46875 0.53125 -vt 0.46875 0.5 -vt 0.03125 0.8125 -vt 0.03125 0.84375 -vt 0.46875 0.84375 -vt 0.46875 0.8125 -vt 0.90625 0.34375 -vt 0.90625 0.5 -vt 1 0.5 -vt 1 0.34375 -vt 0.90625 0.34375 -vt 0.90625 0.5 -vt 1 0.5 -vt 1 0.34375 -vt 0.90625 0.34375 -vt 0.90625 0.5 -vt 1 0.5 -vt 1 0.34375 -vt 0.90625 0.34375 -vt 0.90625 0.5 -vt 1 0.5 -vt 1 0.34375 -vt 0.9375 0.375 -vt 0.9375 0.5 -vt 0.84375 0.4375 -vt 0.84375 0.375 -vt 0.9375 0.5 -vt 0.5625 0.5 -vt 0.65625 0.4375 -vt 0.84375 0.4375 -vt 0.65625 0.4375 -vt 0.5625 0.5 -vt 0.5625 0.375 -vt 0.65625 0.375 -vt 0.46875 0.28125 -vt 0.46875 0.09375 -vt 0.53125 0.09375 -vt 0.53125 0.28125 -vt 0.9375 0.375 -vt 0.9375 0.5 -vt 0.84375 0.4375 -vt 0.84375 0.375 -vt 0.9375 0.5 -vt 0.5625 0.5 -vt 0.65625 0.4375 -vt 0.84375 0.4375 -vt 0.65625 0.4375 -vt 0.5625 0.5 -vt 0.5625 0.375 -vt 0.65625 0.375 -vt 0.46875 0.28125 -vt 0.46875 0.09375 -vt 0.53125 0.09375 -vt 0.53125 0.28125 -vt 0.46875 0.09375 -vt 0.46875 0.28125 -vt 0.4375 0.28125 -vt 0.4375 0.09375 -vt 0.53125 0.09375 -vt 0.46875 0.09375 -vt 0.46875 0.0625 -vt 0.53125 0.0625 -vt 0.96875 0.09375 -vt 0.96875 0.28125 -vt 0.9375 0.28125 -vt 0.9375 0.09375 -vt 0.46875 0.28125 -vt 0.53125 0.28125 -vt 0.53125 0.3125 -vt 0.46875 0.3125 -vt 0.53125 0.0625 -vt 0.53125 0.09375 -vt 0.46875 0.09375 -vt 0.46875 0.0625 -vt 0.4375 0.09375 -vt 0.46875 0.09375 -vt 0.46875 0.28125 -vt 0.4375 0.28125 -vt 0.46875 0.3125 -vt 0.46875 0.28125 -vt 0.53125 0.28125 -vt 0.53125 0.3125 -vt 0.4375 0.28125 -vt 0.4375 0.09375 -vt 0.46875 0.09375 -vt 0.46875 0.28125 -vt 0.53125 0.09375 -vt 0.46875 0.09375 -vt 0.46875 0.0625 -vt 0.53125 0.0625 -vt 0.53125 0.28125 -vt 0.53125 0.09375 -vt 0.5625 0.09375 -vt 0.5625 0.28125 -vt 0.46875 0.28125 -vt 0.53125 0.28125 -vt 0.53125 0.3125 -vt 0.46875 0.3125 -vn 0 0 -1 -vn 0 0 1 -vn 0 -1 0 -vn 0 1 0 -vn 0 0 1 -vn 0 -0.7071067811865476 0.7071067811865476 -vn 0 -0.7071067811865476 0.7071067811865476 -vn 1 0 0 -vn 0.7071067811865476 -0.7071067811865476 0 -vn 0.7071067811865476 -0.7071067811865476 0 -vn 0 0 -1 -vn 0 -0.7071067811865476 -0.7071067811865476 -vn 0 -0.7071067811865476 -0.7071067811865476 -vn -1 0 0 -vn -0.7071067811865476 -0.7071067811865476 0 -vn -0.7071067811865476 -0.7071067811865476 0 -vn -0.7071067811865476 0 0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865476 -vn 0.7071067811865476 0 -0.7071067811865476 -vn -0.7071067811865476 0 -0.7071067811865476 -vn 0 0 -1 -vn 0 0.7071067811865476 -0.7071067811865476 -vn 0 0.7071067811865476 -0.7071067811865476 -vn -1 0 0 -vn -0.7071067811865476 0.7071067811865476 0 -vn -0.7071067811865476 0.7071067811865476 0 -vn 0 0 1 -vn 0 0.7071067811865476 0.7071067811865476 -vn 0 0.7071067811865476 0.7071067811865476 -vn 1 0 0 -vn 0.7071067811865476 0.7071067811865476 0 -vn 0.7071067811865476 0.7071067811865476 0 -vn 0.7071067811865476 0 -0.7071067811865476 -vn -0.7071067811865476 0 -0.7071067811865476 -vn -0.7071067811865476 0 0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865476 -vn -1 0 0 -vn -1 0 0 -vn -1 0 0 -vn -1 0 0 -vn 1 0 0 -vn 1 0 0 -vn 1 0 0 -vn 1 0 0 -vn 0 1 0 -vn 0 0 1 -vn 0 -1 0 -vn 0 0 -1 -vn 0 0 1 -vn 0 1 0 -vn 0 0 -1 -vn 0 1 0 -vn 0 0 -1 -vn 0 -1 0 -vn 0 0 1 -usemtl m_0743a24e-8bbd-39c3-d16f-1cacd6588c2e -f 4/1/1 3/2/1 5/3/1 6/4/1 -f 8/5/2 7/6/2 2/7/2 1/8/2 -f 4/9/3 6/10/3 8/11/3 1/12/3 -f 5/13/4 3/14/4 2/15/4 7/16/4 -f 9/17/5 10/18/5 11/19/5 12/20/5 -f 9/21/6 12/22/6 13/23/6 14/24/6 -f 11/25/7 10/26/7 15/27/7 16/28/7 -f 17/29/8 18/30/8 19/31/8 20/32/8 -f 17/33/9 20/34/9 21/35/9 22/36/9 -f 19/37/10 18/38/10 23/39/10 24/40/10 -f 25/41/11 26/42/11 27/43/11 28/44/11 -f 25/45/12 28/46/12 29/47/12 30/48/12 -f 27/49/13 26/50/13 31/51/13 32/52/13 -f 33/53/14 34/54/14 35/55/14 36/56/14 -f 33/57/15 36/58/15 37/59/15 38/60/15 -f 35/61/16 34/62/16 39/63/16 40/64/16 -f 41/65/17 42/66/17 43/67/17 44/68/17 -f 45/69/18 46/70/18 47/71/18 48/72/18 -f 49/73/19 50/74/19 51/75/19 52/76/19 -f 53/77/20 54/78/20 55/79/20 56/80/20 -f 57/81/21 58/82/21 59/83/21 60/84/21 -f 57/85/22 61/86/22 62/87/22 58/88/22 -f 59/89/23 63/90/23 64/91/23 60/92/23 -f 65/93/24 66/94/24 67/95/24 68/96/24 -f 65/97/25 69/98/25 70/99/25 66/100/25 -f 67/101/26 71/102/26 72/103/26 68/104/26 -f 73/105/27 74/106/27 75/107/27 76/108/27 -f 73/109/28 77/110/28 78/111/28 74/112/28 -f 75/113/29 79/114/29 80/115/29 76/116/29 -f 81/117/30 82/118/30 83/119/30 84/120/30 -f 81/121/31 85/122/31 86/123/31 82/124/31 -f 83/125/32 87/126/32 88/127/32 84/128/32 -f 89/129/33 90/130/33 91/131/33 92/132/33 -f 93/133/34 94/134/34 95/135/34 96/136/34 -f 97/137/35 98/138/35 99/139/35 100/140/35 -f 101/141/36 102/142/36 103/143/36 104/144/36 -f 1/145/37 2/146/37 107/147/37 108/148/37 -f 2/149/38 3/150/38 106/151/38 107/152/38 -f 106/153/39 3/154/39 4/155/39 105/156/39 -f 119/157/40 117/158/40 118/159/40 120/160/40 -f 6/161/41 5/162/41 111/163/41 112/164/41 -f 5/165/42 7/166/42 110/167/42 111/168/42 -f 110/169/43 7/170/43 8/171/43 109/172/43 -f 115/173/44 114/174/44 113/175/44 116/176/44 -f 114/177/45 115/178/45 111/179/45 110/180/45 -f 113/181/46 114/182/46 110/183/46 109/184/46 -f 116/185/47 113/186/47 109/187/47 112/188/47 -f 115/189/48 116/190/48 112/191/48 111/192/48 -f 109/193/49 113/194/49 114/195/49 110/196/49 -f 110/197/50 114/198/50 115/199/50 111/200/50 -f 111/201/51 115/202/51 116/203/51 112/204/51 -f 117/205/52 119/206/52 107/207/52 106/208/52 -f 118/209/53 117/210/53 106/211/53 105/212/53 -f 120/213/54 118/214/54 105/215/54 108/216/54 -f 119/217/55 120/218/55 108/219/55 107/220/55 \ No newline at end of file diff --git a/src/main/resources/assets/createaddition/textures/block/liquid_blaze_heater_brazier.png b/src/main/resources/assets/createaddition/textures/block/liquid_blaze_heater_brazier.png index 03f48990138d5592f3039810408be67e14f455f2..57505317f03fe2255bba9296c1fe6566b9845972 100644 GIT binary patch delta 968 zcmV;(12_DV2;K*fB!81hL_t(|0o;~PPg6k@#qT3&V_U10f+R>wD~1}`u)#!ECdvl= z25eZF=%-@iH;@&Y7)>ORL|6a`jYy$Lf~BE~uQjlE&Trs0liDDWNlYXh?wvDd=AJiy z-lIqU@z4Kbpfolff$_WdqUo8Li0DE&G(Z>L>k71*O}SRtkbiJ~UJ75fW#apRjd0Dm zIVo;_5;R(z=*>VPm5`CJAy;ED=})KS=D>gy1_x!LRFYf0y;98OEYP5p)1RKxDEZ=O z)GhDExmxWXyHm1haC9W;WKy!3jBVE&4ck66tMhqp&vL4zVGXb+G2@&F+?+OWIn9|s zvAVWy(?$^3Sby2w6^hfKcT;0IT#;BjCgdCC)qv7@l5>d^ut&X(@Ud_D>l8H-l|G~rdyFdk<5e-_#boM38L9X1$%iz?M z927>{fPYI(PTDpacbqjaZQkAad|rx$obY6{DdYl})`Ep&S~Z zW32%?-@aQAB2Ttg+n4umUI#AV=tHAgo#Z0X8ejs75dnpWE?myls)p6!-N33neg5pX zuOS?LXwd4owgDynHtyHz($}9AuIS2I+2*traDVjCMyqwa8Q^3yansxeCMUX34h>q` zz@Gv0wPWI)t*V>_H2OaQ+u_ZCUN7QV;Hd$hbj)}&z@)dwMg`;wLjtnqOb`J%KnJ!r z%l3=w%>c_<`&yT+N>!?r9bvEQ=3tTo@}}7)io5V;fMur$%Sr(vrpOg=nrrlCfC*V* z-G2gdI6w|`E8qa{2CoLV=WGMlum5_M8W!X%KRg;snm<3nP`nyQnJ=m>WcE4?o2JCc zFFF53(TC=Q6$x8E{Tkruhs_6#Vp@bq(WLo@hdwlL0At=(fCI-1XlZfTzKF`^bxaX> zINC%s@PIAxW`J8TG@O%ObN4m6IUE{5aY2PQ15BvbP$Sn)b0QiSaNZ2C)ZNgHQxo+4 q0ssL2|Ackq1ONa421!IgR09AKR&aB|aQ_GZ0000>y zcX~no@!$U=pfE8RfXUl;g4wyb0P8}1aDXm+PgkJXXvo#_rhoX0i<14aEmPkQti{(@ zSdiS-M}ecou{{$IjYnn7ugjH4Lc?eiIq$) zA9QMW^0{1%PmC9A(>pqnL@Xw$WYYF)^}6jJn$`KVw`YCIrDFxKClR9@3*0t+;QF*p z0!49s!#3-lXMb&ZcULG*hvL=4LqQyU<5LSV$sF|C9pYwoExzw`)9z1*$T#Co&p9^pqo_n$AMY((Le(PJHgmw!DE@RqbQFD;X*E2Fa zGb0Dtv40lu#iyrjAC5cD3YazD?o1{lxoldP8GQ=5z())YT>5Szt|j1bKAWHSurAaG z2k2NUfZ*#lOM+!)d)0k;`|73V0v|Cr%GD&@SSx@86vF}vVO_XBm#Z9Bhi?O`_W0?O zKVCz8#NfcyaV-Jr2y6GNH5nL830HJ&y=2?;6@U1M(TA&bdM1FAP2z^R4J609P#+w) z^g-_gnAeWPJD)3Z7U1Y_0=A=P0`z)e&jPasJn4w(nE;aBn#c=CXGa92%$dLf+5jHd z-YVG_w<`h6g5L@xRD39wq*C6osF{Q5wi{-fl&3bd0QQfiWY2$N&59oFfYK0000 Date: Mon, 25 May 2026 13:47:03 +0200 Subject: [PATCH 5/5] Fix liquid blaze burner NBT tag reading Properly migrate liquid blaze burners from older mod versions --- .../LiquidBlazeScrollValueBehaviourHeat.java | 5 ++++- .../LiquidBlazeScrollValueBehaviourLiquid.java | 7 ++++--- .../java/com/mrh0/createaddition/config/CommonConfig.java | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourHeat.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourHeat.java index d1f179d0..db21ed5a 100644 --- a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourHeat.java +++ b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourHeat.java @@ -49,7 +49,10 @@ public void write(CompoundTag nbt, HolderLookup.Provider registries, boolean cli @Override public void read(CompoundTag nbt, HolderLookup.Provider registries, boolean clientPacket) { - value = nbt.getInt("HeatCapacityValue"); + if (nbt.contains("HeatCapacityValue")) + value = nbt.getInt("HeatCapacityValue"); + else + value = CommonConfig.LIQUID_BLAZE_BURNER_MAX_HEAT_CAPACITY.get(); } @Override diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourLiquid.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourLiquid.java index e2343b8a..a6d8d537 100644 --- a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourLiquid.java +++ b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeScrollValueBehaviourLiquid.java @@ -29,8 +29,6 @@ public BehaviourType getType() { return TYPE; } - - public LiquidBlazeScrollValueBehaviourLiquid(Component label, SmartBlockEntity be, ValueBoxTransform slot) { super(label, be, slot); } @@ -51,7 +49,10 @@ public void write(CompoundTag nbt, HolderLookup.Provider registries, boolean cli @Override public void read(CompoundTag nbt, HolderLookup.Provider registries, boolean clientPacket) { - value = nbt.getInt("LiquidCapacityValue"); + if (nbt.contains("LiquidCapacityValue")) + value = nbt.getInt("LiquidCapacityValue"); + else + value = CommonConfig.LIQUID_BLAZE_BURNER_MAX_LIQUID_CAPACITY.get(); } @Override diff --git a/src/main/java/com/mrh0/createaddition/config/CommonConfig.java b/src/main/java/com/mrh0/createaddition/config/CommonConfig.java index f4c0855d..a45fa0e6 100644 --- a/src/main/java/com/mrh0/createaddition/config/CommonConfig.java +++ b/src/main/java/com/mrh0/createaddition/config/CommonConfig.java @@ -244,7 +244,7 @@ public class CommonConfig { .defineInRange("liquid_blaze_burner_max_liquid_capacity",4000,100,10000); LIQUID_BLAZE_BURNER_MAX_HEAT_CAPACITY = COMMON_BUILDER.comment("Liquid Blaze Burner internal heat capacity (in ticks).") - .defineInRange("liquid_blaze_burner_max_heat_capacity",10000,0,72000); + .defineInRange("liquid_blaze_burner_max_heat_capacity",10000,2,72000); COMMON_BUILDER.pop();