Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2

This commit is contained in:
Nedelosk committed 2016-10-25 00:28:35 +02:00
commit 9e31a19f34
40 files changed
+154 -92

No files matched your search

@@ -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<? extends MachineComponent> clss) {
@@ -16,7 +16,7 @@ public class RendererMachine extends TileEntitySpecialRenderer<TileEntityMachine
public void renderTileEntityAt(TileEntityMachine te, double x, double y, double z, float partialTicks, int destroyStage) {
if (te != null && te.getMachine() != null) {
final MachinePackage machinePackage = te.getMachine().getPackage();
machinePackage.renderMachine(te.getMachine(), x, y, z, partialTicks);
//machinePackage.renderMachine(te.getMachine(), x, y, z, partialTicks);
}
}
@@ -10,7 +10,6 @@ import net.minecraft.nbt.NBTTagCompound;
public class TileEntityMachine extends TileEntityMachineBase implements INetworkedEntity {
private Machine machine;
@Override
public void update() {
super.update();
@@ -19,14 +18,6 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork
}
}
//TODO MACHINE UPDATE
//
// @Override
// public boolean canUpdate() {
// return super.canUpdate();
// }
public TileEntityMachine(final MachinePackage pack) {
this.setMachine(pack);
}
@@ -295,4 +295,5 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi
public void update() {
}
}
@@ -143,7 +143,7 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy
@Override
public void registerBlockRenderer(final Object renderer) {
//if (renderer != null && renderer instanceof FastTESR) {
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachine.class, new RendererMachine());//.registerBlockHandler((ISimpleBlockRenderingHandler) renderer);
//ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachine.class, new RendererMachine());//.registerBlockHandler((ISimpleBlockRenderingHandler) renderer);
//}
}
@@ -6,6 +6,7 @@ import binnie.core.BinnieCore;
import binnie.core.gui.IBinnieGUID;
import binnie.core.network.BinniePacketHandler;
import binnie.core.proxy.IProxyCore;
import binnie.extrabees.apiary.ModuleApiary;
import binnie.extrabees.config.ConfigurationMachines;
import binnie.extrabees.config.ConfigurationMain;
import binnie.extrabees.core.ExtraBeeGUID;
@@ -50,7 +51,7 @@ public class ExtraBees extends AbstractMod {
this.addModule(new ModuleGenetics());
//this.addModule(new ModuleGeneration());
this.addModule(new ModuleLiquids());
//this.addModule(new ModuleApiary());
this.addModule(new ModuleApiary());
this.preInit();
proxy.registerModels();
}
@@ -1,11 +1,13 @@
package binnie.extrabees.apiary;
import forestry.api.apiculture.*;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier {
public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IItemModelRegister {
EnumHiveFrame frame;
@Override
@@ -21,6 +23,11 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier {
this.setUnlocalizedName("hiveFrame");
}
@Override
public void registerModel(Item item, IModelManager manager) {
manager.registerItemModel(item, 0, "frames/" + getRegistryName().getResourcePath());
}
@Override
public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) {
return this.frame.getTerritoryModifier(genome, currentModifier);
@@ -25,7 +25,7 @@ public class ModuleApiary implements IInitializable {
public void preInit() {
final MachineGroup machineGroup = new MachineGroup(ExtraBees.instance, "alveay", "alveary", AlvearyMachine.values());
machineGroup.setCreativeTab(Tabs.tabApiculture);
BinnieCore.proxy.registerTileEntity(TileExtraBeeAlveary.class, "extrabees.tile.alveary", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
BinnieCore.proxy.registerTileEntity(TileExtraBeeAlveary.class, "extrabees.tile.alveary", null);
ModuleApiary.blockComponent = machineGroup.getBlock();
AlvearyMutator.addMutationItem(new ItemStack(Blocks.SOUL_SAND), 1.5f);
AlvearyMutator.addMutationItem(Mods.IC2.stack("UranFuel"), 4.0f);
@@ -38,7 +38,8 @@ public class ModuleApiary implements IInitializable {
AlvearyMutator.addMutationItem(new ItemStack(Items.ENDER_PEARL), 2.0f);
AlvearyMutator.addMutationItem(new ItemStack(Items.ENDER_EYE), 4.0f);
for (final EnumHiveFrame frame : EnumHiveFrame.values()) {
GameRegistry.registerItem(frame.item = new ItemHiveFrame(frame), "hiveFrame." + frame.name().toLowerCase());
frame.item = new ItemHiveFrame(frame).setRegistryName("hiveFrame." + frame.name().toLowerCase());
ExtraBees.proxy.registerItem(frame.item);
}
}
@@ -1,5 +1,6 @@
package binnie.extrabees.apiary;
import binnie.core.BinnieCore;
import binnie.core.machines.TileEntityMachine;
import binnie.extrabees.apiary.machine.AlvearyMachine;
import com.mojang.authlib.GameProfile;
@@ -74,23 +75,14 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo
return structureLogic;
}
//TODO UPDATE ENTITY
// @Override
// public boolean canUpdate() {
// return false;
// }
@Override
public void updateClient(int arg0) {
// super.updateEntity();
super.update();
}
@Override
public void updateServer(int arg0) {
// super.updateEntity();
super.update();
}
@Override
@@ -207,39 +199,7 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo
}
}
// boolean init;
// //IStructureLogic structureLogic;
// private boolean isMaster;
// protected int masterX;
// protected int masterZ;
// protected int masterY;
// List<TileEntity> 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) {
@@ -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<IEnergyHandler> handlers = new ArrayList<IEnergyHandler>();
// 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<IEnergyStorage> 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;
}
}
}
}
}