paintbrush change

can now cycle skins by using the brush on the train while sneaking. using it while not sneaking will now bring up the paint GUI to make it more intuitive.
EternalBlueFlame · Jan 4, 2024 · c698890 · c698890
1 parent 25d005a
commit c698890
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/main/java/train/common/api/EntityRollingStock.java b/src/main/java/train/common/api/EntityRollingStock.java
@@ -24,6 +24,7 @@
 import net.minecraft.entity.item.EntityMinecart;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemDye;
 import net.minecraft.item.ItemStack;
@@ -381,6 +382,12 @@ public boolean attackEntityFrom(DamageSource damagesource, float i) {
         if (worldObj.isRemote || isDead) {
             return true;
         }
+        if(damagesource.getEntity() instanceof EntityPlayerMP){
+            if(((EntityPlayerMP) damagesource.getEntity()).getHeldItem().getItem() instanceof ItemPaintbrushThing){
+
+            }
+
+        }
         if (damagesource.getEntity() instanceof EntityPlayer && !damagesource.isProjectile()) {
             if (this instanceof IPassenger) {
                 if (canBeDestroyedByPlayer(damagesource)) return false;
@@ -1718,7 +1725,7 @@ public boolean interactFirst(EntityPlayer entityplayer) {
             return true;
         }
 
-        if (itemstack != null && itemstack.getItem() instanceof ItemPaintbrushThing && entityplayer.isSneaking()) {
+        if (itemstack != null && itemstack.getItem() instanceof ItemPaintbrushThing) {
             if (this.getSpec().getLiveries().size() > 0) {
                 entityplayer.openGui(Traincraft.instance, GuiIDs.PAINTBRUSH, entityplayer.getEntityWorld(), this.getEntityId(), -1, (int) this.posZ);
             }
@@ -1727,6 +1734,17 @@ public boolean interactFirst(EntityPlayer entityplayer) {
                 entityplayer.addChatMessage(new ChatComponentText("There are no other colors available."));
             }
             return true;
+        } else if (itemstack != null && itemstack.getItem() instanceof ItemPaintbrushThing && entityplayer.isSneaking()){
+            for (int i = 0; i < this.getSpec().getLiveries().size(); i++) {
+                if (this.getColor().equals(this.getSpec().getLiveries().get(i))) {
+                    if(this.getSpec().getLiveries().size()>i+1){
+                        setColor(i+1);
+                    } else {
+                        setColor(0);
+                    }
+                    return true;
+                }
+            }
         }
 
         return worldObj.isRemote;