diff --git a/changelog b/changelog index 677879017..25f7dcb1b 100644 --- a/changelog +++ b/changelog @@ -20,6 +20,7 @@ * Treasures are no longer senselessly progression breaking, radioactive or plain stupid (whole-ass machines inside meteorites) * The treasure now consists of mainly some rarer earlygame ingots, circuits, some gear, a small selection of armor mods and alexandrite (rare) * Schraranium processing now yields neptunium as a byproduct instead of plutonium, making neptunium easier to automate outside of the cyclotron +* Using the guide book now opens a link to the new wiki ## Fixed * Fixed DFC receivers not outputting power diff --git a/src/main/java/com/hbm/blocks/generic/Guide.java b/src/main/java/com/hbm/blocks/generic/Guide.java index 744a2d9cd..0a9861157 100644 --- a/src/main/java/com/hbm/blocks/generic/Guide.java +++ b/src/main/java/com/hbm/blocks/generic/Guide.java @@ -120,87 +120,11 @@ public class Guide extends Block implements ILookOverlay { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if(world.isRemote && !player.isSneaking()) { - for(int i = 0; i < 10; i++) { - MainRegistry.proxy.openLink(/*"https://ntm.fandom.com/wiki/HBM%27s_Nuclear_Tech_Wiki"*/ "https://www.youtube.com/watch?v=dQw4w9WgXcQ"); - MainRegistry.proxy.openLink("https://gist.githubusercontent.com/HbmMods/ce11ffd908e98d4159f89011aca5c0b1/raw/5cbb1afdca06648319ee4293516f3c5f7cc448ca/go%2520fuck%2520yourself"); - } + MainRegistry.proxy.openLink("https://nucleartech.wiki/wiki/Main_Page"); return true; } return super.onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ); - - /*if(!player.isSneaking()) - { - - ItemStack book1 = new ItemStack(Items.written_book); - book1.stackTagCompound = new NBTTagCompound(); - book1.stackTagCompound.setString("author", "HbMinecraft"); - book1.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 1: Resources"); - NBTTagList pages1 = new NBTTagList(); - - for(String s : Library.book1) { - pages1.appendTag(new NBTTagString(s)); - } - - book1.stackTagCompound.setTag("pages", pages1); - player.inventory.addItemStackToInventory(book1); - - ItemStack book2 = new ItemStack(Items.written_book); - book2.stackTagCompound = new NBTTagCompound(); - book2.stackTagCompound.setString("author", "HbMinecraft"); - book2.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 2: Machines"); - NBTTagList pages2 = new NBTTagList(); - - for(String s : Library.book2) { - pages2.appendTag(new NBTTagString(s)); - } - - book2.stackTagCompound.setTag("pages", pages2); - player.inventory.addItemStackToInventory(book2); - - ItemStack book3 = new ItemStack(Items.written_book); - book3.stackTagCompound = new NBTTagCompound(); - book3.stackTagCompound.setString("author", "HbMinecraft"); - book3.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 3: Bombs"); - NBTTagList pages3 = new NBTTagList(); - - for(String s : Library.book3) { - pages3.appendTag(new NBTTagString(s)); - } - - book3.stackTagCompound.setTag("pages", pages3); - player.inventory.addItemStackToInventory(book3); - - ItemStack book4 = new ItemStack(Items.written_book); - book4.stackTagCompound = new NBTTagCompound(); - book4.stackTagCompound.setString("author", "HbMinecraft"); - book4.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 4: Missiles"); - NBTTagList pages4 = new NBTTagList(); - - for(String s : Library.book4) { - pages4.appendTag(new NBTTagString(s)); - } - - book4.stackTagCompound.setTag("pages", pages4); - player.inventory.addItemStackToInventory(book4); - - ItemStack book5 = new ItemStack(Items.written_book); - book5.stackTagCompound = new NBTTagCompound(); - book5.stackTagCompound.setString("author", "HbMinecraft"); - book5.stackTagCompound.setString("title", "Hbm's Nuclear Tech Mod Part 5: Misc"); - NBTTagList pages5 = new NBTTagList(); - - for(String s : Library.book5) { - pages5.appendTag(new NBTTagString(s)); - } - - book5.stackTagCompound.setTag("pages", pages5); - player.inventory.addItemStackToInventory(book5); - - return true; - } else { - return false; - }*/ } @Override diff --git a/src/main/java/com/hbm/blocks/machine/MachineICFController.java b/src/main/java/com/hbm/blocks/machine/MachineICFController.java index da2d80619..ab5e4797d 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineICFController.java +++ b/src/main/java/com/hbm/blocks/machine/MachineICFController.java @@ -134,6 +134,9 @@ public class MachineICFController extends BlockContainer { icf.coreZ = z; icf.markDirty(); } + + controller.setup(ports, cells, emitters, capacitors, turbochargers); + controller.markDirty(); } controller.assembled = !errored; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityICFController.java b/src/main/java/com/hbm/tileentity/machine/TileEntityICFController.java index 49dfa173e..022359a8f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityICFController.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityICFController.java @@ -1,6 +1,7 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import com.hbm.tileentity.TileEntityTickingBase; @@ -20,6 +21,10 @@ public class TileEntityICFController extends TileEntityTickingBase implements IE protected List ports = new ArrayList(); public boolean assembled; + + public void setup(HashSet ports, HashSet cells, HashSet emitters, HashSet capacitors, HashSet turbochargers) { + + } @Override public String getInventoryName() { diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_block.png b/src/main/resources/assets/hbm/textures/blocks/icf_block.png index f2c0b4c20..52b8aa635 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/icf_block.png and b/src/main/resources/assets/hbm/textures/blocks/icf_block.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_block_ct.png b/src/main/resources/assets/hbm/textures/blocks/icf_block_ct.png index 5f9bb3080..3d5496e2f 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/icf_block_ct.png and b/src/main/resources/assets/hbm/textures/blocks/icf_block_ct.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_block_port.png b/src/main/resources/assets/hbm/textures/blocks/icf_block_port.png index c7595645a..9de12e638 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/icf_block_port.png and b/src/main/resources/assets/hbm/textures/blocks/icf_block_port.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_block_port_ct.png b/src/main/resources/assets/hbm/textures/blocks/icf_block_port_ct.png index c877a699c..df3306630 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/icf_block_port_ct.png and b/src/main/resources/assets/hbm/textures/blocks/icf_block_port_ct.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_casing.png b/src/main/resources/assets/hbm/textures/blocks/icf_casing.png index 56d93d629..87ebf08fd 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/icf_casing.png and b/src/main/resources/assets/hbm/textures/blocks/icf_casing.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_concrete.png b/src/main/resources/assets/hbm/textures/blocks/icf_concrete.png deleted file mode 100644 index 24d2e3d45..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/icf_concrete.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_controller.png b/src/main/resources/assets/hbm/textures/blocks/icf_controller.png index 4ad1c003f..fa0440740 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/icf_controller.png and b/src/main/resources/assets/hbm/textures/blocks/icf_controller.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_port.png b/src/main/resources/assets/hbm/textures/blocks/icf_port.png index c9637ddb0..bbce4c101 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/icf_port.png and b/src/main/resources/assets/hbm/textures/blocks/icf_port.png differ