diff --git a/dependencies.gradle b/dependencies.gradle index f9dc5f45..0bc5ba3d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,8 +1,8 @@ // Add your dependencies here dependencies { - implementation('com.github.GTNewHorizons:GTNHLib:0.0.10:dev') - compile('com.github.GTNewHorizons:ForestryMC:4.5.6:dev') + implementation('com.github.GTNewHorizons:GTNHLib:0.0.13:dev') + compile('com.github.GTNewHorizons:ForestryMC:4.6.7:dev') compile('com.github.GTNewHorizons:NotEnoughItems:2.3.21-GTNH:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.28:api') diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java index c1b1e3ae..4015ea81 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java @@ -18,6 +18,7 @@ import binnie.extrabees.apiary.machine.mutator.MutatorAlvearyPackage; import binnie.extrabees.apiary.machine.rainShield.RainShieldAlvearyPackage; import binnie.extrabees.apiary.machine.stimulator.StimulatorAlvearyPackage; import binnie.extrabees.apiary.machine.transmission.TransmissionAlvearyPackage; +import binnie.extrabees.apiary.machine.unlighting.UnlightingAlvearyPackage; public enum AlvearyMachine implements IMachineType { @@ -27,7 +28,8 @@ public enum AlvearyMachine implements IMachineType { Lighting(LightingAlvearyPackage.class), Stimulator(StimulatorAlvearyPackage.class), Hatchery(HatcheryAlvearyPackage.class), - Transmission(TransmissionAlvearyPackage.class); + Transmission(TransmissionAlvearyPackage.class), + Unlighting(UnlightingAlvearyPackage.class); protected Class cls; diff --git a/src/main/java/binnie/extrabees/apiary/machine/unlighting/UnlightingAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/unlighting/UnlightingAlvearyPackage.java new file mode 100644 index 00000000..3e33609c --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/unlighting/UnlightingAlvearyPackage.java @@ -0,0 +1,18 @@ +package binnie.extrabees.apiary.machine.unlighting; + +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.extrabees.apiary.machine.AlvearyMachine; +import binnie.extrabees.core.ExtraBeeTexture; + +public class UnlightingAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + + public UnlightingAlvearyPackage() { + super("unlighting", ExtraBeeTexture.AlvearyUnlighting.getTexture(), false); + } + + @Override + public void createMachine(Machine machine) { + new UnlightingComponentModifier(machine); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/unlighting/UnlightingComponentModifier.java b/src/main/java/binnie/extrabees/apiary/machine/unlighting/UnlightingComponentModifier.java new file mode 100644 index 00000000..5ea9b9dd --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/unlighting/UnlightingComponentModifier.java @@ -0,0 +1,18 @@ +package binnie.extrabees.apiary.machine.unlighting; + +import binnie.core.machines.Machine; +import binnie.extrabees.apiary.ComponentBeeModifier; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; + +public class UnlightingComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + + public UnlightingComponentModifier(Machine machine) { + super(machine); + } + + @Override + public boolean isSelfUnlighted() { + return true; + } +} diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java b/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java index 8221c3e0..ca1065dc 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java @@ -12,6 +12,7 @@ public enum ExtraBeeTexture implements IBinnieTexture { AlvearyNovaBlock(ResourceType.Tile, "alveary/AlvearyNovaBlock"), AlvearyFrame(ResourceType.Tile, "alveary/AlvearyFrame"), AlvearyLighting(ResourceType.Tile, "alveary/AlvearyLighting"), + AlvearyUnlighting(ResourceType.Tile, "alveary/AlvearyUnlighting"), AlvearyRainShield(ResourceType.Tile, "alveary/AlvearyRainShield"), AlvearyStimulator(ResourceType.Tile, "alveary/AlvearyStimulator"), AlvearyHatchery(ResourceType.Tile, "alveary/AlvearyHatchery"), diff --git a/src/main/resources/assets/extrabees/lang/en_US.lang b/src/main/resources/assets/extrabees/lang/en_US.lang index 821398a0..915d3644 100644 --- a/src/main/resources/assets/extrabees/lang/en_US.lang +++ b/src/main/resources/assets/extrabees/lang/en_US.lang @@ -191,6 +191,9 @@ extrabees.machine.alveay.frame.tooltip=Hive Frames extrabees.machine.alveay.lighting=Alveary Lighting extrabees.machine.alveay.lighting.info=The Alveary Lighting tricks bees into thinking it is daylight at night time. +extrabees.machine.alveay.unlighting=Alveary Unlighting +extrabees.machine.alveay.unlighting.info=The Alveary Unlighting tricks bees into thinking it is night time during the day. + extrabees.machine.alveay.mutator=Mutator extrabees.machine.alveay.mutator.info=The Mutator uses certain items in order to encourage bee mutation. extrabees.machine.alveay.mutator.tooltip=Mutagenic Agents diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyUnlighting.png b/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyUnlighting.png new file mode 100644 index 00000000..359cfa2f Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyUnlighting.png differ