mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-14 17:24:53 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f658e9ec57 | ||
|
|
ddf93bc425 | ||
|
|
503361d6d1 |
No files matched your search
+2
-2
@@ -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')
|
||||
|
||||
@@ -54,7 +54,7 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
|
||||
this,
|
||||
155.0f,
|
||||
I18N.localise(
|
||||
"binniecore.gui.database.species.secretCount",
|
||||
"binniecore.gui.database.species.secretsCount",
|
||||
system.discoveredSecretCount,
|
||||
system.totalSecretCount));
|
||||
}
|
||||
|
||||
@@ -149,9 +149,17 @@ public class TransferRequest {
|
||||
if (destination.getStackInSlot(slot) == null) {
|
||||
insertedSlots.add(new TransferSlot(slot, destination));
|
||||
if (doAdd) {
|
||||
destination.setInventorySlotContents(slot, item.copy());
|
||||
ItemStack movedStack = item.copy();
|
||||
if (movedStack.stackSize > destination.getInventoryStackLimit()) {
|
||||
movedStack.stackSize = destination.getInventoryStackLimit();
|
||||
}
|
||||
item.stackSize -= movedStack.stackSize;
|
||||
destination.setInventorySlotContents(slot, movedStack);
|
||||
if (item.stackSize <= 0) {
|
||||
item = null;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
return item;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<? extends MachinePackage> cls;
|
||||
|
||||
|
||||
+7
-1
@@ -18,7 +18,13 @@ public class StimulatorAlvearyPackage extends AlvearyMachine.AlvearyPackage impl
|
||||
@Override
|
||||
public void createMachine(Machine machine) {
|
||||
new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyStimulator);
|
||||
ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
|
||||
ComponentInventorySlots inventory = new ComponentInventorySlots(machine) {
|
||||
|
||||
@Override
|
||||
public int getInventoryStackLimit() {
|
||||
return 1;
|
||||
}
|
||||
};
|
||||
inventory.addSlot(AlvearyStimulator.SLOT_CIRCUIT, "circuit");
|
||||
inventory.getSlot(AlvearyStimulator.SLOT_CIRCUIT).setValidator(new CircuitSlotValidator());
|
||||
new ComponentPowerReceptor(machine);
|
||||
|
||||
+18
@@ -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);
|
||||
}
|
||||
}
|
||||
+18
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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"),
|
||||
|
||||
@@ -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
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 9.5 KiB |
Reference in new issue
Block a user