diff --git a/changelog b/changelog index 6f92c7c05..c06455a46 100644 --- a/changelog +++ b/changelog @@ -1,11 +1,22 @@ ## Changed +* Updated RBMK visuals + * The indentations on most RBMK passive elements have been removed, heavily reducing tri count and allowing face culling, making RBMKs render much more efficiently + * The caps no longer render as part of the TESR and instead use much more performant ISBRH rendering + * Due to most passive elements no longer needing TESRs for their caps, most parts no longer use any TESRs at all + * This should fix various issues regarding lower-end hardware (especially Pojav) as well as issues with TESRs getting skipped due to the sheer number of things to render + * Control rods now show their set color as part of the model * Improved buzzsaw tree detection * Instead of just clearing a pillar, it now tries to detect branches * The max size of trees that can be successfully harvested is now way bigger * This means that things like 2x2 jungle trees can now be automated +* Annihilating radioactive items now creates that item's radiation value x5 as chunk radiation + * The maximum per tick is a 1000 RAD/s increase to prevent world-destroying radiation levels from annihilating demon cores ## Fixed * Fixed NBTStack serialization omitting the stack size most of the time, preventing deserialization (mainly in the precision assembler config) * Fixed precision assembler not being listed in the creative inventory * Fixed OpenComputers integration for the CCGT -* Fixed tool abilities switching when clicking on a block with a special interaction \ No newline at end of file +* Fixed tool abilities switching when clicking on a block with a special interaction +* Fixed outdated info on the QMAW pages involving AA and BSCCO due to the fusion reactor update +* Fixed ammo container giving 9mm instead of .22 for the akimbo target pistols +* Fixed RBMK control rods incorrectly showing up in the red group when no group is set \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java index b81c618f0..72a54dd84 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java @@ -2,6 +2,7 @@ package com.hbm.blocks.machine.rbmk; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ILookOverlay; +import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandlerXR; import com.hbm.handler.neutron.NeutronNodeWorld; import com.hbm.handler.neutron.RBMKNeutronHandler.RBMKNeutronNode; @@ -35,12 +36,17 @@ public abstract class RBMKBase extends BlockDummyable implements IToolable, ILoo public static boolean dropLids = true; public static boolean digamma = false; - - public static boolean renderLid = false; + + public static final int LID_NONE = 0; + public static final int LID_STANDARD = 1; + public static final int LID_GLASS = 2; + public static int renderLid = LID_NONE; public static boolean overrideOnlyRenderSides = false; public IIcon coverTextureTop; public IIcon coverTextureSide; + public IIcon glassTextureTop; + public IIcon glassTextureSide; public IIcon textureTop; protected RBMKBase() { @@ -55,7 +61,7 @@ public abstract class RBMKBase extends BlockDummyable implements IToolable, ILoo @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { if(overrideOnlyRenderSides && side < 2) return false; - if(renderLid && side > 1) return true; + if(renderLid != LID_NONE && side > 1) return true; return super.shouldSideBeRendered(world, x, y, z, side); } @@ -64,14 +70,18 @@ public abstract class RBMKBase extends BlockDummyable implements IToolable, ILoo public void registerBlockIcons(IIconRegister reg) { this.blockIcon = reg.registerIcon(this.getTextureName() + "_side"); this.textureTop = reg.registerIcon(this.getTextureName() + "_top"); + if(this == ModBlocks.rbmk_control || this == ModBlocks.rbmk_control_auto || this == ModBlocks.rbmk_control_mod) return; this.coverTextureTop = reg.registerIcon(this.getTextureName() + "_cover_top"); this.coverTextureSide = reg.registerIcon(this.getTextureName() + "_cover_side"); + this.glassTextureTop = reg.registerIcon(this.getTextureName() + "_glass_top"); + this.glassTextureSide = reg.registerIcon(this.getTextureName() + "_glass_side"); } @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - if(renderLid) return side == 0 || side == 1 ? coverTextureTop : coverTextureSide; + if(renderLid == LID_STANDARD) return side == 0 || side == 1 ? coverTextureTop : coverTextureSide; + if(renderLid == LID_GLASS) return side == 0 || side == 1 ? glassTextureTop : glassTextureSide; return side == 0 || side == 1 ? textureTop : blockIcon; } @@ -150,6 +160,12 @@ public abstract class RBMKBase extends BlockDummyable implements IToolable, ILoo public static final ForgeDirection DIR_NO_LID = ForgeDirection.NORTH; public static final ForgeDirection DIR_NORMAL_LID = ForgeDirection.EAST; public static final ForgeDirection DIR_GLASS_LID = ForgeDirection.SOUTH; + + public static int metaToLid(int meta) { + if(meta - 10 == DIR_NORMAL_LID.ordinal()) return LID_STANDARD; + if(meta - 10 == DIR_GLASS_LID.ordinal()) return LID_GLASS; + return LID_NONE; + } @Override public void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) { diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory22lr.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory22lr.java index 94f15dcd6..224fcbbb5 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory22lr.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory22lr.java @@ -89,7 +89,7 @@ public class XFactory22lr { .ps(Lego.LAMBDA_STANDARD_CLICK_PRIMARY).pr(Lego.LAMBDA_STANDARD_RELOAD) .decider(GunStateDecider.LAMBDA_STANDARD_DECIDER) .anim(LAMBDA_STAR_F_ANIMS).orchestra(Orchestras.ORCHESTRA_STAR_F_AKIMBO) - ).setDefaultAmmo(EnumAmmo.P9_SP, 30).setUnlocalizedName("gun_star_f_akimbo"); + ).setDefaultAmmo(EnumAmmo.P22_SP, 30).setUnlocalizedName("gun_star_f_akimbo"); } public static Function LAMBDA_NAME_SILENCED = (stack) -> { diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index b5772cb52..cd8a1b13e 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -410,17 +410,8 @@ public class ClientProxy extends ServerProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKControlAuto.class, new RenderRBMKControlRod()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCraneConsole.class, new RenderCraneConsole()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKConsole.class, new RenderRBMKConsole()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKAbsorber.class, new RenderRBMKLid()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKBlank.class, new RenderRBMKLid()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKBoiler.class, new RenderRBMKLid()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKModerator.class, new RenderRBMKLid()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKOutgasser.class, new RenderRBMKLid()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKReflector.class, new RenderRBMKLid()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKRod.class, new RenderRBMKLid()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKRodReaSim.class, new RenderRBMKLid()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKCooler.class, new RenderRBMKLid()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKStorage.class, new RenderRBMKLid()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKHeater.class, new RenderRBMKLid()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKRod.class, new RenderRBMKFuelChannel()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKRodReaSim.class, new RenderRBMKFuelChannel()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKAutoloader.class, new RenderRBMKAutoloader()); //ITER ClientRegistry.bindTileEntitySpecialRenderer(TileEntityITER.class, new RenderITER()); diff --git a/src/main/java/com/hbm/render/block/RenderRBMKControl.java b/src/main/java/com/hbm/render/block/RenderRBMKControl.java index dc2c103fb..aac35075b 100644 --- a/src/main/java/com/hbm/render/block/RenderRBMKControl.java +++ b/src/main/java/com/hbm/render/block/RenderRBMKControl.java @@ -23,6 +23,7 @@ public class RenderRBMKControl implements ISimpleBlockRenderingHandler { GL11.glPushMatrix(); Tessellator tessellator = Tessellator.instance; + RBMKBase.renderLid = RBMKBase.LID_NONE; IIcon iicon = block.getIcon(0, 0); tessellator.setColorOpaque_F(1, 1, 1); @@ -99,30 +100,27 @@ public class RenderRBMKControl implements ISimpleBlockRenderingHandler { int[] pos = ((BlockDummyable) block).findCore(world, x, y, z); if(pos != null) { int coreMeta = world.getBlockMetadata(pos[0], pos[1], pos[2]); - - if(coreMeta - 10 == RBMKBase.DIR_NORMAL_LID.ordinal()) { - tessellator.addTranslation(0, 1, 0); + int lid = RBMKBase.metaToLid(coreMeta); + + if(lid != RBMKBase.LID_NONE) { renderer.setRenderBounds(0, 0, 0, 1, 0.25, 1); - RBMKBase.renderLid = true; - renderer.renderStandardBlock(block, x, y, z); - RBMKBase.renderLid = false; - tessellator.addTranslation(0, -1, 0); + RBMKBase.renderLid = lid; + renderer.renderStandardBlock(block, x, y + 1, z); + RBMKBase.renderLid = RBMKBase.LID_NONE; hasLid = true; } } } if(!hasLid) { - tessellator.addTranslation(0, 1, 0); renderer.setRenderBounds(0.0625, 0, 0.0625, 0.4375, 0.125, 0.4375); - renderer.renderStandardBlock(block, x, y, z); + renderer.renderStandardBlock(block, x, y + 1, z); renderer.setRenderBounds(0.0625, 0, 0.5625, 0.4375, 0.125, 0.9375); - renderer.renderStandardBlock(block, x, y, z); + renderer.renderStandardBlock(block, x, y + 1, z); renderer.setRenderBounds(0.5625, 0, 0.5625, 0.9375, 0.125, 0.9375); - renderer.renderStandardBlock(block, x, y, z); + renderer.renderStandardBlock(block, x, y + 1, z); renderer.setRenderBounds(0.5625, 0, 0.0625, 0.9375, 0.125, 0.4375); - renderer.renderStandardBlock(block, x, y, z); - tessellator.addTranslation(0, -1, 0); + renderer.renderStandardBlock(block, x, y + 1, z); } } else { } @@ -130,13 +128,6 @@ public class RenderRBMKControl implements ISimpleBlockRenderingHandler { return true; } - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return RBMKBase.renderIDControl; - } + @Override public boolean shouldRender3DInInventory(int modelId) { return true; } + @Override public int getRenderId() { return RBMKBase.renderIDControl; } } diff --git a/src/main/java/com/hbm/render/block/RenderRBMKReflector.java b/src/main/java/com/hbm/render/block/RenderRBMKReflector.java index 61429fef3..2e6b4e94d 100644 --- a/src/main/java/com/hbm/render/block/RenderRBMKReflector.java +++ b/src/main/java/com/hbm/render/block/RenderRBMKReflector.java @@ -19,6 +19,7 @@ public class RenderRBMKReflector implements ISimpleBlockRenderingHandler { GL11.glPushMatrix(); Tessellator tessellator = Tessellator.instance; + RBMKBase.renderLid = RBMKBase.LID_NONE; tessellator.setColorOpaque_F(1, 1, 1); GL11.glTranslated(0, -0.675, 0); @@ -55,14 +56,13 @@ public class RenderRBMKReflector implements ISimpleBlockRenderingHandler { int[] pos = ((BlockDummyable) block).findCore(world, x, y, z); if(pos != null) { int coreMeta = world.getBlockMetadata(pos[0], pos[1], pos[2]); - - if(coreMeta - 10 == RBMKBase.DIR_NORMAL_LID.ordinal()) { - tessellator.addTranslation(0, 1, 0); + int lid = RBMKBase.metaToLid(coreMeta); + + if(lid != RBMKBase.LID_NONE) { renderer.setRenderBounds(0, 0, 0, 1, 0.25, 1); - RBMKBase.renderLid = true; - renderer.renderStandardBlock(block, x, y, z); - RBMKBase.renderLid = false; - tessellator.addTranslation(0, -1, 0); + RBMKBase.renderLid = lid; + renderer.renderStandardBlock(block, x, y + 1, z); + RBMKBase.renderLid = RBMKBase.LID_NONE; } } } @@ -70,13 +70,6 @@ public class RenderRBMKReflector implements ISimpleBlockRenderingHandler { return true; } - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return RBMKBase.renderIDPassive; - } + @Override public boolean shouldRender3DInInventory(int modelId) { return true; } + @Override public int getRenderId() { return RBMKBase.renderIDPassive; } } diff --git a/src/main/java/com/hbm/render/block/RenderRBMKRod.java b/src/main/java/com/hbm/render/block/RenderRBMKRod.java index f694cfd36..be5b71355 100644 --- a/src/main/java/com/hbm/render/block/RenderRBMKRod.java +++ b/src/main/java/com/hbm/render/block/RenderRBMKRod.java @@ -24,6 +24,7 @@ public class RenderRBMKRod implements ISimpleBlockRenderingHandler { GL11.glPushMatrix(); RBMKRod rod = (RBMKRod) block; Tessellator tessellator = Tessellator.instance; + RBMKBase.renderLid = RBMKBase.LID_NONE; IIcon iicon = block.getIcon(0, 0); IIcon sideIcon = block.getIcon(2, 0); tessellator.setColorOpaque_F(1, 1, 1); @@ -81,14 +82,13 @@ public class RenderRBMKRod implements ISimpleBlockRenderingHandler { int[] pos = ((BlockDummyable) block).findCore(world, x, y, z); if(pos != null) { int coreMeta = world.getBlockMetadata(pos[0], pos[1], pos[2]); - - if(coreMeta - 10 == RBMKBase.DIR_NORMAL_LID.ordinal()) { - tessellator.addTranslation(0, 1, 0); + int lid = RBMKBase.metaToLid(coreMeta); + + if(lid != RBMKBase.LID_NONE) { renderer.setRenderBounds(0, 0, 0, 1, 0.25, 1); - RBMKBase.renderLid = true; - renderer.renderStandardBlock(block, x, y, z); - RBMKBase.renderLid = false; - tessellator.addTranslation(0, -1, 0); + RBMKBase.renderLid = lid; + renderer.renderStandardBlock(block, x, y + 1, z); + RBMKBase.renderLid = RBMKBase.LID_NONE; } } } @@ -96,13 +96,6 @@ public class RenderRBMKRod implements ISimpleBlockRenderingHandler { return true; } - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return RBMKBase.renderIDRods; - } + @Override public boolean shouldRender3DInInventory(int modelId) { return true; } + @Override public int getRenderId() { return RBMKBase.renderIDRods; } } diff --git a/src/main/java/com/hbm/render/tileentity/RenderRBMKControlRod.java b/src/main/java/com/hbm/render/tileentity/RenderRBMKControlRod.java index 63c81f7e3..b433d267a 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderRBMKControlRod.java +++ b/src/main/java/com/hbm/render/tileentity/RenderRBMKControlRod.java @@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControl; +import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControlManual; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -12,8 +13,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; public class RenderRBMKControlRod extends TileEntitySpecialRenderer { - - private ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_control.png"); + + private ResourceLocation[] textures = new ResourceLocation[] { + new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_control_red.png"), + new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_control_yellow.png"), + new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_control_green.png"), + new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_control_blue.png"), + new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_control_purple.png"), + }; + private ResourceLocation textureStandard = new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_control.png"); + private ResourceLocation textureAuto = new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_control_auto.png"); @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float i) { @@ -43,6 +52,14 @@ public class RenderRBMKControlRod extends TileEntitySpecialRenderer { int lY = brightness / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)lX / 1.0F, (float)lY / 1.0F); + ResourceLocation texture = textureAuto; + + if(control instanceof TileEntityRBMKControlManual) { + TileEntityRBMKControlManual crm = (TileEntityRBMKControlManual) control; + if(crm.color == null) texture = textureStandard; + else texture = textures[crm.color.ordinal()]; + } + bindTexture(texture); double level = control.lastLevel + (control.level - control.lastLevel) * i; diff --git a/src/main/java/com/hbm/render/tileentity/RenderRBMKLid.java b/src/main/java/com/hbm/render/tileentity/RenderRBMKFuelChannel.java similarity index 97% rename from src/main/java/com/hbm/render/tileentity/RenderRBMKLid.java rename to src/main/java/com/hbm/render/tileentity/RenderRBMKFuelChannel.java index a3ac690b2..1083a178a 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderRBMKLid.java +++ b/src/main/java/com/hbm/render/tileentity/RenderRBMKFuelChannel.java @@ -11,7 +11,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -public class RenderRBMKLid extends TileEntitySpecialRenderer { +public class RenderRBMKFuelChannel extends TileEntitySpecialRenderer { private static final ResourceLocation texture_rods = new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_element_fuel.png"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAnnihilator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAnnihilator.java index 4fbcf5282..2019a34dd 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAnnihilator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAnnihilator.java @@ -2,6 +2,9 @@ package com.hbm.tileentity.machine; import java.math.BigInteger; +import com.hbm.handler.radiation.ChunkRadiationManager; +import com.hbm.hazard.HazardRegistry; +import com.hbm.hazard.HazardSystem; import com.hbm.interfaces.IControlReceiver; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.container.ContainerMachineAnnihilator; @@ -67,6 +70,7 @@ public class TileEntityMachineAnnihilator extends TileEntityMachineBase implemen boolean didSomething = false; if(slots[0] != null) { + onDestroy(slots[0]); tryAddPayout(data.pushToPool(pool, slots[0], false)); this.slots[0] = null; this.markChanged(); @@ -100,6 +104,7 @@ public class TileEntityMachineAnnihilator extends TileEntityMachineBase implemen if(slots[9] != null) { ItemStack single = slots[9].copy(); single.stackSize = 1; + onDestroy(single); ItemStack payout = data.pushToPool(pool, single, true); this.decrStackSize(9, 1); if(payout != null) { @@ -117,6 +122,14 @@ public class TileEntityMachineAnnihilator extends TileEntityMachineBase implemen } } + public void onDestroy(ItemStack stack) { + float radiation = HazardSystem.getHazardLevelFromStack(stack, HazardRegistry.RADIATION); + if(radiation > 0) { + ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - 10); + ChunkRadiationManager.proxy.incrementRad(worldObj, this.xCoord - dir.offsetX * 3, this.yCoord + 9, this.zCoord - dir.offsetZ * 3, Math.min(radiation * 5F, 1_000F)); + } + } + public DirPos[] getConPos() { ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - 10); ForgeDirection rot = dir.getRotation(ForgeDirection.UP); diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java index 77b1cb603..fbe930c0f 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java @@ -36,25 +36,18 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase im public void updateEntity() { if(worldObj.isRemote) { - this.lastLevel = this.level; } else { if(level < targetLevel) { - level += speed * RBMKDials.getControlSpeed(worldObj); - - if(level > targetLevel) - level = targetLevel; + if(level > targetLevel) level = targetLevel; } if(level > targetLevel) { - level -= speed * RBMKDials.getControlSpeed(worldObj); - - if(level < targetLevel) - level = targetLevel; + if(level < targetLevel) level = targetLevel; } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java index 721ef2af6..6788dce16 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java @@ -117,16 +117,17 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement buf.writeDouble(this.startingLevel); if(this.color != null) buf.writeInt(this.color.ordinal()); + else + buf.writeInt(-1); } @Override public void deserialize(ByteBuf buf) { super.deserialize(buf); this.startingLevel = buf.readDouble(); - if(buf.isReadable(1)) { - int color = buf.readInt(); - this.color = RBMKColor.values()[MathHelper.clamp_int(color, 0, RBMKColor.values().length)]; - } + int color = buf.readInt(); + this.color = RBMKColor.values()[MathHelper.clamp_int(color, 0, RBMKColor.values().length)]; + if(color == -1) this.color = null; } public static enum RBMKColor { diff --git a/src/main/resources/assets/hbm/manual/material/alloy.json b/src/main/resources/assets/hbm/manual/material/alloy.json index 32b8133f1..8ece9ac17 100644 --- a/src/main/resources/assets/hbm/manual/material/alloy.json +++ b/src/main/resources/assets/hbm/manual/material/alloy.json @@ -9,7 +9,7 @@ "ru_RU": "Продвинутый сплав" }, "content": { - "en_US": "Made in a [[blast furnace|Blast Furnace]] from [[steel|Steel]] and [[Minecraft grade copper|Minecraft Grade Copper]]. Makes better-than-diamond gear. Also used in some high-powered magnets for the [[fusion reactor|Fusion Reactor]] and the [[exposure chamber|Exposure Chamber]].", + "en_US": "Made in a [[blast furnace|Blast Furnace]] from [[steel|Steel]] and [[Minecraft grade copper|Minecraft Grade Copper]]. Makes better-than-diamond gear. Also used in some high-powered magnets for the [[exposure chamber|Exposure Chamber]].", "uk_UA": "Виготовлено в [[доменній печі|Blast Furnace]] зі [[сталі|Steel]] та [[червоної міді|Minecraft Grade Copper]]. З нього робиться спорядження краще за алмазне. Також використовується в деяких потужних магнітах для [[термоядерного реактору|Fusion Reactor]] та [[камери опромінювання|Exposure Chamber]].", "ru_RU": "Изготовлено в [[доменной печи|Blast Furnace]] из [[стали|Steel]] и [[красной меди|Minecraft Grade Copper]]. Из него делают инструменты, превосходящие алмазные. Также используется в некоторых мощных магнитах для [[термоядерного реактора|Fusion Reactor]] и [[камеры облучения|Exposure Chamber]].", "zh_CN": "在[[高炉|Blast Furnace]]中使用[[钢|Steel]]和[[紫铜|Minecraft Grade Copper]]制成。其制成的工具比钻石更加优质。同时也能用于制作[[聚变反应堆|Fusion Reactor]]和[[辐照舱|Exposure Chamber]]的高能磁铁。" diff --git a/src/main/resources/assets/hbm/manual/material/bscco.json b/src/main/resources/assets/hbm/manual/material/bscco.json index 40b83af3b..2aaf0a871 100644 --- a/src/main/resources/assets/hbm/manual/material/bscco.json +++ b/src/main/resources/assets/hbm/manual/material/bscco.json @@ -9,7 +9,7 @@ "zh_CN": "BSCCO超导体" }, "content": { - "en_US": "Powerful superconductor, used in high tier circuits and coils for the [[particle accelerator|Particle Accelerator]]. Requires [[bismuth|Bismuth]], and is therefore only obtainable after building an [[RBMK]].", + "en_US": "Powerful superconductor, used in high tier circuits and coils for the [[particle accelerator|Particle Accelerator]] as well as the [[fusion reactor|Fusion Reactor Vessel]]. Requires [[bismuth|Bismuth]], and is therefore only obtainable after building an [[RBMK]].", "uk_UA": "Потужний надпровідник, що використовується у високоякісних платах та котушках для [[прискорювача часток|Particle Accelerator]]. Потребує [[вісмут|Bismuth]], і тому доступний лише після побудови [[РБМК|RBMK]].", "ru_RU": "Мощный сверхпроводник, используемый в высокоуровневых цепях и катушках для [[ускорителя частиц|Particle Accelerator]]. Требует [[висмут|Bismuth]], и поэтому доступен только после постройки [[РБМК|RBMK]].", "zh_CN": "强力的超导体，用于制作高等级的电路及用于[[粒子加速器|Particle Accelerator]]的线圈。需要[[铋|Bismuth]]制作，因此只能在建造[[RBMK]]后获得。" diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_cover_side.png new file mode 100644 index 000000000..29deb50b0 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_cover_top.png new file mode 100644 index 000000000..609cfa25c Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_side.png index 848810068..84014157f 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_top.png index b58ae8a8a..9cacd5a3b 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_top.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_absorber_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_cover_side.png index 47ba106a5..32a71f4fe 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_cover_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_cover_top.png index c19f58b8b..c530221bd 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_cover_top.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_side.png index 498a1c713..842403f3f 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_blank_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_cover_side.png new file mode 100644 index 000000000..32a71f4fe Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_cover_top.png new file mode 100644 index 000000000..08f9945e6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_glass_top.png new file mode 100644 index 000000000..0e1060ce3 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_boiler_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control.png index df7f6f862..9faabfcda 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto.png index abd7e532e..a506d67c0 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto_side.png index 498a1c713..395db6d38 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_auto_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_base.png similarity index 100% rename from src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod.png rename to src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_base.png diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_blue.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_blue.png new file mode 100644 index 000000000..0540cec79 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_blue.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_green.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_green.png new file mode 100644 index 000000000..b49088f2e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_green.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod_side.png index 498a1c713..395db6d38 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_mod_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_purple.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_purple.png new file mode 100644 index 000000000..0de120b9e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_purple.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_red.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_red.png new file mode 100644 index 000000000..6d7323597 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_red.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_side.png index 498a1c713..395db6d38 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_yellow.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_yellow.png new file mode 100644 index 000000000..6aae1c7a5 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_control_yellow.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_cover_side.png new file mode 100644 index 000000000..32a71f4fe Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_cover_top.png new file mode 100644 index 000000000..d7f967915 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_glass_top.png new file mode 100644 index 000000000..8d25fd39a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_side.png index 042112893..049df5f31 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_cooler_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_cover_side.png index a7b8fc502..29deb50b0 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_cover_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_cover_top.png index 6629480e9..227abb0d1 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_cover_top.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_cover_side.png new file mode 100644 index 000000000..29deb50b0 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_cover_top.png new file mode 100644 index 000000000..c1e771dcf Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_side.png index 498a1c713..395db6d38 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_mod_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_cover_side.png new file mode 100644 index 000000000..29deb50b0 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_cover_top.png new file mode 100644 index 000000000..6f0e6da20 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_cover_side.png new file mode 100644 index 000000000..29deb50b0 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_cover_top.png new file mode 100644 index 000000000..074a9ed31 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_side.png index 498a1c713..395db6d38 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_mod_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_side.png index 498a1c713..395db6d38 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_reasim_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_side.png index 498a1c713..395db6d38 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_element_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_cover_side.png new file mode 100644 index 000000000..32a71f4fe Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_cover_top.png new file mode 100644 index 000000000..08f9945e6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_glass_top.png new file mode 100644 index 000000000..0e1060ce3 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_side.png index 6b0dc2f30..842403f3f 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_heater_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_cover_side.png new file mode 100644 index 000000000..29deb50b0 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_cover_top.png new file mode 100644 index 000000000..609cfa25c Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_side.png index c5c84ee0d..c9dd449d6 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_moderator_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_cover_side.png new file mode 100644 index 000000000..32a71f4fe Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_cover_top.png new file mode 100644 index 000000000..f5ed6969b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_glass_top.png new file mode 100644 index 000000000..8d25fd39a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_side.png index b41a81879..0ec5a81d4 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_outgasser_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_cover_side.png new file mode 100644 index 000000000..29deb50b0 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_cover_top.png new file mode 100644 index 000000000..609cfa25c Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_glass_top.png new file mode 100644 index 000000000..9b2d75a18 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_glass_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_side.png index 7a63bfb15..574ff274d 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_side.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_top.png index 5ec88285d..ddd3ed88d 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_top.png and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_reflector_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_cover_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_cover_side.png new file mode 100644 index 000000000..32a71f4fe Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_cover_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_cover_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_cover_top.png new file mode 100644 index 000000000..4afbf4f01 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_cover_top.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_glass_side.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_glass_side.png new file mode 100644 index 000000000..e53a1eae8 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_glass_side.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_glass_top.png b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_glass_top.png new file mode 100644 index 000000000..8d25fd39a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/rbmk/rbmk_storage_glass_top.png differ