Browse Source

snuvi command

Kajetan Johannes Hammerle 2 years ago
parent
commit
a8f1eaa4c3

+ 16 - 14
src/main/java/me/km/entities/EntityHuman.java

@@ -29,10 +29,14 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraft.util.SoundEvents;
 
 public class EntityHuman extends CreatureEntity {
-    private static final DataParameter<String> SKIN_NAME = EntityDataManager.createKey(EntityHuman.class, DataSerializers.STRING);
-    private static final DataParameter<Float> SCALE = EntityDataManager.createKey(EntityHuman.class, DataSerializers.FLOAT);
-    private static final DataParameter<Boolean> SLIM = EntityDataManager.createKey(EntityHuman.class, DataSerializers.BOOLEAN);
-    private static final DataParameter<Boolean> STATUE = EntityDataManager.createKey(EntityHuman.class, DataSerializers.BOOLEAN);
+    private static final DataParameter<String> SKIN_NAME =
+            EntityDataManager.createKey(EntityHuman.class, DataSerializers.STRING);
+    private static final DataParameter<Float> SCALE =
+            EntityDataManager.createKey(EntityHuman.class, DataSerializers.FLOAT);
+    private static final DataParameter<Boolean> SLIM =
+            EntityDataManager.createKey(EntityHuman.class, DataSerializers.BOOLEAN);
+    private static final DataParameter<Boolean> STATUE =
+            EntityDataManager.createKey(EntityHuman.class, DataSerializers.BOOLEAN);
 
     private final float originalWidth;
     private final float originalHeight;
@@ -131,16 +135,13 @@ public class EntityHuman extends CreatureEntity {
     }
 
     @Override
-    public void addVelocity(double x, double y, double z) {
-    }
+    public void addVelocity(double x, double y, double z) {}
 
     @Override
-    public void applyKnockback(float strength, double ratioX, double ratioZ) {
-    }
+    public void applyKnockback(float strength, double ratioX, double ratioZ) {}
 
     @Override
-    public void applyEntityCollision(Entity entityIn) {
-    }
+    public void applyEntityCollision(Entity entityIn) {}
 
     @Override
     public boolean attackEntityFrom(DamageSource source, float amount) {
@@ -165,8 +166,7 @@ public class EntityHuman extends CreatureEntity {
     }
 
     public static AttributeModifierMap.MutableAttribute getAttributes() {
-        return MonsterEntity.func_234295_eP_()
-                .createMutableAttribute(Attributes.MAX_HEALTH, 20.0)
+        return MonsterEntity.func_234295_eP_().createMutableAttribute(Attributes.MAX_HEALTH, 20.0)
                 .createMutableAttribute(Attributes.ATTACK_DAMAGE, 1)
                 .createMutableAttribute(Attributes.MOVEMENT_SPEED, 0.1)
                 .createMutableAttribute(Attributes.ATTACK_SPEED);
@@ -192,7 +192,8 @@ public class EntityHuman extends CreatureEntity {
         if(ds == DamageSource.ON_FIRE) {
             return SoundEvents.ENTITY_PLAYER_HURT_ON_FIRE;
         } else {
-            return ds == DamageSource.DROWN ? SoundEvents.ENTITY_PLAYER_HURT_DROWN : SoundEvents.ENTITY_PLAYER_HURT;
+            return ds == DamageSource.DROWN ? SoundEvents.ENTITY_PLAYER_HURT_DROWN
+                    : SoundEvents.ENTITY_PLAYER_HURT;
         }
     }
 
@@ -213,7 +214,8 @@ public class EntityHuman extends CreatureEntity {
 
     @Override
     protected SoundEvent getFallSound(int heightIn) {
-        return heightIn > 4 ? SoundEvents.ENTITY_PLAYER_BIG_FALL : SoundEvents.ENTITY_PLAYER_SMALL_FALL;
+        return heightIn > 4 ? SoundEvents.ENTITY_PLAYER_BIG_FALL
+                : SoundEvents.ENTITY_PLAYER_SMALL_FALL;
     }
 
     @OnlyIn(Dist.CLIENT)

+ 4 - 0
src/main/java/me/km/snuviscript/commands/BlockCommands.java

@@ -103,6 +103,10 @@ public class BlockCommands {
             Location l = (Location) in[0].get(sc);
             return l.getWorld().getBlockState(l.getBlockPos()).getBlock();
         });
+        sm.registerFunction("block.getstate", (sc, in) -> {
+            Location l = (Location) in[0].get(sc);
+            return l.getWorld().getBlockState(l.getBlockPos());
+        });
         sm.registerFunction("block.getproperties", (sc, in) -> {
             Location l = (Location) in[0].get(sc);
             return l.getWorld().getBlockState(l.getBlockPos()).getBlock().getStateContainer()