Compare commits

...
8 Commits
Author SHA1 Message Date
Martin Robertz 8d0fa2ebb5 update 2024-12-30 21:12:54 +01:00
glowredman 0db05cb60c Add Localization, Fix Carpentry Hammer / Master Carpentry Hammer Names being reverse (#57) 2024-12-30 21:11:13 +01:00
0265d70a53 Yeet custom config in favor of NHLib (#53)
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Maya <[email protected]>
2024-12-29 12:37:43 -06:00
Martin Robertz 32b7efcd15 update 2024-12-22 01:17:03 +01:00
Guillaume Mercier 7059206cb0 prevent npe and log bad requests (#55) 2024-12-21 10:35:14 -06:00
Martin Robertz 54c702e935 update 2024-11-13 07:12:13 +01:00
Ryan Nasers a3aa358627 Fixing Waila showing incorrect blocks for logs (#54) 2024-11-12 22:04:26 +01:00
ah-OOG-ah f0f14bb278 Minor cleanups (#50)
* Finalize, minor alloc reduction

Also enable Jabel and generic injection

* Update dependencies.gradle

* Clean up Machine a bit

* spotless

more enhanced instanceof

* Update ModuleMachine.java

* More clen

* WARN: Removed exception catching

* Many, many tiny patches + birthday fix

* Spotless

* Spotless again

* Fix getLow and clamp tolerance value

* Revert event -> ignored on unused event parameters

* Rename instanceof variables

* Update Machine.java

* Use StringBuilder

* Cache getStack()

* Oops, Jabel can't handle that

* Spotless

* Spotless again

My IDE was fighting with it

* Remove unused elements + scream test success
2024-09-26 16:59:20 +02:00
368 changed files with 1435 additions and 2844 deletions

No files matched your search

+3 -3
View File
@@ -1,10 +1,10 @@
// Add your dependencies here // Add your dependencies here
dependencies { dependencies {
api('com.github.GTNewHorizons:ForestryMC:4.9.16:dev') api('com.github.GTNewHorizons:ForestryMC:4.10.0:dev')
implementation('com.github.GTNewHorizons:GTNHLib:0.5.11:dev') implementation('com.github.GTNewHorizons:GTNHLib:0.6.0:dev')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.36-GTNH:dev') devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.8-GTNH:dev')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+5 -5
View File
@@ -41,19 +41,19 @@ developmentEnvironmentUserName = Developer
# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8. # Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
# See https://github.com/bsideup/jabel for details on how this works. # See https://github.com/bsideup/jabel for details on how this works.
enableModernJavaSyntax = false enableModernJavaSyntax = true
# Enables injecting missing generics into the decompiled source code for a better coding experience. # Enables injecting missing generics into the decompiled source code for a better coding experience.
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types. # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
enableGenericInjection = false enableGenericInjection = true
# Generate a class with a String field for the mod version named as defined below. # Generate a class with a String field for the mod version named as defined below.
# If generateGradleTokenClass is empty or not missing, no such class will be generated. # If generateGradleTokenClass is empty or not missing, no such class will be generated.
# If gradleTokenVersion is empty or missing, the field will not be present in the class. # If gradleTokenVersion is empty or missing, the field will not be present in the class.
generateGradleTokenClass = generateGradleTokenClass = binnie.core.Tags
# Name of the token containing the project's current version to generate/replace. # Name of the token containing the project's current version to generate/replace.
gradleTokenVersion = GRADLETOKEN_VERSION gradleTokenVersion = VERSION
# [DEPRECATED] Mod ID replacement token. # [DEPRECATED] Mod ID replacement token.
gradleTokenModId = gradleTokenModId =
@@ -70,7 +70,7 @@ gradleTokenGroupName =
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...]). # version in @Mod([...], version = VERSION, [...]).
# Leave these properties empty to skip individual token replacements. # Leave these properties empty to skip individual token replacements.
replaceGradleTokenInFile = BinnieCore.java replaceGradleTokenInFile =
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty. # leave this property empty.
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
+1 -1
View File
@@ -17,5 +17,5 @@ pluginManagement {
} }
plugins { plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27' id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
} }
-2
View File
@@ -8,14 +8,12 @@ import binnie.core.genetics.ManagerGenetics;
import binnie.core.item.ManagerItem; import binnie.core.item.ManagerItem;
import binnie.core.liquid.ManagerLiquid; import binnie.core.liquid.ManagerLiquid;
import binnie.core.machines.ManagerMachine; import binnie.core.machines.ManagerMachine;
import binnie.core.mod.config.ManagerConfig;
import binnie.core.resource.ManagerResource; import binnie.core.resource.ManagerResource;
public final class Binnie { public final class Binnie {
public static List<ManagerBase> Managers = new ArrayList<>(); public static List<ManagerBase> Managers = new ArrayList<>();
public static ManagerGenetics Genetics = new ManagerGenetics(); public static ManagerGenetics Genetics = new ManagerGenetics();
public static ManagerConfig Configuration = new ManagerConfig();
public static ManagerLiquid Liquid = new ManagerLiquid(); public static ManagerLiquid Liquid = new ManagerLiquid();
public static ManagerMachine Machine = new ManagerMachine(); public static ManagerMachine Machine = new ManagerMachine();
public static ManagerItem Item = new ManagerItem(); public static ManagerItem Item = new ManagerItem();
+9 -25
View File
@@ -39,6 +39,7 @@ import binnie.botany.network.PacketID;
import binnie.botany.proxy.Proxy; import binnie.botany.proxy.Proxy;
import binnie.core.AbstractMod; import binnie.core.AbstractMod;
import binnie.core.BinnieCore; import binnie.core.BinnieCore;
import binnie.core.Tags;
import binnie.core.gui.IBinnieGUID; import binnie.core.gui.IBinnieGUID;
import binnie.core.item.ItemMisc; import binnie.core.item.ItemMisc;
import binnie.core.network.BinniePacketHandler; import binnie.core.network.BinniePacketHandler;
@@ -53,12 +54,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@Mod( @Mod(modid = "Botany", name = "Botany", version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore")
modid = "Botany",
name = "Botany",
version = BinnieCore.VERSION,
useMetadata = true,
dependencies = "after:BinnieCore")
public class Botany extends AbstractMod { public class Botany extends AbstractMod {
@Mod.Instance("Botany") @Mod.Instance("Botany")
@@ -121,11 +117,6 @@ public class Botany extends AbstractMod {
return BotanyGUI.values(); return BotanyGUI.values();
} }
@Override
public Class<?>[] getConfigs() {
return new Class[0];
}
@Override @Override
public IPacketID[] getPacketIDs() { public IPacketID[] getPacketIDs() {
return PacketID.values(); return PacketID.values();
@@ -160,9 +151,8 @@ public class Botany extends AbstractMod {
if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null
&& event.entityPlayer.getHeldItem().getItem() == Items.shears) { && event.entityPlayer.getHeldItem().getItem() == Items.shears) {
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (tile instanceof TileEntityFlower) { if (tile instanceof TileEntityFlower tileFlower) {
TileEntityFlower flower = (TileEntityFlower) tile; tileFlower.onShear();
flower.onShear();
event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer); event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
} }
} }
@@ -170,11 +160,10 @@ public class Botany extends AbstractMod {
if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null
&& event.entityPlayer.getHeldItem().getItem() == Botany.pollen) { && event.entityPlayer.getHeldItem().getItem() == Botany.pollen) {
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (tile instanceof TileEntityFlower) { if (tile instanceof TileEntityFlower tileFlower) {
TileEntityFlower flower = (TileEntityFlower) tile;
IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem()); IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem());
if (pollen != null && flower.canMateWith(pollen)) { if (pollen != null && tileFlower.canMateWith(pollen)) {
flower.mateWith(pollen); tileFlower.mateWith(pollen);
if (!event.entityPlayer.capabilities.isCreativeMode) { if (!event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem = event.entityPlayer.getHeldItem(); ItemStack heldItem = event.entityPlayer.getHeldItem();
heldItem.stackSize--; heldItem.stackSize--;
@@ -196,10 +185,10 @@ public class Botany extends AbstractMod {
int y = event.y; int y = event.y;
Block block = event.world.getBlock(event.x, y, event.z); Block block = event.world.getBlock(event.x, y, event.z);
if (block == null || !Gardening.isSoil(block)) { if (!Gardening.isSoil(block)) {
block = event.world.getBlock(event.x, --y, event.z); block = event.world.getBlock(event.x, --y, event.z);
} }
if (block == null || !Gardening.isSoil(block)) { if (!Gardening.isSoil(block)) {
return; return;
} }
@@ -314,11 +303,6 @@ public class Botany extends AbstractMod {
} }
} }
@Override
public boolean isActive() {
return BinnieCore.isBotanyActive();
}
@Mod.EventHandler @Mod.EventHandler
public void onIMC(FMLInterModComms.IMCEvent event) { public void onIMC(FMLInterModComms.IMCEvent event) {
for (FMLInterModComms.IMCMessage message : event.getMessages()) { for (FMLInterModComms.IMCMessage message : event.getMessages()) {
@@ -24,7 +24,7 @@ public enum EnumFlowerChromosome implements IChromosomeType {
SAPPINESS(IAlleleFloat.class), SAPPINESS(IAlleleFloat.class),
STEM(IAlleleInteger.class); STEM(IAlleleInteger.class);
private Class<? extends IAllele> cls; private final Class<? extends IAllele> cls;
EnumFlowerChromosome(Class<? extends IAllele> cls) { EnumFlowerChromosome(Class<? extends IAllele> cls) {
this.cls = cls; this.cls = cls;
@@ -7,7 +7,7 @@ public enum EnumFlowerStage {
POLLEN("Pollen"), POLLEN("Pollen"),
NONE("NONE"); NONE("NONE");
protected String name; private final String name;
EnumFlowerStage(String name) { EnumFlowerStage(String name) {
this.name = name; this.name = name;
@@ -81,7 +81,7 @@ public class BlockCeramic extends Block implements IBlockMetadata {
} }
@Override @Override
public void addBlockTooltip(ItemStack stack, List tooltip) { public void addBlockTooltip(ItemStack stack, List<String> tooltip) {
int meta = TileEntityMetadata.getItemDamage(stack); int meta = TileEntityMetadata.getItemDamage(stack);
tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName()); tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
} }
@@ -92,7 +92,7 @@ public class BlockCeramic extends Block implements IBlockMetadata {
} }
@Override @Override
public void getSubBlocks(Item item, CreativeTabs tabs, List itemList) { public void getSubBlocks(Item item, CreativeTabs tabs, List<ItemStack> itemList) {
for (EnumFlowerColor c : EnumFlowerColor.values()) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal())); itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
} }
@@ -90,7 +90,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
} }
@Override @Override
public void addBlockTooltip(ItemStack itemStack, List tooltip) { public void addBlockTooltip(ItemStack itemStack, List<String> tooltip) {
int meta = TileEntityMetadata.getItemDamage(itemStack); int meta = TileEntityMetadata.getItemDamage(itemStack);
getType(meta).addTooltip(tooltip); getType(meta).addTooltip(tooltip);
} }
@@ -101,7 +101,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
} }
@Override @Override
public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) {
for (EnumFlowerColor c : EnumFlowerColor.values()) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
BlockType type = new BlockType(c, c, TileType.Tile); BlockType type = new BlockType(c, c, TileType.Tile);
itemList.add(TileEntityMetadata.getItemStack(this, type.ordinal())); itemList.add(TileEntityMetadata.getItemStack(this, type.ordinal()));
@@ -205,9 +205,9 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"), VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"),
VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks"); VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks");
protected String id; private final String id;
protected String name; private final String name;
protected IIcon[] icons; private final IIcon[] icons;
TileType(String id, String name) { TileType(String id, String name) {
icons = new IIcon[3]; icons = new IIcon[3];
@@ -224,32 +224,15 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
} }
public ItemStack getRecipe(List<ItemStack> stacks) { public ItemStack getRecipe(List<ItemStack> stacks) {
switch (this) { return switch (this) {
case Tile: case Tile -> getTileRecipe(stacks);
return getTileRecipe(stacks); case Split -> getSplitRecipe(stacks);
case Chequered -> getChequeredRecipe(stacks);
case Split: case Mixed -> getMixedRecipe(stacks);
return getSplitRecipe(stacks); case LargeBrick -> getLargeBrickRecipe(stacks);
case Brick, StripeBrick -> getBrickRecipe(stacks);
case Chequered: case VerticalLargeBrick, VerticalBrick, VerticalStripeBrick -> getVerticalBrickRecipe(stacks);
return getChequeredRecipe(stacks); };
case Mixed:
return getMixedRecipe(stacks);
case LargeBrick:
return getLargeBrickRecipe(stacks);
case Brick:
case StripeBrick:
return getBrickRecipe(stacks);
case VerticalLargeBrick:
case VerticalBrick:
case VerticalStripeBrick:
return getVerticalBrickRecipe(stacks);
}
return null;
} }
private ItemStack getTileRecipe(List<ItemStack> stacks) { private ItemStack getTileRecipe(List<ItemStack> stacks) {
@@ -541,7 +524,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
return I18N.localise("botany." + type.name); return I18N.localise("botany." + type.name);
} }
public void addTooltip(List tooltip) { public void addTooltip(List<String> tooltip) {
String name = color1.getName(); String name = color1.getName();
if (type.canDouble() && color2 != color1) { if (type.canDouble() && color2 != color1) {
name = I18N.localise("botany.colour.double", name, color2.getName()); name = I18N.localise("botany.colour.double", name, color2.getName());
@@ -40,7 +40,7 @@ public class BlockCeramicPatterned extends BlockDesign {
} }
@Override @Override
public void addBlockTooltip(ItemStack stack, List tooltip) { public void addBlockTooltip(ItemStack stack, List<String> tooltip) {
super.addBlockTooltip(stack, tooltip); super.addBlockTooltip(stack, tooltip);
DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
tooltip.add(EnumChatFormatting.GRAY + block.getDesign().getName()); tooltip.add(EnumChatFormatting.GRAY + block.getDesign().getName());
@@ -111,7 +111,7 @@ public class BlockStained extends Block implements IBlockMetadata {
} }
@Override @Override
public void addBlockTooltip(ItemStack itemStack, List tooltip) { public void addBlockTooltip(ItemStack itemStack, List<String> tooltip) {
int meta = TileEntityMetadata.getItemDamage(itemStack); int meta = TileEntityMetadata.getItemDamage(itemStack);
tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName()); tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
} }
@@ -122,7 +122,7 @@ public class BlockStained extends Block implements IBlockMetadata {
} }
@Override @Override
public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) {
for (EnumFlowerColor c : EnumFlowerColor.values()) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal())); itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
} }
@@ -13,7 +13,7 @@ public class PigmentRecipe implements IRecipe {
protected ItemStack cached; protected ItemStack cached;
private ItemStack unknown; private final ItemStack unknown;
public PigmentRecipe() { public PigmentRecipe() {
unknown = null; unknown = null;
@@ -6,7 +6,7 @@ import binnie.core.craftgui.controls.listbox.ControlListBox;
public class ControlColorMixBox extends ControlListBox<IColourMix> { public class ControlColorMixBox extends ControlListBox<IColourMix> {
private Type type; private final Type type;
public ControlColorMixBox(IWidget parent, int x, int y, int width, int height, Type type) { public ControlColorMixBox(IWidget parent, int x, int y, int width, int height, Type type) {
super(parent, x, y, width, height, 12.0f); super(parent, x, y, width, height, 12.0f);
@@ -18,7 +18,7 @@ public class ControlColorMixBox extends ControlListBox<IColourMix> {
return new ControlColorMixItem(getContent(), value, y); return new ControlColorMixItem(getContent(), value, y);
} }
enum Type { public enum Type {
Resultant, Resultant,
Further Further
} }
@@ -13,11 +13,11 @@ import forestry.api.farming.IFarmHousing;
public class CircuitGarden extends BinnieCircuit { public class CircuitGarden extends BinnieCircuit {
private boolean isManual; private final boolean isManual;
private boolean isFertilised; private final boolean isFertilised;
private ItemStack icon; private final ItemStack icon;
private EnumMoisture moisture; private final EnumMoisture moisture;
private EnumAcidity acidity; private final EnumAcidity acidity;
public CircuitGarden(EnumMoisture moisture, EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, public CircuitGarden(EnumMoisture moisture, EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe,
ItemStack icon) { ItemStack icon) {
@@ -46,27 +46,27 @@ public class CircuitGarden extends BinnieCircuit {
} }
if (acidity == EnumAcidity.ACID) { if (acidity == EnumAcidity.ACID) {
if (info.length() > 0) { if (!info.isEmpty()) {
info += ", "; info += ", ";
} }
info += EnumChatFormatting.RED + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET; info += EnumChatFormatting.RED + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET;
} }
if (acidity == EnumAcidity.NEUTRAL) { if (acidity == EnumAcidity.NEUTRAL) {
if (info.length() > 0) { if (!info.isEmpty()) {
info += ", "; info += ", ";
} }
info += EnumChatFormatting.GREEN + I18N.localise("botany.ph.neutral") + EnumChatFormatting.RESET; info += EnumChatFormatting.GREEN + I18N.localise("botany.ph.neutral") + EnumChatFormatting.RESET;
} }
if (acidity == EnumAcidity.ALKALINE) { if (acidity == EnumAcidity.ALKALINE) {
if (info.length() > 0) { if (!info.isEmpty()) {
info += ", "; info += ", ";
} }
info += EnumChatFormatting.AQUA + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET; info += EnumChatFormatting.AQUA + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET;
} }
if (info.length() > 0) { if (!info.isEmpty()) {
info = " (" + info + EnumChatFormatting.RESET + ")"; info = " (" + info + EnumChatFormatting.RESET + ")";
} }
addTooltipString(I18N.localise("botany.circuit.flowers") + info); addTooltipString(I18N.localise("botany.circuit.flowers") + info);
@@ -101,8 +101,4 @@ public class CircuitGarden extends BinnieCircuit {
((IFarmHousing) tile).resetFarmLogic(FarmDirection.values()[slot]); ((IFarmHousing) tile).resetFarmLogic(FarmDirection.values()[slot]);
} }
@Override
public void onTick(int arg0, Object arg1) {
// ignored
}
} }
@@ -359,8 +359,7 @@ public class GardenLogic extends FarmLogic {
try { try {
IOwnable housing2 = (IOwnable) housing; IOwnable housing2 = (IOwnable) housing;
GameProfile prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile", new Class[0]) GameProfile prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile").invoke(housing2);
.invoke(housing2);
((TileEntityFlower) tile).setOwner(prof); ((TileEntityFlower) tile).setOwner(prof);
} catch (Exception ex) { } catch (Exception ex) {
// ignored // ignored
@@ -85,7 +85,7 @@ public class BlockFlower extends BlockContainer {
super.onBlockPlacedBy(world, x, y, z, entity, stack); super.onBlockPlacedBy(world, x, y, z, entity, stack);
TileEntity flower = world.getTileEntity(x, y, z); TileEntity flower = world.getTileEntity(x, y, z);
if (!BinnieCore.proxy.isSimulating(world)) { if (!BinnieCore.proxy.isSimulating(world)) {
if (flower != null && flower instanceof TileEntityFlower) { if (flower instanceof TileEntityFlower) {
IFlower f = BotanyCore.getFlowerRoot().getMember(stack); IFlower f = BotanyCore.getFlowerRoot().getMember(stack);
((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower)); ((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower));
} }
@@ -93,7 +93,7 @@ public class BlockFlower extends BlockContainer {
} }
TileEntity below = world.getTileEntity(x, y - 1, z); TileEntity below = world.getTileEntity(x, y - 1, z);
if (flower != null && flower instanceof TileEntityFlower) { if (flower instanceof TileEntityFlower) {
if (below instanceof TileEntityFlower) { if (below instanceof TileEntityFlower) {
((TileEntityFlower) flower).setSection(((TileEntityFlower) below).getSection()); ((TileEntityFlower) flower).setSection(((TileEntityFlower) below).getSection());
} else { } else {
@@ -108,15 +108,14 @@ public class BlockFlower extends BlockContainer {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
if (!(tile instanceof TileEntityFlower)) { if (!(tile instanceof TileEntityFlower tileFlower)) {
return super.getIcon(world, x, y, z, side); return super.getIcon(world, x, y, z, side);
} }
TileEntityFlower f = (TileEntityFlower) tile; EnumFlowerStage stage = (tileFlower.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER;
EnumFlowerStage stage = (f.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER; IFlowerType flower = tileFlower.getType();
IFlowerType flower = f.getType(); int section = tileFlower.getRenderSection();
int section = f.getRenderSection(); boolean flowered = tileFlower.isFlowered();
boolean flowered = f.isFlowered();
if (RendererBotany.pass == 0) { if (RendererBotany.pass == 0) {
return flower.getStem(stage, flowered, section); return flower.getStem(stage, flowered, section);
} }
@@ -129,12 +128,11 @@ public class BlockFlower extends BlockContainer {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public int colorMultiplier(IBlockAccess world, int x, int y, int z) { public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
if (tile instanceof TileEntityFlower) { if (tile instanceof TileEntityFlower tileFlower) {
TileEntityFlower f = (TileEntityFlower) tile;
if (RendererBotany.pass == 0) { if (RendererBotany.pass == 0) {
return f.getStemColour(); return tileFlower.getStemColour();
} }
return (RendererBotany.pass == 1) ? f.getPrimaryColor() : f.getSecondaryColor(); return (RendererBotany.pass == 1) ? tileFlower.getPrimaryColor() : tileFlower.getSecondaryColor();
} }
return 0xffffff; return 0xffffff;
} }
@@ -153,14 +151,13 @@ public class BlockFlower extends BlockContainer {
super.onNeighborBlockChange(world, x, y, z, block); super.onNeighborBlockChange(world, x, y, z, block);
checkAndDropBlock(world, x, y, z); checkAndDropBlock(world, x, y, z);
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
if (!(tile instanceof TileEntityFlower)) { if (!(tile instanceof TileEntityFlower tileFlower)) {
return; return;
} }
TileEntityFlower flower = (TileEntityFlower) tile; if (tileFlower.getSection() == 0 && tileFlower.getFlower() != null
if (flower.getSection() == 0 && flower.getFlower() != null && tileFlower.getFlower().getAge() > 0
&& flower.getFlower().getAge() > 0 && tileFlower.getFlower().getGenome().getPrimary().getType().getSections() > 1
&& flower.getFlower().getGenome().getPrimary().getType().getSections() > 1
&& world.getBlock(x, y + 1, z) != Botany.flower) { && world.getBlock(x, y + 1, z) != Botany.flower) {
dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
world.setBlockToAir(x, y, z); world.setBlockToAir(x, y, z);
@@ -212,7 +209,7 @@ public class BlockFlower extends BlockContainer {
List<ItemStack> drops = getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0); List<ItemStack> drops = getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
boolean hasBeenBroken = world.setBlockToAir(x, y, z); boolean hasBeenBroken = world.setBlockToAir(x, y, z);
if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) if (hasBeenBroken && BinnieCore.proxy.isSimulating(world)
&& drops.size() > 0 && !drops.isEmpty()
&& (player == null || !player.capabilities.isCreativeMode)) { && (player == null || !player.capabilities.isCreativeMode)) {
for (ItemStack drop : drops) { for (ItemStack drop : drops) {
dropBlockAsItem(world, x, y, z, drop); dropBlockAsItem(world, x, y, z, drop);
@@ -57,11 +57,6 @@ public abstract class ItemBotany extends Item {
return false; return false;
} }
@Override
public boolean getShareTag() {
return true;
}
@Override @Override
public boolean hasEffect(ItemStack stack, int pass) { public boolean hasEffect(ItemStack stack, int pass) {
if (!stack.hasTagCompound()) { if (!stack.hasTagCompound()) {
@@ -73,7 +68,7 @@ public abstract class ItemBotany extends Item {
} }
@Override @Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean flag) { public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> tooltip, boolean flag) {
if (!itemstack.hasTagCompound()) { if (!itemstack.hasTagCompound()) {
return; return;
} }
@@ -138,11 +133,11 @@ public abstract class ItemBotany extends Item {
} }
@Override @Override
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> itemList) {
addCreativeItems(itemList, true); addCreativeItems(itemList, true);
} }
public void addCreativeItems(List itemList, boolean hideSecrets) { public void addCreativeItems(List<ItemStack> itemList, boolean hideSecrets) {
for (IIndividual individual : BotanyCore.speciesRoot.getIndividualTemplates()) { for (IIndividual individual : BotanyCore.speciesRoot.getIndividualTemplates()) {
if (hideSecrets && individual.isSecret() && !Config.isDebug) { if (hideSecrets && individual.isSecret() && !Config.isDebug) {
continue; continue;
@@ -199,10 +194,9 @@ public abstract class ItemBotany extends Item {
if (getStage() == EnumFlowerStage.POLLEN) { if (getStage() == EnumFlowerStage.POLLEN) {
IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(itemstack); IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(itemstack);
TileEntity target = world.getTileEntity(x, y, z); TileEntity target = world.getTileEntity(x, y, z);
if (!(target instanceof IPollinatable)) { if (!(target instanceof IPollinatable pollinatable)) {
return false; return false;
} }
IPollinatable pollinatable = (IPollinatable) target;
if (!pollinatable.canMateWith(flower)) { if (!pollinatable.canMateWith(flower)) {
return false; return false;
} }
@@ -33,7 +33,7 @@ public class ItemInsulatedTube extends Item {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List list) { public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
for (Material mat : Material.values()) { for (Material mat : Material.values()) {
for (Insulate ins : Insulate.values()) { for (Insulate ins : Insulate.values()) {
list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128));
@@ -61,7 +61,7 @@ public class ItemInsulatedTube extends Item {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced); super.addInformation(stack, player, tooltip, advanced);
tooltip.add(Insulate.get(stack.getItemDamage()).getName()); tooltip.add(Insulate.get(stack.getItemDamage()).getName());
} }
@@ -93,8 +93,8 @@ public class ItemInsulatedTube extends Item {
Bronze(0xddc276, "bronze"), Bronze(0xddc276, "bronze"),
Iron(0xd8d8d8, "iron"); Iron(0xd8d8d8, "iron");
protected int color; private final int color;
protected String name; private final String name;
Material(int color, String name) { Material(int color, String name) {
this.color = color; this.color = color;
@@ -123,8 +123,8 @@ public class ItemInsulatedTube extends Item {
Stone(0x6d6d6d, "smoothStone"), Stone(0x6d6d6d, "smoothStone"),
Sandstone(0xc1b989, "sandstone"); Sandstone(0xc1b989, "sandstone");
protected int color; private final int color;
protected String name; private final String name;
Insulate(int color, String name) { Insulate(int color, String name) {
this.color = color; this.color = color;
@@ -144,26 +144,14 @@ public class ItemInsulatedTube extends Item {
} }
public ItemStack getStack() { public ItemStack getStack() {
switch (this) { return switch (this) {
case Clay: case Clay -> new ItemStack(Blocks.clay);
return new ItemStack(Blocks.clay); case Cobble -> new ItemStack(Blocks.cobblestone);
case HardenedClay -> new ItemStack(Blocks.hardened_clay);
case Cobble: case Sand -> new ItemStack(Blocks.sand);
return new ItemStack(Blocks.cobblestone); case Sandstone -> new ItemStack(Blocks.sandstone);
case Stone -> new ItemStack(Blocks.stone);
case HardenedClay: };
return new ItemStack(Blocks.hardened_clay);
case Sand:
return new ItemStack(Blocks.sand);
case Sandstone:
return new ItemStack(Blocks.sandstone);
case Stone:
return new ItemStack(Blocks.stone);
}
return null;
} }
} }
} }
@@ -25,9 +25,8 @@ public class RendererBotany implements ISimpleBlockRenderingHandler {
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z)); tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z));
double d1 = x; double d1 = x;
double d2 = y;
double d3 = z; double d3 = z;
long i1 = x * 3129871 ^ z * 116129781L; long i1 = x * 3129871L ^ z * 116129781L;
i1 = i1 * i1 * 42317861L + i1 * 11L; i1 = i1 * i1 * 42317861L + i1 * 11L;
d1 += ((i1 >> 16 & 0xFL) / 15.0f - 0.5) * 0.3; d1 += ((i1 >> 16 & 0xFL) / 15.0f - 0.5) * 0.3;
d3 += ((i1 >> 24 & 0xFL) / 15.0f - 0.5) * 0.3; d3 += ((i1 >> 24 & 0xFL) / 15.0f - 0.5) * 0.3;
@@ -46,7 +45,7 @@ public class RendererBotany implements ISimpleBlockRenderingHandler {
} }
tessellator.setColorOpaque_F(f, f2, f3); tessellator.setColorOpaque_F(f, f2, f3);
IIcon iicon = block.getIcon(world, x, y, z, 0); IIcon iicon = block.getIcon(world, x, y, z, 0);
renderer.drawCrossedSquares(iicon, d1, d2, d3, 1.0f); renderer.drawCrossedSquares(iicon, d1, y, d3, 1.0f);
} }
return false; return false;
} }
@@ -213,11 +213,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
return; return;
} }
if (!canTolerate || light < 1.0f) { flower.setWilted(!canTolerate || light < 1.0f);
flower.setWilted(true);
} else {
flower.setWilted(false);
}
float chanceDispersal = 0.8f; float chanceDispersal = 0.8f;
chanceDispersal += 0.2f * flower.getGenome().getFertility(); chanceDispersal += 0.2f * flower.getGenome().getFertility();
@@ -302,7 +298,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
public void updateRender(boolean update) { public void updateRender(boolean update) {
if (update && getFlower() != null && getFlower().getGenome() != null) { if (update && getFlower() != null && getFlower().getGenome() != null) {
RenderInfo newInfo = new RenderInfo(getFlower(), this); RenderInfo newInfo = new RenderInfo(getFlower(), this);
if (renderInfo == null || !newInfo.equals(renderInfo)) { if (!newInfo.equals(renderInfo)) {
setRender(newInfo); setRender(newInfo);
} }
} }
@@ -619,8 +615,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj instanceof RenderInfo) { if (obj instanceof RenderInfo o) {
RenderInfo o = (RenderInfo) obj;
return o.age == age && o.wilted == wilted return o.age == age && o.wilted == wilted
&& o.flowered == flowered && o.flowered == flowered
&& o.primary == primary && o.primary == primary
@@ -71,7 +71,7 @@ public class BlockPlant extends BlockBush {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs tab, List list) { public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
for (Type type : Type.values()) { for (Type type : Type.values()) {
list.add(type.get()); list.add(type.get());
} }
@@ -137,7 +137,7 @@ public class BlockPlant extends BlockBush {
public IIcon icon; public IIcon icon;
protected String name; private final String name;
Type(String name) { Type(String name) {
this.name = name; this.name = name;
@@ -56,7 +56,7 @@ public class BlockSoil extends Block implements IBlockSoil {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs tab, List list) { public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
for (int i = 0; i < 9; ++i) { for (int i = 0; i < 9; ++i) {
list.add(new ItemStack(this, 1, i)); list.add(new ItemStack(this, 1, i));
} }
@@ -46,16 +46,16 @@ public class Gardening {
for (int dz = -1; dz < 2; ++dz) { for (int dz = -1; dz < 2; ++dz) {
if (dx != 0 || dz != 0) { if (dx != 0 || dz != 0) {
if (world.getBlock(x + dx, y, z + dz) == Blocks.sand) { if (world.getBlock(x + dx, y, z + dz) == Blocks.sand) {
bias -= 1.5; bias -= 1.5f;
} else if (world.getBlock(x + dx, y, z + dz) == Blocks.water) { } else if (world.getBlock(x + dx, y, z + dz) == Blocks.water) {
bias += 1.5; bias += 1.5f;
} }
} }
} }
} }
if (world.isRaining() && world.canBlockSeeTheSky(x, y + 1, z) && world.getPrecipitationHeight(x, z) <= y + 1) { if (world.isRaining() && world.canBlockSeeTheSky(x, y + 1, z) && world.getPrecipitationHeight(x, z) <= y + 1) {
bias += 1.5; bias += 1.5f;
} }
for (int dx = -1; dx < 2; ++dx) { for (int dx = -1; dx < 2; ++dx) {
@@ -118,13 +118,13 @@ public class Gardening {
return false; return false;
} }
TileEntity tileFlower = world.getTileEntity(x, y, z); final TileEntity tile = world.getTileEntity(x, y, z);
TileEntity below = world.getTileEntity(x, y - 1, z); final TileEntity below = world.getTileEntity(x, y - 1, z);
if (tileFlower != null && tileFlower instanceof TileEntityFlower) { if (tile instanceof TileEntityFlower tileFlower) {
if (below instanceof TileEntityFlower) { if (below instanceof TileEntityFlower lowerFlower) {
((TileEntityFlower) tileFlower).setSection(((TileEntityFlower) below).getSection()); tileFlower.setSection(lowerFlower.getSection());
} else { } else {
((TileEntityFlower) tileFlower).create(flower, owner); tileFlower.create(flower, owner);
} }
} }
@@ -138,7 +138,7 @@ public class Gardening {
} }
TileEntity flower = world.getTileEntity(x, y, z); TileEntity flower = world.getTileEntity(x, y, z);
if (flower == null || !(flower instanceof TileEntityFlower)) { if (!(flower instanceof TileEntityFlower)) {
return; return;
} }
@@ -151,7 +151,7 @@ public class Gardening {
world.setBlock(x, y + 1, z, Botany.flower, 0, 2); world.setBlock(x, y + 1, z, Botany.flower, 0, 2);
TileEntity tileFlower = world.getTileEntity(x, y + 1, z); TileEntity tileFlower = world.getTileEntity(x, y + 1, z);
if (tileFlower != null && tileFlower instanceof TileEntityFlower) { if (tileFlower instanceof TileEntityFlower) {
((TileEntityFlower) tileFlower).setSection(section + 1); ((TileEntityFlower) tileFlower).setSection(section + 1);
} }
} }
@@ -250,14 +250,11 @@ public class Gardening {
} }
public static Block getSoilBlock(EnumSoilType type, boolean weedkill) { public static Block getSoilBlock(EnumSoilType type, boolean weedkill) {
switch (type) { return switch (type) {
case FLOWERBED: case FLOWERBED -> weedkill ? Botany.flowerbedNoWeed : Botany.flowerbed;
return weedkill ? Botany.flowerbedNoWeed : Botany.flowerbed; case LOAM -> weedkill ? Botany.loamNoWeed : Botany.loam;
default -> weedkill ? Botany.soilNoWeed : Botany.soil;
case LOAM: };
return weedkill ? Botany.loamNoWeed : Botany.loam;
}
return weedkill ? Botany.soilNoWeed : Botany.soil;
} }
public static boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp) { public static boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp) {
@@ -20,7 +20,7 @@ public class ItemSoil extends ItemBlock {
protected EnumSoilType type; protected EnumSoilType type;
private boolean noWeed; private final boolean noWeed;
public ItemSoil(Block block) { public ItemSoil(Block block) {
super(block); super(block);
@@ -31,7 +31,7 @@ public class ItemSoil extends ItemBlock {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced); super.addInformation(stack, player, tooltip, advanced);
EnumMoisture moisture = EnumMoisture.values()[stack.getItemDamage() % 3]; EnumMoisture moisture = EnumMoisture.values()[stack.getItemDamage() % 3];
EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3]; EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3];
@@ -45,20 +45,20 @@ public class ItemSoil extends ItemBlock {
} }
if (acidity == EnumAcidity.ACID) { if (acidity == EnumAcidity.ACID) {
if (info.length() > 0) { if (!info.isEmpty()) {
info += ", "; info += ", ";
} }
info += EnumChatFormatting.YELLOW + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET; info += EnumChatFormatting.YELLOW + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET;
} }
if (acidity == EnumAcidity.ALKALINE) { if (acidity == EnumAcidity.ALKALINE) {
if (info.length() > 0) { if (!info.isEmpty()) {
info += ", "; info += ", ";
} }
info += EnumChatFormatting.YELLOW + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET; info += EnumChatFormatting.YELLOW + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET;
} }
if (info.length() > 0) { if (!info.isEmpty()) {
tooltip.add(info); tooltip.add(info);
} }
@@ -4,10 +4,9 @@ import forestry.api.genetics.IAlleleInteger;
public class AlleleColor implements IAlleleInteger { public class AlleleColor implements IAlleleInteger {
private String uid; private final String uid;
private int value; private final int value;
private EnumFlowerColor color; private final EnumFlowerColor color;
private boolean dominant = true;
public AlleleColor(EnumFlowerColor color, String uid, int value) { public AlleleColor(EnumFlowerColor color, String uid, int value) {
this.color = color; this.color = color;
@@ -22,7 +21,7 @@ public class AlleleColor implements IAlleleInteger {
@Override @Override
public boolean isDominant() { public boolean isDominant() {
return dominant; return true;
} }
@Override @Override
@@ -93,10 +93,10 @@ public enum EnumFlowerColor implements IFlowerColor {
YELLOW_GREEN("yellowGreen", 0x9acd32); YELLOW_GREEN("yellowGreen", 0x9acd32);
private static final EnumFlowerColor[] ALL_VALUES = values(); private static final EnumFlowerColor[] ALL_VALUES = values();
private int color; private final int color;
private int colorDis; private final int colorDis;
private String name; private final String name;
private AlleleColor allele; private final AlleleColor allele;
EnumFlowerColor(String name, int color) { EnumFlowerColor(String name, int color) {
this.name = name; this.name = name;
@@ -57,18 +57,18 @@ public enum EnumFlowerType implements IFlowerType {
DELPHINIUM(2), DELPHINIUM(2),
HOLLYHOCK(2); HOLLYHOCK(2);
protected int sections; private final int sections;
protected IIcon[] stem; private final IIcon[] stem;
protected IIcon[] petal; private final IIcon[] petal;
protected IIcon[] variant; private final IIcon[] variant;
protected IIcon[] unflowered; private final IIcon[] unflowered;
protected IIcon seedStem; private IIcon seedStem;
protected IIcon seedPetal; private IIcon seedPetal;
protected IIcon seedVariant; private IIcon seedVariant;
protected IIcon pollenStem; private IIcon pollenStem;
protected IIcon pollenPetal; private IIcon pollenPetal;
protected IIcon pollenVariant; private IIcon pollenVariant;
protected IIcon blank; private IIcon blank;
EnumFlowerType() { EnumFlowerType() {
this(1); this(1);
@@ -96,7 +96,7 @@ public class FlowerGenome extends Genome implements IFlowerGenome {
@Override @Override
public float getAgeChance() { public float getAgeChance() {
return 1.0f * (float) Math.sqrt(2.0f / getLifespan()); return (float) Math.sqrt(2.0f / getLifespan());
} }
@Override @Override
@@ -39,8 +39,8 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
protected static String UID = "rootFlowers"; protected static String UID = "rootFlowers";
private static ArrayList<IFlowerMutation> flowerMutations = new ArrayList<>(); private static final ArrayList<IFlowerMutation> flowerMutations = new ArrayList<>();
private static ArrayList<IColourMix> colourMixes = new ArrayList<>(); private static final ArrayList<IColourMix> colourMixes = new ArrayList<>();
protected Map<ItemStack, IFlower> conversions; protected Map<ItemStack, IFlower> conversions;
@@ -226,7 +226,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
} }
@Override @Override
public Class getMemberClass() { public Class<? extends IIndividual> getMemberClass() {
return IFlower.class; return IFlower.class;
} }
@@ -56,8 +56,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
FOXGLOVE("foxglove", "digitalis", "purpurea", EnumFlowerType.FOXGLOVE, EnumFlowerColor.HOT_PINK), FOXGLOVE("foxglove", "digitalis", "purpurea", EnumFlowerType.FOXGLOVE, EnumFlowerColor.HOT_PINK),
ZINNIA("zinnia", "zinnia", "elegans", EnumFlowerType.ZINNIA, EnumFlowerColor.MEDIUM_VIOLET_RED, ZINNIA("zinnia", "zinnia", "elegans", EnumFlowerType.ZINNIA, EnumFlowerColor.MEDIUM_VIOLET_RED,
EnumFlowerColor.YELLOW), EnumFlowerColor.YELLOW),
CHRYSANTHEMUM("chrysanthemum", "chrysanthemum", "\u00ef?? grandiflorum", EnumFlowerType.MUMS, CHRYSANTHEMUM("chrysanthemum", "chrysanthemum", "ï?? grandiflorum", EnumFlowerType.MUMS, EnumFlowerColor.VIOLET),
EnumFlowerColor.VIOLET),
MARIGOLD("marigold", "calendula", "officinalis", EnumFlowerType.MARIGOLD, EnumFlowerColor.GOLD, MARIGOLD("marigold", "calendula", "officinalis", EnumFlowerType.MARIGOLD, EnumFlowerColor.GOLD,
EnumFlowerColor.DARK_ORANGE), EnumFlowerColor.DARK_ORANGE),
GERANIUM("geranium", "geranium", "maderense", EnumFlowerType.GERANIUM, EnumFlowerColor.DEEP_PINK), GERANIUM("geranium", "geranium", "maderense", EnumFlowerType.GERANIUM, EnumFlowerColor.DEEP_PINK),
@@ -68,7 +67,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
EnumFlowerColor.WHITE), EnumFlowerColor.WHITE),
LILY("lily", "lilium", "auratum", EnumFlowerType.LILY, EnumFlowerColor.PINK, EnumFlowerColor.GOLD), LILY("lily", "lilium", "auratum", EnumFlowerType.LILY, EnumFlowerColor.PINK, EnumFlowerColor.GOLD),
YARROW("yarrow", "achillea", "millefolium", EnumFlowerType.YARROW, EnumFlowerColor.YELLOW), YARROW("yarrow", "achillea", "millefolium", EnumFlowerType.YARROW, EnumFlowerColor.YELLOW),
PETUNIA("petunia", "petunia", "\u00ef?? atkinsiana", EnumFlowerType.PETUNIA, EnumFlowerColor.MEDIUM_VIOLET_RED, PETUNIA("petunia", "petunia", "ï?? atkinsiana", EnumFlowerType.PETUNIA, EnumFlowerColor.MEDIUM_VIOLET_RED,
EnumFlowerColor.THISTLE), EnumFlowerColor.THISTLE),
AGAPANTHUS("agapanthus", "agapanthus", "praecox", EnumFlowerType.AGAPANTHUS, EnumFlowerColor.DEEP_SKY_BLUE), AGAPANTHUS("agapanthus", "agapanthus", "praecox", EnumFlowerType.AGAPANTHUS, EnumFlowerColor.DEEP_SKY_BLUE),
FUCHSIA("fuchsia", "fuchsia", "magellanica", EnumFlowerType.FUCHSIA, EnumFlowerColor.DEEP_PINK, FUCHSIA("fuchsia", "fuchsia", "magellanica", EnumFlowerType.FUCHSIA, EnumFlowerColor.DEEP_PINK,
@@ -96,24 +95,24 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
DELPHINIUM("delphinium", "delphinium", "staphisagria", EnumFlowerType.DELPHINIUM, EnumFlowerColor.DARK_SLATE_BLUE), DELPHINIUM("delphinium", "delphinium", "staphisagria", EnumFlowerType.DELPHINIUM, EnumFlowerColor.DARK_SLATE_BLUE),
HOLLYHOCK("hollyhock", "Alcea", "rosea", EnumFlowerType.HOLLYHOCK, EnumFlowerColor.BLACK, EnumFlowerColor.GOLD); HOLLYHOCK("hollyhock", "Alcea", "rosea", EnumFlowerType.HOLLYHOCK, EnumFlowerColor.BLACK, EnumFlowerColor.GOLD);
protected EnumFlowerColor stemColor; private EnumFlowerColor stemColor;
protected EnumAllele.Fertility fert; private EnumAllele.Fertility fert;
protected EnumAllele.Lifespan life; private EnumAllele.Lifespan life;
protected EnumAllele.Sappiness sap; private EnumAllele.Sappiness sap;
protected IFlowerType type; private final IFlowerType type;
protected String name; private final String name;
protected String binomial; private final String binomial;
protected String branchName; private final String branchName;
protected EnumFlowerColor primaryColor; private final EnumFlowerColor primaryColor;
protected EnumFlowerColor secondaryColor; private final EnumFlowerColor secondaryColor;
protected EnumTemperature temperature; private EnumTemperature temperature;
protected EnumAcidity pH; private EnumAcidity pH;
protected EnumMoisture moisture; private EnumMoisture moisture;
protected EnumTolerance tempTolerance; private EnumTolerance tempTolerance;
protected EnumTolerance pHTolerance; private EnumTolerance pHTolerance;
protected EnumTolerance moistureTolerance; private EnumTolerance moistureTolerance;
protected List<IAllele[]> variantTemplates; private final List<IAllele[]> variantTemplates;
protected IClassification branch; private IClassification branch;
FlowerSpecies(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor colour) { FlowerSpecies(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor colour) {
this(name, branch, binomial, type, colour, colour); this(name, branch, binomial, type, colour, colour);
@@ -42,13 +42,13 @@ public class ItemDictionary extends Item {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced); super.addInformation(stack, player, tooltip, advanced);
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List list) { public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
super.getSubItems(item, tab, list); super.getSubItems(item, tab, list);
list.add(new ItemStack(item, 1, 1)); list.add(new ItemStack(item, 1, 1));
} }
@@ -21,9 +21,9 @@ public enum BotanyItems implements IItemMisc {
Mortar("mortar"), Mortar("mortar"),
Weedkiller("weedkiller"); Weedkiller("weedkiller");
protected IIcon icon; private IIcon icon;
protected String name; private final String name;
protected String iconPath; private final String iconPath;
BotanyItems(String name) { BotanyItems(String name) {
this.name = name; this.name = name;
@@ -41,7 +41,7 @@ public enum BotanyItems implements IItemMisc {
} }
@Override @Override
public void addInformation(List data) { public void addInformation(List<String> data) {
// ignored // ignored
} }
@@ -25,7 +25,7 @@ public class ItemClay extends Item {
} }
@Override @Override
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced); super.addInformation(stack, player, tooltip, advanced);
tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName()); tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName());
} }
@@ -44,7 +44,7 @@ public class ItemClay extends Item {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List list) { public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
for (EnumFlowerColor c : EnumFlowerColor.values()) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
list.add(new ItemStack(this, 1, c.ordinal())); list.add(new ItemStack(this, 1, c.ordinal()));
} }
@@ -25,7 +25,7 @@ public class ItemPigment extends Item {
} }
@Override @Override
public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced); super.addInformation(stack, player, tooltip, advanced);
tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName()); tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName());
} }
@@ -44,7 +44,7 @@ public class ItemPigment extends Item {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List list) { public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
for (EnumFlowerColor c : EnumFlowerColor.values()) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
list.add(new ItemStack(this, 1, c.ordinal())); list.add(new ItemStack(this, 1, c.ordinal()));
} }
+4 -13
View File
@@ -8,7 +8,6 @@ import java.util.List;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import binnie.Binnie;
import binnie.core.gui.IBinnieGUID; import binnie.core.gui.IBinnieGUID;
import binnie.core.mod.parser.FieldParser; import binnie.core.mod.parser.FieldParser;
import binnie.core.network.BinniePacketHandler; import binnie.core.network.BinniePacketHandler;
@@ -33,7 +32,9 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
} }
public abstract boolean isActive(); public boolean isActive() {
return true;
}
@Override @Override
public abstract String getChannel(); public abstract String getChannel();
@@ -47,10 +48,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
return new IBinnieGUID[0]; return new IBinnieGUID[0];
} }
public Class[] getConfigs() {
return new Class[0];
}
public abstract IProxyCore getProxy(); public abstract IProxyCore getProxy();
public abstract String getModID(); public abstract String getModID();
@@ -67,12 +64,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
return; return;
} }
if (getConfigs() != null) {
for (Class cls : getConfigs()) {
Binnie.Configuration.registerConfiguration(cls, this);
}
}
getProxy().preInit(); getProxy().preInit();
for (IInitializable module : modules) { for (IInitializable module : modules) {
module.preInit(); module.preInit();
@@ -80,7 +71,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
// TODO what does it mean? // TODO what does it mean?
Collections.addAll(fields, getClass().getFields()); Collections.addAll(fields, getClass().getFields());
for (Class cls : getClass().getClasses()) { for (Class<?> cls : getClass().getClasses()) {
Collections.addAll(fields, getClass().getFields()); Collections.addAll(fields, getClass().getFields());
} }
for (IInitializable module : modules) { for (IInitializable module : modules) {
+12 -26
View File
@@ -22,8 +22,6 @@ import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.ItemFluidContainer; import binnie.core.liquid.ItemFluidContainer;
import binnie.core.machines.MachineGroup; import binnie.core.machines.MachineGroup;
import binnie.core.machines.storage.ModuleStorage; import binnie.core.machines.storage.ModuleStorage;
import binnie.core.mod.config.ConfigurationMain;
import binnie.core.mod.config.ConfigurationMods;
import binnie.core.mod.parser.FieldParser; import binnie.core.mod.parser.FieldParser;
import binnie.core.mod.parser.ItemParser; import binnie.core.mod.parser.ItemParser;
import binnie.core.network.BinnieCorePacketID; import binnie.core.network.BinnieCorePacketID;
@@ -49,13 +47,16 @@ import forestry.api.core.ForestryEvent;
import forestry.plugins.PluginManager; import forestry.plugins.PluginManager;
@Mod( @Mod(
modid = "BinnieCore", modid = BinnieCore.CORE_MODID,
name = "Binnie Core", name = BinnieCore.CORE_MOD_NAME,
version = BinnieCore.VERSION, version = Tags.VERSION,
useMetadata = true, useMetadata = true,
dependencies = "after:Forestry@[4.2,),required-after:gtnhlib@[0.0.10,)") dependencies = "after:Forestry@[4.2,),required-after:gtnhlib@[0.0.10,)")
public class BinnieCore extends AbstractMod { public class BinnieCore extends AbstractMod {
public static final String CORE_MODID = "BinnieCore";
public static final String CORE_MOD_NAME = "Binnie Core";
@Mod.Instance("BinnieCore") @Mod.Instance("BinnieCore")
public static BinnieCore instance; public static BinnieCore instance;
@@ -63,15 +64,13 @@ public class BinnieCore extends AbstractMod {
public static BinnieProxy proxy; public static BinnieProxy proxy;
public static int multipassRenderID; public static int multipassRenderID;
private static List<AbstractMod> modList = new ArrayList<>(); private static final List<AbstractMod> modList = new ArrayList<>();
public static MachineGroup packageCompartment; public static MachineGroup packageCompartment;
public static ItemGenesis genesis; public static ItemGenesis genesis;
public static ItemFieldKit fieldKit; public static ItemFieldKit fieldKit;
public static final String VERSION = "GRADLETOKEN_VERSION";
@Mod.EventHandler @Mod.EventHandler
public void preInit(FMLPreInitializationEvent evt) { public void preInit(FMLPreInitializationEvent event) {
Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
for (ManagerBase baseManager : Binnie.Managers) { for (ManagerBase baseManager : Binnie.Managers) {
addModule(baseManager); addModule(baseManager);
} }
@@ -86,12 +85,12 @@ public class BinnieCore extends AbstractMod {
} }
@Mod.EventHandler @Mod.EventHandler
public void init(FMLInitializationEvent evt) { public void init(FMLInitializationEvent event) {
init(); init();
} }
@Mod.EventHandler @Mod.EventHandler
public void postInit(FMLPostInitializationEvent evt) { public void postInit(FMLPostInitializationEvent event) {
postInit(); postInit();
} }
@@ -135,20 +134,12 @@ public class BinnieCore extends AbstractMod {
return PluginManager.Module.ARBORICULTURE.isEnabled(); return PluginManager.Module.ARBORICULTURE.isEnabled();
} }
public static boolean isBotanyActive() {
return ConfigurationMods.botany;
}
public static boolean isGeneticsActive() {
return ConfigurationMods.genetics;
}
public static boolean isExtraBeesActive() { public static boolean isExtraBeesActive() {
return ConfigurationMods.extraBees && isApicultureActive(); return isApicultureActive();
} }
public static boolean isExtraTreesActive() { public static boolean isExtraTreesActive() {
return ConfigurationMods.extraTrees && isArboricultureActive(); return isArboricultureActive();
} }
@Override @Override
@@ -216,11 +207,6 @@ public class BinnieCore extends AbstractMod {
Binnie.Resource.registerIcons(event.map, event.map.getTextureType()); Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
} }
@Override
public Class<?>[] getConfigs() {
return new Class[] { ConfigurationMain.class };
}
@Override @Override
protected Class<? extends BinniePacketHandler> getPacketHandler() { protected Class<? extends BinniePacketHandler> getPacketHandler() {
return PacketHandler.class; return PacketHandler.class;
+21 -20
View File
@@ -9,14 +9,16 @@ import cpw.mods.fml.common.registry.GameRegistry;
public class Mods { public class Mods {
public static Mod forestry; public static final Mod forestry = new Mod("Forestry");
public static Mod ic2; public static final Mod ic2 = new Mod("IC2");
public static Mod botania; public static final Mod botania = new Mod("Botania");
public static Mod extraBiomes; public static final Mod extraBiomes = new Mod("ExtrabiomesXL");
public static final Mod dreamcraft = new Mod("dreamcraft");
public static final Mod buildcraftCore = new Mod("BuildCraft|Core");
private static Item findItem(String modId, String name) { private static Item findItem(String modId, String name) {
Item stack = GameRegistry.findItem(modId, name); Item stack = GameRegistry.findItem(modId, name);
if (stack == null && modId.equals("Forestry")) { if (stack == null && forestry.matchID(modId)) {
throw new RuntimeException("Item not found: " + modId + ":" + name); throw new RuntimeException("Item not found: " + modId + ":" + name);
} }
return stack; return stack;
@@ -24,7 +26,7 @@ public class Mods {
private static ItemStack findItemStack(String modId, String name, int stackSize) { private static ItemStack findItemStack(String modId, String name, int stackSize) {
ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize); ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize);
if (stack == null && modId.equals("Forestry")) { if (stack == null && forestry.matchID(modId)) {
throw new RuntimeException("Stack not found: " + modId + ":" + name); throw new RuntimeException("Stack not found: " + modId + ":" + name);
} }
return stack; return stack;
@@ -32,37 +34,32 @@ public class Mods {
private static Block findBlock(String modId, String name) { private static Block findBlock(String modId, String name) {
Block stack = GameRegistry.findBlock(modId, name); Block stack = GameRegistry.findBlock(modId, name);
if (stack == null && modId.equals("Forestry")) { if (stack == null && forestry.matchID(modId)) {
throw new RuntimeException("Block not found: " + modId + ":" + name); throw new RuntimeException("Block not found: " + modId + ":" + name);
} }
return stack; return stack;
} }
static {
Mods.forestry = new Mod("Forestry");
Mods.ic2 = new Mod("IC2");
Mods.botania = new Mod("Botania");
Mods.extraBiomes = new Mod("ExtrabiomesXL");
}
public static class Mod { public static class Mod {
private String id; private final String modid;
private final boolean isLoaded;
private Mod(String id) { private Mod(String id) {
this.id = id; modid = id;
isLoaded = Loader.isModLoaded(id);
} }
public Item item(String name) { public Item item(String name) {
return findItem(id, name); return findItem(modid, name);
} }
public Block block(String name) { public Block block(String name) {
return findBlock(id, name); return findBlock(modid, name);
} }
public ItemStack stack(String name, int stackSize) { public ItemStack stack(String name, int stackSize) {
return findItemStack(id, name, stackSize); return findItemStack(modid, name, stackSize);
} }
public ItemStack stack(String name) { public ItemStack stack(String name) {
@@ -74,7 +71,11 @@ public class Mods {
} }
public boolean active() { public boolean active() {
return Loader.isModLoaded(id); return isLoaded;
}
public boolean matchID(final String id) {
return modid.equals(id);
} }
} }
} }
@@ -62,7 +62,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
} }
@Override @Override
public void addBlockTooltip(ItemStack itemStack, List tooltip) { public void addBlockTooltip(ItemStack itemStack, List<String> tooltip) {
// ignored // ignored
} }
@@ -97,7 +97,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
boolean hasBeenBroken = world.setBlockToAir(i, j, k); boolean hasBeenBroken = world.setBlockToAir(i, j, k);
if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) if (hasBeenBroken && BinnieCore.proxy.isSimulating(world)
&& drops.size() > 0 && !drops.isEmpty()
&& (player == null || !player.capabilities.isCreativeMode)) { && (player == null || !player.capabilities.isCreativeMode)) {
for (ItemStack drop : drops) { for (ItemStack drop : drops) {
block.dropAsStack(world, i, j, k, drop); block.dropAsStack(world, i, j, k, drop);
@@ -15,7 +15,7 @@ public interface IBlockMetadata extends ITileEntityProvider {
String getBlockName(ItemStack itemStack); String getBlockName(ItemStack itemStack);
void addBlockTooltip(ItemStack itemStack, List tooltip); void addBlockTooltip(ItemStack itemStack, List<String> tooltip);
void dropAsStack(World world, int x, int y, int z, ItemStack itemStack); void dropAsStack(World world, int x, int y, int z, ItemStack itemStack);
} }
@@ -19,11 +19,6 @@ public class ItemMetadata extends ItemBlock {
super(block); super(block);
} }
@Override
public int getMetadata(int damage) {
return 0;
}
@Override @Override
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
float hitX, float hitY, float hitZ, int metadata) { float hitX, float hitY, float hitZ, int metadata) {
@@ -56,7 +51,7 @@ public class ItemMetadata extends ItemBlock {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> tooltip, boolean advanced) {
((IBlockMetadata) field_150939_a).addBlockTooltip(itemStack, tooltip); ((IBlockMetadata) field_150939_a).addBlockTooltip(itemStack, tooltip);
} }
@@ -34,14 +34,10 @@ public class MultipassItemRenderer implements IItemRenderer {
@Override @Override
public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) {
switch (type) { return switch (type) {
case ENTITY: case ENTITY, EQUIPPED, INVENTORY, EQUIPPED_FIRST_PERSON -> true;
case EQUIPPED: default -> false;
case INVENTORY: };
case EQUIPPED_FIRST_PERSON:
return true;
}
return false;
} }
@Override @Override
@@ -12,9 +12,9 @@ import forestry.api.circuits.ICircuitLayout;
public class BinnieCircuit implements ICircuit { public class BinnieCircuit implements ICircuit {
private String uid; private final String uid;
private int limit; private final int limit;
private List<String> tooltips; private final List<String> tooltips;
public BinnieCircuit(String uid, int limit, ICircuitLayout layout, ItemStack itemStack) { public BinnieCircuit(String uid, int limit, ICircuitLayout layout, ItemStack itemStack) {
tooltips = new ArrayList<>(); tooltips = new ArrayList<>();
@@ -9,8 +9,8 @@ import forestry.api.circuits.ICircuitSocketType;
public class BinnieCircuitLayout implements ICircuitLayout { public class BinnieCircuitLayout implements ICircuitLayout {
private String uid; private final String uid;
private AbstractMod mod; private final AbstractMod mod;
public BinnieCircuitLayout(AbstractMod mod, String uid) { public BinnieCircuitLayout(AbstractMod mod, String uid) {
this.uid = uid; this.uid = uid;
@@ -39,13 +39,11 @@ public class Tooltip {
} }
public boolean exists() { public boolean exists() {
return tooltip.size() > 0; return !tooltip.isEmpty();
} }
public void add(List list) { public void add(List<String> list) {
for (Object obj : list) { tooltip.addAll(list);
tooltip.add((String) obj);
}
} }
public List<String> getList() { public List<String> getList() {
@@ -19,17 +19,16 @@ public class Widget implements IWidget {
protected int color; protected int color;
private IWidget parent; private IWidget parent;
private List<IWidget> subWidgets; private final List<IWidget> subWidgets;
private List<WidgetAttribute> attributes; private final List<WidgetAttribute> attributes;
private IPoint position; private IPoint position;
private IPoint size; private IPoint size;
private IPoint offset; private IPoint offset;
private Collection<EventHandler> globalEventHandlers; private final Collection<EventHandler> globalEventHandlers;
private boolean enabled; private boolean enabled;
private boolean visible; private boolean visible;
public Widget(IWidget parent) { public Widget(IWidget parent) {
this.parent = null;
subWidgets = new ArrayList<>(); subWidgets = new ArrayList<>();
attributes = new ArrayList<>(); attributes = new ArrayList<>();
position = new IPoint(0.0f, 0.0f); position = new IPoint(0.0f, 0.0f);
@@ -91,7 +90,7 @@ public class Widget implements IWidget {
@Override @Override
public IWidget addWidget(IWidget widget) { public IWidget addWidget(IWidget widget) {
if (subWidgets.size() != 0 if (!subWidgets.isEmpty()
&& subWidgets.get(subWidgets.size() - 1).hasAttribute(WidgetAttribute.ALWAYS_ON_TOP)) { && subWidgets.get(subWidgets.size() - 1).hasAttribute(WidgetAttribute.ALWAYS_ON_TOP)) {
subWidgets.add(subWidgets.size() - 1, widget); subWidgets.add(subWidgets.size() - 1, widget);
} else { } else {
@@ -51,13 +51,13 @@ public class WindowFieldKit extends Window {
private float glassOffsetY; private float glassOffsetY;
private float glassVX; private float glassVX;
private float glassVY; private float glassVY;
private Random glassRand; private final Random glassRand;
private Control GlassControl; private Control GlassControl;
private ControlChromosome chromo; private ControlChromosome chromo;
private ControlText text; private ControlText text;
private float analyseProgress; private float analyseProgress;
private boolean isAnalysing; private boolean isAnalysing;
private Map<IChromosomeType, String> info; private final Map<IChromosomeType, String> info;
public WindowFieldKit(EntityPlayer player, IInventory inventory, Side side) { public WindowFieldKit(EntityPlayer player, IInventory inventory, Side side) {
super(280.0f, 230.0f, player, inventory, side); super(280.0f, 230.0f, player, inventory, side);
@@ -75,7 +75,7 @@ public class WindowGenesis extends Window {
new Panel(this, one.outset(1), MinecraftGUI.PanelType.Black); new Panel(this, one.outset(1), MinecraftGUI.PanelType.Black);
new Panel(this, two.outset(1), MinecraftGUI.PanelType.Black); new Panel(this, two.outset(1), MinecraftGUI.PanelType.Black);
geneList = new ControlListBox<Gene>(this, one.x(), one.y(), one.w(), one.h(), 10.0f) { geneList = new ControlListBox<>(this, one.x(), one.y(), one.w(), one.h(), 10.0f) {
@Override @Override
public IWidget createOption(Gene value, int y) { public IWidget createOption(Gene value, int y) {
@@ -83,7 +83,7 @@ public class WindowGenesis extends Window {
} }
}; };
geneOptions = new ControlListBox<Gene>(this, two.x(), two.y(), two.w(), two.h(), 10.0f) { geneOptions = new ControlListBox<>(this, two.x(), two.y(), two.w(), two.h(), 10.0f) {
@Override @Override
public IWidget createOption(Gene value, int y) { public IWidget createOption(Gene value, int y) {
@@ -28,7 +28,7 @@ public class ControlButton extends Control {
textWidget = new ControlText(this, getArea(), text, TextJustification.MIDDLE_CENTER); textWidget = new ControlText(this, getArea(), text, TextJustification.MIDDLE_CENTER);
} }
private EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() { private final EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() {
@Override @Override
public void onEvent(EventMouse.Down event) { public void onEvent(EventMouse.Down event) {
@@ -23,7 +23,7 @@ public class ControlCheckbox extends Control implements IControlValue<Boolean> {
} }
public ControlCheckbox(IWidget parent, float x, float y, float w, String text, boolean bool) { public ControlCheckbox(IWidget parent, float x, float y, float w, String text, boolean bool) {
super(parent, x, y, (w > 16.0f) ? w : 16.0f, 16.0f); super(parent, x, y, Math.max(w, 16.0f), 16.0f);
this.text = text; this.text = text;
value = bool; value = bool;
if (w > 16.0f) { if (w > 16.0f) {
@@ -11,7 +11,7 @@ import binnie.core.craftgui.geometry.TextJustification;
public class ControlText extends Control implements IControlValue<String> { public class ControlText extends Control implements IControlValue<String> {
private String text; private String text;
private TextJustification align; private final TextJustification align;
public ControlText(IWidget parent, IPoint pos, String text) { public ControlText(IWidget parent, IPoint pos, String text) {
this(parent, new IArea(pos, new IPoint(500.0f, 0.0f)), text, TextJustification.TOP_LEFT); this(parent, new IArea(pos, new IPoint(500.0f, 0.0f)), text, TextJustification.TOP_LEFT);
@@ -69,11 +69,6 @@ public class ControlTextEdit extends Control implements IControlValue<String> {
}.setOrigin(EventHandler.Origin.Self, this)); }.setOrigin(EventHandler.Origin.Self, this));
} }
@Override
public void onUpdateClient() {
// ignored
}
protected void onTextEdit(String value) { protected void onTextEdit(String value) {
// ignored // ignored
} }
@@ -38,11 +38,6 @@ public class Control extends Widget implements ITooltipHelp, ITooltip {
// ignored // ignored
} }
@Override
public void onUpdateClient() {
// ignored
}
public void addHelp(String string) { public void addHelp(String string) {
helpStrings.add(string); helpStrings.add(string);
} }
@@ -37,7 +37,7 @@ public class ControlOption<T> extends Control implements IControlValue<T> {
setColor(color); setColor(color);
} }
private EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() { private final EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() {
@Override @Override
public void onEvent(EventMouse.Down event) { public void onEvent(EventMouse.Down event) {
@@ -22,7 +22,7 @@ public class ControlTextOption<T> extends ControlOption<T> {
this(controlList, option, option.toString(), y); this(controlList, option, option.toString(), y);
} }
private EventWidget.ChangeColour.Handler mouseHandler = new EventWidget.ChangeColour.Handler() { private final EventWidget.ChangeColour.Handler mouseHandler = new EventWidget.ChangeColour.Handler() {
@Override @Override
public void onEvent(EventWidget.ChangeColour event) { public void onEvent(EventWidget.ChangeColour event) {
@@ -15,8 +15,8 @@ public class ControlPage<T> extends Control implements IControlValue<T> {
public ControlPage(IWidget parent, float x, float y, float w, float h, T value) { public ControlPage(IWidget parent, float x, float y, float w, float h, T value) {
super(parent, x, y, w, h); super(parent, x, y, w, h);
setValue(value); setValue(value);
if (parent instanceof IControlValue && ((IControlValue) parent).getValue() == null) { if (parent instanceof IControlValue cv && ((IControlValue<?>) parent).getValue() == null) {
((IControlValue) parent).setValue(value); cv.setValue(value);
} }
} }
@@ -41,7 +41,7 @@ public class ControlPages<T> extends Control implements IControlValues<T>, ICont
public Collection<T> getValues() { public Collection<T> getValues() {
List<T> list = new ArrayList<>(); List<T> list = new ArrayList<>();
for (IWidget child : getWidgets()) { for (IWidget child : getWidgets()) {
list.add((T) ((IControlValue) child).getValue()); list.add((T) ((IControlValue<?>) child).getValue());
} }
return list; return list;
} }
@@ -5,7 +5,7 @@ import binnie.core.craftgui.controls.core.Control;
public class ControlScroll extends Control { public class ControlScroll extends Control {
private IControlScrollable scrollWidget; private final IControlScrollable scrollWidget;
public ControlScroll(IWidget parent, float x, float y, float width, float height, IControlScrollable scrollWidget) { public ControlScroll(IWidget parent, float x, float y, float width, float height, IControlScrollable scrollWidget) {
super(parent, x, y, width, height); super(parent, x, y, width, height);
@@ -30,7 +30,7 @@ public class ControlScrollBar extends Control {
addSelfEventHandler(mouseDownHandler); addSelfEventHandler(mouseDownHandler);
} }
private EventMouse.Down.Handler mouseDownHandler = new EventMouse.Down.Handler() { private final EventMouse.Down.Handler mouseDownHandler = new EventMouse.Down.Handler() {
@Override @Override
public void onEvent(EventMouse.Down event) { public void onEvent(EventMouse.Down event) {
@@ -50,11 +50,6 @@ public class ControlScrollBar extends Control {
} }
}; };
@Override
public void onUpdateClient() {
// ignored
}
@Override @Override
public void onRenderBackground() { public void onRenderBackground() {
IArea renderArea = getRenderArea(); IArea renderArea = getRenderArea();
@@ -29,7 +29,7 @@ public class ControlScrollableContent<T extends IWidget> extends Control impleme
setPercentageIndex(getPercentageIndex()); setPercentageIndex(getPercentageIndex());
} }
private EventMouse.Wheel.Handler mouseWheelHandler = new EventMouse.Wheel.Handler() { private final EventMouse.Wheel.Handler mouseWheelHandler = new EventMouse.Wheel.Handler() {
@Override @Override
public void onEvent(EventMouse.Wheel event) { public void onEvent(EventMouse.Wheel event) {
@@ -20,7 +20,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
protected T value; protected T value;
private ControlTabBar<T> tabBar; private final ControlTabBar<T> tabBar;
public ControlTab(ControlTabBar<T> parent, float x, float y, float w, float h, T value) { public ControlTab(ControlTabBar<T> parent, float x, float y, float w, float h, T value) {
super(parent, x, y, w, h); super(parent, x, y, w, h);
@@ -59,8 +59,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
} }
CraftGUI.render.texture(iTexture, area); CraftGUI.render.texture(iTexture, area);
if (this instanceof ControlTabIcon) { if (this instanceof ControlTabIcon icon) {
ControlTabIcon icon = (ControlTabIcon) this;
ControlItemDisplay item = (ControlItemDisplay) getWidgets().get(0); ControlItemDisplay item = (ControlItemDisplay) getWidgets().get(0);
if (texture == CraftGUITexture.TabDisabled) { if (texture == CraftGUITexture.TabDisabled) {
item.setColor(0xaaaaaaaa); item.setColor(0xaaaaaaaa);
@@ -13,9 +13,9 @@ import binnie.core.genetics.BreedingSystem;
class ControlBreedingProgress extends Control { class ControlBreedingProgress extends Control {
private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2); private static final Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2);
private float percentage; private final float percentage;
private int colour; private final int colour;
public ControlBreedingProgress(IWidget parent, int x, int y, int width, int height, BreedingSystem system, public ControlBreedingProgress(IWidget parent, int x, int y, int width, int height, BreedingSystem system,
float percentage) { float percentage) {
@@ -12,7 +12,7 @@ import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
public class ControlItemStackOption extends ControlTextOption<ItemStack> { public class ControlItemStackOption extends ControlTextOption<ItemStack> {
private ControlItemDisplay controlBee; private final ControlItemDisplay controlBee;
public ControlItemStackOption(ControlList<ItemStack> controlList, ItemStack option, int y) { public ControlItemStackOption(ControlList<ItemStack> controlList, ItemStack option, int y) {
super(controlList, option, option.getDisplayName(), y); super(controlList, option, option.getDisplayName(), y);
@@ -11,7 +11,7 @@ import forestry.api.genetics.IMutation;
class ControlMutationBox extends ControlListBox<IMutation> { class ControlMutationBox extends ControlListBox<IMutation> {
private Type type; private final Type type;
private IAlleleSpecies species; private IAlleleSpecies species;
@Override @Override
@@ -17,11 +17,11 @@ import forestry.api.genetics.IMutation;
class ControlMutationSymbol extends Control implements ITooltip { class ControlMutationSymbol extends Control implements ITooltip {
private static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); private static final Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
private static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2); private static final Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
private IMutation value; private IMutation value;
private boolean discovered; private boolean discovered;
private int type; private final int type;
@Override @Override
public void onRenderBackground() { public void onRenderBackground() {
@@ -11,7 +11,7 @@ import forestry.api.genetics.IAlleleSpecies;
class ControlSpeciesBoxOption extends ControlTextOption<IAlleleSpecies> { class ControlSpeciesBoxOption extends ControlTextOption<IAlleleSpecies> {
private ControlDatabaseIndividualDisplay controlBee; private final ControlDatabaseIndividualDisplay controlBee;
public ControlSpeciesBoxOption(ControlList<IAlleleSpecies> controlList, IAlleleSpecies option, int y) { public ControlSpeciesBoxOption(ControlList<IAlleleSpecies> controlList, IAlleleSpecies option, int y) {
super(controlList, option, option.getName(), y); super(controlList, option, option.getName(), y);
@@ -7,8 +7,8 @@ import binnie.core.util.I18N;
public class DatabaseTab implements ITooltipHelp { public class DatabaseTab implements ITooltipHelp {
private String mod; private final String mod;
private String unloc; private final String unloc;
public DatabaseTab(AbstractMod mod, String unloc) { public DatabaseTab(AbstractMod mod, String unloc) {
this.mod = mod.getModID(); this.mod = mod.getModID();
@@ -14,10 +14,10 @@ import forestry.api.genetics.IClassification;
public class PageBranchOverview extends PageBranch { public class PageBranchOverview extends PageBranch {
private ControlText branchName; private final ControlText branchName;
private ControlText branchScientific; private final ControlText branchScientific;
private ControlText branchAuthority; private final ControlText branchAuthority;
private List<ControlText> branchDescription; private final List<ControlText> branchDescription;
public PageBranchOverview(IWidget parent, DatabaseTab tab) { public PageBranchOverview(IWidget parent, DatabaseTab tab) {
super(parent, tab); super(parent, tab);
@@ -10,7 +10,7 @@ import forestry.api.genetics.IClassification;
public class PageBranchSpecies extends PageBranch { public class PageBranchSpecies extends PageBranch {
private ControlSpeciesBox speciesList; private final ControlSpeciesBox speciesList;
@Mod.EventHandler @Mod.EventHandler
public void onHandleEvent(EventValueChanged<IAlleleSpecies> event) { public void onHandleEvent(EventValueChanged<IAlleleSpecies> event) {
@@ -13,7 +13,7 @@ import binnie.core.util.I18N;
public class PageBreeder extends ControlPage<DatabaseTab> { public class PageBreeder extends ControlPage<DatabaseTab> {
private GameProfile player; private final GameProfile player;
public PageBreeder(IWidget parent, GameProfile player, DatabaseTab tab) { public PageBreeder(IWidget parent, GameProfile player, DatabaseTab tab) {
super(parent, 0.0f, 0.0f, parent.getSize().x(), parent.getSize().y(), tab); super(parent, 0.0f, 0.0f, parent.getSize().x(), parent.getSize().y(), tab);
@@ -22,7 +22,7 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
} }
public void onPageRefresh() { public void onPageRefresh() {
while (getWidgets().size() > 0) { while (!getWidgets().isEmpty()) {
deleteChild(getWidgets().get(0)); deleteChild(getWidgets().get(0));
} }
@@ -11,8 +11,8 @@ import forestry.api.genetics.IClassification;
public class PageSpeciesClassification extends PageSpecies { public class PageSpeciesClassification extends PageSpecies {
private Map<IClassification.EnumClassLevel, ControlText> levels; private final Map<IClassification.EnumClassLevel, ControlText> levels;
private ControlText genus; private final ControlText genus;
public PageSpeciesClassification(IWidget parent, DatabaseTab tab) { public PageSpeciesClassification(IWidget parent, DatabaseTab tab) {
super(parent, tab); super(parent, tab);
@@ -7,7 +7,7 @@ import forestry.api.genetics.IAlleleSpecies;
public class PageSpeciesMutations extends PageSpecies { public class PageSpeciesMutations extends PageSpecies {
private ControlMutationBox list; private final ControlMutationBox list;
public PageSpeciesMutations(IWidget parent, DatabaseTab tab) { public PageSpeciesMutations(IWidget parent, DatabaseTab tab) {
super(parent, tab); super(parent, tab);
@@ -14,14 +14,14 @@ import forestry.api.genetics.IAlleleSpecies;
public class PageSpeciesOverview extends PageSpecies { public class PageSpeciesOverview extends PageSpecies {
private ControlText controlName; private final ControlText controlName;
private ControlText controlScientific; private final ControlText controlScientific;
private ControlText controlAuthority; private final ControlText controlAuthority;
private ControlText controlComplexity; private final ControlText controlComplexity;
private ControlText controlDescription; private final ControlText controlDescription;
private ControlText controlSignature; private final ControlText controlSignature;
private ControlDatabaseIndividualDisplay controlInd1; private final ControlDatabaseIndividualDisplay controlInd1;
private ControlDatabaseIndividualDisplay controlInd2; private final ControlDatabaseIndividualDisplay controlInd2;
public PageSpeciesOverview(IWidget parent, DatabaseTab tab) { public PageSpeciesOverview(IWidget parent, DatabaseTab tab) {
super(parent, tab); super(parent, tab);
@@ -58,23 +58,23 @@ public class PageSpeciesOverview extends PageSpecies {
+ EnumChatFormatting.RESET); + EnumChatFormatting.RESET);
controlComplexity.setValue(I18N.localise("extratrees.genetics.complexity", species.getComplexity())); controlComplexity.setValue(I18N.localise("extratrees.genetics.complexity", species.getComplexity()));
String desc = species.getDescription(); String desc = species.getDescription();
String descBody = EnumChatFormatting.ITALIC.toString(); StringBuilder descBody = new StringBuilder(EnumChatFormatting.ITALIC.toString());
String descSig = ""; String descSig = "";
if (desc == null || desc.isEmpty() || desc.matches("(\\w+\\.?)+")) { if (desc == null || desc.isEmpty() || desc.matches("(\\w+\\.?)+")) {
descBody += I18N.localise("binniecore.gui.database.species.noDesc"); descBody.append(I18N.localise("binniecore.gui.database.species.noDesc"));
} else { } else {
String[] descStrings = desc.split("\\|"); String[] descStrings = desc.split("\\|");
descBody += descStrings[0]; descBody.append(descStrings[0]);
for (int i = 1; i < descStrings.length - 1; ++i) { for (int i = 1; i < descStrings.length - 1; ++i) {
descBody = descBody + " " + descStrings[i]; descBody.append(" ").append(descStrings[i]);
} }
if (descStrings.length > 1) { if (descStrings.length > 1) {
descSig += descStrings[descStrings.length - 1]; descSig += descStrings[descStrings.length - 1];
} }
} }
controlDescription.setValue(descBody + EnumChatFormatting.RESET); controlDescription.setValue(descBody.toString() + EnumChatFormatting.RESET);
controlSignature.setValue(descSig + EnumChatFormatting.RESET); controlSignature.setValue(descSig + EnumChatFormatting.RESET);
float descHeight = CraftGUI.render.textHeight(controlDescription.getValue(), controlDescription.getSize().x()); float descHeight = CraftGUI.render.textHeight(controlDescription.getValue(), controlDescription.getSize().x());
controlSignature.setPosition( controlSignature.setPosition(
@@ -7,7 +7,7 @@ import forestry.api.genetics.IAlleleSpecies;
public class PageSpeciesResultant extends PageSpecies { public class PageSpeciesResultant extends PageSpecies {
private ControlMutationBox list; private final ControlMutationBox list;
public PageSpeciesResultant(IWidget parent, DatabaseTab tab) { public PageSpeciesResultant(IWidget parent, DatabaseTab tab) {
super(parent, tab); super(parent, tab);
@@ -40,8 +40,8 @@ public abstract class WindowAbstractDatabase extends Window {
protected boolean isNEI; protected boolean isNEI;
private float selectionBoxWidth; private float selectionBoxWidth;
private Map<IDatabaseMode, ModeWidgets> modes; private final Map<IDatabaseMode, ModeWidgets> modes;
private BreedingSystem system; private final BreedingSystem system;
private Panel panelInformation; private Panel panelInformation;
private Panel panelSearch; private Panel panelSearch;
private ControlPages<IDatabaseMode> modePages; private ControlPages<IDatabaseMode> modePages;
@@ -88,13 +88,12 @@ public abstract class WindowAbstractDatabase extends Window {
@Override @Override
public void onEvent(EventValueChanged event) { public void onEvent(EventValueChanged event) {
if (!(event.getOrigin().getParent() instanceof ControlPage)) { if (!(event.getOrigin().getParent() instanceof ControlPage parent)) {
return; return;
} else if ((event.getValue() instanceof DatabaseTab)) { } else if ((event.getValue() instanceof DatabaseTab)) {
return; return;
} }
ControlPage parent = (ControlPage) event.getOrigin().getParent();
if (!(parent.getValue() instanceof IDatabaseMode)) { if (!(parent.getValue() instanceof IDatabaseMode)) {
return; return;
} }
@@ -185,7 +184,7 @@ public abstract class WindowAbstractDatabase extends Window {
@Override @Override
public ControlTab<IDatabaseMode> createTab(float x, float y, float w, float h, IDatabaseMode value) { public ControlTab<IDatabaseMode> createTab(float x, float y, float w, float h, IDatabaseMode value) {
return new ControlTab<IDatabaseMode>(this, x, y, w, h, value) { return new ControlTab<>(this, x, y, w, h, value) {
@Override @Override
public String getName() { public String getName() {
@@ -199,7 +198,7 @@ public abstract class WindowAbstractDatabase extends Window {
CraftGUIUtil.linkWidgets(tab, modePages); CraftGUIUtil.linkWidgets(tab, modePages);
changeMode(Mode.Species); changeMode(Mode.Species);
for (IDatabaseMode mode : modes.keySet()) { for (IDatabaseMode mode : modes.keySet()) {
modes.get(mode).infoTabs = new ControlTabBar( modes.get(mode).infoTabs = new ControlTabBar<>(
modes.get(mode).modePage, modes.get(mode).modePage,
8.0f, 8.0f,
24.0f, 24.0f,
@@ -266,7 +265,7 @@ public abstract class WindowAbstractDatabase extends Window {
public ControlPage<IDatabaseMode> modePage; public ControlPage<IDatabaseMode> modePage;
public ControlListBox listBox; public ControlListBox listBox;
private ControlPages<DatabaseTab> infoPages; private final ControlPages<DatabaseTab> infoPages;
private ControlTabBar<DatabaseTab> infoTabs; private ControlTabBar<DatabaseTab> infoTabs;
public ModeWidgets(IDatabaseMode mode, WindowAbstractDatabase database) { public ModeWidgets(IDatabaseMode mode, WindowAbstractDatabase database) {
@@ -33,20 +33,12 @@ public abstract class EventHandler<E extends Event> {
DirectChild; DirectChild;
public boolean isOrigin(IWidget origin, IWidget test) { public boolean isOrigin(IWidget origin, IWidget test) {
switch (this) { return switch (this) {
case Any: case Any -> true;
return true; case DirectChild -> test.getWidgets().contains(origin);
case Parent -> test.getParent() == origin;
case DirectChild: case Self -> test == origin;
return test.getWidgets().contains(origin); };
case Parent:
return test.getParent() == origin;
case Self:
return test == origin;
}
return false;
} }
} }
} }
@@ -7,8 +7,8 @@ public enum Position {
LEFT(-1, 0), LEFT(-1, 0),
RIGHT(1, 0); RIGHT(1, 0);
protected int x; private final int x;
protected int y; private final int y;
Position(int x, int y) { Position(int x, int y) {
this.x = x; this.x = x;
@@ -24,19 +24,11 @@ public enum Position {
} }
public Position opposite() { public Position opposite() {
switch (this) { return switch (this) {
case BOTTOM: case BOTTOM -> Position.TOP;
return Position.TOP; case LEFT -> Position.RIGHT;
case RIGHT -> Position.LEFT;
case LEFT: case TOP -> Position.BOTTOM;
return Position.RIGHT; };
case RIGHT:
return Position.LEFT;
case TOP:
return Position.BOTTOM;
}
return null;
} }
} }
@@ -12,8 +12,8 @@ public enum TextJustification {
BOTTOM_CENTER(0.5f, 1.0f), BOTTOM_CENTER(0.5f, 1.0f),
BOTTOM_RIGHT(1.0f, 1.0f); BOTTOM_RIGHT(1.0f, 1.0f);
protected float xOffset; final float xOffset;
protected float yOffset; final float yOffset;
TextJustification(float xOffset, float yOffset) { TextJustification(float xOffset, float yOffset) {
this.xOffset = xOffset; this.xOffset = xOffset;
@@ -36,10 +36,10 @@ import cpw.mods.fml.relauncher.Side;
public class ContainerCraftGUI extends Container { public class ContainerCraftGUI extends Container {
private Window window; private final Window window;
private Map<String, NBTTagCompound> syncedNBT; private final Map<String, NBTTagCompound> syncedNBT;
private Map<String, NBTTagCompound> sentNBT; private final Map<String, NBTTagCompound> sentNBT;
private Map<Integer, TankInfo> syncedTanks; private final Map<Integer, TankInfo> syncedTanks;
private PowerInfo syncedPower; private PowerInfo syncedPower;
private ProcessInfo syncedProcess; private ProcessInfo syncedProcess;
private int errorType; private int errorType;
@@ -61,8 +61,8 @@ public class ContainerCraftGUI extends Container {
return; return;
} }
inventoryItemStacks = new ListMap(); inventoryItemStacks = new ListMap<>();
inventorySlots = new ListMap(); inventorySlots = new ListMap<>();
if (machine == null) { if (machine == null) {
return; return;
} }
@@ -89,7 +89,7 @@ public class ContainerCraftGUI extends Container {
if (index < 0 || index >= inventorySlots.size()) { if (index < 0 || index >= inventorySlots.size()) {
return null; return null;
} }
return (Slot) inventorySlots.get(index); return inventorySlots.get(index);
} }
@Override @Override
@@ -145,9 +145,9 @@ public class ContainerCraftGUI extends Container {
@Override @Override
public boolean canInteractWith(EntityPlayer player) { public boolean canInteractWith(EntityPlayer player) {
if (player instanceof EntityPlayerMP) { if (player instanceof EntityPlayerMP playerMP) {
if (!crafters.contains(player)) { if (!crafters.contains(playerMP)) {
crafters.add(player); crafters.add(playerMP);
} }
sentNBT.clear(); sentNBT.clear();
} }
@@ -167,7 +167,7 @@ public class ContainerCraftGUI extends Container {
} }
ItemStack stack = request.transfer(true); ItemStack stack = request.transfer(true);
Slot shiftClickedSlot = (Slot) inventorySlots.get(index); Slot shiftClickedSlot = inventorySlots.get(index);
shiftClickedSlot.putStack(stack); shiftClickedSlot.putStack(stack);
shiftClickedSlot.onSlotChanged(); shiftClickedSlot.onSlotChanged();
return null; return null;
@@ -233,9 +233,8 @@ public class ContainerCraftGUI extends Container {
int slotNumber = action.getShort("n"); int slotNumber = action.getShort("n");
getOrCreateSlot(InventoryType.values()[type % 4], index, slotNumber); getOrCreateSlot(InventoryType.values()[type % 4], index, slotNumber);
for (Object crafterObject : crafters) { for (ICrafting crafterObject : crafters) {
ICrafting crafter = (ICrafting) crafterObject; crafterObject.sendContainerAndContentsToPlayer(this, getInventory());
crafter.sendContainerAndContentsToPlayer(this, getInventory());
} }
} }
} }
@@ -299,9 +298,8 @@ public class ContainerCraftGUI extends Container {
if (shouldSend) { if (shouldSend) {
for (Object crafter : crafters) { for (Object crafter : crafters) {
if (crafter instanceof EntityPlayerMP) { if (crafter instanceof EntityPlayerMP playerMP) {
EntityPlayerMP player = (EntityPlayerMP) crafter; BinnieCore.proxy.sendToPlayer(new MessageContainerUpdate(nbt.getValue()), playerMP);
BinnieCore.proxy.sendToPlayer(new MessageContainerUpdate(nbt.getValue()), player);
} }
} }
sentThisTime.put(nbt.getKey(), nbt.getValue()); sentThisTime.put(nbt.getKey(), nbt.getValue());
@@ -20,9 +20,9 @@ public enum EnumColor {
Yellow("Yellow", 16777045, 'e'), Yellow("Yellow", 16777045, 'e'),
White("White", 16777215, 'f'); White("White", 16777215, 'f');
protected int colour; private final int colour;
protected String name; private final String name;
protected char code; private final char code;
EnumColor(String name, int colour, char code) { EnumColor(String name, int colour, char code) {
this.name = name; this.name = name;
@@ -35,7 +35,7 @@ public enum EnumColor {
} }
public String getCode() { public String getCode() {
return "\u00a7" + code; return "§" + code;
} }
@Override @Override
@@ -21,7 +21,7 @@ public enum GUIIcon {
ArrowLeftDown("arrow-leftdown"), ArrowLeftDown("arrow-leftdown"),
ArrowLeftUp("arrow-leftup"); ArrowLeftUp("arrow-leftup");
String path; final String path;
BinnieIcon icon; BinnieIcon icon;
GUIIcon(String path) { GUIIcon(String path) {
@@ -38,7 +38,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiCraftGUI extends GuiContainer { public class GuiCraftGUI extends GuiContainer {
private Window window; private final Window window;
private ItemStack draggedItem; private ItemStack draggedItem;
public GuiCraftGUI(Window window) { public GuiCraftGUI(Window window) {
@@ -9,7 +9,7 @@ import java.util.Map;
class ListMap<T> implements List<T> { class ListMap<T> implements List<T> {
private LinkedHashMap<Integer, T> map; private final LinkedHashMap<Integer, T> map;
ListMap() { ListMap() {
map = new LinkedHashMap<>(); map = new LinkedHashMap<>();
@@ -33,9 +33,9 @@ public class MinecraftTooltip extends Tooltip {
USER(0x962433, EnumChatFormatting.RED, EnumChatFormatting.DARK_RED), USER(0x962433, EnumChatFormatting.RED, EnumChatFormatting.DARK_RED),
POWER(0x896e00, EnumChatFormatting.YELLOW, EnumChatFormatting.GOLD); POWER(0x896e00, EnumChatFormatting.YELLOW, EnumChatFormatting.GOLD);
int outline; final int outline;
String mainText; final String mainText;
String bodyText; final String bodyText;
TypeColor(int outline, EnumChatFormatting mainText, EnumChatFormatting bodyText) { TypeColor(int outline, EnumChatFormatting mainText, EnumChatFormatting bodyText) {
this.outline = outline; this.outline = outline;
@@ -53,15 +53,15 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
protected float titleButtonLeft; protected float titleButtonLeft;
protected float titleButtonRight; protected float titleButtonRight;
private GuiCraftGUI gui; private GuiCraftGUI gui;
private ContainerCraftGUI container; private final ContainerCraftGUI container;
private WindowInventory windowInventory; private final WindowInventory windowInventory;
private ControlText title; private ControlText title;
private StandardTexture bgText1; private StandardTexture bgText1;
private StandardTexture bgText2; private StandardTexture bgText2;
private boolean hasBeenInitialised; private boolean hasBeenInitialised;
private EntityPlayer player; private EntityPlayer player;
private IInventory entityInventory; private IInventory entityInventory;
private Side side; private final Side side;
public Window(float width, float height, EntityPlayer player, IInventory inventory, Side side) { public Window(float width, float height, EntityPlayer player, IInventory inventory, Side side) {
this.side = side; this.side = side;
@@ -13,10 +13,10 @@ import binnie.core.machines.inventory.SlotValidator;
public class WindowInventory implements IInventory { public class WindowInventory implements IInventory {
private Window window; private final Window window;
private Map<Integer, ItemStack> inventory; private final Map<Integer, ItemStack> inventory;
private Map<Integer, SlotValidator> validators; private final Map<Integer, SlotValidator> validators;
private List<Integer> disabledAutoDispenses; private final List<Integer> disabledAutoDispenses;
public WindowInventory(Window window) { public WindowInventory(Window window) {
inventory = new HashMap<>(); inventory = new HashMap<>();
@@ -27,7 +27,7 @@ public class WindowInventory implements IInventory {
@Override @Override
public int getSizeInventory() { public int getSizeInventory() {
if (inventory.size() == 0) { if (inventory.isEmpty()) {
return 0; return 0;
} }
@@ -61,8 +61,7 @@ public class WindowInventory implements IInventory {
amount = available; amount = available;
} }
ItemStack itemStack = item; item.stackSize -= amount;
itemStack.stackSize -= amount;
output.stackSize = amount; output.stackSize = amount;
if (item.stackSize == 0) { if (item.stackSize == 0) {
setInventorySlotContents(index, null); setInventorySlotContents(index, null);
@@ -1,7 +1,5 @@
package binnie.core.craftgui.minecraft.control; package binnie.core.craftgui.minecraft.control;
import net.minecraft.inventory.IInventory;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.CraftGUI;
@@ -17,8 +15,6 @@ import binnie.core.craftgui.minecraft.MinecraftTooltip;
import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.Window;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.machines.Machine; import binnie.core.machines.Machine;
import binnie.core.machines.TileEntityMachine;
import binnie.core.machines.power.IPoweredMachine;
import binnie.core.machines.power.IProcess; import binnie.core.machines.power.IProcess;
import binnie.core.util.I18N; import binnie.core.util.I18N;
@@ -26,7 +22,7 @@ public class ControlEnergyBar extends Control implements ITooltip {
public static boolean isError; public static boolean isError;
private Position direction; private final Position direction;
public ControlEnergyBar(IWidget parent, int x, int y, int width, int height, Position direction) { public ControlEnergyBar(IWidget parent, int x, int y, int width, int height, Position direction) {
super(parent, x, y, width, height); super(parent, x, y, width, height);
@@ -34,18 +30,6 @@ public class ControlEnergyBar extends Control implements ITooltip {
addAttribute(WidgetAttribute.MOUSE_OVER); addAttribute(WidgetAttribute.MOUSE_OVER);
} }
// TODO unused method?
public IPoweredMachine getClientPower() {
IInventory inventory = Window.get(this).getInventory();
TileEntityMachine machine = (inventory instanceof TileEntityMachine) ? (TileEntityMachine) inventory : null;
if (machine == null) {
return null;
}
IPoweredMachine clientPower = machine.getMachine().getInterface(IPoweredMachine.class);
return clientPower;
}
public float getPercentage() { public float getPercentage() {
float percentage = 100.0f * getStoredEnergy() / getMaxEnergy(); float percentage = 100.0f * getStoredEnergy() / getMaxEnergy();
if (percentage > 100.0f) { if (percentage > 100.0f) {
@@ -95,7 +95,7 @@ public class ControlErrorState extends Control implements ITooltip {
} }
tooltip.add(errorState.toString()); tooltip.add(errorState.toString());
if (errorState.getTooltip().length() > 0) { if (!errorState.getTooltip().isEmpty()) {
tooltip.add(errorState.getTooltip()); tooltip.add(errorState.getTooltip());
} }
} }
@@ -9,7 +9,7 @@ import binnie.core.craftgui.geometry.IPoint;
public class ControlIconDisplay extends Control { public class ControlIconDisplay extends Control {
private IIcon icon; private final IIcon icon;
public ControlIconDisplay(IWidget parent, float x, float y, IIcon icon) { public ControlIconDisplay(IWidget parent, float x, float y, IIcon icon) {
super(parent, x, y, 16.0f, 16.0f); super(parent, x, y, 16.0f, 16.0f);
@@ -8,7 +8,7 @@ import binnie.core.craftgui.resource.Texture;
public class ControlImage extends Control { public class ControlImage extends Control {
private Object key; private final Object key;
public ControlImage(IWidget parent, float x, float y, Texture text) { public ControlImage(IWidget parent, float x, float y, Texture text) {
super(parent, x, y, text.w(), text.h()); super(parent, x, y, text.w(), text.h());
@@ -11,7 +11,7 @@ import binnie.core.util.I18N;
public class ControlInfo extends Control implements ITooltip { public class ControlInfo extends Control implements ITooltip {
private String info; private final String info;
public ControlInfo(IWidget parent, float x, float y, String info) { public ControlInfo(IWidget parent, float x, float y, String info) {
super(parent, x, y, 16.0f, 16.0f); super(parent, x, y, 16.0f, 16.0f);
@@ -34,7 +34,7 @@ public class ControlLiquidTank extends Control implements ITooltip {
public static List<Integer> tankError = new ArrayList<>(); public static List<Integer> tankError = new ArrayList<>();
private int tankID; private int tankID;
private boolean horizontal; private final boolean horizontal;
public ControlLiquidTank(IWidget parent, int x, int y) { public ControlLiquidTank(IWidget parent, int x, int y) {
this(parent, x, y, false); this(parent, x, y, false);
@@ -9,7 +9,7 @@ import binnie.core.craftgui.minecraft.InventoryType;
public class ControlPlayerInventory extends Control { public class ControlPlayerInventory extends Control {
private List<ControlSlot> slots; private final List<ControlSlot> slots;
public ControlPlayerInventory(IWidget parent, boolean wide) { public ControlPlayerInventory(IWidget parent, boolean wide) {
super( super(
@@ -77,8 +77,4 @@ public class ControlPlayerInventory extends Control {
return slots.get(i); return slots.get(i);
} }
@Override
public void onUpdateClient() {
// ignored
}
} }
@@ -12,7 +12,7 @@ import binnie.core.util.I18N;
public class ControlPowerSystem extends Control implements ITooltip { public class ControlPowerSystem extends Control implements ITooltip {
private PowerSystem system; private final PowerSystem system;
public ControlPowerSystem(IWidget parent, float x, float y, PowerSystem system) { public ControlPowerSystem(IWidget parent, float x, float y, PowerSystem system) {
super(parent, x, y, 16.0f, 16.0f); super(parent, x, y, 16.0f, 16.0f);
@@ -7,9 +7,9 @@ import binnie.core.craftgui.resource.Texture;
public class ControlProgress extends ControlProgressBase { public class ControlProgress extends ControlProgressBase {
private Texture progressBlank; private final Texture progressBlank;
private Texture progressBar; private final Texture progressBar;
private Position direction; private final Position direction;
public ControlProgress(IWidget parent, int x, int y, Texture progressBlank, Texture progressBar, Position dir) { public ControlProgress(IWidget parent, int x, int y, Texture progressBlank, Texture progressBar, Position dir) {
super( super(
@@ -38,7 +38,7 @@ public class ControlProgressBase extends Control {
} }
if (seconds > 0) { if (seconds > 0) {
if (ts.length() > 0) { if (!ts.isEmpty()) {
ts += " "; ts += " ";
} }
if (seconds == 1) { if (seconds == 1) {
@@ -16,10 +16,10 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
public class ControlSlide extends Control { public class ControlSlide extends Control {
private IArea expanded; private final IArea expanded;
private IArea shrunk; private final IArea shrunk;
private boolean slideActive; private boolean slideActive;
private Position anchor; private final Position anchor;
private String label; private String label;
public ControlSlide(IWidget parent, float x, float y, float w, float h, Position anchor2) { public ControlSlide(IWidget parent, float x, float y, float w, float h, Position anchor2) {
@@ -10,7 +10,7 @@ import binnie.core.craftgui.minecraft.InventoryType;
public class ControlSlotArray extends Control implements Iterable<ControlSlot> { public class ControlSlotArray extends Control implements Iterable<ControlSlot> {
private List<ControlSlot> slots; private final List<ControlSlot> slots;
public ControlSlotArray(IWidget parent, int x, int y, int columns, int rows) { public ControlSlotArray(IWidget parent, int x, int y, int columns, int rows) {
super(parent, x, y, columns * 18, rows * 18); super(parent, x, y, columns * 18, rows * 18);
@@ -17,7 +17,7 @@ import binnie.core.nei.NEIHook;
public abstract class ControlSlotBase extends Control implements ITooltip { public abstract class ControlSlotBase extends Control implements ITooltip {
private ControlItemDisplay itemDisplay; private final ControlItemDisplay itemDisplay;
public ControlSlotBase(IWidget parent, float x, float y) { public ControlSlotBase(IWidget parent, float x, float y) {
this(parent, x, y, 18); this(parent, x, y, 18);
@@ -31,9 +31,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip {
@Override @Override
public void onEvent(EventWidget.ChangeSize event) { public void onEvent(EventWidget.ChangeSize event) {
if (itemDisplay != null) { itemDisplay.setSize(getSize().sub(new IPoint(2.0f, 2.0f)));
itemDisplay.setSize(getSize().sub(new IPoint(2.0f, 2.0f)));
}
} }
}); });
} }
Loaded 100 of 368 files, more files were not shown because too many files have changed in this diff. Show more