diff --git a/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java b/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java index d4e442bfc..4fac17920 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java +++ b/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java @@ -1,20 +1,44 @@ package com.hbm.blocks.machine; +import java.util.ArrayList; +import java.util.List; + +import com.hbm.blocks.ILookOverlay; import com.hbm.tileentity.network.TileEntityConverterHeRf; +import com.hbm.util.BobMathUtil; +import com.hbm.util.i18n.I18nUtil; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; +import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockConverterHeRf extends BlockContainer { +public class BlockConverterHeRf extends BlockContainer implements ILookOverlay { - public BlockConverterHeRf(Material p_i45386_1_) { - super(p_i45386_1_); + public BlockConverterHeRf(Material mat) { + super(mat); } @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityConverterHeRf(); } + + @Override + public void printHook(Pre event, World world, int x, int y, int z) { + TileEntity tile = world.getTileEntity(x, y, z); + + if(!(tile instanceof TileEntityConverterHeRf)) return; + + TileEntityConverterHeRf converter = (TileEntityConverterHeRf) tile; + List text = new ArrayList<>(); + + text.add(EnumChatFormatting.GREEN + "-> " + EnumChatFormatting.RESET + BobMathUtil.getShortNumber(converter.getPower()) + "HE"); + text.add(EnumChatFormatting.RED + "<- " + EnumChatFormatting.RESET + BobMathUtil.getShortNumber(converter.getEnergyStored(ForgeDirection.UNKNOWN)) + "RF"); + + ILookOverlay.printGeneric(event, I18nUtil.resolveKey(getUnlocalizedName() + ".name"), 0xffff00, 0x404000, text); + } } diff --git a/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java b/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java index 2731b4408..be757f5a3 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java +++ b/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java @@ -1,20 +1,44 @@ package com.hbm.blocks.machine; +import java.util.ArrayList; +import java.util.List; + +import com.hbm.blocks.ILookOverlay; import com.hbm.tileentity.network.TileEntityConverterRfHe; +import com.hbm.util.BobMathUtil; +import com.hbm.util.i18n.I18nUtil; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; +import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockConverterRfHe extends BlockContainer { +public class BlockConverterRfHe extends BlockContainer implements ILookOverlay { - public BlockConverterRfHe(Material p_i45386_1_) { - super(p_i45386_1_); + public BlockConverterRfHe(Material mat) { + super(mat); } @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityConverterRfHe(); } + + @Override + public void printHook(Pre event, World world, int x, int y, int z) { + TileEntity tile = world.getTileEntity(x, y, z); + + if(!(tile instanceof TileEntityConverterRfHe)) return; + + TileEntityConverterRfHe converter = (TileEntityConverterRfHe) tile; + List text = new ArrayList<>(); + + text.add(EnumChatFormatting.GREEN + "-> " + EnumChatFormatting.RESET + BobMathUtil.getShortNumber(converter.getEnergyStored(ForgeDirection.UNKNOWN)) + "RF"); + text.add(EnumChatFormatting.RED + "<- " + EnumChatFormatting.RESET + BobMathUtil.getShortNumber(converter.getPower()) + "HE"); + + ILookOverlay.printGeneric(event, I18nUtil.resolveKey(getUnlocalizedName() + ".name"), 0xffff00, 0x404000, text); + } } diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityConverterHeRf.java b/src/main/java/com/hbm/tileentity/network/TileEntityConverterHeRf.java index f6dc1fdff..ce1eff963 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityConverterHeRf.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityConverterHeRf.java @@ -11,6 +11,7 @@ import api.hbm.energymk2.IEnergyReceiverMK2; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyReceiver; +import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -31,7 +32,7 @@ public class TileEntityConverterHeRf extends TileEntityLoadedBase implements IEn @Override public void updateEntity() { - if (!worldObj.isRemote) { + if(!worldObj.isRemote) { long rfCreated = Math.min(storage.getMaxEnergyStored() - storage.getEnergyStored(), power / heInput * rfOutput); this.power -= rfCreated * heInput / rfOutput; @@ -39,13 +40,13 @@ public class TileEntityConverterHeRf extends TileEntityLoadedBase implements IEn if(power > 0) this.power *= (1D - inputDecay); if(rfCreated > 0) this.worldObj.markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, this); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { this.trySubscribe(worldObj, xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir); BlockPos loc = new BlockPos(xCoord, yCoord, zCoord).offset(dir); TileEntity entity = Compat.getTileStandard(worldObj, loc.getX(), loc.getY(), loc.getZ()); - if (entity != null && entity instanceof IEnergyReceiver) { + if(entity != null && entity instanceof IEnergyReceiver) { IEnergyReceiver receiver = (IEnergyReceiver) entity; int maxExtract = storage.getMaxExtract(); @@ -55,6 +56,8 @@ public class TileEntityConverterHeRf extends TileEntityLoadedBase implements IEn storage.extractEnergy(energyTransferred, false); } } + + networkPackNT(15); } } @@ -85,6 +88,22 @@ public class TileEntityConverterHeRf extends TileEntityLoadedBase implements IEn storage.writeToNBT(nbt); } + @Override + public void serialize(ByteBuf buf) { + super.serialize(buf); + + buf.writeLong(power); + buf.writeInt(storage.getEnergyStored()); + } + + @Override + public void deserialize(ByteBuf buf) { + super.deserialize(buf); + + power = buf.readLong(); + storage.setEnergyStored(buf.readInt()); + } + @Override public String getConfigName() { return "HEToRFConverter"; diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityConverterRfHe.java b/src/main/java/com/hbm/tileentity/network/TileEntityConverterRfHe.java index 989b8e354..e6c533a94 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityConverterRfHe.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityConverterRfHe.java @@ -8,6 +8,7 @@ import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energymk2.IEnergyProviderMK2; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyHandler; +import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -26,7 +27,7 @@ public class TileEntityConverterRfHe extends TileEntityLoadedBase implements IEn @Override public void updateEntity() { - if (!worldObj.isRemote) { + if(!worldObj.isRemote) { long rfCreated = Math.min(storage.getEnergyStored(), (maxPower - power) * rfInput / heOutput); storage.setEnergyStored((int) (storage.getEnergyStored() - rfCreated)); @@ -37,6 +38,8 @@ public class TileEntityConverterRfHe extends TileEntityLoadedBase implements IEn for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { this.tryProvide(worldObj, xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir); } + + networkPackNT(15); } } @@ -66,6 +69,22 @@ public class TileEntityConverterRfHe extends TileEntityLoadedBase implements IEn storage.writeToNBT(nbt); } + @Override + public void serialize(ByteBuf buf) { + super.serialize(buf); + + buf.writeLong(power); + buf.writeInt(storage.getEnergyStored()); + } + + @Override + public void deserialize(ByteBuf buf) { + super.deserialize(buf); + + power = buf.readLong(); + storage.setEnergyStored(buf.readInt()); + } + @Override public String getConfigName() { return "RFToHEConverter"; diff --git a/src/main/resources/assets/hbm/models/lights/cage_lamp.obj b/src/main/resources/assets/hbm/models/lights/cage_lamp.obj index 74169d283..2aa00952e 100644 --- a/src/main/resources/assets/hbm/models/lights/cage_lamp.obj +++ b/src/main/resources/assets/hbm/models/lights/cage_lamp.obj @@ -1,571 +1,151 @@ -# Blender 4.0.1 +# Blender 4.3.2 # www.blender.org +mtllib cage_lamp.mtl o CageLamp -v 0.174699 0.050284 -0.170405 -v 0.174699 0.037785 -0.170405 -v 0.187198 0.050284 -0.175448 -v 0.187198 0.037785 -0.175448 -v -0.002109 0.145255 -0.201498 -v -0.002109 0.101109 -0.243600 -v -0.002109 -0.103152 -0.243600 -v -0.002109 -0.145255 -0.201498 -v 0.056171 0.061436 -0.200955 -v 0.056171 0.094421 -0.170760 -v 0.056171 -0.093758 -0.171142 -v 0.056171 -0.063790 -0.201110 -v -0.002109 0.103152 0.243600 -v -0.002109 0.145255 0.201498 -v -0.002109 -0.145255 0.201498 -v -0.002109 -0.103152 0.243600 -v 0.056171 0.094258 0.170780 -v 0.056171 0.064290 0.200748 -v 0.056171 -0.063790 0.200748 -v 0.056171 -0.093758 0.170780 -v 0.009739 0.097808 -0.169350 -v 0.009739 0.063030 -0.204128 -v 0.174699 0.050284 0.170405 -v 0.009739 -0.063030 -0.204128 -v 0.009739 -0.097808 -0.169350 -v 0.174699 0.037785 0.170405 -v 0.125944 0.063030 -0.204128 -v 0.124890 0.095332 -0.169350 -v 0.169823 0.063030 -0.169350 -v 0.125944 -0.097808 -0.169350 -v 0.125944 -0.063030 -0.204128 -v 0.169823 -0.063030 -0.169350 -v 0.009739 0.063030 0.204128 -v 0.009739 0.097808 0.169350 -v 0.187198 0.050284 0.175448 -v 0.009739 -0.097808 0.169350 -v 0.009739 -0.063030 0.204128 -v 0.187198 0.037785 0.175448 -v 0.125944 0.063030 0.204128 -v 0.169823 0.063030 0.169350 -v 0.125944 0.097808 0.169350 -v 0.169823 -0.063030 0.169350 -v 0.125944 -0.063030 0.204128 -v 0.125944 -0.097808 0.169350 -v 0.137281 0.037785 -0.222204 -v 0.131756 0.037785 -0.209752 -v 0.131756 0.050284 -0.209752 -v 0.131756 0.050284 0.209752 -v 0.131756 0.037785 0.209752 -v 0.137281 0.037785 0.222204 -v 0.137281 0.050284 0.222204 -v 0.137281 0.050284 -0.222204 -v 0.053429 0.037785 -0.229540 -v 0.052340 0.037785 -0.217088 -v 0.052340 0.050284 -0.217088 -v 0.052340 0.050284 0.217088 -v 0.052340 0.037785 0.217088 -v 0.053429 0.037785 0.229540 -v 0.053429 0.050284 0.229540 -v 0.053429 0.050284 -0.229540 -v 0.174699 -0.037801 -0.170405 -v 0.174699 -0.050300 -0.170405 -v 0.187198 -0.037801 -0.175448 -v 0.187198 -0.050300 -0.175448 -v 0.174699 -0.037801 0.170405 -v 0.174699 -0.050300 0.170405 -v 0.187198 -0.037801 0.175448 -v 0.187198 -0.050300 0.175448 -v 0.137281 -0.050300 -0.222204 -v 0.131756 -0.050300 -0.209752 -v 0.131756 -0.037801 -0.209752 -v 0.131756 -0.037801 0.209752 -v 0.131756 -0.050300 0.209752 -v 0.137281 -0.050300 0.222204 -v 0.137281 -0.037801 0.222204 -v 0.137281 -0.037801 -0.222204 -v 0.053429 -0.050300 -0.229540 -v 0.052340 -0.050300 -0.217088 -v 0.052340 -0.037801 -0.217088 -v 0.052340 -0.037801 0.217088 -v 0.052340 -0.050300 0.217088 -v 0.053429 -0.050300 0.229540 -v 0.053429 -0.037801 0.229540 -v 0.053429 -0.037801 -0.229540 -v 0.056203 -0.116057 -0.126340 -v 0.056203 0.116108 -0.126340 -v 0.056203 0.116108 -0.113840 -v 0.055114 0.106003 -0.113840 -v 0.055114 0.106003 -0.126340 -v 0.055114 -0.105546 -0.126340 -v 0.055114 -0.105546 -0.113840 -v 0.056203 -0.116057 -0.113840 -v 0.140055 -0.109785 -0.126340 -v 0.140055 0.111267 -0.126340 -v 0.140055 0.111267 -0.113840 -v 0.136242 0.100805 -0.113840 -v 0.136242 0.100805 -0.126340 -v 0.137912 -0.099557 -0.126340 -v 0.137912 -0.099557 -0.113840 -v 0.140055 -0.109785 -0.113840 -v 0.189972 0.072795 -0.113840 -v 0.189972 0.072795 -0.126340 -v 0.177473 0.064705 -0.113840 -v 0.177473 0.064705 -0.126340 -v 0.189972 -0.069577 -0.113840 -v 0.189972 -0.069577 -0.126340 -v 0.177473 -0.063223 -0.113840 -v 0.177473 -0.063223 -0.126340 -v 0.177473 -0.063223 0.113750 -v 0.177473 -0.063223 0.126250 -v 0.189972 -0.069577 0.113750 -v 0.189972 -0.069577 0.126250 -v 0.177473 0.064705 0.113750 -v 0.177473 0.064705 0.126250 -v 0.189972 0.072795 0.113750 -v 0.189972 0.072795 0.126250 -v 0.140055 -0.109785 0.126250 -v 0.137912 -0.099557 0.126250 -v 0.137912 -0.099557 0.113750 -v 0.136242 0.100805 0.113750 -v 0.136242 0.100805 0.126250 -v 0.140055 0.111267 0.126250 -v 0.140055 0.111267 0.113750 -v 0.140055 -0.109785 0.113750 -v 0.056203 -0.116057 0.126250 -v 0.055114 -0.105546 0.126250 -v 0.055114 -0.105546 0.113750 -v 0.055114 0.106003 0.113750 -v 0.055114 0.106003 0.126250 -v 0.056203 0.116108 0.126250 -v 0.056203 0.116108 0.113750 -v 0.056203 -0.116057 0.113750 -v 0.177473 -0.063223 -0.006231 -v 0.177473 -0.063223 0.006268 -v 0.189972 -0.069577 -0.006231 -v 0.189972 -0.069577 0.006268 -v 0.177473 0.064705 -0.006231 -v 0.177473 0.064705 0.006268 -v 0.189972 0.072795 -0.006231 -v 0.189972 0.072795 0.006268 -v 0.140055 -0.109785 0.006268 -v 0.137912 -0.099557 0.006268 -v 0.137912 -0.099557 -0.006231 -v 0.136242 0.100805 -0.006231 -v 0.136242 0.100805 0.006268 -v 0.140055 0.111267 0.006268 -v 0.140055 0.111267 -0.006231 -v 0.140055 -0.109785 -0.006231 -v 0.056203 -0.116057 0.006268 -v 0.055114 -0.105546 0.006268 -v 0.055114 -0.105546 -0.006231 -v 0.055114 0.106003 -0.006231 -v 0.055114 0.106003 0.006268 -v 0.056203 0.116108 0.006268 -v 0.056203 0.116108 -0.006231 -v 0.056203 -0.116057 -0.006231 -v 0.056171 -0.145255 0.201498 -v 0.056171 -0.103152 0.243600 -v 0.056171 0.145255 -0.201498 -v 0.056171 0.099913 -0.243600 -v 0.056171 0.103152 0.243600 -v 0.056171 0.145255 0.201498 -v 0.056171 -0.103152 -0.243600 -v 0.056171 -0.145255 -0.201498 -v -0.002109 0.145255 0.000000 -v 0.056171 0.145255 0.000000 -v 0.056171 0.094339 0.000010 -v -0.002109 -0.145255 0.000000 -v 0.056171 -0.145255 0.000000 -v 0.056171 -0.093758 -0.000181 +v 0.062500 0.187500 0.187500 +v 0.062500 0.187500 -0.187500 +v 0.062500 -0.187500 0.187500 +v 0.062500 -0.187500 -0.187500 +v 0.000000 0.187500 0.187500 +v 0.000000 0.187500 -0.187500 +v 0.000000 -0.187500 0.187500 +v 0.000000 -0.187500 -0.187500 +v 0.062500 0.125000 -0.250000 +v 0.062500 -0.125000 -0.250000 +v 0.000000 0.125000 -0.250000 +v 0.000000 -0.125000 -0.250000 +v 0.062500 0.125000 0.250000 +v 0.000000 0.125000 0.250000 +v 0.062500 -0.125000 0.250000 +v 0.000000 -0.125000 0.250000 +v 0.187500 0.125000 0.187500 +v 0.187500 0.125000 -0.187500 +v 0.187500 -0.125000 0.187500 +v 0.187500 -0.125000 -0.187500 +v 0.062500 0.125000 0.187500 +v 0.062500 0.125000 -0.187500 +v 0.062500 -0.125000 0.187500 +v 0.062500 -0.125000 -0.187500 +v 0.203125 0.140625 0.203125 +v 0.203125 0.140625 -0.203125 +v 0.203125 -0.140625 0.203125 +v 0.203125 -0.140625 -0.203125 +v 0.062500 0.140625 0.203125 +v 0.062500 0.140625 -0.203125 +v 0.062500 -0.140625 0.203125 +v 0.062500 -0.140625 -0.203125 +v 0.203125 0.140625 0.203125 +v 0.203125 0.140625 -0.203125 +v 0.203125 -0.140625 0.203125 +v 0.203125 -0.140625 -0.203125 +v 0.062500 0.140625 0.203125 +v 0.062500 0.140625 -0.203125 +v 0.062500 -0.140625 0.203125 +v 0.062500 -0.140625 -0.203125 +vn 1.0000 -0.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 vn -0.0000 -1.0000 -0.0000 vn -0.0000 -0.0000 1.0000 -vn -0.0000 1.0000 -0.0000 vn -0.0000 -0.0000 -1.0000 -vn -0.0000 -0.7071 0.7071 -vn -0.0000 0.6902 -0.7237 -vn -0.0000 0.7071 0.7071 +vn -0.0000 0.7071 -0.7071 vn -0.0000 -0.7071 -0.7071 -vn 1.0000 -0.0000 -0.0000 -vn 0.4700 0.6538 -0.5930 -vn 0.4889 -0.6168 -0.6168 -vn -1.0000 -0.0000 -0.0000 -vn 0.4889 0.6168 0.6168 -vn 0.4889 -0.6168 0.6168 -vn 0.6212 -0.0000 0.7837 -vn 0.0152 0.7070 -0.7070 -vn 0.5837 0.8120 -0.0000 -vn 0.6212 -0.7837 -0.0000 -vn 0.6212 -0.0000 -0.7837 -vn 0.0215 0.9998 -0.0000 -vn 0.0872 -0.0000 -0.9962 -vn 0.6836 -0.0000 0.7298 -vn 0.6836 -0.0000 -0.7298 -vn -0.6756 -0.0000 0.7373 -vn -0.6756 -0.0000 -0.7373 -vn 0.0872 -0.0000 0.9962 -vn -0.0920 -0.0000 0.9958 -vn -0.0920 -0.0000 -0.9958 -vn -0.0639 -0.9980 -0.0000 -vn -0.0721 0.9974 -0.0000 -vn 0.0576 0.9983 -0.0000 -vn -0.6587 -0.7524 -0.0000 -vn -0.6764 0.7365 -0.0000 -vn 0.6273 -0.7788 -0.0000 -vn 0.6105 0.7921 -0.0000 -vn 0.0746 -0.9972 -0.0000 -vn 0.0140 0.6804 -0.7327 -vn -0.0000 0.7327 -0.6805 -vn 0.6211 0.7837 -0.0077 -vn -0.0000 1.0000 -0.0073 -vt 0.250000 0.625000 -vt 0.375000 0.562500 -vt 0.375000 0.625000 -vt 0.187500 0.562500 -vt 0.062500 0.625000 -vt 0.062500 0.562500 -vt 0.187500 0.625000 -vt 0.000286 0.562500 -vt 0.000000 0.625000 -vt 0.000000 0.562500 -vt 0.250000 0.562500 -vt 1.000000 0.250000 -vt 0.812500 0.750000 -vt 1.000000 0.750000 -vt 0.000000 0.687500 -vt 0.500000 0.750000 -vt 0.000000 0.750000 -vt 0.750000 0.812500 -vt 0.562500 1.000000 -vt 0.562500 0.812500 -vt 0.750000 0.250000 -vt 0.562500 0.750000 -vt 0.562500 0.250000 -vt 0.750000 0.000000 -vt 0.562500 0.187500 -vt 0.562500 0.000000 -vt 0.500000 0.687500 -vt 0.750000 0.937500 -vt 0.812500 0.937500 -vt 0.812500 1.000000 -vt 0.875000 0.937500 -vt 0.500000 0.625000 -vt 0.000000 0.750000 -vt 0.250000 0.687500 -vt 0.250000 0.750000 -vt 0.875000 0.812500 -vt 0.875000 0.750000 -vt 0.937500 0.812500 -vt 0.937500 1.000000 -vt 0.937500 0.937500 -vt 1.000000 0.937500 -vt 0.750000 0.750000 -vt 0.812500 0.250000 -vt 0.937500 0.750000 -vt 0.500000 0.250000 -vt 0.500000 0.812500 -vt 0.000000 0.812500 -vt 0.750000 0.187500 -vt 0.250000 0.812500 -vt 0.000000 0.687500 -vt 0.250000 0.937500 -vt 0.500000 1.000000 -vt 0.250000 1.000000 -vt 0.500000 0.875000 -vt 0.250000 0.875000 -vt 0.000000 1.000000 -vt 0.000000 0.937500 +vn -0.0000 0.7071 0.7071 +vn -0.0000 -0.7071 0.7071 vt 0.500000 0.937500 -vt 0.000000 0.875000 -vt 0.291985 0.089153 -vt 0.415266 0.073249 -vt 0.343988 0.001971 -vt 0.293149 0.410977 -vt 0.416463 0.420276 -vt 0.345186 0.497037 -vt 0.291985 0.407455 -vt 0.415266 0.422512 -vt 0.342719 0.356721 -vt 0.293796 0.092400 -vt 0.416463 0.076496 -vt 0.344530 0.143134 -vt 0.344267 0.355136 -vt 0.004061 0.497037 -vt 0.004044 0.410840 -vt 0.002863 0.001971 -vt 0.002557 0.089153 -vt 0.342719 0.139887 -vt 0.002863 0.493790 -vt 0.343988 0.493790 +vt 0.125000 0.937500 +vt 0.125000 0.562500 vt 0.500000 0.562500 -vt 0.004061 0.005218 -vt 0.345186 0.005218 +vt 0.125000 1.000000 +vt 0.500000 1.000000 +vt 0.125000 0.500000 +vt 0.500000 0.500000 +vt 0.062500 0.625000 +vt 0.062500 0.875000 +vt 0.000000 0.875000 +vt 0.000000 0.625000 +vt 0.625000 0.875000 +vt 0.562500 0.875000 +vt 0.562500 0.625000 +vt 0.625000 0.625000 +vt 0.562500 0.937500 +vt 0.562500 1.000000 +vt 0.562500 0.500000 +vt 0.562500 0.562500 +vt 0.062500 1.000000 +vt 0.062500 0.937500 +vt 0.062500 0.562500 +vt 0.062500 0.500000 vt 0.750000 1.000000 -vt 0.875000 1.000000 -vt -0.000000 0.687500 -vt 0.002880 0.407592 -vt 0.004367 0.092400 -s 0 -f 8/1/1 169/2/1 168/3/1 -f 161/4/2 16/5/2 158/6/2 -f 14/1/3 166/2/3 165/3/3 -f 7/7/4 160/6/4 163/4/4 -f 157/8/5 16/5/5 15/9/5 -f 159/10/6 6/5/6 5/9/6 -f 14/1/7 161/4/7 162/11/7 -f 8/1/8 163/4/8 164/11/8 -f 25/12/1 44/13/1 36/14/1 -f 1/15/3 35/16/3 3/17/3 -f 39/18/2 37/19/2 43/20/2 -f 29/21/9 42/22/9 32/23/9 -f 22/24/4 31/25/4 24/26/4 -f 2/17/1 38/27/1 26/16/1 -f 27/28/10 28/29/10 29/30/10 -f 30/29/11 31/31/11 32/30/11 -f 23/27/12 2/9/12 26/32/12 -f 1/33/3 52/34/3 47/35/3 -f 39/36/13 40/37/13 41/38/13 -f 42/39/14 43/40/14 44/41/14 -f 40/42/15 43/20/15 42/22/15 -f 28/29/16 22/42/16 21/13/16 -f 28/43/17 40/42/17 29/21/17 -f 44/41/5 37/44/5 36/14/5 -f 26/17/1 50/34/1 49/35/1 -f 30/45/18 42/22/18 44/16/18 -f 3/17/9 38/46/9 4/47/9 -f 34/39/7 39/36/7 41/38/7 -f 32/23/19 27/48/19 29/21/19 -f 25/13/8 31/31/8 30/29/8 -f 34/14/20 28/43/20 21/12/20 -f 45/49/21 60/17/21 52/35/21 -f 47/35/3 60/27/3 55/16/3 -f 35/17/22 50/49/22 38/47/22 -f 4/46/23 52/35/23 3/16/23 -f 1/27/24 46/1/24 2/32/24 -f 2/16/1 45/34/1 4/27/1 -f 26/9/25 48/34/25 23/15/25 -f 23/16/3 51/34/3 35/27/3 -f 51/35/26 58/46/26 50/49/26 -f 47/34/27 54/9/27 46/1/27 -f 48/35/3 59/50/3 51/34/3 -f 49/35/1 58/27/1 57/16/1 -f 49/1/28 56/27/28 48/34/28 -f 46/35/1 53/15/1 45/34/1 -f 61/15/3 67/16/3 63/17/3 -f 62/17/1 68/27/1 66/16/1 -f 65/27/12 62/9/12 66/32/12 -f 61/33/3 76/34/3 71/35/3 -f 66/27/1 74/35/1 73/34/1 -f 63/17/9 68/46/9 64/47/9 -f 69/49/21 84/17/21 76/35/21 -f 71/35/3 84/27/3 79/16/3 -f 67/17/22 74/49/22 68/47/22 -f 64/46/23 76/35/23 63/16/23 -f 61/27/24 70/1/24 62/32/24 -f 62/50/1 69/35/1 64/17/1 -f 66/9/25 72/34/25 65/15/25 -f 65/16/3 75/34/3 67/27/3 -f 75/35/26 82/46/26 74/49/26 -f 71/34/27 78/9/27 70/1/27 -f 72/35/3 83/50/3 75/34/3 -f 73/34/1 82/33/1 81/50/1 -f 73/1/28 80/27/28 72/34/28 -f 70/34/1 77/16/1 69/35/1 -f 99/51/2 92/52/2 100/53/2 -f 96/49/29 89/54/29 97/55/29 -f 96/51/2 87/56/2 88/57/2 -f 97/53/4 86/57/4 94/51/4 -f 98/49/30 91/54/30 99/55/30 -f 94/55/31 87/58/31 95/51/31 -f 102/58/4 97/53/4 94/51/4 -f 103/47/32 97/55/32 104/59/32 -f 105/56/2 99/51/2 100/53/2 -f 108/47/33 99/55/33 107/59/33 -f 105/59/34 93/51/34 106/57/34 -f 101/57/35 94/55/35 95/51/35 -f 98/53/4 85/58/4 90/52/4 -f 100/55/36 85/58/36 93/51/36 -f 106/58/9 101/59/9 105/54/9 -f 101/52/2 96/51/2 103/58/2 -f 106/57/4 98/53/4 108/56/4 -f 104/47/12 107/54/12 103/59/12 -f 103/57/2 105/52/2 101/56/2 -f 104/56/4 106/58/4 108/52/4 -f 113/56/4 111/58/4 109/52/4 -f 114/57/2 112/52/2 116/56/2 -f 113/47/12 110/54/12 114/59/12 -f 111/57/4 119/53/4 109/56/4 -f 116/52/2 121/51/2 114/58/2 -f 112/54/9 115/57/9 116/59/9 -f 117/55/36 132/58/36 124/51/36 -f 119/53/4 132/58/4 127/52/4 -f 116/57/35 123/55/35 122/51/35 -f 112/59/34 124/51/34 111/57/34 -f 109/47/33 118/55/33 110/59/33 -f 112/56/2 118/51/2 117/53/2 -f 114/47/32 120/55/32 113/59/32 -f 115/58/4 120/53/4 123/51/4 -f 123/55/31 130/58/31 122/51/31 -f 119/49/30 126/54/30 118/55/30 -f 120/53/4 131/57/4 123/51/4 -f 121/51/2 130/56/2 129/57/2 -f 120/55/29 129/46/29 128/54/29 -f 118/51/2 125/52/2 117/53/2 -f 137/56/4 135/58/4 133/52/4 -f 138/57/2 136/52/2 140/56/2 -f 137/47/12 134/54/12 138/59/12 -f 135/57/4 143/53/4 133/56/4 -f 140/52/2 145/51/2 138/58/2 -f 136/54/9 139/57/9 140/59/9 -f 141/55/36 156/58/36 148/51/36 -f 143/53/4 156/58/4 151/52/4 -f 140/57/35 147/55/35 146/51/35 -f 136/59/34 148/51/34 135/57/34 -f 133/47/33 142/55/33 134/59/33 -f 136/56/2 142/51/2 141/53/2 -f 138/47/32 144/55/32 137/59/32 -f 139/58/4 144/53/4 147/51/4 -f 147/55/31 154/58/31 146/51/31 -f 143/49/30 150/54/30 142/55/30 -f 144/53/4 155/57/4 147/51/4 -f 145/51/2 154/56/2 153/57/2 -f 144/55/29 153/46/29 152/54/29 -f 142/51/2 149/52/2 141/53/2 -f 20/60/9 158/61/9 157/62/9 -f 10/63/9 160/64/9 159/65/9 -f 17/66/9 161/67/9 18/68/9 -f 11/69/9 163/70/9 12/71/9 -f 12/71/9 160/64/9 9/72/9 -f 10/63/9 166/73/9 167/74/9 -f 20/60/9 169/75/9 170/76/9 -f 19/77/9 161/67/9 158/61/9 -f 17/66/9 166/78/9 162/79/9 -f 165/3/3 159/80/3 5/32/3 -f 11/69/9 169/81/9 164/82/9 -f 168/3/1 157/80/1 15/32/1 -f 8/1/1 164/11/1 169/2/1 -f 161/4/2 13/7/2 16/5/2 -f 14/1/3 162/11/3 166/2/3 -f 7/7/4 6/5/4 160/6/4 -f 157/8/5 158/6/5 16/5/5 -f 159/10/37 160/6/37 6/5/37 -f 14/1/7 13/7/7 161/4/7 -f 8/1/8 7/7/8 163/4/8 -f 25/12/1 30/43/1 44/13/1 -f 1/15/3 23/27/3 35/16/3 -f 39/18/2 33/83/2 37/19/2 -f 29/21/9 40/42/9 42/22/9 -f 22/24/4 27/48/4 31/25/4 -f 2/17/1 4/15/1 38/27/1 -f 23/27/12 1/15/12 2/9/12 -f 1/33/3 3/50/3 52/34/3 -f 40/42/15 39/18/15 43/20/15 -f 28/29/38 27/28/38 22/42/38 -f 28/43/39 41/13/39 40/42/39 -f 44/41/5 43/40/5 37/44/5 -f 26/17/1 38/15/1 50/34/1 -f 30/45/18 32/23/18 42/22/18 -f 3/17/9 35/16/9 38/46/9 -f 34/39/7 33/84/7 39/36/7 -f 32/23/19 31/25/19 27/48/19 -f 25/13/8 24/37/8 31/31/8 -f 34/14/40 41/13/40 28/43/40 -f 45/49/21 53/47/21 60/17/21 -f 47/35/3 52/34/3 60/27/3 -f 35/17/22 51/35/22 50/49/22 -f 4/46/23 45/49/23 52/35/23 -f 1/27/24 47/34/24 46/1/24 -f 2/16/1 46/35/1 45/34/1 -f 26/9/25 49/1/25 48/34/25 -f 23/16/3 48/35/3 51/34/3 -f 51/35/26 59/16/26 58/46/26 -f 47/34/27 55/15/27 54/9/27 -f 48/35/3 56/33/3 59/50/3 -f 49/35/1 50/34/1 58/27/1 -f 49/1/28 57/32/28 56/27/28 -f 46/35/1 54/17/1 53/15/1 -f 61/15/3 65/27/3 67/16/3 -f 62/17/1 64/15/1 68/27/1 -f 65/27/12 61/15/12 62/9/12 -f 61/33/3 63/85/3 76/34/3 -f 66/27/1 68/16/1 74/35/1 -f 63/17/9 67/16/9 68/46/9 -f 69/49/21 77/47/21 84/17/21 -f 71/35/3 76/34/3 84/27/3 -f 67/17/22 75/35/22 74/49/22 -f 64/46/23 69/49/23 76/35/23 -f 61/27/24 71/34/24 70/1/24 -f 62/50/1 70/34/1 69/35/1 -f 66/9/25 73/1/25 72/34/25 -f 65/16/3 72/35/3 75/34/3 -f 75/35/26 83/16/26 82/46/26 -f 71/34/27 79/15/27 78/9/27 -f 72/35/3 80/33/3 83/50/3 -f 73/34/1 74/35/1 82/33/1 -f 73/1/28 81/32/28 80/27/28 -f 70/34/1 78/27/1 77/16/1 -f 99/51/2 91/58/2 92/52/2 -f 96/49/29 88/46/29 89/54/29 -f 96/51/2 95/53/2 87/56/2 -f 97/53/4 89/56/4 86/57/4 -f 98/49/30 90/46/30 91/54/30 -f 94/55/31 86/54/31 87/58/31 -f 102/58/4 104/52/4 97/53/4 -f 103/47/32 96/49/32 97/55/32 -f 105/56/2 107/57/2 99/51/2 -f 108/47/33 98/49/33 99/55/33 -f 105/59/34 100/55/34 93/51/34 -f 101/57/35 102/59/35 94/55/35 -f 98/53/4 93/51/4 85/58/4 -f 100/55/36 92/54/36 85/58/36 -f 106/58/9 102/57/9 101/59/9 -f 101/52/2 95/53/2 96/51/2 -f 106/57/4 93/51/4 98/53/4 -f 104/47/12 108/46/12 107/54/12 -f 103/57/2 107/58/2 105/52/2 -f 104/56/4 102/57/4 106/58/4 -f 113/56/4 115/57/4 111/58/4 -f 114/57/2 110/58/2 112/52/2 -f 113/47/12 109/46/12 110/54/12 -f 111/57/4 124/51/4 119/53/4 -f 116/52/2 122/53/2 121/51/2 -f 112/54/9 111/58/9 115/57/9 -f 117/55/36 125/54/36 132/58/36 -f 119/53/4 124/51/4 132/58/4 -f 116/57/35 115/59/35 123/55/35 -f 112/59/34 117/55/34 124/51/34 -f 109/47/33 119/49/33 118/55/33 -f 112/56/2 110/57/2 118/51/2 -f 114/47/32 121/49/32 120/55/32 -f 115/58/4 113/52/4 120/53/4 -f 123/55/31 131/54/31 130/58/31 -f 119/49/30 127/46/30 126/54/30 -f 120/53/4 128/56/4 131/57/4 -f 121/51/2 122/53/2 130/56/2 -f 120/55/29 121/49/29 129/46/29 -f 118/51/2 126/58/2 125/52/2 -f 137/56/4 139/57/4 135/58/4 -f 138/57/2 134/58/2 136/52/2 -f 137/47/12 133/46/12 134/54/12 -f 135/57/4 148/51/4 143/53/4 -f 140/52/2 146/53/2 145/51/2 -f 136/54/9 135/58/9 139/57/9 -f 141/55/36 149/54/36 156/58/36 -f 143/53/4 148/51/4 156/58/4 -f 140/57/35 139/59/35 147/55/35 -f 136/59/34 141/55/34 148/51/34 -f 133/47/33 143/49/33 142/55/33 -f 136/56/2 134/57/2 142/51/2 -f 138/47/32 145/49/32 144/55/32 -f 139/58/4 137/52/4 144/53/4 -f 147/55/31 155/54/31 154/58/31 -f 143/49/30 151/46/30 150/54/30 -f 144/53/4 152/56/4 155/57/4 -f 145/51/2 146/53/2 154/56/2 -f 144/55/29 145/49/29 153/46/29 -f 142/51/2 150/58/2 149/52/2 -f 20/60/9 19/77/9 158/61/9 -f 10/63/9 9/72/9 160/64/9 -f 17/66/9 162/79/9 161/67/9 -f 11/69/9 164/82/9 163/70/9 -f 12/71/9 163/70/9 160/64/9 -f 10/63/9 159/65/9 166/73/9 -f 20/60/9 157/62/9 169/75/9 -f 19/77/9 18/68/9 161/67/9 -f 17/66/9 167/86/9 166/78/9 -f 165/3/3 166/2/3 159/80/3 -f 11/69/9 170/87/9 169/81/9 -f 168/3/1 169/2/1 157/80/1 +vt 0.750000 0.625000 +vt 1.000000 0.625000 +vt 1.000000 1.000000 +vt 0.625000 1.000000 +vt 0.750000 0.500000 +vt 1.000000 0.500000 +vt 0.125000 0.062500 +vt 0.125000 0.375000 +vt 0.562500 0.375000 +vt 0.562500 0.062500 +vt 0.000000 0.375000 +vt 0.000000 0.062500 +s 1 +usemtl m_522401c1-473a-3eee-a103-cf6dbc826e48 +f 2/1/1 1/2/1 3/3/1 +f 2/1/1 3/3/1 4/4/1 +f 7/4/2 5/1/2 6/2/2 +f 7/4/2 6/2/2 8/3/2 +f 5/5/3 1/2/3 2/1/3 +f 5/5/3 2/1/3 6/6/3 +f 4/4/4 3/3/4 7/7/4 +f 4/4/4 7/7/4 8/8/4 +f 15/9/5 13/10/5 14/11/5 +f 15/9/5 14/11/5 16/12/5 +f 11/13/6 9/14/6 10/15/6 +f 11/13/6 10/15/6 12/16/6 +f 9/17/7 11/18/7 6/6/7 +f 9/17/7 6/6/7 2/1/7 +f 10/15/1 9/14/1 2/1/1 +f 10/15/1 2/1/1 4/4/1 +f 12/19/8 10/20/8 4/4/8 +f 12/19/8 4/4/8 8/8/8 +f 11/10/2 12/9/2 8/3/2 +f 11/10/2 8/3/2 6/2/2 +f 13/10/1 15/9/1 3/3/1 +f 13/10/1 3/3/1 1/2/1 +f 14/21/9 13/22/9 1/2/9 +f 14/21/9 1/2/9 5/5/9 +f 16/15/2 14/14/2 5/1/2 +f 16/15/2 5/1/2 7/4/2 +f 15/23/10 16/24/10 7/7/10 +f 15/23/10 7/7/10 3/3/10 +f 18/25/1 17/26/1 19/27/1 +f 18/25/1 19/27/1 20/28/1 +f 21/16/3 17/26/3 18/25/3 +f 21/16/3 18/25/3 22/29/3 +f 20/26/4 19/25/4 23/29/4 +f 20/26/4 23/29/4 24/16/4 +f 19/27/5 17/26/5 21/30/5 +f 19/27/5 21/30/5 23/31/5 +f 22/31/6 18/27/6 20/26/6 +f 22/31/6 20/26/6 24/30/6 +f 27/32/2 25/33/2 26/34/2 +f 27/32/2 26/34/2 28/35/2 +f 26/34/4 25/33/4 29/7/4 +f 26/34/4 29/7/4 30/19/4 +f 31/19/3 27/34/3 28/33/3 +f 31/19/3 28/33/3 32/7/3 +f 29/36/6 25/33/6 27/32/6 +f 29/36/6 27/32/6 31/37/6 +f 28/33/5 26/32/5 30/37/5 +f 28/33/5 30/37/5 32/36/5 +f 34/34/1 33/33/1 35/32/1 +f 34/34/1 35/32/1 36/35/1 +f 37/7/3 33/33/3 34/34/3 +f 37/7/3 34/34/3 38/19/3 +f 36/33/4 35/34/4 39/19/4 +f 36/33/4 39/19/4 40/7/4 +f 35/32/5 33/33/5 37/36/5 +f 35/32/5 37/36/5 39/37/5 +f 38/37/6 34/32/6 36/33/6 +f 38/37/6 36/33/6 40/36/6 diff --git a/src/main/resources/assets/hbm/models/lights/flood_lamp.obj b/src/main/resources/assets/hbm/models/lights/flood_lamp.obj index 09cddd769..efcaf6938 100644 --- a/src/main/resources/assets/hbm/models/lights/flood_lamp.obj +++ b/src/main/resources/assets/hbm/models/lights/flood_lamp.obj @@ -1,228 +1,210 @@ # Blender 4.0.1 # www.blender.org o FloodLamp -v 0.015049 -0.086498 0.155863 -v 0.015049 0.086498 0.155863 -v 0.015049 -0.086498 -0.155863 -v 0.015049 0.086498 -0.155863 -v 0.306240 -0.185247 0.273848 -v 0.306240 0.185247 0.273848 -v 0.306240 -0.185247 -0.273848 -v 0.306240 0.185247 -0.273848 -v 0.306240 0.228156 -0.325088 -v 0.306240 -0.228156 -0.325088 -v 0.306240 -0.228156 0.325088 -v 0.306240 0.228156 0.325088 -v 0.183352 0.115790 -0.171171 -v 0.183352 -0.115790 -0.171171 -v 0.183352 -0.115790 0.171171 -v 0.183352 0.115790 0.171171 -v 0.183138 0.057253 -0.202014 -v 0.183138 0.057253 0.202014 -v 0.183138 -0.057253 -0.202014 -v 0.183138 -0.057253 0.202014 -v 0.214999 -0.040484 -0.202014 -v 0.214999 -0.040484 0.202014 -v 0.228196 0.000000 -0.202014 -v 0.228196 0.000000 0.202014 -v 0.214999 0.040484 -0.202014 -v 0.214999 0.040484 0.202014 -v -0.001481 -0.036719 0.241790 -v -0.001481 0.036719 0.241790 -v -0.001481 -0.036719 -0.241790 -v -0.001481 0.036719 -0.241790 -v 0.005048 -0.036719 0.237296 -v 0.005048 0.036719 0.237296 -v 0.005048 -0.036719 -0.237296 -v 0.005048 0.036719 -0.237296 -v 0.150804 -0.036719 0.259541 -v 0.150804 0.036719 0.259541 -v 0.150804 0.036719 -0.259541 -v 0.150804 -0.036719 -0.259541 -v 0.150804 -0.036719 -0.253185 -v 0.150804 0.036719 -0.253185 -v 0.150804 0.036719 0.253185 -v 0.150804 -0.036719 0.253185 -v 0.071925 -0.135739 -0.228998 -v 0.071925 0.135739 -0.228998 -v 0.071925 -0.135739 0.228998 -v 0.071925 0.135739 0.228998 -v 0.256780 0.219497 -0.320654 -v 0.256780 -0.219497 0.320654 -v 0.256780 -0.219497 -0.320654 -v 0.256780 0.219497 0.320654 -vn -1.0000 -0.0000 -0.0000 -vn -0.0893 -0.0000 -0.9960 -vn 0.4920 -0.8706 -0.0000 -vn -0.7894 -0.0000 0.6139 -vn -0.1724 -0.9850 -0.0000 -vn -0.6545 0.7560 -0.0000 +v 0.312500 0.250000 0.312500 +v 0.312500 0.250000 -0.312500 +v 0.312500 -0.250000 0.312500 +v 0.312500 -0.250000 -0.312500 +v 0.250000 0.250000 0.312500 +v 0.250000 0.250000 -0.312500 +v 0.250000 -0.250000 0.312500 +v 0.250000 -0.250000 -0.312500 +v 0.062500 0.156250 0.250000 +v 0.062500 0.156250 -0.250000 +v 0.062500 -0.156250 0.250000 +v 0.062500 -0.156250 -0.250000 +v 0.000000 0.062500 0.125000 +v 0.000000 0.062500 -0.125000 +v 0.000000 -0.062500 0.125000 +v 0.000000 -0.062500 -0.125000 +v 0.312500 0.187500 0.250000 +v 0.312500 -0.187500 0.250000 +v 0.312500 0.187500 -0.250000 +v 0.312500 -0.187500 -0.250000 +v 0.125000 0.125000 0.187500 +v 0.125000 -0.125000 0.187500 +v 0.125000 0.125000 -0.187500 +v 0.125000 -0.125000 -0.187500 +v 0.250000 0.031250 0.250000 +v 0.250000 0.031250 -0.250000 +v 0.250000 -0.031250 0.250000 +v 0.250000 -0.031250 -0.250000 +v 0.187500 0.093750 0.250000 +v 0.187500 0.093750 -0.250000 +v 0.125000 0.093750 0.250000 +v 0.125000 0.093750 -0.250000 +v 0.187500 -0.093750 0.250000 +v 0.125000 -0.093750 0.250000 +v 0.187500 -0.093750 -0.250000 +v 0.125000 -0.093750 -0.250000 +v 0.250000 0.062500 0.312500 +v 0.250000 0.062500 -0.312500 +v 0.250000 -0.062500 0.312500 +v 0.250000 -0.062500 -0.312500 +v 0.000000 0.062500 0.312500 +v 0.000000 0.062500 -0.312500 +v 0.000000 -0.062500 0.312500 +v 0.000000 -0.062500 -0.312500 +v 0.250000 0.062500 0.312500 +v 0.250000 0.062500 -0.312500 +v 0.250000 -0.062500 0.312500 +v 0.250000 -0.062500 -0.312500 +v 0.000000 0.062500 0.312500 +v 0.000000 0.062500 -0.312500 +v 0.000000 -0.062500 0.312500 +v 0.000000 -0.062500 -0.312500 vn 1.0000 -0.0000 -0.0000 -vn 0.6412 -0.0000 0.7674 -vn 0.6412 -0.0000 -0.7674 -vn 0.4920 0.8706 -0.0000 -vn 0.4658 -0.8849 -0.0000 -vn 0.9508 -0.3099 -0.0000 -vn 0.9508 0.3099 -0.0000 -vn 0.4658 0.8849 -0.0000 -vn -0.0000 -1.0000 -0.0000 -vn 0.1084 -0.0000 0.9941 vn -0.0000 1.0000 -0.0000 -vn 0.1084 -0.0000 -0.9941 -vn -0.1158 -0.0000 -0.9933 -vn -0.1158 -0.0000 0.9933 -vn -0.4127 0.9109 -0.0000 -vn -0.6545 -0.7560 -0.0000 -vn -0.4442 -0.0000 0.8959 -vn -0.7894 -0.0000 -0.6139 -vn -0.0893 -0.0000 0.9960 -vn -0.1724 0.9850 -0.0000 -vn -0.4127 -0.9109 -0.0000 -vn -0.4442 -0.0000 -0.8959 -vt 0.750000 0.312500 -vt 0.937500 0.000000 -vt 0.937500 0.312500 -vt 0.433577 0.606066 -vt 0.390675 0.995211 -vt 0.433577 0.987684 -vt 0.319041 0.068172 -vt 0.433066 0.416342 -vt 0.319041 0.496674 -vt 0.592516 0.678877 -vt 0.640575 0.872068 -vt 0.592516 0.914873 -vt 0.954474 0.992052 -vt 0.393131 0.950474 -vt 0.950619 0.950474 -vt 0.536383 0.742486 -vt 0.870944 0.796340 -vt 0.472806 0.796340 -vt 0.520556 0.519306 -vt 0.125992 0.563849 -vt 0.166945 0.519306 -vt 0.520555 0.043194 -vt 0.561508 0.563849 -vt 0.125992 -0.001349 -vt 0.166945 0.043194 -vt 0.166945 0.045709 -vt 0.561508 0.001166 -vt 0.520555 0.045709 -vt 0.062500 1.000000 -vt 0.312500 0.687500 -vt 0.312500 1.000000 -vt 0.999676 0.773340 -vt 0.890949 0.511648 -vt 0.999676 0.451269 -vt 1.000000 0.773310 -vt 0.891273 0.511618 -vt 1.000000 0.451239 -vt 0.320607 0.064998 -vt 0.433145 0.419320 -vt 0.320607 0.493499 -vt 0.000000 0.437500 -vt 0.062500 0.437500 -vt 0.000000 1.000000 -vt 0.937500 0.437500 -vt 1.000000 0.000000 -vt 1.000000 0.437500 -vt 1.000000 0.125000 -vt 0.937500 0.125000 -vt 0.950619 0.956002 -vt 0.393131 0.956002 -vt 0.807367 0.757948 -vt 0.472806 0.801131 -vt 0.536383 0.757948 -vt 0.640575 0.721682 -vt 0.390675 0.598539 -vt 0.390675 0.995211 -vt 0.954474 0.995950 -vt 0.389276 0.995950 -vt 0.870944 0.801131 -vt 0.750000 0.000000 -vt 0.390675 0.598539 -vt 0.433066 0.148504 -vt 0.389276 0.992052 -vt 0.807367 0.742486 -vt 0.561508 -0.001349 -vt 0.125992 0.001166 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.3162 -0.0000 0.9487 +vn -0.4472 0.8944 -0.0000 +vn -0.3162 -0.0000 -0.9487 +vn -0.4472 -0.8944 -0.0000 +vn -0.8944 -0.0000 0.4472 +vn -0.8321 0.5547 -0.0000 +vn -0.8944 -0.0000 -0.4472 +vn -0.8321 -0.5547 -0.0000 +vn 0.3162 -0.9487 -0.0000 +vn 0.3162 -0.0000 -0.9487 +vn 0.3162 0.9487 -0.0000 +vn 0.3162 -0.0000 0.9487 +vn 0.7071 0.7071 -0.0000 +vn 0.7071 -0.7071 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vt 0.187500 0.187500 +vt 0.187500 0.312500 +vt 0.437500 0.312500 +vt 0.437500 0.187500 +vt 0.000000 0.500000 +vt 0.000000 0.453125 +vt 0.625000 0.453125 +vt 0.625000 0.500000 +vt 0.625000 0.046875 +vt 0.000000 0.046875 +vt 0.000000 0.000000 +vt 0.625000 0.000000 +vt 0.046875 0.000000 +vt 0.046875 0.500000 +vt 0.578125 0.500000 +vt 0.578125 0.000000 +vt 0.812500 0.093750 +vt 0.812500 0.406250 +vt 0.562500 0.687500 vt 0.062500 0.687500 -vt 0.890949 0.712961 -vt 0.891273 0.712931 -vt 0.433145 0.151481 -s 0 -f 2/1/1 3/2/1 1/3/1 -f 47/4/2 10/5/2 49/6/2 -f 6/7/3 13/8/3 8/9/3 -f 46/10/4 1/11/4 45/12/4 -f 10/13/5 48/14/5 49/15/5 -f 4/16/6 46/17/6 44/18/6 -f 7/19/7 9/20/7 8/21/7 -f 5/22/7 10/23/7 7/19/7 -f 8/21/7 12/24/7 6/25/7 -f 6/26/7 11/27/7 5/28/7 -f 13/29/7 15/30/7 14/31/7 -f 8/32/8 14/33/8 7/34/8 -f 5/35/9 16/36/9 6/37/9 -f 7/38/10 15/39/10 5/40/10 -f 21/41/11 20/29/11 19/42/11 -f 23/41/12 22/29/12 21/42/12 -f 25/29/13 24/41/13 23/43/13 -f 17/29/14 26/41/14 25/43/14 -f 28/44/1 29/45/1 27/46/1 -f 33/2/15 38/47/15 39/48/15 -f 34/44/7 31/45/7 33/46/7 -f 33/45/16 40/48/16 34/2/16 -f 33/44/15 27/45/15 29/46/15 -f 30/45/17 32/44/17 34/2/17 -f 32/2/17 36/47/17 41/48/17 -f 32/48/18 42/45/18 31/47/18 -f 34/45/17 37/48/17 30/2/17 -f 30/48/19 38/45/19 29/47/19 -f 27/45/20 36/48/20 28/2/20 -f 31/45/15 35/48/15 27/2/15 -f 44/18/21 50/49/21 47/50/21 -f 3/51/22 45/52/22 1/53/22 -f 50/4/23 45/12/23 48/6/23 -f 4/54/24 43/12/24 3/11/24 -f 12/55/25 48/6/25 11/56/25 -f 47/50/26 12/57/26 9/58/26 -f 49/15/27 45/52/27 43/59/27 -f 44/10/28 49/6/28 43/12/28 -f 2/1/1 4/60/1 3/2/1 -f 47/4/2 9/61/2 10/5/2 -f 6/7/3 16/62/3 13/8/3 -f 46/10/4 2/54/4 1/11/4 -f 10/13/5 11/63/5 48/14/5 -f 4/16/6 2/64/6 46/17/6 -f 7/19/7 10/23/7 9/20/7 -f 5/22/7 11/65/7 10/23/7 -f 8/21/7 9/20/7 12/24/7 -f 6/26/7 12/66/7 11/27/7 -f 13/29/7 16/67/7 15/30/7 -f 8/32/8 13/68/8 14/33/8 -f 5/35/9 15/69/9 16/36/9 -f 7/38/10 14/70/10 15/39/10 -f 21/41/11 22/43/11 20/29/11 -f 23/41/12 24/43/12 22/29/12 -f 25/29/13 26/42/13 24/41/13 -f 17/29/14 18/42/14 26/41/14 -f 28/44/1 30/2/1 29/45/1 -f 33/2/15 29/45/15 38/47/15 -f 34/44/7 32/2/7 31/45/7 -f 33/45/16 39/47/16 40/48/16 -f 33/44/15 31/2/15 27/45/15 -f 30/45/17 28/46/17 32/44/17 -f 32/2/17 28/45/17 36/47/17 -f 32/48/18 41/2/18 42/45/18 -f 34/45/17 40/47/17 37/48/17 -f 30/48/19 37/2/19 38/45/19 -f 27/45/20 35/47/20 36/48/20 -f 31/45/15 42/47/15 35/48/15 -f 44/18/21 46/17/21 50/49/21 -f 3/51/22 43/59/22 45/52/22 -f 50/4/23 46/10/23 45/12/23 -f 4/54/24 44/10/24 43/12/24 -f 12/55/25 50/4/25 48/6/25 -f 47/50/26 50/49/26 12/57/26 -f 49/15/27 48/14/27 45/52/27 -f 44/10/28 47/4/28 49/6/28 +vt 0.937500 0.187500 +vt 0.937500 0.312500 +vt 0.437500 0.812500 +vt 0.187500 0.812500 +vt 0.062500 0.453125 +vt 0.562500 0.453125 +vt 0.046875 0.062500 +vt 0.046875 0.437500 +vt 0.562500 0.046875 +vt 0.062500 0.046875 +vt 0.578125 0.437500 +vt 0.578125 0.062500 +vt 0.125000 0.312500 +vt 0.500000 0.312500 +vt 0.562500 0.500000 +vt 0.062500 0.500000 +vt 0.187500 0.125000 +vt 0.187500 0.375000 +vt 0.000000 0.437500 +vt 0.000000 0.062500 +vt 0.500000 0.187500 +vt 0.125000 0.187500 +vt 0.062500 0.000000 +vt 0.562500 0.000000 +vt 0.437500 0.375000 +vt 0.437500 0.125000 +vt 0.625000 0.062500 +vt 0.625000 0.437500 +vt 1.000000 0.750000 +vt 0.750000 0.750000 +vt 0.750000 0.687500 +vt 1.000000 0.687500 +vt 0.750000 0.875000 +vt 0.750000 0.812500 +vt 1.000000 0.812500 +vt 1.000000 0.875000 +vt 1.000000 0.625000 +vt 0.750000 0.625000 +vt 0.750000 0.562500 +vt 1.000000 0.562500 +vt 1.000000 0.890625 +vt 1.000000 0.984375 +vt 0.750000 0.984375 +vt 0.750000 0.890625 +vt 0.250000 0.984375 +vt 0.000000 0.984375 +vt 0.000000 0.890625 +vt 0.250000 0.890625 +vt 0.625000 1.000000 +vt 0.375000 1.000000 +vt 0.375000 0.875000 +vt 0.625000 0.875000 +s 1 +f 23/1/1 21/2/1 22/3/1 +f 23/1/1 22/3/1 24/4/1 +f 5/5/2 1/6/2 2/7/2 +f 5/5/2 2/7/2 6/8/2 +f 4/9/3 3/10/3 7/11/3 +f 4/9/3 7/11/3 8/12/3 +f 3/13/4 1/14/4 5/5/4 +f 3/13/4 5/5/4 7/11/4 +f 6/8/5 2/15/5 4/16/5 +f 6/8/5 4/16/5 8/12/5 +f 9/17/6 11/18/6 7/8/6 +f 9/17/6 7/8/6 5/12/6 +f 10/19/7 9/20/7 5/5/7 +f 10/19/7 5/5/7 6/8/7 +f 12/17/8 10/18/8 6/8/8 +f 12/17/8 6/8/8 8/12/8 +f 11/19/9 12/20/9 8/5/9 +f 11/19/9 8/5/9 7/8/9 +f 13/21/10 15/22/10 11/18/10 +f 13/21/10 11/18/10 9/17/10 +f 14/23/11 13/24/11 9/20/11 +f 14/23/11 9/20/11 10/19/11 +f 16/21/12 14/22/12 10/18/12 +f 16/21/12 10/18/12 12/17/12 +f 15/23/13 16/24/13 12/20/13 +f 15/23/13 12/20/13 11/19/13 +f 17/25/1 19/26/1 2/8/1 +f 17/25/1 2/8/1 1/5/1 +f 18/27/1 17/28/1 1/5/1 +f 18/27/1 1/5/1 3/11/1 +f 20/29/1 18/30/1 3/11/1 +f 20/29/1 3/11/1 4/12/1 +f 19/31/1 20/32/1 4/12/1 +f 19/31/1 4/12/1 2/8/1 +f 21/33/14 23/34/14 19/35/14 +f 21/33/14 19/35/14 17/36/14 +f 22/37/15 21/38/15 17/39/15 +f 22/37/15 17/39/15 18/40/15 +f 24/41/16 22/42/16 18/43/16 +f 24/41/16 18/43/16 20/44/16 +f 23/45/17 24/46/17 20/47/17 +f 23/45/17 20/47/17 19/48/17 +f 26/49/1 25/50/1 27/51/1 +f 26/49/1 27/51/1 28/52/1 +f 31/53/2 29/54/2 30/55/2 +f 31/53/2 30/55/2 32/56/2 +f 35/57/3 33/58/3 34/59/3 +f 35/57/3 34/59/3 36/60/3 +f 30/55/18 29/54/18 25/50/18 +f 30/55/18 25/50/18 26/49/18 +f 33/58/19 35/57/19 28/52/19 +f 33/58/19 28/52/19 27/51/19 +f 39/61/4 37/62/4 41/63/4 +f 39/61/4 41/63/4 43/64/4 +f 42/65/5 38/66/5 40/67/5 +f 42/65/5 40/67/5 44/68/5 +f 49/63/5 45/62/5 47/61/5 +f 49/63/5 47/61/5 51/64/5 +f 48/67/4 46/66/4 50/65/4 +f 48/67/4 50/65/4 52/68/4 +f 13/69/20 14/70/20 16/71/20 +f 13/69/20 16/71/20 15/72/20 diff --git a/src/main/resources/assets/hbm/models/lights/fluorescent_lamp.obj b/src/main/resources/assets/hbm/models/lights/fluorescent_lamp.obj index 9343ef1bc..8c3ffef90 100644 --- a/src/main/resources/assets/hbm/models/lights/fluorescent_lamp.obj +++ b/src/main/resources/assets/hbm/models/lights/fluorescent_lamp.obj @@ -1,306 +1,331 @@ -# Blender 4.0.1 +# Blender 4.4.0 # www.blender.org +mtllib fluorescent_lamp.mtl o FluoroCap -v -0.002210 -0.289110 0.300000 -v -0.002210 0.289110 0.300000 -v -0.002210 -0.289110 -0.500000 -v -0.002210 0.289110 -0.500000 -v 0.147790 -0.315000 0.300000 -v 0.147790 0.315000 0.300000 -v 0.147790 -0.315000 -0.500000 -v 0.147790 0.315000 -0.500000 -v 0.072790 -0.315000 -0.500000 -v 0.072790 0.315000 -0.500000 -v 0.072790 -0.315000 0.300000 -v 0.072790 0.315000 0.300000 -v -0.002210 0.289110 0.350000 -v -0.002210 -0.289110 0.350000 -v 0.147790 -0.315000 0.350000 -v 0.147790 0.315000 0.350000 -v 0.072790 0.315000 0.350000 -v 0.072790 -0.315000 0.350000 -vn -0.0000 -0.0000 -1.0000 -vn 1.0000 -0.0000 -0.0000 -vn -0.0000 -1.0000 -0.0000 -vn -0.3263 0.9453 -0.0000 -vn -0.0000 1.0000 -0.0000 -vn -0.3263 -0.9453 -0.0000 -vn -0.0000 -0.0000 1.0000 -vt 0.125000 0.937500 -vt 0.625000 0.875000 -vt 0.625000 0.937500 -vt 0.125000 0.687500 -vt 0.625000 0.125000 -vt 0.625000 0.687500 -vt 0.687500 0.125000 -vt 0.687500 0.687500 -vt 0.000000 0.687500 -vt 0.062500 0.125000 -vt 0.062500 0.687500 -vt 0.125000 0.125000 -vt 0.750000 0.125000 -vt 0.750000 0.687500 -vt 0.125000 1.000000 -vt 0.625000 1.000000 -vt 0.125000 0.062500 -vt 0.625000 0.000000 -vt 0.625000 0.062500 -vt 1.000000 0.375000 -vt 0.937500 0.437500 -vt 0.937500 0.375000 -vt 1.000000 0.437500 -vt 0.937500 1.000000 -vt 1.000000 0.500000 -vt 1.000000 1.000000 -vt 0.937500 0.500000 -vt 0.125000 0.875000 -vt 0.000000 0.125000 -vt 0.125000 0.000000 -s 0 -f 10/1/1 7/2/1 9/3/1 -f 8/4/2 5/5/2 7/6/2 -f 7/6/3 11/7/3 9/8/3 -f 4/9/4 12/10/4 10/11/4 -f 10/11/5 6/12/5 8/4/5 -f 9/8/6 1/13/6 3/14/6 -f 4/15/1 9/3/1 3/16/1 -f 17/17/7 14/18/7 18/19/7 -f 13/20/4 12/21/4 2/22/4 -f 18/21/6 1/20/6 11/23/6 -f 16/12/7 18/19/7 15/5/7 -f 16/24/2 5/25/2 6/26/2 -f 17/21/5 6/25/5 12/23/5 -f 15/27/3 11/23/3 5/25/3 -f 10/1/1 8/28/1 7/2/1 -f 8/4/2 6/12/2 5/5/2 -f 7/6/3 5/5/3 11/7/3 -f 4/9/4 2/29/4 12/10/4 -f 10/11/5 12/10/5 6/12/5 -f 9/8/6 11/7/6 1/13/6 -f 4/15/1 10/1/1 9/3/1 -f 17/17/7 13/30/7 14/18/7 -f 13/20/4 17/23/4 12/21/4 -f 18/21/6 14/22/6 1/20/6 -f 16/12/7 17/17/7 18/19/7 -f 16/24/2 15/27/2 5/25/2 -f 17/21/5 16/27/5 6/25/5 -f 15/27/3 18/21/3 11/23/3 -o FluoroMid -v -0.002210 -0.289110 0.500000 -v -0.002210 0.289110 0.500000 -v -0.002210 -0.289110 -0.500000 -v -0.002210 0.289110 -0.500000 -v 0.147790 -0.315000 0.500000 -v 0.147790 0.315000 0.500000 -v 0.147790 -0.315000 -0.500000 -v 0.147790 0.315000 -0.500000 -v 0.072790 -0.315000 -0.500000 -v 0.072790 0.315000 -0.500000 -v 0.072790 -0.315000 0.500000 -v 0.072790 0.315000 0.500000 -v -0.002210 -0.289110 0.000000 -v -0.002210 0.289110 0.000000 -v 0.147790 -0.315000 0.000000 -v 0.147790 0.315000 0.000000 -v 0.072790 0.315000 0.000000 -v 0.072790 -0.315000 0.000000 -vn -0.0000 -0.0000 -1.0000 +v 0.125000 0.312500 0.375000 +v 0.125000 0.312500 -0.500000 +v 0.125000 -0.312500 0.375000 +v 0.125000 -0.312500 -0.500000 +v 0.062500 0.312500 0.375000 +v 0.062500 0.312500 -0.500000 +v 0.062500 -0.312500 0.375000 +v 0.062500 -0.312500 -0.500000 +v 0.000000 0.250000 0.375000 +v 0.000000 0.250000 -0.500000 +v 0.000000 -0.250000 0.375000 +v 0.000000 -0.250000 -0.500000 +v 0.125000 0.312500 0.187500 +v 0.125000 -0.312500 0.187500 +v 0.125000 0.312500 -0.187500 +v 0.125000 -0.312500 -0.187500 +v 0.062500 0.312500 -0.187500 +v 0.000000 0.250000 -0.187500 +v 0.062500 0.312500 0.187500 +v 0.000000 0.250000 0.187500 +v 0.062500 -0.312500 0.187500 +v 0.000000 -0.250000 0.187500 +v 0.062500 -0.312500 -0.187500 +v 0.000000 -0.250000 -0.187500 vn 1.0000 -0.0000 -0.0000 vn -0.0000 -0.0000 1.0000 -vn -0.0000 -1.0000 -0.0000 -vn -0.3263 0.9453 -0.0000 -vn -0.0000 1.0000 -0.0000 -vn -0.3263 -0.9453 -0.0000 -vt 0.125000 0.937500 -vt 0.625000 0.875000 -vt 0.625000 0.937500 -vt 0.125000 0.687500 -vt 0.625000 0.312500 -vt 0.625000 0.687500 -vt 0.125000 0.062500 -vt 0.625000 0.000000 -vt 0.625000 0.062500 -vt 0.625000 0.500000 -vt 0.687500 0.125000 -vt 0.687500 0.500000 -vt 0.000000 0.500000 -vt 0.062500 0.125000 -vt 0.062500 0.500000 -vt 0.125000 0.125000 -vt 0.125000 0.500000 -vt 0.750000 0.125000 -vt 0.750000 0.500000 -vt 0.625000 0.125000 -vt 0.125000 1.000000 -vt 0.625000 1.000000 -vt 0.687500 0.875000 -vt 0.750000 0.875000 -vt 0.062500 0.875000 -vt 0.125000 0.875000 -vt -0.000000 0.875000 -vt 0.125000 0.312500 -vt 0.125000 0.000000 -vt 0.000000 0.125000 -s 0 -f 28/31/8 25/32/8 27/33/8 -f 34/34/9 23/35/9 33/36/9 -f 30/37/10 19/38/10 29/39/10 -f 33/40/11 29/41/11 36/42/11 -f 32/43/12 30/44/12 35/45/12 -f 35/45/13 24/46/13 34/47/13 -f 36/42/14 19/48/14 31/49/14 -f 24/46/10 29/39/10 23/50/10 -f 22/51/8 27/33/8 21/52/8 -f 27/53/14 31/49/14 21/54/14 -f 28/55/13 34/47/13 26/56/13 -f 22/57/12 35/45/12 28/55/12 -f 25/32/11 36/42/11 27/53/11 -f 26/34/9 33/35/9 25/36/9 -f 28/31/8 26/56/8 25/32/8 -f 34/34/9 24/58/9 23/35/9 -f 30/37/10 20/59/10 19/38/10 -f 33/40/11 23/50/11 29/41/11 -f 32/43/12 20/60/12 30/44/12 -f 35/45/13 30/44/13 24/46/13 -f 36/42/14 29/41/14 19/48/14 -f 24/46/10 30/37/10 29/39/10 -f 22/51/8 28/31/8 27/33/8 -f 27/53/14 36/42/14 31/49/14 -f 28/55/13 35/45/13 34/47/13 -f 22/57/12 32/43/12 35/45/12 -f 25/32/11 33/40/11 36/42/11 -f 26/34/9 34/58/9 33/35/9 -o FluoroSingle -v -0.002210 -0.289110 0.300000 -v -0.002210 0.289110 0.300000 -v -0.002210 -0.289110 -0.300000 -v -0.002210 0.289110 -0.300000 -v 0.147790 -0.315000 0.300000 -v 0.147790 0.315000 0.300000 -v 0.147790 -0.315000 -0.300000 -v 0.147790 0.315000 -0.300000 -v 0.072790 -0.315000 -0.300000 -v 0.072790 0.315000 -0.300000 -v 0.072790 -0.315000 0.300000 -v 0.072790 0.315000 0.300000 -v 0.072790 -0.315000 -0.350000 -v 0.072790 0.315000 -0.350000 -v 0.147790 0.315000 -0.350000 -v 0.147790 -0.315000 -0.350000 -v 0.072790 -0.315000 0.350000 -v 0.072790 0.315000 0.350000 -v -0.002210 0.289110 0.350000 -v -0.002210 -0.289110 0.350000 -v 0.147790 -0.315000 0.350000 -v 0.147790 0.315000 0.350000 -v -0.002210 -0.289110 -0.350000 -v -0.002210 0.289110 -0.350000 -v -0.002210 -0.289110 0.000000 -v -0.002210 0.289110 0.000000 -v 0.147790 -0.315000 0.000000 -v 0.147790 0.315000 0.000000 -v 0.072790 0.315000 0.000000 -v 0.072790 -0.315000 0.000000 -vn 1.0000 -0.0000 -0.0000 -vn -0.0000 -1.0000 -0.0000 -vn -0.3263 0.9453 -0.0000 -vn -0.0000 1.0000 -0.0000 -vn -0.3263 -0.9453 -0.0000 vn -0.0000 -0.0000 -1.0000 -vn -0.0000 -0.0000 1.0000 -vt 0.125000 0.375000 -vt 0.625000 0.125000 -vt 0.625000 0.375000 -vt 0.625000 0.625000 -vt 0.687500 0.375000 -vt 0.687500 0.625000 +vn -0.0000 -1.0000 -0.0000 +vn -0.7071 -0.7071 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -0.7071 0.7071 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vt 0.000000 0.000000 +vt 0.187500 0.000000 +vt 0.187500 0.625000 vt 0.000000 0.625000 -vt 0.062500 0.375000 -vt 0.062500 0.625000 -vt 0.125000 0.375000 -vt 0.125000 0.625000 -vt 0.750000 0.375000 -vt 0.750000 0.625000 -vt 0.125000 0.937500 -vt 0.625000 0.875000 -vt 0.625000 0.937500 -vt 0.937500 0.437500 -vt 1.000000 0.500000 -vt 1.000000 0.437500 -vt 0.937500 0.562500 -vt 1.000000 1.000000 -vt 1.000000 0.562500 -vt 1.000000 0.500000 -vt 0.937500 0.500000 -vt 0.125000 0.062500 -vt 0.625000 -0.000000 -vt 0.625000 0.062500 -vt 1.000000 0.500000 -vt 0.125000 0.125000 -vt 0.625000 0.125000 -vt 0.937500 1.000000 -vt 0.937500 0.562500 -vt 0.125000 1.000000 -vt 0.625000 1.000000 -vt 1.000000 0.562500 -vt 1.000000 0.562500 -vt 0.687500 0.875000 +vt 0.187500 0.750000 +vt 0.812500 0.750000 +vt 0.812500 0.812500 +vt 0.187500 0.812500 +vt 0.187500 0.937500 +vt 0.187500 0.875000 +vt 0.812500 0.875000 +vt 0.812500 0.937500 vt 0.750000 0.875000 -vt 0.062500 0.875000 -vt 0.125000 0.875000 -vt 0.000000 0.875000 -vt 0.125000 0.875000 -vt 0.625000 0.875000 -vt 0.125000 0.125000 -vt 0.625000 0.375000 -vt 0.000000 0.375000 -vt 0.125000 -0.000000 -s 0 -f 64/61/15 41/62/15 63/63/15 -f 63/64/16 47/65/16 66/66/16 -f 62/67/17 48/68/17 65/69/17 -f 65/69/18 42/70/18 64/71/18 -f 66/66/19 37/72/19 61/73/19 -f 50/74/20 52/75/20 49/76/20 -f 51/77/18 46/78/18 44/79/18 -f 52/80/15 44/81/15 43/82/15 -f 49/83/16 43/77/16 45/84/16 -f 54/85/21 56/86/21 53/87/21 -f 55/79/17 48/84/17 38/77/17 -f 53/88/19 37/77/19 47/84/19 -f 58/89/21 53/87/21 57/90/21 -f 58/91/15 41/82/15 42/81/15 -f 54/78/18 42/92/18 48/84/18 -f 57/82/16 47/84/16 41/92/16 -f 60/93/20 49/76/20 59/94/20 -f 50/84/17 40/95/17 46/78/17 -f 59/96/19 45/84/19 39/92/19 -f 45/97/19 61/73/19 39/98/19 -f 46/99/18 64/71/18 44/100/18 -f 40/101/17 65/69/17 46/99/17 -f 43/75/16 66/66/16 45/97/16 -f 44/102/15 63/64/15 43/103/15 -f 64/61/15 42/104/15 41/62/15 -f 63/64/16 41/105/16 47/65/16 -f 62/67/17 38/106/17 48/68/17 -f 65/69/18 48/68/18 42/70/18 -f 66/66/19 47/65/19 37/72/19 -f 50/74/20 51/100/20 52/75/20 -f 51/77/18 50/84/18 46/78/18 -f 52/80/15 51/91/15 44/81/15 -f 49/83/16 52/79/16 43/77/16 -f 54/85/21 55/107/21 56/86/21 -f 55/79/17 54/78/17 48/84/17 -f 53/88/19 56/79/19 37/77/19 -f 58/89/21 54/85/21 53/87/21 -f 58/91/15 57/80/15 41/82/15 -f 54/78/18 58/95/18 42/92/18 -f 57/82/16 53/88/16 47/84/16 -f 60/93/20 50/74/20 49/76/20 -f 50/84/17 60/92/17 40/95/17 -f 59/96/19 49/83/19 45/84/19 -f 45/97/19 66/66/19 61/73/19 -f 46/99/18 65/69/18 64/71/18 -f 40/101/17 62/67/17 65/69/17 -f 43/75/16 63/64/16 66/66/16 -f 44/102/15 64/71/15 63/64/15 +vt 0.250000 0.875000 +vt 0.812500 0.625000 +vt 0.500000 0.625000 +vt 0.500000 0.000000 +vt 0.812500 0.000000 +vt 0.687500 0.687500 +vt 0.375000 0.687500 +vt 0.375000 0.625000 +vt 0.687500 0.625000 +vt 0.687500 0.750000 +vt 0.312500 0.750000 +vt 0.312500 0.687500 +vt 0.812500 0.687500 +vt 0.500000 0.687500 +vt 0.500000 0.750000 +vt 0.625000 0.687500 +vt 0.312500 0.625000 +vt 0.625000 0.625000 +vt 0.187500 0.687500 +vt 0.000000 0.687500 +vt 0.000000 0.750000 +vt 0.312500 0.000000 +vt 0.625000 0.000000 +vt 1.000000 0.687500 +vt 1.000000 0.625000 +vt 1.000000 0.750000 +vt 0.750000 0.812500 +vt 0.250000 0.812500 +s 1 +usemtl m_f2fc5e6a-df7e-b2ac-c266-afe51098c5f3 +f 3/1/1 14/2/1 13/3/1 +f 3/1/1 13/3/1 1/4/1 +f 3/5/2 1/6/2 5/7/2 +f 3/5/2 5/7/2 7/8/2 +f 6/9/3 2/10/3 4/11/3 +f 6/9/3 4/11/3 8/12/3 +f 9/13/2 11/14/2 7/8/2 +f 9/13/2 7/8/2 5/7/2 +f 12/13/3 10/14/3 6/8/3 +f 12/13/3 6/8/3 8/7/3 +f 2/15/1 15/16/1 16/17/1 +f 2/15/1 16/17/1 4/18/1 +f 21/19/4 23/20/4 16/21/4 +f 21/19/4 16/21/4 14/22/4 +f 22/23/5 24/24/5 23/25/5 +f 22/23/5 23/25/5 21/19/5 +f 6/26/6 17/27/6 15/16/6 +f 6/26/6 15/16/6 2/15/6 +f 10/6/7 18/28/7 17/27/7 +f 10/6/7 17/27/7 6/26/7 +f 17/29/6 19/25/6 13/30/6 +f 17/29/6 13/30/6 15/31/6 +f 18/23/7 20/24/7 19/25/7 +f 18/23/7 19/25/7 17/19/7 +f 1/4/6 13/3/6 19/32/6 +f 1/4/6 19/32/6 5/33/6 +f 5/33/7 19/32/7 20/5/7 +f 5/33/7 20/5/7 9/34/7 +f 14/35/1 16/36/1 15/31/1 +f 14/35/1 15/31/1 13/30/1 +f 7/37/4 21/26/4 14/15/4 +f 7/37/4 14/15/4 3/38/4 +f 11/39/5 22/6/5 21/26/5 +f 11/39/5 21/26/5 7/37/5 +f 4/3/4 16/16/4 23/27/4 +f 4/3/4 23/27/4 8/32/4 +f 8/32/5 23/27/5 24/28/5 +f 8/32/5 24/28/5 12/5/5 +f 12/40/8 11/13/8 9/14/8 +f 12/40/8 9/14/8 10/41/8 +o FluoroMid +v 0.125000 0.312500 0.500000 +v 0.125000 0.312500 -0.500000 +v 0.125000 -0.312500 0.500000 +v 0.125000 -0.312500 -0.500000 +v 0.062500 0.312500 0.500000 +v 0.062500 0.312500 -0.500000 +v 0.062500 -0.312500 0.500000 +v 0.062500 -0.312500 -0.500000 +v 0.000000 0.250000 0.500000 +v 0.000000 0.250000 -0.500000 +v 0.000000 -0.250000 0.500000 +v 0.000000 -0.250000 -0.500000 +v 0.125000 0.312500 0.187500 +v 0.125000 -0.312500 0.187500 +v 0.125000 0.312500 -0.187500 +v 0.125000 -0.312500 -0.187500 +v 0.062500 0.312500 -0.187500 +v 0.000000 0.250000 -0.187500 +v 0.062500 0.312500 0.187500 +v 0.000000 0.250000 0.187500 +v 0.062500 -0.312500 0.187500 +v 0.000000 -0.250000 0.187500 +v 0.062500 -0.312500 -0.187500 +v 0.000000 -0.250000 -0.187500 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.7071 -0.7071 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -0.7071 0.7071 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vt 0.187500 0.000000 +vt 0.500000 0.000000 +vt 0.500000 0.625000 +vt 0.187500 0.625000 +vt 0.187500 0.875000 +vt 0.812500 0.875000 +vt 0.812500 0.937500 +vt 0.187500 0.937500 +vt 0.750000 0.875000 +vt 0.250000 0.875000 +vt 0.187500 0.812500 +vt 0.812500 0.812500 +vt 0.812500 0.625000 +vt 0.812500 0.000000 +vt 0.625000 0.687500 +vt 0.375000 0.687500 +vt 0.375000 0.625000 +vt 0.625000 0.625000 +vt 0.687500 0.750000 +vt 0.312500 0.750000 +vt 0.312500 0.687500 +vt 0.687500 0.687500 +vt 0.812500 0.687500 +vt 0.500000 0.687500 +vt 0.812500 0.750000 +vt 0.500000 0.750000 +vt 0.187500 0.687500 +vt 0.187500 0.750000 +vt 0.375000 0.000000 +vt 0.625000 0.000000 +vt 0.750000 0.812500 +vt 0.250000 0.812500 +s 1 +usemtl m_f2fc5e6a-df7e-b2ac-c266-afe51098c5f3 +f 27/42/9 38/43/9 37/44/9 +f 27/42/9 37/44/9 25/45/9 +f 27/46/10 25/47/10 29/48/10 +f 27/46/10 29/48/10 31/49/10 +f 30/49/11 26/46/11 28/47/11 +f 30/49/11 28/47/11 32/48/11 +f 33/50/10 35/51/10 31/52/10 +f 33/50/10 31/52/10 29/53/10 +f 36/50/11 34/51/11 30/52/11 +f 36/50/11 30/52/11 32/53/11 +f 26/54/9 39/44/9 40/43/9 +f 26/54/9 40/43/9 28/55/9 +f 45/56/12 47/57/12 40/58/12 +f 45/56/12 40/58/12 38/59/12 +f 46/60/13 48/61/13 47/62/13 +f 46/60/13 47/62/13 45/63/13 +f 30/64/14 41/65/14 39/44/14 +f 30/64/14 39/44/14 26/54/14 +f 34/66/15 42/67/15 41/65/15 +f 34/66/15 41/65/15 30/64/15 +f 41/56/14 43/57/14 37/58/14 +f 41/56/14 37/58/14 39/59/14 +f 42/60/15 44/61/15 43/62/15 +f 42/60/15 43/62/15 41/63/15 +f 25/45/14 37/44/14 43/65/14 +f 25/45/14 43/65/14 29/68/14 +f 29/68/15 43/65/15 44/67/15 +f 29/68/15 44/67/15 33/69/15 +f 38/70/9 40/71/9 39/59/9 +f 38/70/9 39/59/9 37/58/9 +f 31/64/12 45/65/12 38/44/12 +f 31/64/12 38/44/12 27/54/12 +f 35/66/13 46/67/13 45/65/13 +f 35/66/13 45/65/13 31/64/13 +f 28/45/12 40/44/12 47/65/12 +f 28/45/12 47/65/12 32/68/12 +f 32/68/13 47/65/13 48/67/13 +f 32/68/13 48/67/13 36/69/13 +f 33/72/16 34/50/16 36/51/16 +f 33/72/16 36/51/16 35/73/16 +o FluoroSingle +v 0.125000 0.312500 0.375000 +v 0.125000 0.312500 -0.375000 +v 0.125000 -0.312500 0.375000 +v 0.125000 -0.312500 -0.375000 +v 0.062500 0.312500 0.375000 +v 0.062500 0.312500 -0.375000 +v 0.062500 -0.312500 0.375000 +v 0.062500 -0.312500 -0.375000 +v 0.000000 0.250000 0.375000 +v 0.000000 0.250000 -0.375000 +v 0.000000 -0.250000 0.375000 +v 0.000000 -0.250000 -0.375000 +v 0.125000 0.312500 0.187500 +v 0.125000 -0.312500 0.187500 +v 0.125000 0.312500 -0.187500 +v 0.125000 -0.312500 -0.187500 +v 0.062500 0.312500 -0.187500 +v 0.000000 0.250000 -0.187500 +v 0.062500 0.312500 0.187500 +v 0.000000 0.250000 0.187500 +v 0.062500 -0.312500 0.187500 +v 0.000000 -0.250000 0.187500 +v 0.062500 -0.312500 -0.187500 +v 0.000000 -0.250000 -0.187500 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 -0.0000 -1.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.7071 -0.7071 -0.0000 +vn -0.0000 1.0000 -0.0000 +vn -0.7071 0.7071 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vt 0.000000 0.000000 +vt 0.187500 0.000000 +vt 0.187500 0.625000 +vt 0.000000 0.625000 +vt 0.187500 0.750000 +vt 0.812500 0.750000 +vt 0.812500 0.812500 +vt 0.187500 0.812500 +vt 0.750000 0.875000 +vt 0.250000 0.875000 +vt 1.000000 0.625000 +vt 0.812500 0.625000 +vt 0.812500 0.000000 +vt 1.000000 0.000000 +vt 0.687500 0.687500 +vt 0.312500 0.687500 +vt 0.312500 0.625000 +vt 0.687500 0.625000 +vt 0.687500 0.750000 +vt 0.312500 0.750000 +vt 1.000000 0.687500 +vt 0.812500 0.687500 +vt 1.000000 0.750000 +vt 0.187500 0.687500 +vt 0.000000 0.687500 +vt 0.000000 0.750000 +vt 0.312500 0.000000 +vt 0.687500 0.000000 +vt 0.750000 0.812500 +vt 0.250000 0.812500 +s 1 +usemtl m_f2fc5e6a-df7e-b2ac-c266-afe51098c5f3 +f 51/74/17 62/75/17 61/76/17 +f 51/74/17 61/76/17 49/77/17 +f 51/78/18 49/79/18 53/80/18 +f 51/78/18 53/80/18 55/81/18 +f 54/81/19 50/78/19 52/79/19 +f 54/81/19 52/79/19 56/80/19 +f 57/82/18 59/83/18 55/81/18 +f 57/82/18 55/81/18 53/80/18 +f 60/82/19 58/83/19 54/81/19 +f 60/82/19 54/81/19 56/80/19 +f 50/84/17 63/85/17 64/86/17 +f 50/84/17 64/86/17 52/87/17 +f 69/88/20 71/89/20 64/90/20 +f 69/88/20 64/90/20 62/91/20 +f 70/92/21 72/93/21 71/89/21 +f 70/92/21 71/89/21 69/88/21 +f 54/94/22 65/95/22 63/85/22 +f 54/94/22 63/85/22 50/84/22 +f 58/96/23 66/79/23 65/95/23 +f 58/96/23 65/95/23 54/94/23 +f 65/88/22 67/89/22 61/90/22 +f 65/88/22 61/90/22 63/91/22 +f 66/92/23 68/93/23 67/89/23 +f 66/92/23 67/89/23 65/88/23 +f 49/77/22 61/76/22 67/97/22 +f 49/77/22 67/97/22 53/98/22 +f 53/98/23 67/97/23 68/78/23 +f 53/98/23 68/78/23 57/99/23 +f 62/100/17 64/101/17 63/91/17 +f 62/100/17 63/91/17 61/90/17 +f 55/94/20 69/95/20 62/85/20 +f 55/94/20 62/85/20 51/84/20 +f 59/96/21 70/79/21 69/95/21 +f 59/96/21 69/95/21 55/94/21 +f 52/77/20 64/76/20 71/97/20 +f 52/77/20 71/97/20 56/98/20 +f 56/98/21 71/97/21 72/78/21 +f 56/98/21 72/78/21 60/99/21 +f 57/102/24 58/82/24 60/83/24 +f 57/102/24 60/83/24 59/103/24 diff --git a/src/main/resources/assets/hbm/textures/blocks/cage_lamp.png b/src/main/resources/assets/hbm/textures/blocks/cage_lamp.png index f78cb205e..c81008daa 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/cage_lamp.png and b/src/main/resources/assets/hbm/textures/blocks/cage_lamp.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/cage_lamp_off.png b/src/main/resources/assets/hbm/textures/blocks/cage_lamp_off.png index c2bf59718..0764dea2a 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/cage_lamp_off.png and b/src/main/resources/assets/hbm/textures/blocks/cage_lamp_off.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/flood_lamp.png b/src/main/resources/assets/hbm/textures/blocks/flood_lamp.png index 1582fc963..361893562 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/flood_lamp.png and b/src/main/resources/assets/hbm/textures/blocks/flood_lamp.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/flood_lamp_off.png b/src/main/resources/assets/hbm/textures/blocks/flood_lamp_off.png index b79c23c1d..e041d7df3 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/flood_lamp_off.png and b/src/main/resources/assets/hbm/textures/blocks/flood_lamp_off.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fluorescent_lamp.png b/src/main/resources/assets/hbm/textures/blocks/fluorescent_lamp.png index f10e42271..bf30e6c65 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/fluorescent_lamp.png and b/src/main/resources/assets/hbm/textures/blocks/fluorescent_lamp.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fluorescent_lamp_off.png b/src/main/resources/assets/hbm/textures/blocks/fluorescent_lamp_off.png index edc0193a7..d0decfb41 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/fluorescent_lamp_off.png and b/src/main/resources/assets/hbm/textures/blocks/fluorescent_lamp_off.png differ