diff --git a/changelog b/changelog index 40d1275a5..d00dbd0ad 100644 --- a/changelog +++ b/changelog @@ -3,4 +3,8 @@ * Meteors will now punch through weak blocks like leaves instead of getting stuck on trees * Meteor impacts now have new visuals * Falling meteors will produce a sound instead of stealthily blowing people up - * Fallen meteors will now be placed deeper into the actual crater instead of hovering awkwardly over the hole \ No newline at end of file + * Fallen meteors will now be placed deeper into the actual crater instead of hovering awkwardly over the hole +* Addd QMAW pages for the particle accelerator parts along with a PA overview page and a simple step by step construction tutorial + +## Fixed +* Fixed arc furnace only allowing electrodes to be inserted when the lid is down instead of up \ No newline at end of file diff --git a/src/main/java/com/hbm/qmaw/GuiQMAW.java b/src/main/java/com/hbm/qmaw/GuiQMAW.java index e98d4e476..96090a557 100644 --- a/src/main/java/com/hbm/qmaw/GuiQMAW.java +++ b/src/main/java/com/hbm/qmaw/GuiQMAW.java @@ -23,6 +23,7 @@ import net.minecraft.util.ResourceLocation; public class GuiQMAW extends GuiScreen { protected static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_wiki.png"); + protected static final ResourceLocation the_man = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_wiki_flix.png"); public String title; public String qmawID; @@ -300,7 +301,13 @@ public class GuiQMAW extends GuiScreen { int y = guiTop + 30; int lineNum = 0; - for(List line : lines) { + + if(lines.size() > 1 && scrollProgress == lines.size() - 1) { + Minecraft.getMinecraft().getTextureManager().bindTexture(the_man); + drawTexturedModalRect(guiLeft + 60, guiTop + this.ySize - 84, 0, 0, 80, 80); + drawTexturedModalRect(guiLeft + 140, guiTop + this.ySize - 60, 0, 80, 77, 39); + + } else for(List line : lines) { lineNum++; if(lineNum <= this.scrollProgress) continue; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java index f39a8c10e..1bf233ed7 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java @@ -147,7 +147,7 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl } else { if(this.delay > 0) delay--; this.progress = 0; - if(lid < 1 && this.electrodes[0] != 0 && this.electrodes[1] != 0 && this.electrodes[2] != 0) { + if(lid < 1) { lid += 1F / (60F / (upgrade * 0.5 + 1)); if(lid > 1) lid = 1; } @@ -393,7 +393,7 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl @Override public boolean canInsertItem(int slot, ItemStack stack, int side) { - if(slot < 3) return lid <= 0 && stack.getItem() == ModItems.arc_electrode; + if(slot < 3) return lid >= 1 && stack.getItem() == ModItems.arc_electrode; if(slot >= 25) { ArcFurnaceRecipe recipe = ArcFurnaceRecipes.getOutput(stack, this.liquidMode); if(recipe == null) return false; @@ -404,7 +404,7 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl @Override public boolean isItemValidForSlot(int slot, ItemStack stack) { - if(slot < 3) return stack.getItem() == ModItems.arc_electrode; + if(slot < 3) return lid >= 1 && stack.getItem() == ModItems.arc_electrode; if(slot > 4) { ArcFurnaceRecipe recipe = ArcFurnaceRecipes.getOutput(stack, this.liquidMode); if(recipe == null) return false; diff --git a/src/main/resources/assets/hbm/manual/machine/compressor.json b/src/main/resources/assets/hbm/manual/machine/compressor.json new file mode 100644 index 000000000..a230410e4 --- /dev/null +++ b/src/main/resources/assets/hbm/manual/machine/compressor.json @@ -0,0 +1,11 @@ +{ + "name": "Compressor", + "icon": ["hbm:tile.machine_compressor", 1, 0], + "trigger": [["hbm:tile.machine_compressor"], ["hbm:tile.machine_compressor_compact"]], + "title": { + "en_US": "Compressor" + }, + "content": { + "en_US": "Compresses fluids, i.e. increases the \"PU\" number of a fluid. Certain fluids change when compressed, for example [[perfluoromethyl|Perfluoromethyl]] turns into cold PFM when compressed to 2 PU. Each compressor can only do a single PU increase. Compressed fluids can use the same pipes as uncompressed fluids (and in fact share the exact same network, as there is no pressure identification), but they cannot be stored in tanks." + } +} diff --git a/src/main/resources/assets/hbm/textures/gui/gui_wiki_flix.png b/src/main/resources/assets/hbm/textures/gui/gui_wiki_flix.png new file mode 100644 index 000000000..7eb02d9d9 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/gui_wiki_flix.png differ