Merge pull request #1 from Bigjango13/7.2

Update to 7.2pr2 and bugfixes

gradle.properties

@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx2G
 
 # BTA
-bta_version=7.2-pre1
+bta_version=7.2-pre2
 
 # Loader & Mod Menu
 loader_version=0.15.6-babric.6-bta
 mod_menu_version=2.0.6
 
 # HalpLibe
-halplibe_version=4.0.6
+halplibe_version=4.1.3
 
 # Mod
 mod_version=1.5.1

src/main/java/kleiders/jurisretro/JurisRetroMod.java

@@ -25,29 +25,25 @@
 
 
 public class JurisRetroMod implements ModInitializer, GameStartEntrypoint, RecipeEntrypoint {
-    public static final String MOD_ID = "juris_retro";
+    public static final String MOD_ID = "jurisretro";
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
     @Override
     public void onInitialize() {
         LOGGER.info(MOD_ID + "initialized.");
     }
 
-
-
-
 	@Override
 	public void beforeGameStart() {
+		new JurisRetroModItems().initializeItems();
 		PacketChangeData.addIdClassMapping(216, true, false, PacketChangeData.class);
 		PacketChangeData.addIdClassMapping(217, true, false, PacketRideEntity.class);
 		PacketChangeSize.addIdClassMapping(218, true, false, PacketChangeSize.class);
-		new JurisRetroModItems().initializeItems();
-		new JurisRetroModEntities().initializeEntities();
 	}
 
 
 	@Override
 	public void afterGameStart() {
-
+		new JurisRetroModEntities().initializeEntities();
 	}
 
 	@Override

src/main/java/kleiders/jurisretro/JurisRetroModItems.java

@@ -38,7 +38,7 @@ public void initializeItems() {
 			.setIcon("jurisretro:item/chicken_pig_egg")
 			.build(new ItemEgg("chicken_pig_egg", nextItemID("chicken_pig_egg")) {
 				@Override
-				public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) {
+				public ItemStack onUseItem(ItemStack itemstack, World world, EntityPlayer entityplayer) {
 					itemstack.consumeItem(entityplayer);
 					world.playSoundAtEntity(entityplayer, entityplayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
 					if (!world.isClientSide) {

src/main/java/kleiders/jurisretro/entities/EntityIceSpell.java

@@ -2,6 +2,7 @@
 
 import kleiders.jurisretro.JurisRetroModItems;
 import kleiders.jurisretro.interfaces.EntityExtensions;
+import net.minecraft.core.Global;
 import net.minecraft.core.HitResult;
 import net.minecraft.core.block.Block;
 import net.minecraft.core.entity.EntityLiving;
@@ -41,7 +42,7 @@ public void tick() {
 		super.tick();
 		Random random = new Random();
 		for (int index0 = 0; index0 < 5; index0++) {
-			if (!this.world.isClientSide && MinecraftServer.getInstance() != null) {
+			if (Global.isServer && MinecraftServer.getInstance() != null) {
 				MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(new Packet63SpawnParticleEffect("snowshovel",
 					this.x + (random.nextFloat() * 0.3) - (random.nextFloat() * 0.3), this.y + 0.1 + (random.nextFloat() * 0.3) - (random.nextFloat() * 0.3),
 					this.z + (random.nextFloat() * 0.3) - (random.nextFloat() * 0.3), 0, -0.06, 0, 0), world.dimension.id);
@@ -57,16 +58,17 @@ public void onHit(HitResult hitResult) {
 		if (hitResult.entity != null) {
 			if (hitResult.entity.hurt(this.owner, this.damage, DamageType.COMBAT)) {
 				((EntityExtensions) hitResult.entity).getExtraCustomData().putDouble("iceSlowness", 150);
-				((EntityExtensions) hitResult.entity).syncExtraCustomData();
 				if (hitResult.entity instanceof EntityIceZombie) {
 					((EntityExtensions) hitResult.entity).getExtraCustomData().putDouble("iceTicks", 300);
-					((EntityExtensions) hitResult.entity).syncExtraCustomData();
 				}
+				if (Global.isServer) {
+				    ((EntityExtensions) hitResult.entity).syncExtraCustomData();
+			    }
 			}
 		}
 		Random random = new Random();
 		for (int index0 = 0; index0 < 50; index0++) {
-			if (!this.world.isClientSide && MinecraftServer.getInstance() != null) {
+			if (Global.isServer && MinecraftServer.getInstance() != null) {
 				MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(new Packet63SpawnParticleEffect("snowshovel",
 					this.x + (random.nextFloat() * 0.55) - (random.nextFloat() * 0.55), this.y + 0.1 + (random.nextFloat() * 0.55) - (random.nextFloat() * 0.55),
 					this.z + (random.nextFloat() * 0.55) - (random.nextFloat() * 0.55), (random.nextFloat() * 0.05) - (random.nextFloat() * 0.05), -0.05, (random.nextFloat() * 0.05) - (random.nextFloat() * 0.05), 0), world.dimension.id);

src/main/java/kleiders/jurisretro/items/AirSpellItem.java

@@ -1,5 +1,6 @@
 package kleiders.jurisretro.items;
 
+import net.minecraft.core.Global;
 import net.minecraft.core.entity.Entity;
 import net.minecraft.core.entity.player.EntityPlayer;
 import net.minecraft.core.item.Item;
@@ -22,20 +23,31 @@ public AirSpellItem(String name, int id) {
 		super(name, id);
 	}
 
-	public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) {
-		ItemStack retVal = super.onItemRightClick(itemstack, world, entityplayer);
+	public ItemStack onUseItem(ItemStack itemstack, World world, EntityPlayer entityplayer) {
+		ItemStack retVal = super.onUseItem(itemstack, world, entityplayer);
 
 		//world.netHandler.addToSendQueue(new Packet14BlockDig(1, x, y, z, side));
 
 		itemstack.consumeItem(entityplayer);
 		for (int index0 = 0; index0 < 90; index0++) {
 			Random random = new Random();
-			if (!world.isClientSide && MinecraftServer.getInstance() != null) {
-				MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(new Packet63SpawnParticleEffect("explode", entityplayer.x + (random.nextFloat() * 3) - (random.nextFloat() * 3), entityplayer.y - 0.25 + (random.nextFloat() * 0.2) - (random.nextFloat() * 0.2),
-					entityplayer.z + (random.nextFloat() * 3) - (random.nextFloat() * 3), 0, 0.12, 0, 0), world.dimension.id);
+			if (Global.isServer && MinecraftServer.getInstance() != null) {
+				MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(
+				    new Packet63SpawnParticleEffect(
+				        "explode",
+				        entityplayer.x + (random.nextFloat() * 3) - (random.nextFloat() * 3),
+				        entityplayer.y - 0.25 + (random.nextFloat() * 0.2) - (random.nextFloat() * 0.2),
+					    entityplayer.z + (random.nextFloat() * 3) - (random.nextFloat() * 3), 0, 0.12, 0, 0),
+					    world.dimension.id
+					);
 			} else {
-				world.spawnParticle("explode", entityplayer.x + (random.nextFloat() * 3) - (random.nextFloat() * 3), entityplayer.y - 1 + (random.nextFloat() * 0.2) - (random.nextFloat() * 0.2),
-						entityplayer.z + (random.nextFloat() * 3) - (random.nextFloat() * 3), 0, 0.12,0, 0);
+				world.spawnParticle(
+				    "explode",
+				    entityplayer.x + (random.nextFloat() * 3) - (random.nextFloat() * 3),
+				    entityplayer.y - 1 + (random.nextFloat() * 0.2) - (random.nextFloat() * 0.2),
+					entityplayer.z + (random.nextFloat() * 3) - (random.nextFloat() * 3),
+					0, 0.12, 0, 0
+				);
 			}
 		}
 		world.playSoundEffect(entityplayer, SoundCategory.ENTITY_SOUNDS, entityplayer.x, entityplayer.y, entityplayer.z, "random.pop", 1, 1);

src/main/java/kleiders/jurisretro/items/TransformationSpellItem.java

@@ -1,6 +1,7 @@
 package kleiders.jurisretro.items;
 
 import kleiders.jurisretro.interfaces.EntityExtensions;
+import net.minecraft.core.Global;
 import net.minecraft.core.entity.player.EntityPlayer;
 import net.minecraft.core.item.Item;
 import net.minecraft.core.item.ItemStack;
@@ -17,13 +18,13 @@ public TransformationSpellItem(String name, int id) {
 		super(name, id);
 	}
 
-	public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) {
-		ItemStack retVal = super.onItemRightClick(itemstack, world, entityplayer);
+	public ItemStack onUseItem(ItemStack itemstack, World world, EntityPlayer entityplayer) {
+		ItemStack retVal = super.onUseItem(itemstack, world, entityplayer);
 
 		itemstack.consumeItem(entityplayer);
 		for (int index0 = 0; index0 < 90; index0++) {
 			Random random = new Random();
-			if (!world.isClientSide && MinecraftServer.getInstance() != null) {
+			if (Global.isServer && MinecraftServer.getInstance() != null) {
 				MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(new Packet63SpawnParticleEffect("explode", entityplayer.x + (random.nextFloat() * 1) - (random.nextFloat() * 1), entityplayer.y - 0.25 + (random.nextFloat() * 0.4) - (random.nextFloat() * 0.3),
 					entityplayer.z + (random.nextFloat() * 1) - (random.nextFloat() * 1), 0, 0.12, 0, 0), world.dimension.id);
 			} else {
@@ -33,7 +34,9 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer
 		}
 		world.playSoundEffect(entityplayer, SoundCategory.ENTITY_SOUNDS, entityplayer.x, entityplayer.y, entityplayer.z, "mob.chicken", 1, 1);
 		((EntityExtensions) entityplayer).getExtraCustomData().putDouble("chickenTime", ((EntityExtensions) entityplayer).getExtraCustomData().getDouble("chickenTime") + 1200);
-		((EntityExtensions) entityplayer).syncExtraCustomData();
+		if (Global.isServer) {
+		    ((EntityExtensions) entityplayer).syncExtraCustomData();
+	    }
 		return retVal;
 	}
 }

src/main/java/kleiders/jurisretro/mixin/EntityCameraMixin.java

@@ -9,7 +9,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(EntityCamera.class)
+@Mixin(value = EntityCamera.class, remap=false)
 public class EntityCameraMixin {
 	@Shadow
 	public EntityLiving entity;

src/main/java/kleiders/jurisretro/mixin/EntityMixin.java

@@ -3,6 +3,7 @@
 import com.mojang.nbt.CompoundTag;
 import kleiders.jurisretro.interfaces.EntityExtensions;
 import kleiders.jurisretro.packets.PacketChangeData;
+import net.minecraft.core.Global;
 import net.minecraft.core.entity.Entity;
 import net.minecraft.core.util.phys.AABB;
 import net.minecraft.core.world.World;
@@ -15,7 +16,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(Entity.class)
+@Mixin(value = Entity.class, remap = false)
 public class EntityMixin implements EntityExtensions {
 	@Shadow
 	public World world;
@@ -52,7 +53,7 @@ public class EntityMixin implements EntityExtensions {
 	@Unique
 	@Override
 	public void syncExtraCustomData() {
-		if (!this.world.isClientSide && MinecraftServer.getInstance() != null) {
+		if (Global.isServer && MinecraftServer.getInstance() != null) {
 			MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(new PacketChangeData(((Entity) (Object) this), juris$extraCustomData), this.world.dimension.id);
 		}
 	}

src/main/java/kleiders/jurisretro/mixin/EntityPlayerMixin.java

@@ -4,6 +4,7 @@
 import kleiders.jurisretro.interfaces.EntityExtensions;
 import kleiders.jurisretro.packets.PacketChangeSize;
 import kleiders.jurisretro.packets.PacketRideEntity;
+import net.minecraft.core.Global;
 import net.minecraft.core.entity.Entity;
 import net.minecraft.core.entity.EntityLiving;
 import net.minecraft.core.entity.monster.EntityZombie;
@@ -42,7 +43,7 @@ public void interact(EntityPlayer otherplayer, CallbackInfoReturnable<Boolean> c
 		EntityPlayer player = ((EntityPlayer) (Object) this);
 		if (((EntityExtensions) player).getExtraCustomData().getDouble("chickenTime") > 0 && ((EntityExtensions) otherplayer).getExtraCustomData().getDouble("chickenTime") <= 0) {
 			otherplayer.startRiding(player);
-			if (!player.world.isClientSide && MinecraftServer.getInstance() != null) {
+			if (Global.isServer && MinecraftServer.getInstance() != null) {
 				MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(new PacketRideEntity(otherplayer, player), player.world.dimension.id);
 			}
 		}
@@ -80,7 +81,9 @@ private void injected(Entity attacker, int damage, DamageType type, CallbackInfo
 		if (cir.getReturnValue() && attacker instanceof EntityIceZombie) {
 			EntityPlayer player = ((EntityPlayer) (Object) this);
 			((EntityExtensions) player).getExtraCustomData().putDouble("iceSlowness", 100);
-			((EntityExtensions) player).syncExtraCustomData();
+			if (Global.isServer) {
+    			((EntityExtensions) player).syncExtraCustomData();
+			}
 		}
 	}
 
@@ -92,14 +95,14 @@ public void modifySpeed(CallbackInfo ci) {
 			((EntityExtensions) player).getExtraCustomData().putDouble("iceSlowness", ((EntityExtensions) player).getExtraCustomData().getDouble("iceSlowness") - 1);
 			player.speed *= 0.8;
 			Random random = new Random();
-			if (!player.world.isClientSide && MinecraftServer.getInstance() != null) {
+			if (Global.isServer && MinecraftServer.getInstance() != null) {
 				MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(new Packet63SpawnParticleEffect("snowshovel", player.x + (random.nextFloat() * 1) - (random.nextFloat() * 1), player.y + 0.25 + (random.nextFloat() * 0.2) - (random.nextFloat() * 0.2),
 					player.z + (random.nextFloat() * 1) - (random.nextFloat() * 1), 0, -0.12, 0, 0), world.dimension.id);
 			} else {
 				player.world.spawnParticle("snowshovel", player.x + (random.nextFloat() * 1) - (random.nextFloat() * 1), player.y - 0.25 + (random.nextFloat() * 0.2) - (random.nextFloat() * 0.2),
 					player.z + (random.nextFloat() * 1) - (random.nextFloat() * 1), 0, -0.12,0, 0);
 			}
-			if (((EntityExtensions) player).getExtraCustomData().getDouble("iceSlowness") <= 0) {
+			if (((EntityExtensions) player).getExtraCustomData().getDouble("iceSlowness") <= 0 && Global.isServer) {
 				((EntityExtensions) player).syncExtraCustomData();
 			}
 		}
@@ -112,9 +115,9 @@ private void onDwarf(CallbackInfo ci) {
 			((EntityExtensions) player).getExtraCustomData().putDouble("chickenTime", ((EntityExtensions) player).getExtraCustomData().getDouble("chickenTime") - 1);
 			if (!isChicken) {
 				this.setSize(0.6F, 0.7F);
-				((EntityExtensions) player).syncExtraCustomData();
 				isChicken = true;
-				if (!player.world.isClientSide && MinecraftServer.getInstance() != null) {
+				if (Global.isServer && MinecraftServer.getInstance() != null) {
+    				((EntityExtensions) player).syncExtraCustomData();
 					MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(new PacketChangeSize(player, true), player.world.dimension.id);
 				}
 			}
@@ -123,8 +126,8 @@ private void onDwarf(CallbackInfo ci) {
 				this.setSize(0.6F, 1.8F);
 				isChicken = false;
 				isDwarf = false;
-				((EntityExtensions) player).syncExtraCustomData();
-				if (!player.world.isClientSide && MinecraftServer.getInstance() != null) {
+				if (Global.isServer && MinecraftServer.getInstance() != null) {
+    				((EntityExtensions) player).syncExtraCustomData();
 					MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(new PacketChangeSize(player, false), player.world.dimension.id);
 				}
 			}

src/main/java/kleiders/jurisretro/mixin/EntityPlayerSPMixin.java

@@ -8,7 +8,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(EntityPlayerSP.class)
+@Mixin(value = EntityPlayerSP.class, remap = false)
 public class EntityPlayerSPMixin {
 	@Inject(method = "checkInTile", remap = false, at = @At("HEAD"), cancellable = true)
 	public void shouldBeFree(CallbackInfoReturnable<Boolean> cir) {

src/main/java/kleiders/jurisretro/mixin/EntityTrackerEntryMixin.java

@@ -13,7 +13,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(EntityTrackerEntry.class)
+@Mixin(value = EntityTrackerEntry.class, remap = false)
 public class EntityTrackerEntryMixin {
 	@Shadow
 	public Entity trackedEntity;

src/main/java/kleiders/jurisretro/mixin/EntityTrackerMixin.java

@@ -9,7 +9,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(EntityTracker.class)
+@Mixin(value = EntityTracker.class, remap = false)
 public class EntityTrackerMixin {
 
 	@Inject(method = "trackEntity", remap = false, at = @At("HEAD"), cancellable = true)

src/main/java/kleiders/jurisretro/mixin/EntityZombieMixin.java

@@ -6,7 +6,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(EntityZombie.class)
+@Mixin(value = EntityZombie.class, remap = false)
 public class EntityZombieMixin {
 
 	@Redirect(method = "onLivingUpdate", remap = false, at = @At(value = "FIELD", target = "Lnet/minecraft/core/entity/monster/EntityZombie;remainingFireTicks:I"))

src/main/java/kleiders/jurisretro/mixin/LivingEntityMixin.java

@@ -3,6 +3,7 @@
 import kleiders.jurisretro.JurisRetroMod;
 import kleiders.jurisretro.JurisRetroModItems;
 import kleiders.jurisretro.interfaces.EntityExtensions;
+import net.minecraft.core.Global;
 import net.minecraft.core.block.Block;
 import net.minecraft.core.entity.EntityLiving;
 import net.minecraft.core.entity.player.EntityPlayer;
@@ -51,7 +52,7 @@ public void modifySpeed(float moveStrafing, float moveForward, CallbackInfo ci)
 				living.speed *= 0.4;
 				Random random = new Random();
 				float height = living.bbHeight;
-				if (!living.world.isClientSide && MinecraftServer.getInstance() != null) {
+				if (Global.isServer && MinecraftServer.getInstance() != null) {
 					MinecraftServer.getInstance().playerList.sendPacketToAllPlayersInDimension(new Packet63SpawnParticleEffect("snowshovel", living.x + (random.nextFloat() * 1) - (random.nextFloat() * 1), living.y + (height / 2) + (random.nextFloat() * (height / 2)) - (random.nextFloat() * (height / 2)),
 						living.z + (random.nextFloat() * 1) - (random.nextFloat() * 1), 0, -0.12, 0, 0), living.world.dimension.id);
 				} else {

src/main/java/kleiders/jurisretro/mixin/NetClientHandlerMixin.java

@@ -18,7 +18,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(NetClientHandler.class)
+@Mixin(value = NetClientHandler.class, remap = false)
 public abstract class NetClientHandlerMixin implements NetHandlerPacketsExtensions {
 	@Shadow
 	public abstract Entity getEntityByID(int i);

src/main/java/kleiders/jurisretro/mixin/NetHandlerMixin.java

@@ -8,7 +8,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
-@Mixin(NetHandler.class)
+@Mixin(value = NetHandler.class, remap = false)
 public class NetHandlerMixin implements NetHandlerPacketsExtensions {
 
 

src/main/java/kleiders/jurisretro/mixin/WorldRendererMixin.java

@@ -9,7 +9,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
-@Mixin(WorldRenderer.class)
+@Mixin(value = WorldRenderer.class, remap = false)
 public class WorldRendererMixin {
 	@Shadow
 	public Minecraft mc;

src/main/resources/lang/jurisretro/en_US.lang

@@ -1,15 +1,15 @@
-item.juris_retro.air_spell.name=Air Spell
-item.juris_retro.air_spell.desc=Push enemies away!
-item.juris_retro.chicken_pig_egg.name=Chicken Pig Egg
-item.juris_retro.chicken_pig_egg.desc=Can be used to make a Transformation Spell.
-item.juris_retro.transformation_spell.name=Transformation Spell
-item.juris_retro.transformation_spell.desc=Transforms you into a Chicken Pig for 1 minute. Can Stack.
-item.juris_retro.spider_boots.name=Spider Boots
-item.juris_retro.spider_boots.desc=Climb like a Spider!
-item.juris_retro.spider_mother_leather.name=Spider Mother Leather
-item.juris_retro.spider_mother_leather.desc=A flat Spider Mother. Can be used to make Boots.
-item.juris_retro.ice_spell.name=Ice Spell
-item.juris_retro.ice_spell.desc=Shoots an Ice Block that slows enemies on hit.
+item.jurisretro.air_spell.name=Air Spell
+item.jurisretro.air_spell.desc=Push enemies away!
+item.jurisretro.chicken_pig_egg.name=Chicken Pig Egg
+item.jurisretro.chicken_pig_egg.desc=Can be used to make a Transformation Spell.
+item.jurisretro.transformation_spell.name=Transformation Spell
+item.jurisretro.transformation_spell.desc=Transforms you into a Chicken Pig for 1 minute. Can Stack.
+item.jurisretro.spider_boots.name=Spider Boots
+item.jurisretro.spider_boots.desc=Climb like a Spider!
+item.jurisretro.spider_mother_leather.name=Spider Mother Leather
+item.jurisretro.spider_mother_leather.desc=A flat Spider Mother. Can be used to make Boots.
+item.jurisretro.ice_spell.name=Ice Spell
+item.jurisretro.ice_spell.desc=Shoots an Ice Block that slows enemies on hit.
 section.jurisretro.chicken_pig.name=Chicken Pig
 section.jurisretro.chicken_pig.desc=A strange but calm mix between a Chicken and a Pig.
 section.jurisretro.spider_mother.name=Spider Mother