Fix #261 Ceramic block issues

This commit is contained in:
Nedelosk committed 2017-08-12 23:48:56 +02:00
1 parent f968bfdb38
commit 9acfedfa16
6 files changed
+37 -14

No files matched your search

@@ -1,24 +1,21 @@
package binnie.botany;
import binnie.botany.genetics.FlowerBreedingSystem;
import binnie.core.Binnie;
import binnie.core.api.genetics.IBreedingSystem;
import net.minecraftforge.fml.common.Mod;
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 binnie.core.Constants;
import binnie.botany.gui.BotanyGUI;
import binnie.botany.network.PacketID;
import binnie.botany.proxy.Proxy;
import binnie.core.BinnieCore;
import binnie.core.Constants;
import binnie.core.gui.IBinnieGUID;
import binnie.core.modules.BlankModuleContainer;
import binnie.core.network.BinniePacketHandler;
import binnie.core.network.IPacketID;
import binnie.core.proxy.IProxyCore;
import binnie.core.modules.BlankModuleContainer;
@Mod(
modid = Constants.BOTANY_MOD_ID,
@@ -34,13 +31,10 @@ public class Botany extends BlankModuleContainer {
@SuppressWarnings("NullableProblems")
@SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
public static Proxy proxy;
public static IBreedingSystem flowerBreedingSystem;
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent evt) {
super.preInit(evt);
flowerBreedingSystem = new FlowerBreedingSystem();
Binnie.GENETICS.registerBreedingSystem(flowerBreedingSystem);
}
@Mod.EventHandler
@@ -12,6 +12,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.botany.Botany;
import binnie.botany.api.genetics.IFlowerColor;
import binnie.botany.api.genetics.EnumFlowerColor;
import binnie.botany.modules.ModuleFlowers;
import binnie.core.AbstractMod;
import binnie.core.gui.IWidget;
import binnie.core.gui.controls.listbox.ControlListBox;
@@ -32,7 +33,7 @@ import binnie.core.util.I18N;
public class WindowBotanistDatabase extends WindowAbstractDatabase {
public WindowBotanistDatabase(EntityPlayer player, Side side, boolean nei) {
super(player, side, nei, Botany.flowerBreedingSystem, 130);
super(player, side, nei, ModuleFlowers.flowerBreedingSystem, 130);
}
public static Window create(EntityPlayer player, Side side, boolean nei) {
@@ -15,6 +15,7 @@ import binnie.core.util.I18N;
public class ItemCeramic extends ItemBlock implements IColoredItem {
public ItemCeramic(BlockCeramic block) {
super(block);
setHasSubtypes(true);
}
@Override
@@ -14,6 +14,7 @@ import binnie.botany.ceramic.brick.CeramicBrickPair;
public class ItemCeramicBrick extends ItemBlock implements IColoredItem {
public ItemCeramicBrick(BlockCeramicBrick block) {
super(block);
setHasSubtypes(true);
}
@Override
@@ -1,7 +1,5 @@
package binnie.botany.modules;
import binnie.core.modules.BotanyModuleUIDs;
import binnie.core.util.TileUtil;
import com.google.common.collect.ImmutableSet;
import javax.annotation.Nullable;
@@ -34,26 +32,31 @@ import forestry.api.storage.BackpackManager;
import forestry.api.storage.IBackpackInterface;
import forestry.storage.BackpackDefinition;
import binnie.core.Constants;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.api.BotanyAPI;
import binnie.botany.api.gardening.IBlockSoil;
import binnie.botany.api.genetics.EnumFlowerColor;
import binnie.botany.api.genetics.EnumFlowerStage;
import binnie.botany.api.genetics.IFlower;
import binnie.botany.api.genetics.IFlowerRoot;
import binnie.botany.blocks.BlockFlower;
import binnie.botany.core.BotanyCore;
import binnie.botany.api.genetics.EnumFlowerColor;
import binnie.botany.genetics.FlowerBreedingSystem;
import binnie.botany.genetics.FlowerDefinition;
import binnie.botany.genetics.FlowerFactory;
import binnie.botany.genetics.allele.AlleleEffectNone;
import binnie.botany.items.ItemFlowerGE;
import binnie.botany.tile.TileEntityFlower;
import binnie.core.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.RecipeUtil;
import binnie.core.Constants;
import binnie.core.api.genetics.IBreedingSystem;
import binnie.core.modules.BinnieModule;
import binnie.core.modules.BotanyModuleUIDs;
import binnie.core.modules.Module;
import binnie.core.util.RecipeUtil;
import binnie.core.util.TileUtil;
@BinnieModule(moduleID = BotanyModuleUIDs.FLOWERS, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Flowers", unlocalizedDescription = "botany.module.flowers")
public class ModuleFlowers extends Module {
@@ -65,6 +68,7 @@ public class ModuleFlowers extends Module {
public static ItemFlowerGE flowerItem;
public static ItemFlowerGE seed;
public static ItemFlowerGE pollen;
public static IBreedingSystem flowerBreedingSystem;
@Override
public void setupAPI() {
@@ -107,6 +111,8 @@ public class ModuleFlowers extends Module {
@Override
public void preInit() {
MinecraftForge.EVENT_BUS.register(this);
flowerBreedingSystem = new FlowerBreedingSystem();
Binnie.GENETICS.registerBreedingSystem(flowerBreedingSystem);
}
@Override
@@ -1,7 +1,11 @@
package binnie.botany.tile;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import binnie.botany.api.genetics.EnumFlowerColor;
@@ -41,4 +45,20 @@ public class TileCeramic extends TileEntity {
}
return new ItemStack(ModuleCeramic.ceramic, amount, ID);
}
@Override
public NBTTagCompound getUpdateTag() {
return writeToNBT(new NBTTagCompound());
}
@Nullable
@Override
public SPacketUpdateTileEntity getUpdatePacket() {
return new SPacketUpdateTileEntity(pos, 0, getUpdateTag());
}
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) {
handleUpdateTag(pkt.getNbtCompound());
}
}