1.0.2-snapshot 9

Change Log.txt

@@ -1,3 +1,33 @@
+######## 1.0.2-Snapshot 9 ########
+-added config option to adjust the distance between chaos islands.
+-fixed infused obsidian and draconium blocks wither resistance.
+-nurfed crasy op weapons effectiveness against the chaos guardian a little. 
+-hopefully fixed the chaos guardian crystal syncing issue (cant reproduce this so not sure if its actually fixed)
+-fixed the damage bonus on draconic weapons (+X% mob health) now works on dragons including the chaos guardian.
+-addressed the issue of certain mod items being able to move the chaos crystal...
+-added some missing localization.
+-disabled enchant effect on armor.
+-fixed issue with particle gen view distance.
+-added config option to reanable the original 3D armor models by Skeletonpunk.
+-field drain rate (now called field input rate) in the reactor gui makes more sense now.
+-added hover text to values in the reactor stats page.
+-fixed some bugs in the reactor code.
+-fixed a minor bug in the custom spwner blacklist.
+-
+-
+-
+-
+
+######## 1.0.2-Snapshot 8-bugfix ########
+-fixed crash in information tablet.
+-removed console spam from entities spawned by the stabilized spawner. 
+-increased energy infuser buffer and transfer rate to 10m.
+-updated chaos island documentation.
+-added documentation for chaos shard and chaotic core.
+
+######## 1.0.2-Snapshot 7-bugfix ########
+-fixed some missing texture errors.
+
 ######## 1.0.2-Snapshot 6 ########
 -added new textures and models for ALL THE THINGS! Thanks to @Sn0wShepherd
 -added config option to disable custom tool models.
@@ -18,7 +48,7 @@
 -rewrote chaos island and chaos guardian.
 -added CC and OC support to reactor, flow gates and energy core.
 -re implemented the ability to disable item lore.
--fixed conflict with draconic helm and tcon cleaver mining fateige.
+-fixed conflict with draconic helm and tcon cleaver mining fatigue.
 -added draconium and awakened draconium nuggets.
 -added Chaos Crystal.
 -added Chaos Shard and Chaos Fragments.

VERSION.txt

@@ -1,3 +1,3 @@
 Version:1.0.2
-Snapshot:6
-ReleaseNote:The start of the 1.0.2 snapshots!
+Snapshot:9
+ReleaseNote:More bug fixes! Hopefully fixed the chaos guardian issues once and for all...

build.properties

@@ -1,7 +1,7 @@
 minecraft_version=1.7.10
-mod_version=1.0.2-Snapshot_6
+mod_version=1.0.2-Snapshot_9
 forge_version=10.13.4.1492-1.7.10
-CCLIB_version=1.1.1.99
+CCLIB_version=1.1.3.140
 NEI_version=1.0.3.74
 ccc_version=1.0.4.29
 

src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java

@@ -21,7 +21,7 @@
 		"after:NotEnoughItems;" +
 		"after:ThermalExpansion;" +
 		"after:ThermalFoundation;" +
-		"required-after:BrandonsCore@[1.0.0.9,);")
+		"required-after:BrandonsCore@[1.0.0.10,);")
 public class DraconicEvolution {
 
 	@Mod.Instance(References.MODID)
@@ -66,7 +66,7 @@ public static void preInit(final FMLPreInitializationEvent event)
 	public void init(final FMLInitializationEvent event)
 	{if(debug)
 		System.out.println("init()");
-		
+
 		proxy.init(event);
 	}
 

src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java

@@ -149,7 +149,7 @@ else if (collection.getComponent("CONTRIBUTORS") != null && collection.getCompon
 			barPosition = (int)(((double)page.scrollOffset/page.scrollLimit) * 247D);
 		}
 		else if (collection.getComponent("OPEN_PAGE") != null && collection.getComponent("OPEN_PAGE").isEnabled()) {
-			ComponentManualPage page = (ComponentManualPage)collection.getComponent("CONTRIBUTORS");
+			ComponentManualPage page = (ComponentManualPage)collection.getComponent("OPEN_PAGE");
 			barPosition = (int)(((double)page.scrollOffset/page.scrollLimit) * 247D);
 		}
 
@@ -193,7 +193,7 @@ else if (!scrollPressed && collection.getComponent("CONTRIBUTORS") != null && co
 			barPosition = (int)(((double)page.scrollOffset/page.scrollLimit) * 247D);
 		}
 		else if (collection.getComponent("OPEN_PAGE") != null && collection.getComponent("OPEN_PAGE").isEnabled()) {
-			ComponentManualPage page = (ComponentManualPage)collection.getComponent("CONTRIBUTORS");
+			ComponentManualPage page = (ComponentManualPage)collection.getComponent("OPEN_PAGE");
 			barPosition = (int)(((double)page.scrollOffset/page.scrollLimit) * 247D);
 		}
 
@@ -407,7 +407,7 @@ else if (collection.getComponent("CONTRIBUTORS") != null && collection.getCompon
 			page.scrollOffset = (int) (position * page.scrollLimit);
 		}
 		else if (collection.getComponent("OPEN_PAGE") != null && collection.getComponent("OPEN_PAGE").isEnabled()) {
-			ComponentManualPage page = (ComponentManualPage)collection.getComponent("CONTRIBUTORS");
+			ComponentManualPage page = (ComponentManualPage)collection.getComponent("OPEN_PAGE");
 			if (page.scrollLimit < 0) return;
 			page.scrollOffset = (int) (position * page.scrollLimit);
 		}

src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIReactor.java

@@ -121,13 +121,13 @@ public void drawScreen(int mouseX, int mouseY, float par3) {
 		else if (GuiHelper.isInRect(33, 4, 18, 114, mouseX-guiLeft, mouseY-guiTop)){
 			text.add(StatCollector.translateToLocal("gui.de.fieldStrength.txt"));
 			if (reactor.maxFieldCharge > 0) text.add(Utills.round(reactor.fieldCharge / reactor.maxFieldCharge * 100D, 100D) + "%");
-			text.add((int)reactor.fieldCharge + " / " + (int)reactor.maxFieldCharge); //todo refine or remove
+			text.add(Utills.addCommas((int)reactor.fieldCharge) + " / " + Utills.addCommas((int)reactor.maxFieldCharge)); //todo refine or remove
 			drawHoveringText(text, mouseX, mouseY, fontRendererObj);
 		}
 		else if (GuiHelper.isInRect(197, 4, 18, 114, mouseX-guiLeft, mouseY-guiTop)){
 			text.add(StatCollector.translateToLocal("gui.de.energySaturation.txt"));
 			if (reactor.maxEnergySaturation > 0) text.add(Utills.round((double)reactor.energySaturation / (double)reactor.maxEnergySaturation * 100D, 100D) + "%");
-			text.add(reactor.energySaturation + " / " + reactor.maxEnergySaturation); //todo refine or remove
+			text.add(Utills.addCommas(reactor.energySaturation) + " / " + Utills.addCommas(reactor.maxEnergySaturation)); //todo refine or remove
 			drawHoveringText(text, mouseX, mouseY, fontRendererObj);
 		}
 		else if (GuiHelper.isInRect(221, 4, 18, 114, mouseX-guiLeft, mouseY-guiTop)){
@@ -136,29 +136,41 @@ else if (GuiHelper.isInRect(221, 4, 18, 114, mouseX-guiLeft, mouseY-guiTop)){
 			text.add(reactor.convertedFuel + " / " + (reactor.convertedFuel + reactor.reactorFuel)); //todo refine or remove
 			drawHoveringText(text, mouseX, mouseY, fontRendererObj);
 		}
+		else if (GuiHelper.isInRect(53, 15, 140, 18, mouseX-guiLeft, mouseY-guiTop)){
+			text.addAll(fontRendererObj.listFormattedStringToWidth(StatCollector.translateToLocal("gui.de.reacTempLoadFactor.txt"), 200));
+			drawHoveringText(text, mouseX, mouseY, fontRendererObj);
+		}
+		else if (GuiHelper.isInRect(53, 40, 140, 18, mouseX-guiLeft, mouseY-guiTop)){
+			text.addAll(fontRendererObj.listFormattedStringToWidth(StatCollector.translateToLocal("gui.de.reacCoreMass.txt"), 200));
+			drawHoveringText(text, mouseX, mouseY, fontRendererObj);
+		}
+		else if (GuiHelper.isInRect(53, 65, 140, 18, mouseX-guiLeft, mouseY-guiTop)){
+			text.addAll(fontRendererObj.listFormattedStringToWidth(StatCollector.translateToLocal("gui.de.reacGenRate.txt"), 200));
+			drawHoveringText(text, mouseX, mouseY, fontRendererObj);
+		}
+		else if (GuiHelper.isInRect(53, 88, 140, 18, mouseX-guiLeft, mouseY-guiTop)){
+			text.addAll(fontRendererObj.listFormattedStringToWidth(StatCollector.translateToLocal("gui.de.reacInputRate.txt"), 200));
+			drawHoveringText(text, mouseX, mouseY, fontRendererObj);
+		}
+		else if (GuiHelper.isInRect(53, 113, 140, 18, mouseX-guiLeft, mouseY-guiTop)){
+			text.addAll(fontRendererObj.listFormattedStringToWidth(StatCollector.translateToLocal("gui.de.reacConversionRate.txt"), 200));
+			drawHoveringText(text, mouseX, mouseY, fontRendererObj);
+		}
 	}
 
 	private void drawStats(){
-		/*
-		* Values To Add
-		* -tempDrainFactor (Temperature load factor?)
-		* -mass
-		* -generation rate
-		* -field drain rate
-		* -fuel conversion rate
-		* */
 
+		double inputRate = reactor.fieldDrain / (1D - (reactor.fieldCharge / reactor.maxFieldCharge));
 		fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.tempLoad.name"), 55, 16, 0x0000FF);
-		fontRendererObj.drawString(""+reactor.tempDrainFactor, 60, 2 + 24, 0);
+		fontRendererObj.drawString(Utills.round(reactor.tempDrainFactor * 100D, 1D) + "%", 60, 2 + 24, 0);
 		fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.mass.name"), 55, 16 + 24, 0x0000FF);
-		fontRendererObj.drawString(Utills.round((reactor.reactorFuel + reactor.convertedFuel)/1296D, 100)+"m³", 60, 2 + 2 * 24, 0);
+		fontRendererObj.drawString(Utills.round((reactor.reactorFuel + reactor.convertedFuel)/1296D, 100)+"m^3", 60, 2 + 2 * 24, 0);
 		fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.genRate.name"), 55, 16 + 2 * 24, 0x0000FF);
 		fontRendererObj.drawString(Utills.addCommas((int)reactor.generationRate)+"RF/t", 60, 2 + 3 * 24, 0);
-		fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.fieldDrainRate.name"), 55, 16 + 3 * 24, 0x0000FF);
-		fontRendererObj.drawString(Utills.addCommas(reactor.fieldDrain)+"RF/t", 60, 2 + 4 * 24, 0);
+		fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.fieldInputRate.name"), 55, 16 + 3 * 24, 0x0000FF);
+		fontRendererObj.drawString(Utills.addCommas((int)Math.min(inputRate, Integer.MAX_VALUE))+"RF/t", 60, 2 + 4 * 24, 0);
 		fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.fuelConversion.name"), 55, 16 + 4 * 24, 0x0000FF);
 		fontRendererObj.drawString(Utills.addCommas((int)Math.round(reactor.fuelUseRate * 1000000D)) + "nb/t", 60, 2 + 5 * 24, 0);
-
 	}
 
 	@Override

src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java

@@ -1,18 +1,24 @@
 package com.brandon3055.draconicevolution.client.handler;
 
+import com.brandon3055.brandonscore.common.utills.ItemNBTHelper;
 import com.brandon3055.draconicevolution.DraconicEvolution;
 import com.brandon3055.draconicevolution.common.ModItems;
+import com.brandon3055.draconicevolution.common.handler.ConfigHandler;
+import com.brandon3055.draconicevolution.common.items.armor.DraconicArmor;
+import com.brandon3055.draconicevolution.common.items.armor.WyvernArmor;
 import com.brandon3055.draconicevolution.common.items.weapons.DraconicBow;
 import com.brandon3055.draconicevolution.common.items.weapons.WyvernBow;
 import com.brandon3055.draconicevolution.common.network.MountUpdatePacket;
-import com.brandon3055.brandonscore.common.utills.ItemNBTHelper;
 import com.brandon3055.draconicevolution.common.utills.LogHelper;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.relauncher.Side;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemArmor;
 import net.minecraftforge.client.event.FOVUpdateEvent;
+import net.minecraftforge.client.event.RenderPlayerEvent;
 
 import java.util.Random;
 
@@ -126,4 +132,19 @@ public static void tryRepositionPlayerOnMount(int id){
 		remountEntityID = id;
 		LogHelper.info("Started checking for player mount");
 	}
+
+	@SubscribeEvent
+	public void renderArmorEvent(RenderPlayerEvent.SetArmorModel event) {
+		if (ConfigHandler.useOriginal3DArmorModel) return;
+		if (event.stack != null && (event.stack.getItem() instanceof DraconicArmor || event.stack.getItem() instanceof WyvernArmor))
+		{
+			ItemArmor itemarmor = (ItemArmor)event.stack.getItem();
+			ModelBiped modelbiped = itemarmor.getArmorModel(event.entityPlayer, event.stack, event.slot);
+			event.renderer.setRenderPassModel(modelbiped);
+			modelbiped.onGround = event.renderer.modelBipedMain.onGround;
+			modelbiped.isRiding = event.renderer.modelBipedMain.isRiding;
+			modelbiped.isChild = event.renderer.modelBipedMain.isChild;
+			event.result = 1;
+		}
+	}
 }