Merge pull request #1247 from Ice-Arrow/master

Make the research reactor compatible with IC2's water changes
This commit is contained in:
HbmMods 2023-11-20 10:58:43 +01:00 committed by GitHub
commit 76ef72bb11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,6 +26,7 @@ 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;
@ -211,6 +212,9 @@ public class TileEntityReactorResearch extends TileEntityMachineBase implements
Block b = worldObj.getBlock(x, y, z);
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;