multidimensional time crystal

changelog

@@ -1,2 +1,10 @@
 ## Changed
-* QMAW now has buttons for returning to previously viewed pages
+* QMAW now has buttons for returning to previously viewed pages
+* QMAW file detection now includes subfolders to `manual`
+* OpenComputers integration for the ZIRNOX should now return values in °C and bar instead of unexplained weird internal units
+
+## Fixed
+* Fixed QMAW not working at all
+* Potentially fixed a bug where proxy tile entities would reference unloaded core tile entities which would cause bizarre item voiding/duping issues in rare cases
+* Fixed fusion reactor automation being able to remove items other than the breeding output slot
+* Fixed chunkloading transport drones getting stuck due to off-by-one rounding errors

src/main/java/com/hbm/entity/item/EntityDeliveryDrone.java

@@ -200,9 +200,11 @@ public class EntityDeliveryDrone extends EntityDroneBase implements IInventory,
 			}
 			
 			// This is the lowest padding that worked with my drone waypoint path. if they stop getting loaded crank up paddingSize
-			for (ChunkCoordIntPair chunk : ChunkShapeHelper.getChunksAlongLineSegment((int) this.posX, (int) this.posZ, (int) (this.posX + this.motionX), (int) (this.posZ + this.motionZ), 4)){
+			for (ChunkCoordIntPair chunk : ChunkShapeHelper.getChunksAlongLineSegment((int) Math.floor(this.posX), (int) Math.floor(this.posZ), (int) Math.floor(this.posX + this.motionX), (int) Math.floor(this.posZ + this.motionZ), 8)){
 				ForgeChunkManager.forceChunk(loaderTicket, chunk);
 			}
+			
+			System.out.println("guhhh");
 		}
 	}
 

src/main/java/com/hbm/entity/logic/EntityBalefire.java

@@ -10,8 +10,8 @@ import com.hbm.main.MainRegistry;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-public class EntityBalefire extends EntityExplosionChunkloading  {
-	
+public class EntityBalefire extends EntityExplosionChunkloading {
+
 	public int age = 0;
 	public int destructionRange = 0;
 	public ExplosionBalefire exp;
@@ -24,13 +24,11 @@ public class EntityBalefire extends EntityExplosionChunkloading  {
 		destructionRange = nbt.getInteger("destructionRange");
 		speed = nbt.getInteger("speed");
 		did = nbt.getBoolean("did");
-		
-    	
-		exp = new ExplosionBalefire((int)this.posX, (int)this.posY, (int)this.posZ, this.worldObj, this.destructionRange);
+
+		exp = new ExplosionBalefire((int) this.posX, (int) this.posY, (int) this.posZ, this.worldObj, this.destructionRange);
 		exp.readFromNbt(nbt, "exp_");
-    	
-    	this.did = true;
-		
+
+		this.did = true;
 	}
 
 	@Override
@@ -39,10 +37,10 @@ public class EntityBalefire extends EntityExplosionChunkloading  {
 		nbt.setInteger("destructionRange", destructionRange);
 		nbt.setInteger("speed", speed);
 		nbt.setBoolean("did", did);
-    	
+
 		if(exp != null)
 			exp.saveToNbt(nbt, "exp_");
-		
+
 	}
 
 	public EntityBalefire(World p_i1582_1_) {
@@ -53,7 +51,8 @@ public class EntityBalefire extends EntityExplosionChunkloading  {
 	public void onUpdate() {
 		super.onUpdate();
 
-		if(!worldObj.isRemote) loadChunk((int) Math.floor(posX / 16D), (int) Math.floor(posZ / 16D));
+		if(!worldObj.isRemote)
+			loadChunk((int) Math.floor(posX / 16D), (int) Math.floor(posZ / 16D));
 
 		if(!this.did) {
 			if(GeneralConfig.enableExtendedLogging && !worldObj.isRemote)

src/main/java/com/hbm/inventory/gui/LoadingScreenRendererNT.java

@@ -37,7 +37,7 @@ public class LoadingScreenRendererNT extends LoadingScreenRenderer {
 	}
 	
 	private String chooseTip() {
-		if(HTTPHandler.tipOfTheDay.isEmpty()) return "null";
+		if(HTTPHandler.tipOfTheDay.isEmpty()) return "Explore! There's tons of free stuff to find.";
 		return HTTPHandler.tipOfTheDay.get(new Random().nextInt(HTTPHandler.tipOfTheDay.size()));
 	}
 

src/main/java/com/hbm/main/ModEventHandlerClient.java

@@ -114,6 +114,8 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
 import net.minecraftforge.client.event.sound.PlaySoundEvent17;
 import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+import net.minecraftforge.oredict.OreDictionary;
+
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -753,6 +755,9 @@ public class ModEventHandlerClient {
 
 		try {
 			QuickManualAndWiki qmaw = QMAWLoader.triggers.get(comp);
+			if(qmaw == null) {
+				qmaw = QMAWLoader.triggers.get(new ComparableStack(comp.item, 1, OreDictionary.WILDCARD_VALUE));
+			}
 			if(qmaw != null) {
 				list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("qmaw.tab", Keyboard.getKeyName(HbmKeybinds.qmaw.getKeyCode())));
 				lastQMAW = qmaw;

src/main/java/com/hbm/qmaw/QMAWLoader.java

@@ -174,6 +174,8 @@ public class QMAWLoader implements IResourceManagerReloadListener {
 				} catch(Exception ex) {
 					MainRegistry.logger.info("[QMAW] Error reading manual " + name + ": " + ex);
 				}
+			} else if(file.isDirectory()) {
+				dissectManualFolder(file); // scrape subfolders too lmao
 			}
 		}
 	}

src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java

@@ -77,7 +77,7 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy
 	
 	/** Returns the actual tile entity that represents the core. Only for internal use, and EnergyControl. */
 	public TileEntity getTile() {
-		if(tile == null || tile.isInvalid()) {
+		if(tile == null || tile.isInvalid() || (tile instanceof TileEntityLoadedBase && !((TileEntityLoadedBase) tile).isLoaded)) {
 			tile = this.getTE();
 		}
 		return tile;

src/main/java/com/hbm/tileentity/machine/TileEntityITER.java

@@ -317,19 +317,19 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyRece
 	}
 
 	@Override
-	public boolean canExtractItem(int i, ItemStack itemStack, int j) {
-		return true;
+	public boolean canExtractItem(int slot, ItemStack stack, int side) {
+		return slot == 2; // only allow removing breeder outputs
 	}
 
 	@Override
-	public int[] getAccessibleSlotsFromSide(int p_94128_1_) {
+	public int[] getAccessibleSlotsFromSide(int side) {
 		return new int[] { 1, 2, 4 };
 	}
 
 	@Override
-	public boolean isItemValidForSlot(int i, ItemStack itemStack) {
+	public boolean isItemValidForSlot(int i, ItemStack stack) {
 
-		if(i == 1 && BreederRecipes.getOutput(itemStack) != null)
+		if(i == 1 && BreederRecipes.getOutput(stack) != null)
 			return true;
 
 		return false;

src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java

@@ -468,13 +468,13 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IC
 	@Callback(direct = true)
 	@Optional.Method(modid = "OpenComputers")
 	public Object[] getTemp(Context context, Arguments args) {
-		return new Object[] {heat};
+		return new Object[] {Math.round(heat * 1.0E-5D * 780.0D + 20.0D)};
 	}
 
 	@Callback(direct = true)
 	@Optional.Method(modid = "OpenComputers")
 	public Object[] getPressure(Context context, Arguments args) {
-		return new Object[] {pressure};
+		return new Object[] {Math.round(pressure * 1.0E-5D * 30.0D)};
 	}
 
 	@Callback(direct = true)
@@ -504,7 +504,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IC
 	@Callback(direct = true)
 	@Optional.Method(modid = "OpenComputers")
 	public Object[] getInfo(Context context, Arguments args) {
-		return new Object[] {heat, pressure, water.getFill(), steam.getFill(), carbonDioxide.getFill(), isOn};
+		return new Object[] {Math.round(heat * 1.0E-5D * 780.0D + 20.0D), Math.round(pressure * 1.0E-5D * 30.0D), water.getFill(), steam.getFill(), carbonDioxide.getFill(), isOn};
 	}
 
 	@Callback(direct = true, limit = 4)

src/main/java/com/hbm/tileentity/machine/TileEntityRefueler.java

@@ -153,5 +153,4 @@ public class TileEntityRefueler extends TileEntityLoadedBase implements IFluidSt
 	public FluidTank[] getReceivingTanks() {
 		return new FluidTank[] { tank };
 	}
-	
 }

src/main/resources/assets/hbm/manual/material/aluminium.json

@@ -0,0 +1,11 @@
+{
+	"name": "Aluminium",
+	"icon": ["hbm:item.ingot_aluminium", 1, 0],
+    "trigger": [["hbm:item.ingot_aluminium"], ["hbm:item.plate_aluminium"], ["hbm:item.powder_aluminium"]],
+    "title": {
+        "en_US": "Aluminium"
+    },
+	"content": {
+		"en_US": "Common, lightweight metal. Available early on from smelting cryolite ('aluminium-bearing ore') in a [[combination oven|Combination Oven]]. Can be made later by processing [[bauxite|Bauxite]], and [[electrolyzing|Electrolysis Machine]] the resulting alumina solution.<br><br>Used in piping, general fluid handling, as part of [[gunmetal|Gunmetal]] and missile fuselages."
+	}
+}

src/main/resources/assets/hbm/manual/material/cadmium_steel.json

@@ -0,0 +1,11 @@
+{
+	"name": "Cadmium Steel",
+	"icon": ["hbm:item.ingot_cdalloy", 1, 0],
+    "trigger": [["hbm:item.ingot_cdalloy"]],
+    "title": {
+        "en_US": "Cadmium Steel"
+    },
+	"content": {
+		"en_US": "Corrosion-resistant alloy, made from [[steel|Steel]] and [[cadmium|Cadmium]]. Alternative to [[technetium steel|Technetium Steel]] in most recipes."
+	}
+}

src/main/resources/assets/hbm/manual/material/cinnabar.json

@@ -0,0 +1,11 @@
+{
+	"name": "Cinnabar",
+	"icon": ["hbm:item.cinnebar", 1, 0],
+    "trigger": [["hbm:item.cinnebar"]],
+    "title": {
+        "en_US": "Cinnabar"
+    },
+	"content": {
+		"en_US": "Rare ore. Can be [[acidized|Ore Acidizer]] into 375mB worth of [[mercury|Mercury]] drops, or [[combination smelted|Combination Oven]] into 100mB of mercury and some sulfur. Mainly exists as an early means to get mercury for [[desh|Desh]] production."
+	}
+}

src/main/resources/assets/hbm/manual/material/coke.json

@@ -0,0 +1,11 @@
+{
+	"name": "Coke",
+	"icon": ["hbm:item.coke", 1, 0],
+    "trigger": [["hbm:item.coke", 1, 32767]],
+    "title": {
+        "en_US": "Coke"
+    },
+	"content": {
+		"en_US": "High-purity carbon, has twice the burn value of coal. Can be pressed into [[graphite|Graphite]], used in various [[steel|Steel]] recipes or as a source of carbon for the [[crucible|Crucible]].<br><br>Coal coke can be made by smelting coal briquettes, or combination smelting coal in its various forms.<br><br>Lignite coke is made from the much cheaper and less powerful lignite in much the same way, despite this it has the same characteristics.<br><br>Petroleum coke is made either from non-coal tars in a [[combination oven|Combination Oven]], or by coking various types of oil in a [[coker|Coking Unit]]."
+	}
+}

src/main/resources/assets/hbm/manual/material/copper.json

@@ -0,0 +1,11 @@
+{
+	"name": "Copper",
+	"icon": ["hbm:item.ingot_copper", 1, 0],
+    "trigger": [["hbm:item.ingot_copper"], ["hbm:item.plate_copper"], ["hbm:item.powder_copper"]],
+    "title": {
+        "en_US": "Copper"
+    },
+	"content": {
+		"en_US": "Common resource. In its raw form, mostly used as a structural material, and in things that handle high temperatures (as a heat conductor). Strongly used in various alloyed forms.<br><br>[[Minecraft grade copper|Minecraft Grade Copper]] is an alloy made from redstone that is used in almost all electrical things.<br><br>[[Advanced alloy|Advanced Alloy]] is a powerful early tool material which surpasses diamond.<br><br>[[Gunmetal]] is a vital component of many guns, as well as casings for ammunition.<br><br>[[Bismuth bronze|Bismuth Bronze]] and [[arsenic bronze|Arsenic Bronze]] are post-[[RBMK]] materials used in many late-game machines.<br><br>[[BSCCO]] is a [[bismuth|Bismuth]]-derived super conductor needed for high-tier quantum circuits and [[particle accelerator|Particle Accelerator]] coils."
+	}
+}

src/main/resources/assets/hbm/manual/material/desh.json

@@ -0,0 +1,11 @@
+{
+	"name": "Desh",
+	"icon": ["hbm:item.ingot_desh", 1, 0],
+    "trigger": [["hbm:item.ingot_desh"], ["hbm:item.powder_desh"]],
+    "title": {
+        "en_US": "Desh"
+    },
+	"content": {
+		"en_US": "High-strength working alloy made in a [[chemical plant|Chemical Plant]]. Requires [[light oil|Light oil]] from basic [[oil|Crude Oil]] refining, [[mercury|Mercury]], a byproduct of [[centrifuging|Centrifuge]] redstone ore and desh blend, which is just [[shredded|Shredder]] rare earth ore chunks.<br><br>Used in a variety of things, especially tools and weapons. Desh tools are slow and only iron tier, but are the first available ones to be unbreakable and offer many tool abilities."
+	}
+}

src/main/resources/assets/hbm/manual/material/graphite.json

@@ -0,0 +1,11 @@
+{
+	"name": "Graphite",
+	"icon": ["hbm:item.ingot_graphite", 1, 0],
+    "trigger": [["hbm:item.ingot_graphite"]],
+    "title": {
+        "en_US": "Graphite"
+    },
+	"content": {
+		"en_US": "Made from pressing coke. Used in nuclear reactors, graphite electrodes for the [[electric arc furnace|Electric Arc Furnace]] or as a source for carbon in various [[crucible|Crucible]] recipes."
+	}
+}

src/main/resources/assets/hbm/manual/material/gunmetal.json

@@ -0,0 +1,11 @@
+{
+	"name": "Gunmetal",
+	"icon": ["hbm:item.ingot_gunmetal", 1, 0],
+    "trigger": [["hbm:item.ingot_gunmetal"], ["hbm:item.plate_gunmetal"]],
+    "title": {
+        "en_US": "Gunmetal"
+    },
+	"content": {
+		"en_US": "Alloy of [[aluminium|Aluminium]] and [[copper|Copper]]. Can be made in an anvil, or more efficiently in a [[rotary furnace|Rotary Furnace]]. Used mainly for weapon parts, as well as casings for most ammunition."
+	}
+}

src/main/resources/assets/hbm/manual/material/hss.json

@@ -0,0 +1,11 @@
+{
+	"name": "High-Speed Steel",
+	"icon": ["hbm:item.ingot_dura_steel", 1, 0],
+    "trigger": [["hbm:item.ingot_dura_steel"], ["hbm:item.powder_dura_steel"], ["hbm:item.plate_dura_steel"]],
+    "title": {
+        "en_US": "High-Speed Steel"
+    },
+	"content": {
+		"en_US": "Alloy made from [[steel|Steel]], [[tungsten|Tungsten]] and [[cobalt|Cobalt]] in a [[curcible|Crucible]]. Created as liquid metal, needs to be cast into ingot or plate shape before being usable."
+	}
+}

src/main/resources/assets/hbm/manual/material/latex.json

@@ -0,0 +1,11 @@
+{
+	"name": "Latex",
+	"icon": ["hbm:item.ingot_biorubber", 1, 0],
+    "trigger": [["hbm:item.ingot_biorubber"], ["hbm:item.ball_resin"]],
+    "title": {
+        "en_US": "Latex"
+    },
+	"content": {
+		"en_US": "Natural form of rubber, obtainable from dandelions or by pressing jungle wood. Can be replaced in all recipes by [[rubber|Rubber]], but not vice versa."
+	}
+}

src/main/resources/assets/hbm/manual/material/lead.json

@@ -0,0 +1,11 @@
+{
+	"name": "Lead",
+	"icon": ["hbm:item.ingot_lead", 1, 0],
+    "trigger": [["hbm:item.ingot_lead"], ["hbm:item.nugget_lead"], ["hbm:item.powder_lead"]],
+    "title": {
+        "en_US": "Lead"
+    },
+	"content": {
+		"en_US": "Common resource. Mainly used for things that involve radiation, as well as ammunition, and as solder for many circuits."
+	}
+}

src/main/resources/assets/hbm/manual/material/neptunium.json

@@ -0,0 +1,11 @@
+{
+	"name": "Neptunium",
+	"icon": ["hbm:item.ingot_neptunium", 1, 0],
+    "trigger": [["hbm:item.ingot_neptunium"], ["hbm:item.billet_neptunium"], ["hbm:item.nugget_neptunium"], ["hbm:item.powder_neptunium"]],
+    "title": {
+        "en_US": "Neptunium"
+    },
+	"content": {
+		"en_US": "Fissile isotope, usually found in spent [[uranium-235|Uranium-235]] fuel. Mostly used for nuclear reactors, either pure as high enriched neptunium fuel, or combined with [[uranium-238|Uranium-238]] as medium enriched neptunium fuel. Usable in the [[PWR]] and [[RBMK]]."
+	}
+}

src/main/resources/assets/hbm/manual/material/rubber.json

@@ -0,0 +1,11 @@
+{
+	"name": "Rubber",
+	"icon": ["hbm:item.ingot_rubber", 1, 0],
+    "trigger": [["hbm:item.ingot_rubber"]],
+    "title": {
+        "en_US": "Rubber"
+    },
+	"content": {
+		"en_US": "Oil product, derived from [[unsaturated hydrocabons|Unsaturated Hydrocarbons]] and [[sulfur|Sulfur]]. Requires at least a [[cracking tower|Catalytic Cracking Tower]] to make. Can replace [[latex|Latex]] in every recipe."
+	}
+}

src/main/resources/assets/hbm/manual/material/sodium.json

@@ -0,0 +1,11 @@
+{
+	"name": "Sodium",
+	"icon": ["hbm:item.powder_sodium", 1, 0],
+    "trigger": [["hbm:item.powder_sodium"]],
+    "title": {
+        "en_US": "Sodium"
+    },
+	"content": {
+		"en_US": "Mainly derived from sodalite, a gem which is found as a [[centrifuge|Centrifuge]] byproduct of many ores. Used in liquid form as a powerful [[PWR]] coolant."
+	}
+}

src/main/resources/assets/hbm/manual/material/sulfur.json

@@ -0,0 +1,11 @@
+{
+	"name": "Sulfur",
+	"icon": ["hbm:item.sulfur", 1, 0],
+    "trigger": [["hbm:item.sulfur"]],
+    "title": {
+        "en_US": "Sulfur"
+    },
+	"content": {
+		"en_US": "Common ore, found in even larger numbers in the nether. Used in a variety of things, like [[sulfuric acid|Sulfuric Acid]], [[rubber|Rubber]] and in yellowcake for [[uranium|Uranium]] hexafluoride. Can also make gunpowder, matchsticks, or act as yellow dye."
+	}
+}

src/main/resources/assets/hbm/manual/material/weaponsteel.json

@@ -0,0 +1,11 @@
+{
+	"name": "Weapon Steel",
+	"icon": ["hbm:item.ingot_weaponsteel", 1, 0],
+    "trigger": [["hbm:item.ingot_weaponsteel"], ["hbm:item.plate_weaponsteel"]],
+    "title": {
+        "en_US": "Weapon Steel"
+    },
+	"content": {
+		"en_US": "High-purity version of [[steel|Steel]] made in a [[rotary furnace|Rotary Furnace]]. Requires [[coker gas|Coker Gas]], and therefore a [[coker unit|Coker Unit]]. Used in many mid-game weapons, weapon modifications and missile warheads."
+	}
+}