Merge branch 'master' of https://github.com/Roadhog360/Et-Futurum

format_all_source_files.sh

@@ -1,2 +1,3 @@
 #!/bin/sh
 find "src" -iname "*.java" -exec "./format_source_file.sh" {} \;
+find "src" -iname "*.png" -exec optipng -o7 -nc -clobber {} \;

src/main/java/ganymedes01/etfuturum/client/skins/NewRenderPlayer.java

@@ -7,8 +7,6 @@
 import ganymedes01.etfuturum.lib.Reference;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.AbstractClientPlayer;
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.entity.EntityLivingBase;
@@ -17,67 +15,62 @@
 
 @SideOnly(Side.CLIENT)
 public class NewRenderPlayer extends RenderPlayer {
-
+	
 	public static final ResourceLocation STEVE_SKIN = new ResourceLocation(Reference.MOD_ID, "textures/steve.png");
-	private static final ModelBase STEVE = new ModelPlayer(0.0F, false);
-	private static final ModelBase ALEX = new ModelPlayer(0.0F, true);
-
+	private static final ModelPlayer STEVE = new ModelPlayer(0.0F, false), ALEX = new ModelPlayer(0.0F, true);
+
 	public NewRenderPlayer() {
 		renderManager = RenderManager.instance;
-		mainModel = STEVE;
-		modelBipedMain = (ModelBiped) mainModel;
+		mainModel = modelBipedMain = STEVE;
 	}
-
+	
 	private void setModel(EntityPlayer player) {
-		boolean isAlex;
-
-		isAlex = PlayerModelManager.isPlayerModelAlex(player);
-
-		mainModel = isAlex ? ALEX : STEVE;
-		modelBipedMain = (ModelBiped) mainModel;
+		mainModel = modelBipedMain = PlayerModelManager.isPlayerModelAlex(player) ? ALEX : STEVE;
 	}
-
+	
 	@Override
 	protected int shouldRenderPass(AbstractClientPlayer player, int pass, float partialTickTime) {
 		setModel(player);
 		return super.shouldRenderPass(player, pass, partialTickTime);
 	}
-
+	
 	@Override
 	public void doRender(AbstractClientPlayer player, double x, double y, double z, float someFloat, float partialTickTime) {
 		setModel(player);
 		super.doRender(player, x, y, z, someFloat, partialTickTime);
 	}
-
+	
 	@Override
 	protected void renderEquippedItems(AbstractClientPlayer player, float partialTickTime) {
 		setModel(player);
 		super.renderEquippedItems(player, partialTickTime);
 	}
-
+	
 	@Override
 	protected ResourceLocation getEntityTexture(AbstractClientPlayer player) {
 		if (!ConfigurationHandler.enablePlayerSkinOverlay || player.getLocationSkin() == null)
 			return super.getEntityTexture(player);
 		return new ResourceLocation(Reference.MOD_ID, player.getLocationSkin().getResourcePath());
 	}
-
+	
 	@Override
 	protected boolean func_110813_b(EntityLivingBase entity) {
 		boolean isGUiEnabled = Minecraft.isGuiEnabled();
 		boolean isPlayer = entity != renderManager.livingPlayer;
 		boolean isInvisible = !entity.isInvisibleToPlayer(Minecraft.getMinecraft().thePlayer);
 		boolean isBeingRidden = entity.riddenByEntity == null;
-
+		
 		return isGUiEnabled && isPlayer && isInvisible && isBeingRidden;
 	}
-
+	
 	@Override
 	public void renderFirstPersonArm(EntityPlayer player) {
 		setModel(player);
 		Minecraft.getMinecraft().getTextureManager().bindTexture(getEntityTexture(player));
-
+		
 		super.renderFirstPersonArm(player);
-		((ModelPlayer) modelBipedMain).bipedRightArmwear.render(0.0625F);
+
+		// This call is not needed at all due to bipedRightArmwear being a Child of bipedRightArm, therefore moving and rendering with it automatically already.
+		//((ModelPlayer) modelBipedMain).bipedRightArmwear.render(0.0625F);
 	}
 }

src/main/java/ganymedes01/etfuturum/items/ItemArrowTipped.java

@@ -156,10 +156,10 @@ public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list,
 						// TODO This did nothing at all
 						//while (iterator.hasNext())
 						//{
-						//	Entry<?, ?> entry = (Entry<?, ?>)iterator.next();
-						//	AttributeModifier attributemodifier = (AttributeModifier)entry.getValue(); 
-						//	AttributeModifier attributemodifier1 = new AttributeModifier(attributemodifier.getName(), potion.func_111183_a(potioneffect.getAmplifier(), attributemodifier), attributemodifier.getOperation());
-						//	//hashmultimap.put(((IAttribute)entry.getKey()).getAttributeUnlocalizedName(), attributemodifier1);
+						//  Entry<?, ?> entry = (Entry<?, ?>)iterator.next();
+						//  AttributeModifier attributemodifier = (AttributeModifier)entry.getValue(); 
+						//  AttributeModifier attributemodifier1 = new AttributeModifier(attributemodifier.getName(), potion.func_111183_a(potioneffect.getAmplifier(), attributemodifier), attributemodifier.getOperation());
+						//  //hashmultimap.put(((IAttribute)entry.getKey()).getAttributeUnlocalizedName(), attributemodifier1);
 						//}
 					}
 

src/main/java/ganymedes01/etfuturum/recipes/ModRecipes.java

@@ -12,8 +12,8 @@
 import ganymedes01.etfuturum.ModBlocks;
 import ganymedes01.etfuturum.ModItems;
 import ganymedes01.etfuturum.blocks.BlockGlazedTerracotta;
-import ganymedes01.etfuturum.blocks.BlockStoneSlab2;
 import ganymedes01.etfuturum.blocks.BlockNewStone;
+import ganymedes01.etfuturum.blocks.BlockStoneSlab2;
 import ganymedes01.etfuturum.blocks.ores.BlockDeepslateOre;
 import ganymedes01.etfuturum.configuration.ConfigurationHandler;
 import ganymedes01.etfuturum.items.ItemSuspiciousStew;
@@ -218,6 +218,7 @@ private static void registerOreDictionary() {
 		if(ConfigurationHandler.enableCopper) {
 			OreDictionary.registerOre("oreCopper", new ItemStack(ModBlocks.copper_ore, 1, 0));
 			OreDictionary.registerOre("ingotCopper", new ItemStack(ModItems.copper_ingot, 1, 0));
+			if (ConfigurationHandler.copper9to1)
 			OreDictionary.registerOre("blockCopper", new ItemStack(ModBlocks.copper_block, 1, 0));
 			OreDictionary.registerOre("blockCopperCut", new ItemStack(ModBlocks.copper_block, 1, 4));
 		}