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

improve visuals

Browse source
This commit is contained in:
Sen 2025-08-30 09:07:15 +02:00
parent b25dd6161a
commit e3e5fbd7fd
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
15 changed files with 31 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -648,10 +648,6 @@ public class Block {
return true;
}
public boolean isNonBlock() {
return false;
}
public boolean isPassable(IBlockAccess world, BlockPos pos) {
return !this.material.blocksMovement();
}
@ -1100,4 +1096,14 @@ public class Block {
public String getInfo(World world, BlockPos pos, State state, EntityNPC player) {
return null;
}
@Clientside
public boolean isNonBlock() {
return false;
}
@Clientside
public boolean canConnectNonBlock() {
return true;
}
}

6
common/src/main/java/common/block/BlockAir.java
View file

@ -2,6 +2,7 @@ package common.block;
import common.util.BlockPos;
import common.util.BoundingBox;
import common.util.Clientside;
import common.world.State;
import common.world.World;
@ -36,4 +37,9 @@ public final class BlockAir extends Block {
protected boolean hasRegisteredItem() {
return false;
}
@Clientside
public boolean canConnectNonBlock() {
return false;
}
}

6
common/src/main/java/common/block/foliage/BlockBush.java
View file

@ -8,6 +8,7 @@ import common.model.Model;
import common.rng.Random;
import common.util.BlockPos;
import common.util.BoundingBox;
import common.util.Clientside;
import common.util.Facing;
import common.world.State;
import common.world.World;
@ -87,6 +88,11 @@ public class BlockBush extends Block
{
return false;
}
@Clientside
public boolean canConnectNonBlock() {
return false;
}
public static Model makeCrossModel(Model model) {
return model

2
common/src/main/java/common/init/ItemRegistry.java
View file

@ -283,7 +283,7 @@ public abstract class ItemRegistry {
register("melon_seed", new ItemSeeds(Blocks.melon_stem, Blocks.farmland).setDisplay("Melonenkerne").setMaxAmount(StackSize.XL));
register("whip", (new ItemWhip()).setDisplay("Peitsche"));
register("charge_crystal", (new Item()).setDisplay("Energiekristall").setTab(CheatTab.MATERIALS).setColor(Color.DARK_MAGENTA).setGleaming().setFuelAmount(120000));
register("charge_crystal", (new Item()).setDisplay("Energiekristall").setTab(CheatTab.MATERIALS).setColor(Color.DARK_MAGENTA).setFuelAmount(120000));
for(Enchantment ench : Enchantment.values()) {
register("enchanted_book_" + ench.getName(), (new ItemEnchantedBook(ench, 1)).setUnstackable().setDisplay("Verzaubertes Buch mit " + ench.getFormattedName(1)).setTab(CheatTab.ENCHANTMENTS));
int max = ench.getMaxLevel();

11
common/src/main/java/common/item/Item.java
View file

@ -36,7 +36,6 @@ public class Item {
private int fuelAmount = 0;
private int explosive = 0;
private boolean magnetic = false;
private boolean gleaming = false;
private boolean fragile = false;
public Item() {
@ -108,11 +107,6 @@ public class Item {
return this;
}
public final Item setGleaming() {
this.gleaming = true;
return this;
}
public final Item setFragile() {
this.fragile = true;
return this;
@ -181,11 +175,6 @@ public class Item {
return this.magnetic;
}
@Clientside
public final boolean isGleaming(ItemStack stack) {
return this.gleaming || stack.isItemEnchanted();
}
public final boolean isFragile() {
return this.fragile;
}

2
common/src/main/java/common/item/consumable/ItemAppleGold.java
View file

@ -16,8 +16,6 @@ public class ItemAppleGold extends ItemFood
super(amount, false);
this.powered = powered;
this.setColor(powered ? Color.MAGENTA : Color.NEON);
if(this.powered)
this.setGleaming();
}
protected void onFoodEaten(ItemStack stack, World worldIn, EntityNPC player)

2
common/src/main/java/common/item/consumable/ItemPotion.java
View file

@ -77,8 +77,6 @@ public class ItemPotion extends Item
this.setColor(Color.ORK);
this.setDisplay(getDisplay(this));
this.setFragile();
if(this.effect != null)
this.setGleaming();
POTIONS.add(this);
}

1
common/src/main/java/common/item/material/ItemEnchantedBook.java
View file

@ -26,7 +26,6 @@ public class ItemEnchantedBook extends Item
public ItemEnchantedBook(Enchantment enchantment, int level) {
this.setColor(Color.YELLOW);
this.setGleaming();
this.setFuelAmount(80);
this.enchantment = enchantment;
this.level = level;

1
common/src/main/java/common/item/tool/ItemEditor.java
View file

@ -12,7 +12,6 @@ public class ItemEditor extends Item {
public ItemEditor() {
this.setUnstackable();
this.setTab(CheatTab.TOOLS);
this.setGleaming();
}
public boolean onAction(ItemStack stack, EntityNPC player, World world, ItemControl control, BlockPos block) {

1
common/src/main/java/common/item/tool/ItemWand.java
View file

@ -21,7 +21,6 @@ public abstract class ItemWand extends Item {
public ItemWand() {
this.setUnstackable();
this.setTab(CheatTab.TOOLS);
this.setGleaming();
}
public final boolean onAction(ItemStack stack, EntityNPC player, World world, ItemControl control, BlockPos block) {