diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index ff45fc61..cd988192 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -21,6 +21,7 @@ import binnie.craftgui.mod.database.PageSpeciesResultant; import binnie.craftgui.mod.database.WindowAbstractDatabase; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Collections; @@ -38,6 +39,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { } @Override + @SideOnly(Side.CLIENT) protected void addTabs() { new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.overview", 0)); new PageSpeciesFlowerGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.genome", 0)); diff --git a/src/main/java/binnie/core/models/PanelModelBaker.java b/src/main/java/binnie/core/models/PanelModelBaker.java index 0c88aa03..b01c0022 100644 --- a/src/main/java/binnie/core/models/PanelModelBaker.java +++ b/src/main/java/binnie/core/models/PanelModelBaker.java @@ -8,6 +8,7 @@ import forestry.core.models.baker.ModelBakerModel; import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BlockFaceUV; import net.minecraft.client.renderer.block.model.BlockPartFace; @@ -79,7 +80,7 @@ public class PanelModelBaker implements IModelBaker { setColorIndex(colorIndex); if (pos != null) { - World world = Proxies.common.getRenderWorld(); + World world = Minecraft.getMinecraft().world; IBlockState blockState = world.getBlockState(pos); for (EnumFacing facing : EnumFacing.VALUES) { if (blockState.shouldSideBeRendered(world, pos, facing)) { diff --git a/src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java b/src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java index 247e9dab..2113773f 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java @@ -8,7 +8,10 @@ import binnie.craftgui.core.geometry.CraftGUIUtil; import binnie.craftgui.core.geometry.Point; import binnie.craftgui.minecraft.control.ControlItemDisplay; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ControlItemStackOption extends ControlTextOption { private ControlItemDisplay controlBee; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java b/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java index c8e56c54..2c2739e0 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java @@ -16,7 +16,7 @@ public class ControlSpeciesBox extends ControlListBox { @Override public IWidget createOption(final IAlleleSpecies value, final int y) { - return new ControlSpeciexBoxOption(this.getContent(), value, y); + return new ControlSpeciesBoxOption(this.getContent(), value, y); } public ControlSpeciesBox(final IWidget parent, final int x, final int y, final int width, final int height) { diff --git a/src/main/java/binnie/craftgui/mod/database/ControlSpeciexBoxOption.java b/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBoxOption.java similarity index 86% rename from src/main/java/binnie/craftgui/mod/database/ControlSpeciexBoxOption.java rename to src/main/java/binnie/craftgui/mod/database/ControlSpeciesBoxOption.java index cd8b3e0d..e184c902 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlSpeciexBoxOption.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBoxOption.java @@ -7,11 +7,14 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.geometry.CraftGUIUtil; import binnie.craftgui.core.geometry.Point; import forestry.api.genetics.IAlleleSpecies; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -class ControlSpeciexBoxOption extends ControlTextOption { +@SideOnly(Side.CLIENT) +class ControlSpeciesBoxOption extends ControlTextOption { private ControlDatabaseIndividualDisplay controlBee; - public ControlSpeciexBoxOption(final ControlList controlList, final IAlleleSpecies option, final int y) { + public ControlSpeciesBoxOption(final ControlList controlList, final IAlleleSpecies option, final int y) { super(controlList, option, option.getName(), y); this.setSize(new Point(this.getSize().x(), 20)); (this.controlBee = new ControlDatabaseIndividualDisplay(this, 2, 2)).setSpecies(this.getValue(), EnumDiscoveryState.Undetermined); diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java b/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java index 5b987502..56f58835 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java @@ -10,9 +10,12 @@ import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Objects; +@SideOnly(Side.CLIENT) public class PageSpeciesOverview extends PageSpecies { private ControlText controlName; private ControlText controlScientific; diff --git a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java index cccb5565..a19d11b2 100644 --- a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java @@ -190,6 +190,7 @@ public abstract class WindowAbstractDatabase extends Window { } } + @SideOnly(Side.CLIENT) protected void addTabs() { } diff --git a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java b/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java index af3b1246..c2616010 100644 --- a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java @@ -15,9 +15,11 @@ import binnie.craftgui.mod.database.WindowAbstractDatabase; import binnie.extrabees.ExtraBees; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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)); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java index 0efc11df..12a01fdf 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java @@ -23,6 +23,7 @@ import binnie.extratrees.block.WoodManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.stream.Collectors; @@ -40,6 +41,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { } @Override + @SideOnly(Side.CLIENT) protected void addTabs() { new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.overview", 0)); new PageSpeciesTreeGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.genome", 0)); @@ -54,6 +56,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { public void createListBox(final Area area) { (this.listBox = new ControlListBox(this.modePage, area.xPos(), area.yPos(), area.width(), area.height(), 12) { @Override + @SideOnly(Side.CLIENT) public IWidget createOption(final ItemStack value, final int y) { return new ControlItemStackOption(this.getContent(), value, y); } @@ -65,6 +68,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { public void createListBox(final Area area) { (this.listBox = new ControlListBox(this.modePage, area.xPos(), area.yPos(), area.width(), area.height(), 12) { @Override + @SideOnly(Side.CLIENT) public IWidget createOption(final ItemStack value, final int y) { return new ControlItemStackOption(this.getContent(), value, y); } @@ -76,6 +80,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { public void createListBox(final Area area) { (this.listBox = new ControlListBox(this.modePage, area.xPos(), area.yPos(), area.width(), area.height(), 12) { @Override + @SideOnly(Side.CLIENT) public IWidget createOption(final ItemStack value, final int y) { return new ControlItemStackOption(this.getContent(), value, y); } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java index d2dc36a9..9cd9f908 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java @@ -15,6 +15,7 @@ import binnie.craftgui.mod.database.WindowAbstractDatabase; import binnie.extratrees.ExtraTrees; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class WindowLepidopteristDatabase extends WindowAbstractDatabase { public WindowLepidopteristDatabase(final EntityPlayer player, final Side side, final boolean nei) { @@ -26,6 +27,7 @@ public class WindowLepidopteristDatabase extends WindowAbstractDatabase { } @Override + @SideOnly(Side.CLIENT) protected void addTabs() { new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.overview", 0)); new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.classification", 0));