From a85f8455f7a7cb112454faeab108aedfd3b6a04e Mon Sep 17 00:00:00 2001 From: Ice_Arrow <48144917+Ice-Arrow@users.noreply.github.com> Date: Sat, 18 Nov 2023 16:05:05 -0800 Subject: [PATCH 1/3] Update Research Reactor to explicitly check for water blocks --- .../com/hbm/tileentity/machine/TileEntityReactorResearch.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java index 3e17bf1e0..074ca24a0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java @@ -22,6 +22,7 @@ import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.SimpleComponent; +import net.minecraft.init.Blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.gui.GuiScreen; @@ -211,7 +212,7 @@ public class TileEntityReactorResearch extends TileEntityMachineBase implements Block b = worldObj.getBlock(x, y, z); - if(b == ModBlocks.block_lead || b == ModBlocks.block_desh || b == ModBlocks.reactor_research || b == ModBlocks.machine_reactor_breeding) + if(b == ModBlocks.block_lead || b == ModBlocks.block_desh || b == ModBlocks.reactor_research || b == ModBlocks.machine_reactor_breeding || b == Blocks.water) return true; if(b.getExplosionResistance(null) >= 100) From c528d96e7adfd8d127ddf8b424c1a383c4dc853e Mon Sep 17 00:00:00 2001 From: Ice_Arrow <48144917+Ice-Arrow@users.noreply.github.com> Date: Sat, 18 Nov 2023 21:18:49 -0800 Subject: [PATCH 2/3] Fun fact: I am not qualified for this --- .../hbm/tileentity/machine/TileEntityReactorResearch.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java index 074ca24a0..bec8a90d9 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java @@ -212,7 +212,10 @@ public class TileEntityReactorResearch extends TileEntityMachineBase implements Block b = worldObj.getBlock(x, y, z); - if(b == ModBlocks.block_lead || b == ModBlocks.block_desh || b == ModBlocks.reactor_research || b == ModBlocks.machine_reactor_breeding || b == Blocks.water) + if((b == Blocks.water || b == Blocks.flowing_water) && worldObj.getBlockMetadata(x, y, z) == 0) + return true; + + if(b == ModBlocks.block_lead || b == ModBlocks.block_desh || b == ModBlocks.reactor_research || b == ModBlocks.machine_reactor_breeding) return true; if(b.getExplosionResistance(null) >= 100) From bbe8158db8ebb3a65a61351b88bb985ff2bc6976 Mon Sep 17 00:00:00 2001 From: Ice_Arrow <48144917+Ice-Arrow@users.noreply.github.com> Date: Sun, 19 Nov 2023 01:53:39 -0800 Subject: [PATCH 3/3] Ohhh it's alphabetical --- .../com/hbm/tileentity/machine/TileEntityReactorResearch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java index bec8a90d9..a6ee7c13d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java @@ -22,11 +22,11 @@ import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.SimpleComponent; -import net.minecraft.init.Blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound;