From 84873de7c357250b88c4e38da0916f0496b3dd7a Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Tue, 30 Jul 2019 10:56:58 -0300
Subject: [PATCH] cleanup

---
 .../java/carpet/mixins/VillagerEntity_aiMixin.java   |  6 ++----
 src/main/java/carpet/script/CarpetExpression.java    |  4 ----
 src/main/java/carpet/script/Expression.java          |  1 -
 .../java/carpet/script/value/AbstractListValue.java  | 12 ------------
 4 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java
index bd7cd6c5..a17e6085 100644
--- a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java
+++ b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java
@@ -103,9 +103,9 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity
             if (Math.abs(displayAge) < 100 && displayAge !=0) displayAge = getBreedingAge();
 
             this.setCustomName(Messenger.c(
-                    (hasBed?"eb ":"fb ")+"\u263d ",
+                    (hasBed?"eb ":"fb ")+"\u2616 ",//"\u263d ",
                     (totalFood>0?"eb ":"fb ")+"\u2668",(totalFood>0?"e ":"f ")+totalFood+" ",
-                    (displayAge==0?"eb ":"fb ")+"\u2661",(displayAge==0?"e ":"f ")+displayAge+""
+                    (displayAge==0?"eb ":"fb ")+"\u2661",(displayAge==0?"e ":"f "+displayAge)
             ));
             this.setCustomNameVisible(true);
         }
@@ -159,8 +159,6 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity
                         ((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER,
                                 pv.x, pv.y+1, pv.z,
                                 1, 0.1, 0.1, 0.1, 0.0);
-
-
                 }
             }
             cir.setReturnValue(false);
diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java
index a84f9385..56715295 100644
--- a/src/main/java/carpet/script/CarpetExpression.java
+++ b/src/main/java/carpet/script/CarpetExpression.java
@@ -1678,7 +1678,6 @@ public class CarpetExpression
             if (EntityType.getId(EntityType.LIGHTNING_BOLT).equals(entityId)) {
                 LightningEntity lightningEntity_1 = new LightningEntity(cc.s.getWorld(), vec3d.x, vec3d.y, vec3d.z, false);
                 cc.s.getWorld().addLightning(lightningEntity_1);
-                cc.s.sendFeedback(new TranslatableText("commands.summon.success", lightningEntity_1.getDisplayName()), true);
                 return LazyValue.NULL;
             } else {
                 ServerWorld serverWorld = cc.s.getWorld();
@@ -2891,7 +2890,6 @@ public class CarpetExpression
      * followed by the second set of coordinates, providing tab completion, with <code>looking at... </code> mechanics for convenience,
      * followed by any other required arguments</p>
      * </div>
-     * @return .
      */
 
     public void invokeGlobalFunctionCommand()
@@ -2934,7 +2932,6 @@ public class CarpetExpression
      * <h3><code>/script in &lt;module&gt; ... </code></h3>
      * <p>Allows to run normal /script commands in a specific module, like <code>run, invoke,..., globals</code> etc...</p>
      * </div>
-     * @return .
      */
     public void loadScriptsFromFilesCommand()
     {
@@ -2978,7 +2975,6 @@ public class CarpetExpression
      * <p>used to display current events and bounded functions. use <code>add_to</code> ro register new event, or <code>remove_from</code>
      * to unbind a specific function from an event.</p>
      * </div>
-     * @return .
      */
     public void gameEventsSystem()
     {
diff --git a/src/main/java/carpet/script/Expression.java b/src/main/java/carpet/script/Expression.java
index 128f89ff..f3256963 100644
--- a/src/main/java/carpet/script/Expression.java
+++ b/src/main/java/carpet/script/Expression.java
@@ -20,7 +20,6 @@ import carpet.script.value.ListValue;
 import carpet.script.value.NumericValue;
 import carpet.script.value.StringValue;
 import carpet.script.value.Value;
-import carpet.settings.CarpetSettings;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
diff --git a/src/main/java/carpet/script/value/AbstractListValue.java b/src/main/java/carpet/script/value/AbstractListValue.java
index 716b17b0..f7e33a02 100644
--- a/src/main/java/carpet/script/value/AbstractListValue.java
+++ b/src/main/java/carpet/script/value/AbstractListValue.java
@@ -1,18 +1,6 @@
 package carpet.script.value;
 
-import carpet.script.exception.InternalExpressionException;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.util.registry.Registry;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static java.lang.Math.abs;
 
 public abstract class AbstractListValue extends Value
 {