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

add basic inventory mode switch (tab)

Browse source
This commit is contained in:
Sen 2025-09-05 18:50:20 +02:00
parent 9f452b410e
commit 83dca68f11
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
46 changed files with 198 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/java/common/block/tech/BlockNuke.java
View file

@ -47,7 +47,7 @@ public class BlockNuke extends Block
public boolean onUse(World worldIn, LocalPos pos, State state, EntityNPC playerIn, Facing side, float hitX, float hitY, float hitZ) {
if(playerIn.getHeldItem() != null) {
Item item = playerIn.getHeldItem().getItem();
if(item == Items.charged_powder) {
if(item == Items.fireball) {
this.explode(worldIn, pos, playerIn);
worldIn.setBlockToAir(pos);
playerIn.getHeldItem().decrSize();

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

@ -28,7 +28,7 @@ public class EntityMouse extends EntityAnimal {
this.tasks.addTask(0, new EntityAISwimming(this));
this.tasks.addTask(1, new EntityAIPanic(this, 1.4D));
this.tasks.addTask(2, new EntityAIMate(this, 1.0D));
this.tasks.addTask(3, new EntityAITempt(this, 1.0D, Items.sugar, false));
this.tasks.addTask(3, new EntityAITempt(this, 1.0D, Items.cheese, false));
this.tasks.addTask(4, new EntityAIFollowParent(this, 1.1D));
this.tasks.addTask(5, new EntityAIWander(this, 1.0D));
this.tasks.addTask(6, new EntityAIWatchClosest(this, null, 6.0F));
@ -85,7 +85,7 @@ public class EntityMouse extends EntityAnimal {
}
public boolean isBreedingItem(ItemStack stack) {
return stack != null && stack.getItem() == Items.sugar;
return stack != null && stack.getItem() == Items.cheese;
}
protected int getExperiencePoints(EntityNPC player) {

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

@ -36,6 +36,7 @@ import common.item.material.ItemBucket;
import common.item.material.ItemDye;
import common.item.material.ItemEnchantedBook;
import common.item.material.ItemGrindedBones;
import common.item.material.ItemLure;
import common.item.material.ItemAnimalArmor;
import common.item.material.ItemMetal;
import common.item.material.ItemRecord;
@ -212,7 +213,7 @@ public abstract class ItemRegistry {
register("stick", (new Item()).setDisplay("Stock").setTab(CheatTab.MATERIALS).setWeight(ItemWeight.XS).setFuelAmount(100));
register("feather", (new Item()).setDisplay("Feder").setTab(CheatTab.MATERIALS).setWeight(ItemWeight.XXS));
register("gunpowder", (new Item()).setDisplay("Schwarzpulver").setTab(CheatTab.MATERIALS).setWeight(ItemWeight.XS).setExplosive(1));
register("wheat", (new Item()).setDisplay("Weizen").setTab(CheatTab.MATERIALS).setWeight(ItemWeight.S));
register("wheat", (new ItemLure()).setDisplay("Weizen").setTab(CheatTab.MATERIALS).setWeight(ItemWeight.S));
register("bread", (new ItemFood(5, false)).setDisplay("Brot"));
register("flint", (new Item()).setDisplay("Feuerstein").setTab(CheatTab.MATERIALS).setWeight(ItemWeight.S));
register("porkchop", (new ItemFood(3, true)).setDisplay("Rohes Schweinefleisch"));
@ -242,7 +243,7 @@ public abstract class ItemRegistry {
for(Color color : Color.values()) {
register(color.getName() + "_dye", new ItemDye(color));
}
register("bone", (new Item()).setDisplay("Knochen").setTab(CheatTab.MATERIALS).setWeight(ItemWeight.S));
register("bone", (new ItemLure()).setDisplay("Knochen").setTab(CheatTab.MATERIALS).setWeight(ItemWeight.S));
register("sugar", (new Item()).setDisplay("Zucker").setTab(CheatTab.MATERIALS).setWeight(ItemWeight.XXS));
register("cookie", (new ItemFood(2, false)).setDisplay("Keks").setWeight(ItemWeight.S));
register("melon", (new ItemFood(2, false)).setDisplay("Melone"));

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

@ -24,6 +24,7 @@ import common.item.material.ItemBucket;
import common.item.material.ItemDye;
import common.item.material.ItemEnchantedBook;
import common.item.material.ItemGrindedBones;
import common.item.material.ItemLure;
import common.item.material.ItemAnimalArmor;
import common.item.material.ItemMetal;
import common.item.material.ItemRecord;
@ -183,7 +184,7 @@ public abstract class Items {
public static final ItemBoat boat = get("boat");
public static final ItemAmmo bolt = get("bolt");
public static final ItemBoltgun boltgun = get("boltgun");
public static final Item bone = get("bone");
public static final ItemLure bone = get("bone");
public static final ItemBook book = get("book");
public static final Item bookshelf = get("bookshelf");
public static final ItemBow bow = get("bow");
@ -770,7 +771,7 @@ public abstract class Items {
public static final ItemWeatherToken weather_token_thunder = get("weather_token_thunder");
public static final Item web = get("web");
public static final ItemSeeds wheat_seed = get("wheat_seed");
public static final Item wheat = get("wheat");
public static final ItemLure wheat = get("wheat");
public static final Item white_bed = get("white_bed");
public static final Item white_carpet = get("white_carpet");
public static final Item white_clay = get("white_clay");

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

@ -131,6 +131,10 @@ public class Item {
return this.block;
}
public final int getWeight() {
return this.weight;
}
public final int getMaxAmount() {
return this.stackable ? 67108864 : 1;
}
@ -281,6 +285,10 @@ public class Item {
return this.block != null ? this.block.getRadiation() * (float)stack.getSize() : 0.0f;
}
public boolean canBeHeld() {
return this.block != null;
}
public WieldType getWieldType() {
return null;
}

4
common/src/main/java/common/item/consumable/ItemFood.java
View file

@ -28,6 +28,10 @@ public class ItemFood extends Item
this.setTab(CheatTab.FOOD);
}
public boolean canBeHeld() {
return true;
}
/**
* Called when the player finishes using this Item (E.g. finishes eating.). Not called when the player stops using
* the Item before the action is complete.

4
common/src/main/java/common/item/consumable/ItemMilkBottle.java
View file

@ -18,6 +18,10 @@ public class ItemMilkBottle extends Item {
this.setMagnetic();
}
public boolean canBeHeld() {
return true;
}
public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityNPC playerIn) {
stack.decrSize();
if(!worldIn.client)

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

@ -80,6 +80,10 @@ public class ItemPotion extends Item
POTIONS.add(this);
}
public boolean canBeHeld() {
return true;
}
public StatusEffect getEffect()
{
return this.effect;

2
common/src/main/java/common/item/material/ItemArmor.java
View file

@ -71,6 +71,7 @@ public class ItemArmor extends Item {
return this.material.isRepairItem(repair.getItem()) ? true : super.getIsRepairable(toRepair, repair);
}
/*
public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityNPC playerIn) {
for(Equipment slot : this.type.getPossibleSlots(playerIn)) {
if(playerIn.getArmor(slot) == null) {
@ -82,6 +83,7 @@ public class ItemArmor extends Item {
return itemStackIn;
}
*/
public void getArmorModifiers(Map<Attribute, Float> map) {
if(this.material.getRadiationReduction(this.type) > 0.0f)

5
common/src/main/java/common/item/material/ItemBottle.java
View file

@ -15,8 +15,13 @@ public class ItemBottle extends Item
public ItemBottle()
{
this.setTab(CheatTab.TOOLS);
this.setFragile();
}
public boolean canBeHeld() {
return true;
}
/**
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/

4
common/src/main/java/common/item/material/ItemBucket.java
View file

@ -132,6 +132,10 @@ public class ItemBucket extends Item
MAPPING.put(liquid.getStaticBlock(), this);
}
}
public boolean canBeHeld() {
return true;
}
public BlockDynamicLiquid getLiquid() {
return this.liquid;

4
common/src/main/java/common/item/material/ItemDye.java
View file

@ -34,6 +34,10 @@ public class ItemDye extends Item {
this.setWeight(ItemWeight.XXS);
DIES[this.color.ordinal()] = this;
}
public boolean canBeHeld() {
return true;
}
public Color getColor() {
return this.color;

4
common/src/main/java/common/item/material/ItemGrindedBones.java
View file

@ -40,6 +40,10 @@ public class ItemGrindedBones extends Item {
}
}
public boolean canBeHeld() {
return true;
}
public static boolean applyBonemeal(ItemStack stack, World worldIn, LocalPos target)
{
State iblockstate = worldIn.getState(target);

9
common/src/main/java/common/item/material/ItemLure.java Normal file
View file

@ -0,0 +1,9 @@
package common.item.material;
import common.item.Item;
public class ItemLure extends Item {
public boolean canBeHeld() {
return true;
}
}

4
common/src/main/java/common/item/material/ItemSeeds.java
View file

@ -22,6 +22,10 @@ public class ItemSeeds extends Item
this.setTab(CheatTab.MATERIALS);
}
public boolean canBeHeld() {
return true;
}
public boolean onItemUse(ItemStack stack, EntityNPC playerIn, World worldIn, LocalPos pos, Facing side, float hitX, float hitY, float hitZ)
{
if (side != Facing.UP)

4
common/src/main/java/common/item/projectile/ItemChargedOrb.java
View file

@ -25,6 +25,10 @@ public class ItemChargedOrb extends Item
this.setColor(Color.DARK_MAGENTA);
this.setFragile();
}
public boolean canBeHeld() {
return true;
}
public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityNPC playerIn)
{

4
common/src/main/java/common/item/projectile/ItemDie.java
View file

@ -52,6 +52,10 @@ public class ItemDie extends Item
this.setDisplay("Würfel W" + this.sides);
DICE.put(sides, this);
}
public boolean canBeHeld() {
return true;
}
public int getSides() {
return this.sides;

4
common/src/main/java/common/item/projectile/ItemDynamite.java
View file

@ -31,6 +31,10 @@ public class ItemDynamite extends Item {
DYNAMITE[power] = this;
}
public boolean canBeHeld() {
return true;
}
public int getExplosionPower() {
return this.power;
}

4
common/src/main/java/common/item/projectile/ItemEgg.java
View file

@ -21,6 +21,10 @@ public class ItemEgg extends Item
this.setTab(CheatTab.TOOLS);
}
public boolean canBeHeld() {
return true;
}
/**
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/

4
common/src/main/java/common/item/projectile/ItemFireball.java
View file

@ -22,6 +22,10 @@ public class ItemFireball extends Item
this.setTab(CheatTab.TOOLS);
}
public boolean canBeHeld() {
return true;
}
/**
* Called when a Block is right-clicked with this Item
*/

4
common/src/main/java/common/item/projectile/ItemSnowball.java
View file

@ -21,6 +21,10 @@ public class ItemSnowball extends Item
this.setTab(CheatTab.TOOLS);
}
public boolean canBeHeld() {
return true;
}
/**
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/

4
common/src/main/java/common/item/spawner/ItemBoat.java
View file

@ -29,6 +29,10 @@ public class ItemBoat extends Item
this.setTab(CheatTab.VEHICLES);
}
public boolean canBeHeld() {
return true;
}
/**
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/

4
common/src/main/java/common/item/spawner/ItemCharTemplate.java
View file

@ -40,6 +40,10 @@ public class ItemCharTemplate extends Item
this.setDisplay("delegate");
TEMPLATES.add(this);
}
public boolean canBeHeld() {
return true;
}
public void delegateSetDisplay() {
this.setDisplay("DNA-Probe von " + this.getCharName());

4
common/src/main/java/common/item/spawner/ItemMinecart.java
View file

@ -26,6 +26,10 @@ public class ItemMinecart extends Item
this.setMagnetic();
}
public boolean canBeHeld() {
return true;
}
/**
* Called when a Block is right-clicked with this Item
*/

4
common/src/main/java/common/item/spawner/ItemMobTemplate.java
View file

@ -38,6 +38,10 @@ public class ItemMobTemplate extends Item
this.setDisplay("delegate");
TEMPLATES.add(this);
}
public boolean canBeHeld() {
return true;
}
public void delegateSetDisplay() {
this.setDisplay("DNA-Probe von " + EntityRegistry.getEntityName(this.entityId));

4
common/src/main/java/common/item/tool/ItemCamera.java
View file

@ -13,6 +13,10 @@ public class ItemCamera extends Item {
this.setUnstackable();
this.setMagnetic();
}
public boolean canBeHeld() {
return true;
}
public boolean onAction(ItemStack stack, EntityNPC player, World world, ItemControl control, LocalPos block) {
if(control == ItemControl.SECONDARY) {

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

@ -13,6 +13,10 @@ public class ItemEditor extends Item {
this.setUnstackable();
this.setTab(CheatTab.TOOLS);
}
public boolean canBeHeld() {
return true;
}
public boolean onAction(ItemStack stack, EntityNPC player, World world, ItemControl control, LocalPos block) {
if(!world.client && control == ItemControl.TERTIARY && player.connection.isAdmin())

4
common/src/main/java/common/item/tool/ItemFire.java
View file

@ -30,6 +30,10 @@ public class ItemFire extends Item
this.setMagnetic();
}
public boolean canBeHeld() {
return true;
}
public void addInformation(ItemStack stack, EntityNPC playerIn, List<String> tooltip) {
this.fireBlock.getTooltips(stack, playerIn, tooltip);
}

4
common/src/main/java/common/item/tool/ItemFishingRod.java
View file

@ -18,6 +18,10 @@ public class ItemFishingRod extends Item
this.setTab(CheatTab.TOOLS);
}
public boolean canBeHeld() {
return true;
}
// /**
// * Returns True is the item is renderer in full 3D when hold.
// */

4
common/src/main/java/common/item/tool/ItemHoe.java
View file

@ -20,6 +20,10 @@ public class ItemHoe extends Item
this.setTab(CheatTab.TOOLS);
}
public boolean canBeHeld() {
return true;
}
public boolean onItemUse(ItemStack stack, EntityNPC playerIn, World worldIn, LocalPos pos, Facing side, float hitX, float hitY, float hitZ)
{
if (!playerIn.canPlayerEdit(pos.offset(side), side, stack))

4
common/src/main/java/common/item/tool/ItemKey.java
View file

@ -6,4 +6,8 @@ public class ItemKey extends Item {
public ItemKey() {
this.setMagnetic();
}
public boolean canBeHeld() {
return true;
}
}

4
common/src/main/java/common/item/tool/ItemLead.java
View file

@ -20,6 +20,10 @@ public class ItemLead extends Item
this.setTab(CheatTab.TOOLS);
}
public boolean canBeHeld() {
return true;
}
/**
* Called when a Block is right-clicked with this Item
*/

4
common/src/main/java/common/item/tool/ItemMagnet.java
View file

@ -24,6 +24,10 @@ public class ItemMagnet extends Item {
this.chicken = chicken;
}
public boolean canBeHeld() {
return true;
}
// public boolean isFull3D() {
// return true;
// }

4
common/src/main/java/common/item/tool/ItemNameTag.java
View file

@ -13,6 +13,10 @@ public class ItemNameTag extends Item
this.setTab(CheatTab.TOOLS);
}
public boolean canBeHeld() {
return true;
}
/**
* Returns true if the item can be used on the given entity, e.g. shears on sheep.
*/

4
common/src/main/java/common/item/tool/ItemSaddle.java
View file

@ -15,6 +15,10 @@ public class ItemSaddle extends Item
this.setTab(CheatTab.TOOLS);
}
public boolean canBeHeld() {
return true;
}
/**
* Returns true if the item can be used on the given entity, e.g. shears on sheep.
*/

4
common/src/main/java/common/item/tool/ItemSpaceNavigator.java
View file

@ -22,6 +22,10 @@ public class ItemSpaceNavigator extends Item {
this.setColor(Color.DARK_GREEN);
this.setMagnetic();
}
public boolean canBeHeld() {
return true;
}
public void setLocalTime(String local) {
this.localTime = local;

4
common/src/main/java/common/item/tool/ItemTool.java
View file

@ -34,6 +34,10 @@ public class ItemTool extends Item {
this.setFuelAmount(200);
}
public boolean canBeHeld() {
return true;
}
@Clientside
public void addInformation(ItemStack stack, EntityNPC playerIn, List<String> tooltip)
{

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

@ -23,6 +23,10 @@ public abstract class ItemWand extends Item {
this.setTab(CheatTab.TOOLS);
}
public boolean canBeHeld() {
return true;
}
public final boolean onAction(ItemStack stack, EntityNPC player, World world, ItemControl control, LocalPos block) {
if(control == ItemControl.SECONDARY && !world.client && block == null) {
LocalPos vec = world.getBlockTrace(player, this.getRange(stack, player));

4
common/src/main/java/common/item/tool/ItemWeatherToken.java
View file

@ -19,6 +19,10 @@ public class ItemWeatherToken extends Item {
this.setDisplay("Wetterkristall (" + this.weather.getDisplay() + ")");
this.setMagnetic();
}
public boolean canBeHeld() {
return true;
}
public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityNPC playerIn)
{

4
common/src/main/java/common/item/tool/ItemWhip.java
View file

@ -16,6 +16,10 @@ public class ItemWhip extends Item
this.setMaxDamage(35);
}
public boolean canBeHeld() {
return true;
}
public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityNPC playerIn)
{
if (playerIn.isRiding() && playerIn.vehicle instanceof EntityPig)

4
common/src/main/java/common/item/weapon/ItemBow.java
View file

@ -22,6 +22,10 @@ public class ItemBow extends Item
this.setTab(CheatTab.WEAPONS);
}
public boolean canBeHeld() {
return true;
}
/**
* Called when the player stops using an Item (stops holding the right mouse button).
*/

4
common/src/main/java/common/item/weapon/ItemExterminator.java
View file

@ -18,6 +18,10 @@ public class ItemExterminator extends Item {
this.setMagnetic();
}
public boolean canBeHeld() {
return true;
}
public ItemStack onItemRightClick(ItemStack stack, World world, EntityNPC player) {
if(!world.client && player.connection.isAdmin()) {
world.playSoundAtEntity(player, SoundEvent.CLICK, 1.0F);

4
common/src/main/java/common/item/weapon/ItemGunBase.java
View file

@ -26,6 +26,10 @@ public abstract class ItemGunBase extends Item
this.setTab(CheatTab.WEAPONS);
}
public boolean canBeHeld() {
return true;
}
@Clientside
public ItemAction getItemPosition()
{