mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass
This commit is contained in:
commit
df68b1e36a
299 files changed
+514
-9448
No files matched your search
@@ -1,9 +1,11 @@
|
||||
package mekanism.generators.common;
|
||||
|
||||
import buildcraft.api.mj.MjAPI;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import mekanism.api.MekanismAPI;
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasRegistry;
|
||||
import mekanism.api.infuse.InfuseRegistry;
|
||||
@@ -117,13 +119,13 @@ public class MekanismGenerators implements IModule
|
||||
{
|
||||
for(IFuel s : BuildcraftFuelRegistry.fuel.getFuels())
|
||||
{
|
||||
if(!(s.getFluid() == null || GasRegistry.containsGas(s.getFluid().getName())))
|
||||
if(s.getFluid() != null && !GasRegistry.containsGas(s.getFluid().getFluid().getName()))
|
||||
{
|
||||
GasRegistry.register(new Gas(s.getFluid()));
|
||||
GasRegistry.register(new Gas(s.getFluid().getFluid()));
|
||||
}
|
||||
}
|
||||
|
||||
BuildcraftFuelRegistry.fuel.addFuel(MekanismFluids.Ethene.getFluid(), (int)(240 * general.TO_RF), 40 * Fluid.BUCKET_VOLUME);
|
||||
BuildcraftFuelRegistry.fuel.addFuel(MekanismFluids.Ethene.getFluid(), (long)(240 * general.TO_RF / 20 * MjAPI.MJ), 40 * Fluid.BUCKET_VOLUME);
|
||||
}
|
||||
|
||||
for(ItemStack ore : OreDictionary.getOres("dustGold"))
|
||||
@@ -221,4 +223,12 @@ public class MekanismGenerators implements IModule
|
||||
proxy.loadConfiguration();
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onBlacklistUpdate(MekanismAPI.BoxBlacklistEvent event)
|
||||
{
|
||||
// Mekanism Generators multiblock structures
|
||||
MekanismAPI.addBoxBlacklist(GeneratorsBlocks.Generator, 5); // Advanced Solar Generator
|
||||
MekanismAPI.addBoxBlacklist(GeneratorsBlocks.Generator, 6); // Wind Generator
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user