diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index dda3d5a1..41904f9f 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -85,8 +85,8 @@ public class ManagerMachine extends ManagerBase { @Override public void postInit() { - BinnieCore.proxy.registerBlockRenderer(BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine")); - BinnieCore.proxy.registerTileEntity(TileEntityMachine.class, "binnie.tile.machine", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine")); + //BinnieCore.proxy.registerBlockRenderer(BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine")); + //BinnieCore.proxy.registerTileEntity(TileEntityMachine.class, "binnie.tile.machine", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine")); } public Class[] getComponentInterfaces(final Class clss) { diff --git a/src/main/java/binnie/core/machines/RendererMachine.java b/src/main/java/binnie/core/machines/RendererMachine.java index 7eb4eeff..e514ae57 100644 --- a/src/main/java/binnie/core/machines/RendererMachine.java +++ b/src/main/java/binnie/core/machines/RendererMachine.java @@ -16,7 +16,7 @@ public class RendererMachine extends TileEntitySpecialRenderer tiles; - // - // @Override - // public void updateEntity() { - // super.updateEntity(); - // if (!BinnieCore.proxy.isSimulating(this.worldObj)) { - // return; - // } - // if (this.worldObj.getWorldTime() % 200L == 0L) { - // if (!this.isIntegratedIntoStructure() || this.isMaster()) { - // // this.validateStructure(); - // } - // // final IMultiblockComponent master = this.getCentralTE(); - // // if (master == null) { - // // return; - // // } - // // if (this.getBeeListener() != null) { - // // - // ((IAlvearyComponent)master).registerBeeListener(this.getBeeListener()); - // // } - // if (this.getBeeModifier() != null) { - // // - // ((IAlvearyComponent)master).registerBeeModifier(this.getBeeModifier()); - // } - // this.init = true; - // } - // } + // // @Override // public void readFromNBT(final NBTTagCompound nbttagcompound) { diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java index 475bb8b6..b542ef14 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java @@ -5,9 +5,17 @@ import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.craftgui.minecraft.IMachineInformation; import binnie.extrabees.apiary.ComponentBeeModifier; +import binnie.extrabees.apiary.TileExtraBeeAlveary; import binnie.extrabees.core.ExtraBeeTexture; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.energy.IEnergyStorage; + +import java.util.LinkedList; +import java.util.List; public class AlvearyTransmission { public static class PackageAlvearyTransmission extends AlvearyMachine.AlvearyPackage implements IMachineInformation { @@ -30,37 +38,37 @@ public class AlvearyTransmission { @Override public void onUpdate() { super.onUpdate(); - //TODO Energy -// int energy = this.getUtil().getPoweredMachine().getEnergyStored(EnumFacing.NORTH); -// if (energy == 0) { -// return; -// } -// final TileExtraBeeAlveary tile = (TileExtraBeeAlveary) this.getMachine().getTileEntity(); -// final List handlers = new ArrayList(); -// for (final TileEntity alvearyTile : tile.getAlvearyBlocks()) { -// if (alvearyTile instanceof IEnergyHandler && alvearyTile != tile) { -// handlers.add((IEnergyHandler) alvearyTile); -// } -// } -// if (handlers.isEmpty()) { -// return; -// } -// final int maxOutput = 500; -// int output = energy / handlers.size(); -// if (output > maxOutput) { -// output = maxOutput; -// } -// if (output < 1) { -// output = 1; -// } -// for (final IEnergyHandler handler : handlers) { -//// final int recieved = handler.receiveEnergy(ForgeDirection.NORTH, output, false); -//// this.getUtil().getPoweredMachine().receiveEnergy(ForgeDirection.NORTH, -recieved, false); -//// energy = this.getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH); -// if (energy <= 0) { -// return; -// } -// } + + int energy = this.getUtil().getPoweredMachine().getEnergyStored(); + if (energy == 0) { + return; + } + final TileExtraBeeAlveary tile = (TileExtraBeeAlveary) this.getMachine().getTileEntity(); + final List handlers = new LinkedList<>(); + for (final TileEntity alvearyTile : tile.getAlvearyBlocks()) { + if (alvearyTile != tile && alvearyTile.hasCapability(CapabilityEnergy.ENERGY, EnumFacing.NORTH)) { + handlers.add(alvearyTile.getCapability(CapabilityEnergy.ENERGY, EnumFacing.NORTH)); + } + } + if (handlers.isEmpty()) { + return; + } + final int maxOutput = 500; + int output = energy / handlers.size(); + if (output > maxOutput) { + output = maxOutput; + } + if (output < 1) { + output = 1; + } + for (final IEnergyStorage handler : handlers) { + final int recieved = handler.receiveEnergy(output, false); + this.getUtil().getPoweredMachine().receiveEnergy(-recieved, false); + energy = this.getUtil().getPoweredMachine().getEnergyStored(); + if (energy <= 0) { + return; + } + } } } } diff --git a/src/main/resources/assets/extrabees/blockstates/alveary.json b/src/main/resources/assets/extrabees/blockstates/alveary.json new file mode 100644 index 00000000..ac011f5e --- /dev/null +++ b/src/main/resources/assets/extrabees/blockstates/alveary.json @@ -0,0 +1,63 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_column" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "machine_type":{ + "0": { + "textures":{ + "end": "extrabees:tile/alveary/alveary_mutator_top", + "side": "extrabees:tile/alveary/alveary_mutator_side" + } + }, + "1": { + "textures":{ + "end": "extrabees:tile/alveary/alveary_frame_top", + "side": "extrabees:tile/alveary/alveary_frame_side" + } + }, + "2": { + "textures":{ + "end": "extrabees:tile/alveary/alveary_rainshield_top", + "side": "extrabees:tile/alveary/alveary_rainshield_side" + } + }, + "3": { + "textures":{ + "end": "extrabees:tile/alveary/alveary_lighting_top", + "side": "extrabees:tile/alveary/alveary_lighting_side" + } + }, + "4": { + "textures":{ + "end": "extrabees:tile/alveary/alveary_stimulator_top", + "side": "extrabees:tile/alveary/alveary_stimulator_side" + } + }, + "5": { + "textures":{ + "end": "extrabees:tile/alveary/alveary_hatchery_top", + "side": "extrabees:tile/alveary/alveary_hatchery_side" + } + }, + "6": { + "textures":{ + "end": "extrabees:tile/alveary/alveary_transmission_top", + "side": "extrabees:tile/alveary/alveary_transmission_side" + } + }, + "7": {}, + "8": {}, + "9": {}, + "10": {}, + "11": {}, + "12": {}, + "13": {}, + "14": {}, + "15": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cage.json b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cage.json new file mode 100644 index 00000000..d02fce47 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cage.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/frameCage" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.clay.json b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.clay.json new file mode 100644 index 00000000..a25e689a --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.clay.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/frameClay" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cocoa.json b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cocoa.json new file mode 100644 index 00000000..ca6da73e --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.cocoa.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/frameCocoa" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.debug.json b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.debug.json new file mode 100644 index 00000000..0cc09f23 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.debug.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/frameDebug" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.soul.json b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.soul.json new file mode 100644 index 00000000..19f1b332 --- /dev/null +++ b/src/main/resources/assets/extrabees/models/item/frames/hiveFrame.soul.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "extrabees:items/frameSoul" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyFrame.png b/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyFrame.png deleted file mode 100644 index 366c0497..00000000 Binary files a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyFrame.png and /dev/null differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyHatchery.png b/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyHatchery.png deleted file mode 100644 index aa85364f..00000000 Binary files a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyHatchery.png and /dev/null differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyLighting.png b/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyLighting.png deleted file mode 100644 index b06625c7..00000000 Binary files a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyLighting.png and /dev/null differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyMutator.png b/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyMutator.png deleted file mode 100644 index b670d9d2..00000000 Binary files a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyMutator.png and /dev/null differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyNovaBlock.png b/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyNovaBlock.png deleted file mode 100644 index 31d03322..00000000 Binary files a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyNovaBlock.png and /dev/null differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyRainShield.png b/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyRainShield.png deleted file mode 100644 index b10086b8..00000000 Binary files a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyRainShield.png and /dev/null differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyStimulator.png b/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyStimulator.png deleted file mode 100644 index 0754f396..00000000 Binary files a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyStimulator.png and /dev/null differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyTransmission.png b/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyTransmission.png deleted file mode 100644 index ca8eac7a..00000000 Binary files a/src/main/resources/assets/extrabees/textures/tile/alveary/AlvearyTransmission.png and /dev/null differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_side.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_side.png new file mode 100644 index 00000000..9da1e3aa Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_side.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_top.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_top.png new file mode 100644 index 00000000..a698cbff Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_frame_top.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_side.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_side.png new file mode 100644 index 00000000..bcd76af0 Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_side.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_top.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_top.png new file mode 100644 index 00000000..818f976f Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_hatchery_top.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_side.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_side.png new file mode 100644 index 00000000..21938b36 Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_side.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_top.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_top.png new file mode 100644 index 00000000..e5e8e3d3 Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_lighting_top.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_side.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_side.png new file mode 100644 index 00000000..4eca4e24 Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_side.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_top.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_top.png new file mode 100644 index 00000000..49e5058c Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_mutator_top.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_side.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_side.png new file mode 100644 index 00000000..19735797 Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_side.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_top.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_top.png new file mode 100644 index 00000000..4c214081 Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_novablock_top.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_side.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_side.png new file mode 100644 index 00000000..b86df00b Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_side.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_top.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_top.png new file mode 100644 index 00000000..9aabc40d Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_rainshield_top.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_side.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_side.png new file mode 100644 index 00000000..3de0f98f Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_side.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_top.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_top.png new file mode 100644 index 00000000..5a317f29 Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_stimulator_top.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_side.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_side.png new file mode 100644 index 00000000..7d214b10 Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_side.png differ diff --git a/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_top.png b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_top.png new file mode 100644 index 00000000..e1b86777 Binary files /dev/null and b/src/main/resources/assets/extrabees/textures/tile/alveary/alveary_transmission_top.png differ