sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

fix textures

Browse source
This commit is contained in:
Sen 2025-08-01 20:08:26 +02:00
parent 6fb9ded711
commit b5e5cb0444
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
74 changed files with 60 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common/src/main/java/common/ai/EntityAICatSit.java
View file

@ -2,6 +2,7 @@ package common.ai;
import common.block.Block;
import common.block.artificial.BlockBed;
import common.block.tech.BlockChest;
import common.entity.animal.EntityCat;
import common.init.Blocks;
import common.tileentity.TileEntity;
@ -86,7 +87,7 @@ public class EntityAICatSit extends EntityAIMoveToBlock
State iblockstate = worldIn.getState(pos);
Block block = iblockstate.getBlock();
if (block == Blocks.chest)
if (block instanceof BlockChest)
{
TileEntity tileentity = worldIn.getTileEntity(pos);

1
common/src/main/java/common/block/tech/BlockAnvil.java
View file

@ -9,7 +9,6 @@ import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving;
import common.inventory.Container;
import common.inventory.ContainerRepair;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.model.Model;
import common.model.Model.ModelProvider;

1
common/src/main/java/common/block/tech/BlockEnchantmentTable.java
View file

@ -5,7 +5,6 @@ import common.block.Material;
import common.entity.npc.EntityNPC;
import common.inventory.Container;
import common.inventory.ContainerEnchantment;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.model.Model;
import common.model.Model.ModelProvider;

1
common/src/main/java/common/block/tech/BlockWarpChest.java
View file

@ -8,7 +8,6 @@ import common.entity.types.EntityLiving;
import common.init.Items;
import common.inventory.Container;
import common.inventory.ContainerChest;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.item.Item;
import common.model.Model;

1
common/src/main/java/common/block/tech/BlockWorkbench.java
View file

@ -5,7 +5,6 @@ import common.block.Material;
import common.entity.npc.EntityNPC;
import common.inventory.Container;
import common.inventory.ContainerWorkbench;
import common.entity.npc.EntityNPC;
import common.item.CheatTab;
import common.model.Model;
import common.model.Model.ModelProvider;

4
common/src/main/java/common/entity/animal/EntityHorse.java
View file

@ -362,7 +362,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic {
{
if (!this.worldObj.client && this.isChested())
{
this.dropItem(Items.chest, 1);
this.dropItem(Items.wood_chest, 1);
this.setChested(false);
}
}
@ -891,7 +891,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic {
return true;
}
if (!flag && this.canCarryChest() && !this.isChested() && itemstack.getItem() == Items.chest)
if (!flag && this.canCarryChest() && !this.isChested() && itemstack.getItem() == Items.wood_chest)
{
this.setChested(true);
this.playSound(SoundEvent.PLOP, 1.0F);

4
common/src/main/java/common/entity/npc/EntityNPC.java
View file

@ -1166,6 +1166,10 @@ public abstract class EntityNPC extends EntityLiving implements IInventory
public String formatStats() {
return super.formatStats() + (this.getManaPoints() == 0 ? "" : Color.GRAY + " [" + Color.MIDNIGHT + this.getManaPoints() + Color.GRAY + "]");
}
public String formatStatsFull() {
return super.formatStatsFull() + (this.getManaPoints() == 0 ? "" : Color.DARK_GRAY + " | " + Color.BLUE + this.getManaPoints() + Color.MIDNIGHT + " Mana");
}
public MerchantRecipeList getTrades(EntityNPC player) {
if(this.trades == null) {

6
common/src/main/java/common/entity/types/EntityLiving.java
View file

@ -2235,6 +2235,12 @@ public abstract class EntityLiving extends Entity
this.getHealth(), this.getMaxHealth());
}
public String formatStatsFull() {
return String.format(this.getAlignment().color + this.getAlignment().display + Color.DARK_GRAY + " | " + getHealthColor(this.getHealth(), this.getMaxHealth()) + "%d" +
Color.GRAY + " / " + getMaxHpColor(this.getMaxHealth()) + "%d" + Color.RED + " HP",
this.getHealth(), this.getMaxHealth());
}
public abstract int getColor();
public boolean isGhost() {

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

@ -611,14 +611,14 @@ public abstract class BlockRegistry {
register("construction_table", (new BlockWorkbench(4)).setHardness(2.5F).setSound(SoundType.WOOD).setDisplay("Konstruktionstisch"));
register("assembly_unit", (new BlockWorkbench(5)).setHardness(2.5F).setSound(SoundType.WOOD).setDisplay("Fertigungseinheit"));
register("chest", new BlockChest(9, 3).setDisplay("Truhe"));
register("large_chest", new BlockChest(9, 6).setDisplay("Große Truhe"));
register("xlarge_chest", new BlockChest(12, 8).setDisplay("Große Truhe"));
register("xxlarge_chest", new BlockChest(16, 10).setDisplay("Große Truhe"));
register("xxxlarge_chest", new BlockChest(18, 14).setDisplay("Große Truhe"));
register("huge_chest", new BlockChest(22, 18).setDisplay("Große Truhe"));
register("giant_chest", new BlockChest(28, 18).setDisplay("Große Truhe"));
register("toolarge_chest", new BlockChest(32, 18).setDisplay("Große Truhe"));
register("wood_chest", new BlockChest(9, 3).setDisplay("Holztruhe"));
register("stone_chest", new BlockChest(9, 6).setDisplay("Steintruhe"));
register("iron_chest", new BlockChest(12, 8).setDisplay("Eisentruhe"));
register("platinum_chest", new BlockChest(16, 10).setDisplay("Platintruhe"));
register("silver_chest", new BlockChest(18, 14).setDisplay("Silbertruhe"));
register("thetium_chest", new BlockChest(22, 18).setDisplay("Thetiumtruhe"));
register("black_metal_chest", new BlockChest(28, 18).setDisplay("Schwarzmetalltruhe"));
register("nichun_chest", new BlockChest(32, 18).setDisplay("Nichuntruhe"));
register("warp_chest", (new BlockWarpChest()).setHardness(22.5F).setResistance(1000.0F).setSound(SoundType.STONE)
.setDisplay("Warptruhe").setLight(0.5F));

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

@ -148,7 +148,6 @@ public abstract class Blocks {
public static final BlockSapling cherry_sapling = get("cherry_sapling");
public static final BlockSlab cherry_slab = get("cherry_slab");
public static final BlockStairs cherry_stairs = get("cherry_stairs");
public static final BlockChest chest = get("chest");
public static final BlockMetalBlock chrome_block = get("chrome_block");
public static final BlockMetalOre chrome_ore = get("chrome_ore");
public static final Block cinnabar_block = get("cinnabar_block");
@ -550,13 +549,6 @@ public abstract class Blocks {
public static final BlockActiveDisplay display_on = get("display_on");
public static final BlockActiveDisplay display2_on = get("display2_on");
public static final BlockActiveDisplay display4_on = get("display4_on");
public static final BlockChest large_chest = get("large_chest");
public static final BlockChest giant_chest = get("giant_chest");
public static final BlockChest huge_chest = get("huge_chest");
public static final BlockChest toolarge_chest = get("toolarge_chest");
public static final BlockChest xlarge_chest = get("xlarge_chest");
public static final BlockChest xxlarge_chest = get("xxlarge_chest");
public static final BlockChest xxxlarge_chest = get("xxxlarge_chest");
public static final BlockUnlitTorch torch = get("torch");
public static final BlockLitTorch lit_torch = get("lit_torch");
public static final BlockUnlitTorch tian_torch = get("tian_torch");
@ -677,6 +669,14 @@ public abstract class Blocks {
public static final BlockStainedGlass violet_glass = get("violet_glass");
public static final BlockStainedGlassPane violet_glass_pane = get("violet_glass_pane");
public static final BlockWool violet_wool = get("violet_wool");
public static final BlockChest wood_chest = get("wood_chest");
public static final BlockChest stone_chest = get("stone_chest");
public static final BlockChest iron_chest = get("iron_chest");
public static final BlockChest platinum_chest = get("platinum_chest");
public static final BlockChest silver_chest = get("silver_chest");
public static final BlockChest thetium_chest = get("thetium_chest");
public static final BlockChest black_metal_chest = get("black_metal_chest");
public static final BlockChest nichun_chest = get("nichun_chest");
private static <T extends Block> T get(String id) {
T block = (T)BlockRegistry.byNameExact(id);

4
common/src/main/java/common/init/CraftingRegistry.java
View file

@ -172,7 +172,7 @@ public abstract class CraftingRegistry
add(new ItemStack(slab, 6), "###", '#', planks);
add(new ItemStack(ItemRegistry.byName(wood.getName() + "_stairs"), 4), "# ", "## ", "###", '#', planks);
add(new ItemStack(Items.chest), "###", "# #", "###", '#', planks);
add(new ItemStack(Items.wood_chest), "###", "# #", "###", '#', planks);
add(new ItemStack(Items.workbench), "##", "##", '#', planks);
add(new ItemStack(Items.assembly_unit), "----", "XXXX", "X##X", '#', Items.construction_table, '-', Items.titanium_ingot, 'X', planks);
@ -257,7 +257,7 @@ public abstract class CraftingRegistry
addShapeless(new ItemStack(Items.charged_orb, 1), Items.orb, Items.blazing_powder);
addShapeless(new ItemStack(Items.fireball, 3), Items.gunpowder, Items.blazing_powder, Items.coal);
addShapeless(new ItemStack(Items.fireball, 3), Items.gunpowder, Items.blazing_powder, Items.charcoal);
add(new ItemStack(Items.hopper), "I I", "ICI", " I ", 'I', Items.iron_ingot, 'C', Items.chest);
add(new ItemStack(Items.hopper), "I I", "ICI", " I ", 'I', Items.iron_ingot, 'C', Items.wood_chest);
add(new ItemStack(Items.dynamite, 1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Items.clay_lump);

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

@ -236,7 +236,6 @@ public abstract class Items {
public static final Item cherry_sapling = get("cherry_sapling");
public static final Item cherry_slab = get("cherry_slab");
public static final Item cherry_stairs = get("cherry_stairs");
public static final Item chest = get("chest");
public static final ItemMagnet chick_magnet = get("chick_magnet");
public static final ItemFood chicken = get("chicken");
public static final Item chrome_block = get("chrome_block");
@ -910,13 +909,6 @@ public abstract class Items {
public static final ItemPotion potion_weakness = get("potion_weakness");
public static final ItemPotion potion_weakness_base = get("potion_weakness_base");
public static final ItemPotion potion_weakness_extended = get("potion_weakness_extended");
public static final Item large_chest = get("large_chest");
public static final Item giant_chest = get("giant_chest");
public static final Item huge_chest = get("huge_chest");
public static final Item toolarge_chest = get("toolarge_chest");
public static final Item xlarge_chest = get("xlarge_chest");
public static final Item xxlarge_chest = get("xxlarge_chest");
public static final Item xxxlarge_chest = get("xxxlarge_chest");
public static final ItemKey key = get("key");
public static final ItemKey black_key = get("black_key");
public static final ItemKey black_keycard = get("black_keycard");
@ -1061,6 +1053,14 @@ public abstract class Items {
public static final Item ink_sack = get("ink_sack");
public static final Item lapis_lazuli = get("lapis_lazuli");
public static final ItemHoe hoe = get("hoe");
public static final Item wood_chest = get("wood_chest");
public static final Item black_metal_chest = get("black_metal_chest");
public static final Item iron_chest = get("iron_chest");
public static final Item nichun_chest = get("nichun_chest");
public static final Item platinum_chest = get("platinum_chest");
public static final Item silver_chest = get("silver_chest");
public static final Item stone_chest = get("stone_chest");
public static final Item thetium_chest = get("thetium_chest");
private static <T extends Item> T get(String id) {
T item = (T)ItemRegistry.byName(id);

1
common/src/main/java/common/tileentity/TileEntityBrewingStand.java
View file

@ -10,7 +10,6 @@ import common.init.Items;
import common.inventory.Container;
import common.inventory.ContainerBrewingStand;
import common.inventory.ISidedInventory;
import common.entity.npc.EntityNPC;
import common.item.Item;
import common.item.ItemStack;
import common.item.consumable.ItemPotion;

1
common/src/main/java/common/tileentity/TileEntityDispenser.java
View file

@ -5,7 +5,6 @@ import common.collect.Lists;
import common.entity.npc.EntityNPC;
import common.inventory.Container;
import common.inventory.ContainerDispenser;
import common.entity.npc.EntityNPC;
import common.item.ItemStack;
import common.rng.Random;
import common.tags.TagObject;

1
common/src/main/java/common/tileentity/TileEntityFurnace.java
View file

@ -15,7 +15,6 @@ import common.inventory.Container;
import common.inventory.ContainerFurnace;
import common.inventory.IInventory;
import common.inventory.ISidedInventory;
import common.entity.npc.EntityNPC;
import common.inventory.SlotFurnaceFuel;
import common.item.Item;
import common.item.ItemStack;

1
common/src/main/java/common/tileentity/TileEntityHopper.java
View file

@ -15,7 +15,6 @@ import common.inventory.Container;
import common.inventory.ContainerHopper;
import common.inventory.IInventory;
import common.inventory.ISidedInventory;
import common.entity.npc.EntityNPC;
import common.item.ItemStack;
import common.tags.TagObject;
import common.util.BlockPos;