final fixes

Added the rest of suggestions,
made one class for glotek and neonite, made variable names more descriptive and removed SideOnly
This commit is contained in:
Jimbno committed 2023-04-24 19:16:33 +02:00
1 parent 1be95d427a
commit bfbdcb07cf
6 files changed
+55 -127

No files matched your search

@@ -1,80 +0,0 @@
package team.chisel.client.render;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import team.chisel.ctmlib.RenderBlocksCTM;
import team.chisel.ctmlib.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SubmapManagerNeonite extends SubmapManagerBase {
@SideOnly(Side.CLIENT)
private static class RenderBlocksCTMFullbright extends RenderBlocksCTM {
@Override
protected void fillLightmap(int bottomLeft, int bottomRight, int topRight, int topLeft) {
ao();
int maxLight = 0xF000F0;
super.fillLightmap(maxLight, maxLight, maxLight, maxLight);
}
@Override
protected void fillColormap(float bottomLeft, float bottomRight, float topRight, float topLeft, float[][] map) {
ao();
int color = 0xFFFFFF;
super.fillColormap(color, color, color, color, map);
}
@Override
public boolean renderStandardBlock(Block block, int x, int y, int z) {
boolean ret = super.renderStandardBlock(block, x, y, z);
this.enableAO = false;
return ret;
}
private void ao() {
if (this.inWorld) {
this.enableAO = true;
}
}
};
@SideOnly(Side.CLIENT)
private static RenderBlocksCTMFullbright rb;
private String color;
private TextureSubmap submap, submapSmall;
public SubmapManagerNeonite(String color) {
this.color = color;
}
@Override
public IIcon getIcon(int side, int meta) {
return submapSmall.getBaseIcon();
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(String modName, Block block, IIconRegister register) {
submap = new TextureSubmap(register.registerIcon(modName + ":Neonite/" + color + "-ctm"), 4, 4);
submapSmall = new TextureSubmap(register.registerIcon(modName + ":Neonite/" + color), 2, 2);
}
@Override
@SideOnly(Side.CLIENT)
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
if (rb == null) {
rb = new RenderBlocksCTMFullbright();
}
rb.setRenderBoundsFromBlock(block);
rb.submap = submap;
rb.submapSmall = submapSmall;
return rb;
}
}
@@ -8,24 +8,26 @@ import net.minecraft.world.IBlockAccess;
import team.chisel.ctmlib.RenderBlocksCTM;
import team.chisel.ctmlib.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SubmapManagerGlotek extends SubmapManagerBase {
public class SubmapManagerSpecialMaterial extends SubmapManagerBase {
public enum MaterialType {
NEONITE,
GLOTEK
}
@SideOnly(Side.CLIENT)
private static class RenderBlocksCTMFullbright extends RenderBlocksCTM {
@Override
protected void fillLightmap(int bottomLeft, int bottomRight, int topRight, int topLeft) {
ao();
enableAmbientOcclusionIfInWorld();
int maxLight = 0xF000F0;
super.fillLightmap(maxLight, maxLight, maxLight, maxLight);
}
@Override
protected void fillColormap(float bottomLeft, float bottomRight, float topRight, float topLeft, float[][] map) {
ao();
enableAmbientOcclusionIfInWorld();
int color = 0xFFFFFF;
super.fillColormap(color, color, color, color, map);
}
@@ -37,21 +39,22 @@ public class SubmapManagerGlotek extends SubmapManagerBase {
return ret;
}
private void ao() {
private void enableAmbientOcclusionIfInWorld() {
if (this.inWorld) {
this.enableAO = true;
}
}
};
@SideOnly(Side.CLIENT)
private static RenderBlocksCTMFullbright rb;
private static RenderBlocksCTMFullbright renderBlocksFullbright;
private String color;
private MaterialType materialType;
private TextureSubmap submap, submapSmall;
public SubmapManagerGlotek(String color) {
public SubmapManagerSpecialMaterial(String color, MaterialType materialType) {
this.color = color;
this.materialType = materialType;
}
@Override
@@ -60,21 +63,20 @@ public class SubmapManagerGlotek extends SubmapManagerBase {
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(String modName, Block block, IIconRegister register) {
submap = new TextureSubmap(register.registerIcon(modName + ":Glotek/" + color + "-ctm"), 4, 4);
submapSmall = new TextureSubmap(register.registerIcon(modName + ":Glotek/" + color), 2, 2);
String materialName = materialType.name().toLowerCase();
submap = new TextureSubmap(register.registerIcon(modName + ":" + materialName + "/" + color + "-ctm"), 4, 4);
submapSmall = new TextureSubmap(register.registerIcon(modName + ":" + materialName + "/" + color), 2, 2);
}
@Override
@SideOnly(Side.CLIENT)
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
if (rb == null) {
rb = new RenderBlocksCTMFullbright();
if (renderBlocksFullbright == null) {
renderBlocksFullbright = new RenderBlocksCTMFullbright();
}
rb.setRenderBoundsFromBlock(block);
rb.submap = submap;
rb.submapSmall = submapSmall;
return rb;
renderBlocksFullbright.setRenderBoundsFromBlock(block);
renderBlocksFullbright.submap = submap;
renderBlocksFullbright.submapSmall = submapSmall;
return renderBlocksFullbright;
}
}