mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 11:59:11 +00:00
More sideonly cleanup
This commit is contained in:
1 parent
475f4b63da
commit
a0843d9523
10 files changed
+26
-4
No files matched your search
@@ -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));
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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<ItemStack> {
|
||||
private ControlItemDisplay controlBee;
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ public class ControlSpeciesBox extends ControlListBox<IAlleleSpecies> {
|
||||
|
||||
@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) {
|
||||
|
||||
+5
-2
@@ -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<IAlleleSpecies> {
|
||||
@SideOnly(Side.CLIENT)
|
||||
class ControlSpeciesBoxOption extends ControlTextOption<IAlleleSpecies> {
|
||||
private ControlDatabaseIndividualDisplay controlBee;
|
||||
|
||||
public ControlSpeciexBoxOption(final ControlList<IAlleleSpecies> controlList, final IAlleleSpecies option, final int y) {
|
||||
public ControlSpeciesBoxOption(final ControlList<IAlleleSpecies> 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);
|
||||
@@ -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;
|
||||
|
||||
@@ -190,6 +190,7 @@ public abstract class WindowAbstractDatabase extends Window {
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
protected void addTabs() {
|
||||
}
|
||||
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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<ItemStack>(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<ItemStack>(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<ItemStack>(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);
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
|
||||
Reference in new issue
Block a user