mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 12:42:53 +00:00
Split the proxy from the rest
This commit is contained in:
1 parent
2c45413a6b
commit
60607354dd
26 files changed
+296
-170
No files matched your search
@@ -59,6 +59,10 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
||||
|
||||
protected abstract Class<? extends BinniePacketHandler> getPacketHandler();
|
||||
|
||||
public Object getMod(){
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
getProxy().setMod(this);
|
||||
|
||||
@@ -129,7 +129,7 @@ public final class BinnieCore extends AbstractMod {
|
||||
public void init(final FMLInitializationEvent evt) {
|
||||
this.init();
|
||||
for (final AbstractMod mod : getActiveMods()) {
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod));
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(mod.getMod(), new BinnieGUIHandler(mod));
|
||||
}
|
||||
GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata");
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy {
|
||||
|
||||
@Override
|
||||
public void openGui(final AbstractMod mod, final int id, final EntityPlayer player, final BlockPos pos) {
|
||||
player.openGui(mod, id, player.world, pos.getX(), pos.getY(), pos.getZ());
|
||||
player.openGui(mod.getMod(), id, player.world, pos.getX(), pos.getY(), pos.getZ());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,14 +1,8 @@
|
||||
package binnie.extrabees;
|
||||
|
||||
import binnie.Constants;
|
||||
import binnie.core.AbstractMod;
|
||||
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.core.ExtraBeeGUID;
|
||||
import binnie.extrabees.core.ModuleCore;
|
||||
import binnie.core.gui.BinnieGUIHandler;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import binnie.extrabees.genetics.ExtraBeeMutation;
|
||||
import binnie.extrabees.genetics.ExtraBeesBranch;
|
||||
import binnie.extrabees.genetics.ExtraBeesFlowers;
|
||||
@@ -18,7 +12,7 @@ import binnie.extrabees.init.BlockRegister;
|
||||
import binnie.extrabees.init.ItemRegister;
|
||||
import binnie.extrabees.init.RecipeRegister;
|
||||
import binnie.extrabees.items.ItemHoneyComb;
|
||||
import binnie.extrabees.proxy.ExtraBeesProxy;
|
||||
import binnie.extrabees.proxy.ExtraBeesCommonProxy;
|
||||
import binnie.extrabees.utils.MaterialBeehive;
|
||||
import binnie.extrabees.utils.config.ConfigHandler;
|
||||
import binnie.extrabees.utils.config.ConfigurationMain;
|
||||
@@ -32,23 +26,22 @@ import net.minecraftforge.fml.common.SidedProxy;
|
||||
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
||||
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
@Mod(modid = ExtraBees.MODID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
|
||||
public class ExtraBees extends AbstractMod {
|
||||
public class ExtraBees {
|
||||
|
||||
public static final String MODID = "extrabees";
|
||||
|
||||
@SuppressWarnings("NullableProblems")
|
||||
@Mod.Instance(MODID)
|
||||
public static ExtraBees instance;
|
||||
|
||||
@SuppressWarnings("NullableProblems")
|
||||
@SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesProxyClient", serverSide = "binnie.extrabees.proxy.ExtraBeesProxyServer")
|
||||
public static ExtraBeesProxy proxy;
|
||||
@SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesClientProxy", serverSide = "binnie.extrabees.proxy.ExtraBeesCommonProxy")
|
||||
public static ExtraBeesCommonProxy proxy;
|
||||
public static ConfigHandler configHandler;
|
||||
public static SimpleNetworkWrapper networkHandler;
|
||||
public static NetworkHandler networkHandler;
|
||||
|
||||
public static Block hive;
|
||||
public static Material materialBeehive;
|
||||
@@ -63,9 +56,11 @@ public class ExtraBees extends AbstractMod {
|
||||
|
||||
@Mod.EventHandler
|
||||
public void preInit(final FMLPreInitializationEvent event) {
|
||||
this.preInit();
|
||||
GuiHack.INSTANCE.preInit();
|
||||
|
||||
networkHandler = new NetworkHandler(MODID);
|
||||
materialBeehive = new MaterialBeehive();
|
||||
configHandler = new ConfigHandler(event.getModConfigurationDirectory());
|
||||
configHandler = new ConfigHandler(event.getSuggestedConfigurationFile());
|
||||
configHandler.addConfigurable(new ConfigurationMain());
|
||||
BlockRegister.preInitBlocks();
|
||||
ItemRegister.preInitItems();
|
||||
@@ -79,7 +74,9 @@ public class ExtraBees extends AbstractMod {
|
||||
|
||||
@Mod.EventHandler
|
||||
public void init(final FMLInitializationEvent evt) {
|
||||
this.init();
|
||||
GuiHack.INSTANCE.init();
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(instance, new BinnieGUIHandler(GuiHack.INSTANCE));
|
||||
|
||||
configHandler.reload(true);
|
||||
ItemHoneyComb.addSubtypes();
|
||||
GameRegistry.registerWorldGenerator(new ExtraBeesWorldGenerator(), 0);
|
||||
@@ -91,56 +88,20 @@ public class ExtraBees extends AbstractMod {
|
||||
|
||||
@Mod.EventHandler
|
||||
public void postInit(final FMLPostInitializationEvent evt) {
|
||||
this.postInit();
|
||||
GuiHack.INSTANCE.postInit();
|
||||
|
||||
BlockRegister.postInitBlocks();
|
||||
RecipeRegister.postInitRecipes();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerModules() {
|
||||
this.addModule(new ModuleCore());
|
||||
this.addModule(new ModuleApiary());
|
||||
}
|
||||
private static class NetworkHandler {
|
||||
|
||||
@Override
|
||||
public IBinnieGUID[] getGUIDs() {
|
||||
return ExtraBeeGUID.values();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<?>[] getConfigs() {
|
||||
return new Class[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public IProxyCore getProxy() {
|
||||
return ExtraBees.proxy;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getChannel() {
|
||||
return "EB";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getModID() {
|
||||
return MODID;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Class<? extends BinniePacketHandler> getPacketHandler() {
|
||||
return PacketHandler.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isActive() {
|
||||
return BinnieCore.isExtraBeesActive();
|
||||
}
|
||||
|
||||
public static class PacketHandler extends BinniePacketHandler {
|
||||
public PacketHandler() {
|
||||
super(ExtraBees.instance);
|
||||
private NetworkHandler(String channel){
|
||||
this.networkWrapper = new SimpleNetworkWrapper(channel);
|
||||
}
|
||||
|
||||
private final SimpleNetworkWrapper networkWrapper;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import binnie.core.machines.Machine;
|
||||
import binnie.core.machines.MachineComponent;
|
||||
import binnie.core.machines.component.IInteraction;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import binnie.extrabees.core.ExtraBeeGUID;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
@@ -19,6 +20,6 @@ public class ComponentExtraBeeGUI extends MachineComponent implements IInteracti
|
||||
|
||||
@Override
|
||||
public void onRightClick(final World world, final EntityPlayer player, final BlockPos pos) {
|
||||
ExtraBees.proxy.openGui(this.id, player, pos);
|
||||
GuiHack.INSTANCE.openGui(this.id, player, pos);
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.apiary.machine.AlvearyMachine;
|
||||
import binnie.extrabees.apiary.machine.AlvearyMutator;
|
||||
import binnie.extrabees.apiary.machine.AlvearyStimulator;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import binnie.extrabees.items.types.EnumHiveFrame;
|
||||
import binnie.extrabees.utils.BinnieCircuitLayout;
|
||||
import binnie.extrabees.utils.BinnieCircuitSocketType;
|
||||
@@ -31,7 +32,7 @@ public class ModuleApiary implements IInitializable {
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
final MachineGroup machineGroup = new MachineGroup(ExtraBees.instance, "alveay", "alveary", AlvearyMachine.values());
|
||||
final MachineGroup machineGroup = new MachineGroup(GuiHack.INSTANCE, "alveay", "alveary", AlvearyMachine.values());
|
||||
machineGroup.setCreativeTab(Tabs.tabApiculture);
|
||||
GameRegistry.registerTileEntity(TileExtraBeeAlveary.class, "extrabees.tile.alveary");
|
||||
ModuleApiary.blockComponent = machineGroup.getBlock();
|
||||
@@ -72,6 +73,6 @@ public class ModuleApiary implements IInitializable {
|
||||
@Override
|
||||
public void init() {
|
||||
this.stimulatorLayout = new BinnieCircuitLayout("Stimulator", BinnieCircuitSocketType.STIMULATOR);
|
||||
ModuleApiary.spriteMutator = new ValidatorSprite(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1");
|
||||
ModuleApiary.spriteMutator = new ValidatorSprite(GuiHack.INSTANCE, "validator/mutator.0", "validator/mutator.1");
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import forestry.api.apiculture.IHiveDrop;
|
||||
import forestry.api.core.Tabs;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.properties.PropertyEnum;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -14,6 +15,7 @@ import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
@@ -36,14 +38,33 @@ public class BlockExtraBeeHive extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
|
||||
public void getSubBlocks(@Nonnull final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
|
||||
for (int i = 0; i < EnumHiveType.values().length; ++i) {
|
||||
itemList.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return state.getValue(hiveType).ordinal();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
@SuppressWarnings("deprecation")
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
return getDefaultState().withProperty(hiveType, EnumHiveType.values()[meta]);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
protected BlockStateContainer createBlockState() {
|
||||
return new BlockStateContainer(this, hiveType);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune) {
|
||||
final ArrayList<ItemStack> ret = new ArrayList<>();
|
||||
final List<IHiveDrop> dropList = state.getValue(hiveType).drops;
|
||||
Collections.shuffle(dropList);
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
package binnie.extrabees.client;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.gui.IBinnieGUID;
|
||||
import binnie.core.network.BinniePacketHandler;
|
||||
import binnie.core.proxy.IProxyCore;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.apiary.ModuleApiary;
|
||||
import binnie.extrabees.core.ExtraBeeGUID;
|
||||
import binnie.extrabees.core.ModuleCore;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
/**
|
||||
* Created by Elec332 on 12-5-2017.
|
||||
*/
|
||||
public class GuiHack extends AbstractMod {
|
||||
|
||||
public static final GuiHack INSTANCE;
|
||||
|
||||
private GuiHack(){
|
||||
proxy = new IProxyCore(){
|
||||
|
||||
@Override
|
||||
public void setMod(AbstractMod mod) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item registerItem(Item item) {
|
||||
return ExtraBees.proxy.registerItem(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Block registerBlock(Block block) {
|
||||
return ExtraBees.proxy.registerBlock(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <B extends Block> void registerBlock(B block, ItemBlock itemBlock) {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModels() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItemAndBlockColors() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private IProxyCore proxy;
|
||||
|
||||
public void openGui(final IBinnieGUID ID, final EntityPlayer player, final BlockPos pos) {
|
||||
BinnieCore.getBinnieProxy().openGui(this, ID.ordinal(), player, pos);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void registerModules() {
|
||||
addModule(new ModuleCore());
|
||||
addModule(new ModuleApiary());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
public Object getMod() {
|
||||
return ExtraBees.instance;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isActive() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getChannel() {
|
||||
return "EB";
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBinnieGUID[] getGUIDs() {
|
||||
return ExtraBeeGUID.values();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IProxyCore getProxy() {
|
||||
return proxy;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getModID() {
|
||||
return ExtraBees.MODID;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Class<? extends BinniePacketHandler> getPacketHandler() {
|
||||
return PacketHandler.class;
|
||||
}
|
||||
|
||||
public static class PacketHandler extends BinniePacketHandler {
|
||||
public PacketHandler() {
|
||||
super(INSTANCE);
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
INSTANCE = new GuiHack();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -40,7 +40,7 @@ public enum ExtraBeeTexture implements IBinnieTexture {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public BinnieResource getTexture() {
|
||||
if (resource == null) {
|
||||
resource = Binnie.RESOURCE.getPNG(ExtraBees.instance, this.type, this.texture);
|
||||
resource = Binnie.RESOURCE.getPNG("extrabees", this.type, this.texture);
|
||||
}
|
||||
return resource;
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ public enum ExtraBeesBranch implements IClassification {
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return ExtraBees.proxy.localiseOrBlank("branch." + this.toString().toLowerCase() + ".desc");
|
||||
return ExtraBees.proxy.localise("branch." + this.toString().toLowerCase() + ".desc");
|
||||
}
|
||||
|
||||
ExtraBeesBranch(final String scientific) {
|
||||
|
||||
@@ -219,7 +219,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return ExtraBees.proxy.localiseOrBlank("species." + this.name().toLowerCase() + ".desc");
|
||||
return ExtraBees.proxy.localise("species." + this.name().toLowerCase() + ".desc");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -29,6 +29,7 @@ import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vec3i;
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.energy.CapabilityEnergy;
|
||||
@@ -125,7 +126,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return ExtraBees.proxy.localise("effect." + this.name().toLowerCase() + ".name");
|
||||
return I18n.translateToLocal("effect." + this.name().toLowerCase() + ".name");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,6 +5,7 @@ import binnie.core.craftgui.minecraft.Window;
|
||||
import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
|
||||
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
@@ -34,7 +35,7 @@ public class WindowAlvearyFrame extends Window {
|
||||
|
||||
@Override
|
||||
public AbstractMod getMod() {
|
||||
return ExtraBees.instance;
|
||||
return GuiHack.INSTANCE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,8 +4,8 @@ import binnie.core.AbstractMod;
|
||||
import binnie.core.craftgui.minecraft.Window;
|
||||
import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
|
||||
import binnie.core.craftgui.minecraft.control.ControlSlotArray;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.apiary.machine.AlvearyHatchery;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
@@ -35,7 +35,7 @@ public class WindowAlvearyHatchery extends Window {
|
||||
|
||||
@Override
|
||||
public AbstractMod getMod() {
|
||||
return ExtraBees.instance;
|
||||
return GuiHack.INSTANCE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,7 +4,7 @@ import binnie.core.AbstractMod;
|
||||
import binnie.core.craftgui.minecraft.Window;
|
||||
import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
|
||||
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
@@ -27,7 +27,7 @@ public class WindowAlvearyIndustrialFrame extends Window {
|
||||
|
||||
@Override
|
||||
public AbstractMod getMod() {
|
||||
return ExtraBees.instance;
|
||||
return GuiHack.INSTANCE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -10,6 +10,7 @@ import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
|
||||
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.apiary.machine.AlvearyMutator;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -60,7 +61,7 @@ public class WindowAlvearyMutator extends Window {
|
||||
|
||||
@Override
|
||||
public AbstractMod getMod() {
|
||||
return ExtraBees.instance;
|
||||
return GuiHack.INSTANCE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -8,6 +8,7 @@ import binnie.core.craftgui.minecraft.control.ControlPlayerInventory;
|
||||
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.apiary.machine.AlvearyStimulator;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
@@ -37,7 +38,7 @@ public class WindowAlvearyStimulator extends Window {
|
||||
|
||||
@Override
|
||||
public AbstractMod getMod() {
|
||||
return ExtraBees.instance;
|
||||
return GuiHack.INSTANCE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,6 +5,7 @@ import binnie.core.AbstractMod;
|
||||
import binnie.core.craftgui.database.*;
|
||||
import binnie.core.craftgui.minecraft.Window;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
@@ -13,16 +14,16 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
protected void addTabs() {
|
||||
new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraBees.instance, "species.overview", 0));
|
||||
new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraBees.instance, "species.classification", 0));
|
||||
new PageSpeciesGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraBees.instance, "species.genome", 0));
|
||||
new PageSpeciesProducts(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraBees.instance, "species.products", 0));
|
||||
new PageSpeciesClimate(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraBees.instance, "species.climate", 0));
|
||||
new PageSpeciesResultant(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraBees.instance, "species.resultant", 0));
|
||||
new PageSpeciesMutations(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraBees.instance, "species.further", 0));
|
||||
new PageBranchOverview(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(ExtraBees.instance, "branches.overview", 0));
|
||||
new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(ExtraBees.instance, "branches.species", 0));
|
||||
new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(ExtraBees.instance, "breeder", 0));
|
||||
new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.overview", 0));
|
||||
new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.classification", 0));
|
||||
new PageSpeciesGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.genome", 0));
|
||||
new PageSpeciesProducts(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.products", 0));
|
||||
new PageSpeciesClimate(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.climate", 0));
|
||||
new PageSpeciesResultant(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.resultant", 0));
|
||||
new PageSpeciesMutations(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.further", 0));
|
||||
new PageBranchOverview(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(GuiHack.INSTANCE, "branches.overview", 0));
|
||||
new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(GuiHack.INSTANCE, "branches.species", 0));
|
||||
new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(GuiHack.INSTANCE, "breeder", 0));
|
||||
}
|
||||
|
||||
public WindowApiaristDatabase(final EntityPlayer player, final Side side, final boolean nei) {
|
||||
@@ -35,7 +36,7 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase {
|
||||
|
||||
@Override
|
||||
public AbstractMod getMod() {
|
||||
return ExtraBees.instance;
|
||||
return GuiHack.INSTANCE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -9,6 +9,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
|
||||
import binnie.core.craftgui.resource.minecraft.PaddedTexture;
|
||||
import binnie.core.craftgui.resource.minecraft.StandardTexture;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import binnie.extrabees.core.ExtraBeeTexture;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -36,7 +37,7 @@ public class WindowPunnettSquare extends Window {
|
||||
|
||||
@Override
|
||||
public AbstractMod getMod() {
|
||||
return ExtraBees.instance;
|
||||
return GuiHack.INSTANCE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import binnie.extrabees.core.ExtraBeeGUID;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
@@ -53,7 +54,7 @@ public class ItemDictionary extends Item implements IItemModelRegister {
|
||||
} else {
|
||||
id = ExtraBeeGUID.DatabaseNEI;
|
||||
}
|
||||
ExtraBees.proxy.openGui(id, playerIn, playerIn.getPosition());
|
||||
GuiHack.INSTANCE.openGui(id, playerIn, playerIn.getPosition());
|
||||
|
||||
return super.onItemRightClick(worldIn, playerIn, handIn);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package binnie.extrabees.items;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.client.GuiHack;
|
||||
import binnie.extrabees.core.ExtraBeeGUID;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -26,7 +27,7 @@ public class ItemPunnettSquare extends Item {
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) {
|
||||
if (handIn == EnumHand.MAIN_HAND) {
|
||||
ExtraBees.proxy.openGui(ExtraBeeGUID.PunnettSquare, playerIn, playerIn.getPosition());
|
||||
GuiHack.INSTANCE.openGui(ExtraBeeGUID.PunnettSquare, playerIn, playerIn.getPosition());
|
||||
}
|
||||
ItemStack itemStack = playerIn.getHeldItem(handIn);
|
||||
return new ActionResult<>(EnumActionResult.PASS, itemStack);
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
package binnie.extrabees.proxy;
|
||||
|
||||
import forestry.core.models.ModelManager;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
/**
|
||||
* Created by Elec332 on 12-5-2017.
|
||||
*/
|
||||
public class ExtraBeesClientProxy extends ExtraBeesCommonProxy {
|
||||
|
||||
private static final ModelManager modelManager = ModelManager.getInstance();
|
||||
|
||||
@Override
|
||||
public Block registerBlock(Block block) {
|
||||
modelManager.registerBlockClient(block);
|
||||
return super.registerBlock(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item registerItem(Item item) {
|
||||
modelManager.registerItemClient(item);
|
||||
return super.registerItem(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("all")
|
||||
public void registerModel(@Nonnull Item item, int meta) {
|
||||
ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory"));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package binnie.extrabees.proxy;
|
||||
|
||||
import binnie.extrabees.genetics.ExtraBeesSpecies;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
/**
|
||||
* Created by Elec332 on 12-5-2017.
|
||||
*/
|
||||
public class ExtraBeesCommonProxy {
|
||||
|
||||
public void registerBeeModel(ExtraBeesSpecies type) {
|
||||
|
||||
}
|
||||
|
||||
public Block registerBlock(Block block){
|
||||
return GameRegistry.register(block);
|
||||
}
|
||||
|
||||
public Item registerItem(Item item){
|
||||
return GameRegistry.register(item);
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public String localise(String s){
|
||||
return I18n.translateToLocal(s);
|
||||
}
|
||||
|
||||
public void registerModel(Item item, int meta) {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package binnie.extrabees.proxy;
|
||||
|
||||
import binnie.core.proxy.BinnieModProxy;
|
||||
import binnie.extrabees.genetics.ExtraBeesSpecies;
|
||||
|
||||
public class ExtraBeesProxy extends BinnieModProxy {
|
||||
|
||||
public void registerBeeModel(ExtraBeesSpecies type) {
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
package binnie.extrabees.proxy;
|
||||
|
||||
import binnie.core.models.ModelManager;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.genetics.ExtraBeesSpecies;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ExtraBeesProxyClient extends ExtraBeesProxy {
|
||||
|
||||
public static ModelManager modelManager = new ModelManager(ExtraBees.MODID);
|
||||
|
||||
@Override
|
||||
public void registerBeeModel(ExtraBeesSpecies type) {
|
||||
for (EnumBeeType t : EnumBeeType.VALUES)
|
||||
type.registerModels(BeeManager.beeRoot.getMemberStack(BeeManager.beeRoot.templateAsIndividual(type.getTemplate()), t).getItem(), null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModel(Item item, int meta) {
|
||||
registerModel(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModel(Item item, int meta, ModelResourceLocation modelResourceLocation) {
|
||||
ModelLoader.setCustomModelResourceLocation(item, meta, modelResourceLocation);
|
||||
}
|
||||
|
||||
public static ModelManager getModelManager() {
|
||||
return modelManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item registerItem(Item item) {
|
||||
getModelManager().registerItemClient(item);
|
||||
return super.registerItem(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Block registerBlock(Block block) {
|
||||
getModelManager().registerBlockClient(block);
|
||||
return super.registerBlock(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModels() {
|
||||
getModelManager().registerModels();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItemAndBlockColors() {
|
||||
getModelManager().registerItemAndBlockColors();
|
||||
}
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
package binnie.extrabees.proxy;
|
||||
|
||||
public class ExtraBeesProxyServer extends ExtraBeesProxy {
|
||||
}
|
||||
Reference in new issue
Block a user