mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-19 11:59:19 +00:00
Merge remote-tracking branch 'Quantumlyy/bring-closer-to-forestry' into dev
This commit is contained in:
2 files changed
+7
-4
No files matched your search
@@ -45,13 +45,13 @@ public class BlockApimancersDrainer extends BlockContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7,
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float par7,
|
||||
float par8, float par9) {
|
||||
if (world.isRemote) {
|
||||
return false;
|
||||
} else {
|
||||
TileEntity tile = world.getTileEntity(x, y, z);
|
||||
if (tile instanceof TileEntityApimancersDrainerCommon) {
|
||||
if (tile instanceof TileEntityApimancersDrainerCommon && side != 0) {
|
||||
ItemStack tItemStack = player.getHeldItem();
|
||||
if (tItemStack != null) {
|
||||
Item tItem = tItemStack.getItem();
|
||||
@@ -71,7 +71,9 @@ public class BlockApimancersDrainer extends BlockContainer {
|
||||
}
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
return true;
|
||||
} else return false;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -165,6 +165,7 @@ public class Config {
|
||||
|
||||
// ---- Loaded mods -----------------------------------------
|
||||
public static boolean isGTLoaded = Loader.isModLoaded("gregtech");
|
||||
public static boolean isGTNHCoreModLoaded = Loader.isModLoaded("gregtech") && Loader.isModLoaded("dreamcraft");
|
||||
|
||||
public Config(File configFile) {
|
||||
configuration = new Configuration(configFile);
|
||||
@@ -507,7 +508,7 @@ public class Config {
|
||||
GameRegistry.registerBlock(visAuraProvider, "visAuraProvider");
|
||||
GameRegistry.registerTileEntity(TileEntityVisAuraProvider.class, "visAuraProvider");
|
||||
|
||||
if (isGTLoaded) BlockApimancersDrainer.drainer = TileEntityApimancersDrainerGT.class;
|
||||
if (isGTNHCoreModLoaded) BlockApimancersDrainer.drainer = TileEntityApimancersDrainerGT.class;
|
||||
apimancersDrainer = new BlockApimancersDrainer();
|
||||
GameRegistry.registerBlock(apimancersDrainer, "apimancersDrainer");
|
||||
GameRegistry.registerTileEntity(BlockApimancersDrainer.drainer, "apimancersDrainer");
|
||||
|
||||
Reference in new issue
Block a user