sen/tcr
sen/tcr
1
0
Fork 0
Code Activity

revert some rendering changes, fix colored lighting

Browse source
This commit is contained in:
Sen 2025-09-01 09:38:58 +02:00
parent 4862b7c9b5
commit 02f3146aea
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
98 changed files with 1248 additions and 1332 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/src/main/java/common/block/Block.java
View file

@ -1080,11 +1080,6 @@ public class Block {
return provider.getModel(name).add().all();
}
@Clientside
public float getShinyness() {
return 1.0f;
}
@Clientside
public GuiPosition getItemPosition() {
return GuiPosition.NORMAL;

5
common/src/main/java/common/block/artificial/BlockGlass.java
View file

@ -46,9 +46,4 @@ public class BlockGlass extends Block {
world.destroyBlock(pos, true);
return false;
}
@Clientside
public float getShinyness() {
return 16.0f;
}
}

5
common/src/main/java/common/block/artificial/BlockMetalBlock.java
View file

@ -51,9 +51,4 @@ public class BlockMetalBlock extends Block {
if(this.metal.radioactivity > 0.0f)
map.put(Attribute.RADIATION, this.metal.radioactivity * 4.0f * 9.0f);
}
@Clientside
public float getShinyness() {
return 32.0f;
}
}

5
common/src/main/java/common/block/artificial/BlockPane.java
View file

@ -205,11 +205,6 @@ public class BlockPane extends Block
return this.material == Material.SOLID ? "iron_bars" : "glass_pane";
}
@Clientside
public float getShinyness() {
return this.material == Material.SOLID ? 4.0f : 16.0f;
}
public Model getModel(ModelProvider provider, String name, State state) {
boolean n = state.getValue(NORTH);
boolean s = state.getValue(SOUTH);

5
common/src/main/java/common/block/liquid/BlockLiquid.java
View file

@ -333,9 +333,4 @@ public abstract class BlockLiquid extends Block
protected boolean hasRegisteredItem() {
return false;
}
@Clientside
public float getShinyness() {
return 3.0f;
}
}

5
common/src/main/java/common/block/natural/BlockCyber.java
View file

@ -16,11 +16,6 @@ public class BlockCyber extends Block {
this.setDisplay("CYBER");
}
@Clientside
public float getShinyness() {
return 0.0f;
}
@Clientside
public boolean isNonBlock() {
return true;

24
common/src/main/java/common/dimension/Dimension.java
View file

@ -57,13 +57,11 @@ public abstract class Dimension extends Section {
// client
private boolean denseFog = false;
private boolean subtractBlock = false;
private float cloudHeight = 192.0f;
private int skyColor = 0x000000;
private int fogColor = 0x000000;
private int cloudColor = 0x000000;
private int lightColor = 0xffffffff;
private int blockColor = 0xffffffff;
private float starBrightness = 0.0f;
private float deepstarBrightness = 0.0f;
private CloudType cloudTexture = CloudType.NORMAL;
@ -208,16 +206,6 @@ public abstract class Dimension extends Section {
return this;
}
public final Dimension setBlockColor(int value) {
this.blockColor = value;
return this;
}
public final Dimension enableBlockLightSubtraction() {
this.subtractBlock = true;
return this;
}
public final Dimension setDefaultWeather(Weather value) {
this.defaultWeather = this.weather = value;
return this;
@ -352,14 +340,6 @@ public abstract class Dimension extends Section {
return this.lightColor;
}
public final int getBlockColor() {
return this.blockColor;
}
public final boolean isBlockLightSubtracted() {
return this.subtractBlock;
}
public final String getCloudTexture() {
return "textures/world/" + this.cloudTexture.getTexture() + ".png";
}
@ -533,8 +513,6 @@ public abstract class Dimension extends Section {
this.fogColor = tag.getInt("FogColor");
this.cloudColor = tag.getInt("CloudColor");
this.lightColor = tag.getInt("LightColor");
this.blockColor = tag.getInt("BlockColor");
this.subtractBlock = tag.getBool("SubtractBlock");
this.gravity = tag.getFloat("Gravity");
this.size = tag.getInt("Size");
this.temperature = tag.getFloat("Temperature");
@ -582,8 +560,6 @@ public abstract class Dimension extends Section {
tag.setInt("FogColor", this.fogColor);
tag.setInt("CloudColor", this.cloudColor);
tag.setInt("LightColor", this.lightColor);
tag.setInt("BlockColor", this.blockColor);
tag.setBool("SubtractBlock", this.subtractBlock);
tag.setFloat("Gravity", this.gravity);
tag.setInt("Size", this.size);
tag.setFloat("Temperature", this.temperature);

1
common/src/main/java/common/init/BlockRegistry.java
View file

@ -149,7 +149,6 @@ public abstract class BlockRegistry {
register("sandstone", sandstone);
Block smooth_sandstone;
register("smooth_sandstone", (smooth_sandstone = new BlockSandStone("smooth")).setSound(SoundType.STONE).setHardness(0.8F).setDisplay("Glatter Sandstein"));
register("carved_sandstone", (new BlockSandStone("carved")).setSound(SoundType.STONE).setHardness(0.8F).setDisplay("Gemeißelter Sandstein"));
Block obsidian = register("obsidian", (new BlockObsidian()).setHardness(50.0F).setResistance(2000.0F).setSound(SoundType.STONE)
.setDisplay("Obsidian").setMiningTool(Equipment.PICKAXE, 3));
Block clay = register("clay", (new BlockClay()).setHardness(0.6F).setSound(SoundType.GRAVEL).setDisplay("Ton").setMiningTool(Equipment.SHOVEL));

1
common/src/main/java/common/init/Blocks.java
View file

@ -130,7 +130,6 @@ public abstract class Blocks {
public static final BlockMetalBlock calcium_block = get("calcium_block");
public static final BlockMetalOre calcium_ore = get("calcium_ore");
public static final BlockCarrot carrots = get("carrots");
public static final BlockSandStone carved_sandstone = get("carved_sandstone");
public static final Block carved_stonebrick = get("carved_stonebrick");
public static final BlockCauldron cauldron = get("cauldron");
public static final Block cell_rock = get("cell_rock");

1
common/src/main/java/common/init/Items.java
View file

@ -211,7 +211,6 @@ public abstract class Items {
public static final ItemCamera camera = get("camera");
public static final ItemSeedFood carrot = get("carrot");
public static final ItemWhip whip = get("whip");
public static final Item carved_sandstone = get("carved_sandstone");
public static final Item carved_stonebrick = get("carved_stonebrick");
public static final Item cauldron = get("cauldron");
public static final Item cell_rock = get("cell_rock");

4
common/src/main/java/common/world/Chunk.java
View file

@ -403,8 +403,8 @@ public abstract class Chunk {
Material mat = block.getMaterial();
if((!mat.blocksMovement() && !mat.isLiquid())
// || (mat == Material.LEAVES && ((mat = this.getBlock(loc.up()).getMaterial()) == Material.POWDER)
|| mat == Material.LEAVES) {
|| (mat == Material.LEAVES && ((mat = this.getBlock(loc.up()).getMaterial()) == Material.POWDER)
|| mat == Material.LEAVES)) {
loc = loc.down();
}
else {