cleanup
This commit is contained in:
1 parent
5cef894cf7
commit
84873de7c3
4 files changed
+2
-21
No files matched your search
@@ -103,9 +103,9 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity
|
|||||||
if (Math.abs(displayAge) < 100 && displayAge !=0) displayAge = getBreedingAge();
|
if (Math.abs(displayAge) < 100 && displayAge !=0) displayAge = getBreedingAge();
|
||||||
|
|
||||||
this.setCustomName(Messenger.c(
|
this.setCustomName(Messenger.c(
|
||||||
(hasBed?"eb ":"fb ")+"\u263d ",
|
(hasBed?"eb ":"fb ")+"\u2616 ",//"\u263d ",
|
||||||
(totalFood>0?"eb ":"fb ")+"\u2668",(totalFood>0?"e ":"f ")+totalFood+" ",
|
(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);
|
this.setCustomNameVisible(true);
|
||||||
}
|
}
|
||||||
@@ -159,8 +159,6 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity
|
|||||||
((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER,
|
((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER,
|
||||||
pv.x, pv.y+1, pv.z,
|
pv.x, pv.y+1, pv.z,
|
||||||
1, 0.1, 0.1, 0.1, 0.0);
|
1, 0.1, 0.1, 0.1, 0.0);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cir.setReturnValue(false);
|
cir.setReturnValue(false);
|
||||||
|
|||||||
@@ -1678,7 +1678,6 @@ public class CarpetExpression
|
|||||||
if (EntityType.getId(EntityType.LIGHTNING_BOLT).equals(entityId)) {
|
if (EntityType.getId(EntityType.LIGHTNING_BOLT).equals(entityId)) {
|
||||||
LightningEntity lightningEntity_1 = new LightningEntity(cc.s.getWorld(), vec3d.x, vec3d.y, vec3d.z, false);
|
LightningEntity lightningEntity_1 = new LightningEntity(cc.s.getWorld(), vec3d.x, vec3d.y, vec3d.z, false);
|
||||||
cc.s.getWorld().addLightning(lightningEntity_1);
|
cc.s.getWorld().addLightning(lightningEntity_1);
|
||||||
cc.s.sendFeedback(new TranslatableText("commands.summon.success", lightningEntity_1.getDisplayName()), true);
|
|
||||||
return LazyValue.NULL;
|
return LazyValue.NULL;
|
||||||
} else {
|
} else {
|
||||||
ServerWorld serverWorld = cc.s.getWorld();
|
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 the second set of coordinates, providing tab completion, with <code>looking at... </code> mechanics for convenience,
|
||||||
* followed by any other required arguments</p>
|
* followed by any other required arguments</p>
|
||||||
* </div>
|
* </div>
|
||||||
* @return .
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public void invokeGlobalFunctionCommand()
|
public void invokeGlobalFunctionCommand()
|
||||||
@@ -2934,7 +2932,6 @@ public class CarpetExpression
|
|||||||
* <h3><code>/script in <module> ... </code></h3>
|
* <h3><code>/script in <module> ... </code></h3>
|
||||||
* <p>Allows to run normal /script commands in a specific module, like <code>run, invoke,..., globals</code> etc...</p>
|
* <p>Allows to run normal /script commands in a specific module, like <code>run, invoke,..., globals</code> etc...</p>
|
||||||
* </div>
|
* </div>
|
||||||
* @return .
|
|
||||||
*/
|
*/
|
||||||
public void loadScriptsFromFilesCommand()
|
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>
|
* <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>
|
* to unbind a specific function from an event.</p>
|
||||||
* </div>
|
* </div>
|
||||||
* @return .
|
|
||||||
*/
|
*/
|
||||||
public void gameEventsSystem()
|
public void gameEventsSystem()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ import carpet.script.value.ListValue;
|
|||||||
import carpet.script.value.NumericValue;
|
import carpet.script.value.NumericValue;
|
||||||
import carpet.script.value.StringValue;
|
import carpet.script.value.StringValue;
|
||||||
import carpet.script.value.Value;
|
import carpet.script.value.Value;
|
||||||
import carpet.settings.CarpetSettings;
|
|
||||||
|
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|||||||
@@ -1,18 +1,6 @@
|
|||||||
package carpet.script.value;
|
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.Iterator;
|
||||||
import java.util.List;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import static java.lang.Math.abs;
|
|
||||||
|
|
||||||
public abstract class AbstractListValue extends Value
|
public abstract class AbstractListValue extends Value
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user