Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Closes #839 and #840 (#841)

Browse source 
* Safeguard against #840

* update Common caps

* Closes #839
This commit is contained in:
Brennan Ward 2017-07-08 14:56:24 -04:00 committed by Ellpeck
parent 9698d345a2
commit 978d624eeb
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -49,7 +49,7 @@ repositories {
dependencies { dependencies {
compile "net.darkhax.tesla:Tesla-1.12:1.0.59" compile "net.darkhax.tesla:Tesla-1.12:1.0.59"
deobfCompile "mezz.jei:jei_1.12:4.7.0.68" deobfCompile "mezz.jei:jei_1.12:4.7.0.68"
compileOnly "org.cyclops.commoncapabilities:CommonCapabilities:1.11.2-1.3.3-115" deobfCompile "org.cyclops.commoncapabilities:CommonCapabilities:1.12-1.3.3+"
} }
processResources { processResources {

5
src/main/java/de/ellpeck/actuallyadditions/mod/RegistryHandler.java
View file

@ -1,6 +1,7 @@
package de.ellpeck.actuallyadditions.mod; package de.ellpeck.actuallyadditions.mod;
import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
import de.ellpeck.actuallyadditions.mod.crafting.InitCrafting; import de.ellpeck.actuallyadditions.mod.crafting.InitCrafting;
import de.ellpeck.actuallyadditions.mod.gen.village.InitVillager; import de.ellpeck.actuallyadditions.mod.gen.village.InitVillager;
import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.InitItems;
@ -51,8 +52,8 @@ public class RegistryHandler{
public void onVillagerRegistry(Register<VillagerProfession> event){ public void onVillagerRegistry(Register<VillagerProfession> event){
InitVillager.init(); InitVillager.init();
event.getRegistry().register(InitVillager.jamProfession); if(ConfigBoolValues.JAM_VILLAGER_EXISTS.isEnabled()) event.getRegistry().register(InitVillager.jamProfession);
event.getRegistry().register(InitVillager.engineerProfession); if(ConfigBoolValues.ENGINEER_VILLAGER_EXISTS.isEnabled()) event.getRegistry().register(InitVillager.engineerProfession);
} }
@SubscribeEvent @SubscribeEvent

2
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java
View file

@ -163,6 +163,7 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay{
TileEntity tile = theRelay.receiversAround.get(facing); TileEntity tile = theRelay.receiversAround.get(facing);
EnumFacing opp = facing.getOpposite(); EnumFacing opp = facing.getOpposite();
if(tile != null){
if(tile.hasCapability(CapabilityEnergy.ENERGY, opp)){ if(tile.hasCapability(CapabilityEnergy.ENERGY, opp)){
IEnergyStorage cap = tile.getCapability(CapabilityEnergy.ENERGY, opp); IEnergyStorage cap = tile.getCapability(CapabilityEnergy.ENERGY, opp);
if(cap != null && cap.receiveEnergy(maxTransfer, true) > 0){ if(cap != null && cap.receiveEnergy(maxTransfer, true) > 0){
@ -179,6 +180,7 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay{
} }
} }
} }
}
if(workedOnce){ if(workedOnce){
relaysThatWork.add(theRelay); relaysThatWork.add(theRelay);