Compare commits

...
8 Commits
234 changed files with 430 additions and 245 deletions

No files matched your search

+17
View File
@@ -0,0 +1,17 @@
name: Optimize images
on:
pull_request:
branches: [ master, main, release/** ]
paths:
- "**/*.png"
push:
branches: [ master, main, release/** ]
paths:
- "**/*.png"
jobs:
optimize-images:
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
secrets: inherit
+3 -3
View File
@@ -2,10 +2,10 @@
dependencies {
api('curse.maven:cofh-lib-220333:2388748')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta62:api')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.21-GTNH:dev')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta68a:api')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.70-GTNH:dev')
compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api')
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
compileOnly('curse.maven:craftguide-75557:2459320')
}
+36 -3
View File
@@ -39,9 +39,33 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
developmentEnvironmentUserName = Developer
# 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.
enableModernJavaSyntax = true
# Enables modern Java syntax support. Valid values:
# - false: No modern syntax, Java 8 only
# - jabel: Jabel syntax-only support, compiles to J8 bytecode
# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
# - modern: Native modern Java bytecode, no downgrading
enableModernJavaSyntax = jabel
# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
# and should *not* be used in most situations. -1 disables this.
# forceToolchainVersion = -1
# Target JVM version for JVM Downgrader bytecode downgrading.
# Only used when enableModernJavaSyntax = jvmDowngrader
# downgradeTargetVersion = 8
# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
# Classes will be available in META-INF/versions/N/ for each version N in this list.
# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
# jvmDowngraderMultiReleaseVersions = 21,25
# Specifies how JVM Downgrader API stubs are provided. Options:
# - shade: Shade minimized stubs into the jar
# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
# - external: Another dependency provides stubs (no constraint, no warning)
# - (empty): Warning reminding you to configure stubs
# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
# jvmDowngraderStubsProvider =
# 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.
@@ -174,6 +198,12 @@ curseForgeRelations =
# projects. New projects should not use this parameter.
# customArchiveBaseName =
# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
# runClientWorkingDirectory = run/client
# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
# runServerWorkingDirectory = run/server
# Optional parameter to have the build automatically fail if an illegal version is used.
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
# The check is ONLY performed if the version is a git tag.
@@ -203,3 +233,6 @@ curseForgeRelations =
# This is meant to be set in $HOME/.gradle/gradle.properties.
# ideaCheckSpotlessOnBuild = true
# Non-GTNH properties
org.gradle.configuration-cache = true
org.gradle.parallel = true
+12
View File
@@ -0,0 +1,12 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3426ffcaa54c3f62406beb1f1ab8b179/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/f636c800fdb3f9ae33f019dfa048ba72/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0ef34dd9312b12d61ba1b8e66126d140/redirect
toolchainVersion=25
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Vendored
+2 -5
View File
@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
Vendored
+1 -2
View File
@@ -70,11 +70,10 @@ goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.46'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.20'
}
@@ -84,7 +84,12 @@ public enum EnumBeeChromosome implements IChromosomeType {
*/
EFFECT(IAlleleBeeEffect.class);
Class<? extends IAllele> clss;
final Class<? extends IAllele> clss;
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumBeeChromosome[] VALUES = values();
EnumBeeChromosome(Class<? extends IAllele> clss) {
this.clss = clss;
@@ -17,9 +17,12 @@ public enum EnumBeeType implements ISpeciesType {
LARVAE,
NONE;
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumBeeType[] VALUES = values();
String name;
private final String name;
EnumBeeType() {
this.name = this.toString().toLowerCase(Locale.ENGLISH);
@@ -28,4 +31,8 @@ public enum EnumBeeType implements ISpeciesType {
public String getName() {
return name;
}
public static EnumBeeType fromOrdinal(int ordinal) {
return VALUES[ordinal];
}
}
@@ -73,9 +73,14 @@ public enum EnumTreeChromosome implements IChromosomeType {
/**
* Determines if the tree can burn.
*/
FIREPROOF(IAlleleBoolean.class),;
FIREPROOF(IAlleleBoolean.class);
Class<? extends IAllele> clss;
final Class<? extends IAllele> clss;
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumTreeChromosome[] VALUES = values();
EnumTreeChromosome(Class<? extends IAllele> clss) {
this.clss = clss;
@@ -17,9 +17,14 @@ public enum EnumHumidity {
NORMAL("Normal"),
DAMP("Damp");
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumHumidity[] VALUES = values();
public final String name;
private EnumHumidity(String name) {
EnumHumidity(String name) {
this.name = name;
}
@@ -27,10 +27,15 @@ public enum EnumTemperature {
HOT("Hot", "habitats/desert"),
HELLISH("Hellish", "habitats/nether");
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumTemperature[] VALUES = values();
public final String name;
public final String iconIndex;
private EnumTemperature(String name, String iconIndex) {
EnumTemperature(String name, String iconIndex) {
this.name = name;
this.iconIndex = iconIndex;
}
@@ -16,6 +16,11 @@ public enum FarmDirection {
private final ForgeDirection forgeDirection;
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final FarmDirection[] VALUES = values();
FarmDirection(ForgeDirection forgeDirection) {
this.forgeDirection = forgeDirection;
}
@@ -25,17 +30,16 @@ public enum FarmDirection {
}
public static FarmDirection getFarmDirection(ForgeDirection forgeDirection) {
switch (forgeDirection) {
case NORTH:
return NORTH;
case EAST:
return EAST;
case SOUTH:
return SOUTH;
case WEST:
return WEST;
default:
return null;
}
return switch (forgeDirection) {
case NORTH -> NORTH;
case EAST -> EAST;
case SOUTH -> SOUTH;
case WEST -> WEST;
default -> null;
};
}
public static FarmDirection fromOrdinal(int ordinal) {
return VALUES[ordinal];
}
}
@@ -77,7 +77,12 @@ public enum EnumButterflyChromosome implements IChromosomeType {
*/
TERRITORY(IAlleleArea.class),;
Class<? extends IAllele> clss;
final Class<? extends IAllele> clss;
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumButterflyChromosome[] VALUES = values();
EnumButterflyChromosome(Class<? extends IAllele> clss) {
this.clss = clss;
@@ -38,7 +38,7 @@ public class CommandBeeGive extends SubCommand {
setPermLevel(PermLevel.ADMIN);
List<String> beeTypeStrings = new ArrayList<>();
for (EnumBeeType type : EnumBeeType.values()) {
for (EnumBeeType type : EnumBeeType.VALUES) {
if (type == EnumBeeType.NONE) {
continue;
}
@@ -166,7 +166,7 @@ public class CommandBeeGive extends SubCommand {
}
private static EnumBeeType getBeeType(String beeTypeName) {
for (EnumBeeType beeType : EnumBeeType.values()) {
for (EnumBeeType beeType : EnumBeeType.VALUES) {
if (beeType.getName().equalsIgnoreCase(beeTypeName)) {
return beeType;
}
@@ -148,7 +148,7 @@ public enum BeeBranchDefinition implements IBranchDefinition {
private static IAllele[] getDefaultTemplate() {
if (defaultTemplate == null) {
defaultTemplate = new IAllele[EnumBeeChromosome.values().length];
defaultTemplate = new IAllele[EnumBeeChromosome.VALUES.length];
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER);
@@ -102,7 +102,7 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot {
IBee bee = (IBee) individual;
Item beeItem;
switch (EnumBeeType.VALUES[type]) {
switch (EnumBeeType.fromOrdinal(type)) {
case QUEEN:
beeItem = PluginApiculture.items.beeQueenGE;
// ensure a queen is always mated
@@ -353,7 +353,7 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot {
@Override
public IChromosomeType[] getKaryotype() {
return EnumBeeChromosome.values();
return EnumBeeChromosome.VALUES;
}
@Override
@@ -8,8 +8,6 @@
******************************************************************************/
package forestry.apiculture.genetics;
import java.util.Locale;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
@@ -22,24 +20,23 @@ import forestry.core.render.TextureManager;
public class DefaultBeeIconProvider implements IBeeIconProvider {
public static final DefaultBeeIconProvider instance = new DefaultBeeIconProvider();
private static final IIcon[][] icons = new IIcon[EnumBeeType.VALUES.length][3];
private DefaultBeeIconProvider() {}
private static final IIcon[][] icons = new IIcon[EnumBeeType.values().length][3];
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
String beeIconDir = "bees/default/";
IIcon body1 = TextureManager.registerTex(register, beeIconDir + "body1");
for (int i = 0; i < EnumBeeType.values().length; i++) {
EnumBeeType beeType = EnumBeeType.values()[i];
for (int i = 0; i < EnumBeeType.VALUES.length; i++) {
EnumBeeType beeType = EnumBeeType.VALUES[i];
if (beeType == EnumBeeType.NONE) {
continue;
}
String beeTypeNameBase = beeIconDir + beeType.toString().toLowerCase(Locale.ENGLISH);
String beeTypeNameBase = beeIconDir + beeType.getName();
icons[i][0] = TextureManager.registerTex(register, beeTypeNameBase + ".outline");
if (beeType == EnumBeeType.LARVAE) {
@@ -36,29 +36,29 @@ public class BlockFruitPod extends BlockCocoa {
}
public static TileFruitPod getPodTile(IBlockAccess world, int x, int y, int z) {
TileEntity tile = world.getTileEntity(x, y, z);
if (!(tile instanceof TileFruitPod)) {
return null;
final TileEntity tile = world.getTileEntity(x, y, z);
if (tile instanceof TileFruitPod) {
return (TileFruitPod) tile;
}
return (TileFruitPod) tile;
return null;
}
@Override
public void updateTick(World world, int x, int y, int z, Random rand) {
if (!world.checkChunksExist(x - 1, y, z - 1, x + 1, y, z + 1)) {
return;
}
if (!canBlockStay(world, x, y, z)) {
dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
final int meta = world.getBlockMetadata(x, y, z);
this.dropBlockAsItem(world, x, y, z, meta, 0);
world.setBlockToAir(x, y, z);
return;
}
TileFruitPod tile = getPodTile(world, x, y, z);
if (tile == null) {
return;
final TileFruitPod tile = getPodTile(world, x, y, z);
if (tile != null) {
tile.onBlockTick();
}
tile.onBlockTick();
}
@SuppressWarnings("deprecation")
@@ -82,7 +82,7 @@ public enum TreeBranchDefinition implements IBranchDefinition {
@Override
public IAllele[] getTemplate() {
if (defaultTemplate == null) {
defaultTemplate = new IAllele[EnumTreeChromosome.values().length];
defaultTemplate = new IAllele[EnumTreeChromosome.VALUES.length];
AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.FRUITS, AlleleFruit.fruitNone);
AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.GROWTH, AlleleGrowth.growthLightLevel);
@@ -389,7 +389,7 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot {
@Override
public IChromosomeType[] getKaryotype() {
return EnumTreeChromosome.values();
return EnumTreeChromosome.VALUES;
}
@Override
@@ -113,11 +113,7 @@ public final class AccessHandler implements IAccessHandler {
if (!isOwner(player)) {
return false;
}
int ordinal = (access.ordinal() + 1) % EnumAccess.values().length;
EnumAccess newAccess = EnumAccess.values()[ordinal];
setAccess(player.worldObj, newAccess);
setAccess(player.worldObj, access.next());
return true;
}
@@ -156,7 +152,7 @@ public final class AccessHandler implements IAccessHandler {
public void readData(DataInputStreamForestry data) throws IOException {
byte accessOrdinal = data.readByte();
if (accessOrdinal >= 0) {
access = EnumAccess.values()[accessOrdinal];
access = EnumAccess.fromOrdinal(accessOrdinal);
GameProfile owner = new GameProfile(new UUID(data.readLong(), data.readLong()), data.readUTF());
setOwner(owner);
}
@@ -164,8 +160,7 @@ public final class AccessHandler implements IAccessHandler {
@Override
public void readFromNBT(NBTTagCompound data) {
access = EnumAccess.values()[data.getInteger("Access")];
access = EnumAccess.fromOrdinal(data.getInteger("Access"));
if (data.hasKey("owner")) {
owner = NBTUtil.func_152459_a(data.getCompoundTag("owner"));
}
@@ -8,22 +8,15 @@
******************************************************************************/
package forestry.core.access;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public enum EnumAccess {
SHARED("gui.rule.shared"),
VIEWABLE("gui.rule.restricted"),
PRIVATE("gui.rule.private");
private static final EnumAccess[] VALUES = values();
private final String name;
@SideOnly(Side.CLIENT)
private IIcon icon;
EnumAccess(String name) {
this.name = name;
}
@@ -31,4 +24,13 @@ public enum EnumAccess {
public String getName() {
return this.name;
}
public EnumAccess next() {
int ordinal = (this.ordinal() + 1) % VALUES.length;
return VALUES[ordinal];
}
public static EnumAccess fromOrdinal(int ordinal) {
return VALUES[ordinal];
}
}
@@ -84,31 +84,26 @@ public class BlockSoil extends Block implements IItemTyped {
}
@Override
public void updateTick(World world, int i, int j, int k, Random random) {
public void updateTick(World world, int x, int y, int z, Random random) {
if (world.isRemote) {
return;
}
int meta = world.getBlockMetadata(i, j, k);
int meta = world.getBlockMetadata(x, y, z);
SoilType type = getTypeFromMeta(meta);
if (type == SoilType.HUMUS) {
updateTickHumus(world, i, j, k);
if (world.checkChunksExist(x - 1, y + 1, z - 1, x + 1, y + 1, z + 1)) {
if (isEnrooted(world, x, y, z)) {
degradeSoil(world, x, y, z);
}
}
} else if (type == SoilType.BOG_EARTH) {
updateTickBogEarth(world, i, j, k);
}
}
private static void updateTickHumus(World world, int i, int j, int k) {
if (isEnrooted(world, i, j, k)) {
degradeSoil(world, i, j, k);
}
}
private static void updateTickBogEarth(World world, int i, int j, int k) {
if (isMoistened(world, i, j, k)) {
matureBog(world, i, j, k);
if (world.checkChunksExist(x - 2, y, z - 2, x + 2, y, z + 2)) {
if (isMoistened(world, x, y, z)) {
matureBog(world, x, y, z);
}
}
}
}
@@ -122,7 +117,6 @@ public class BlockSoil extends Block implements IItemTyped {
}
}
}
return false;
}
@@ -156,7 +150,6 @@ public class BlockSoil extends Block implements IItemTyped {
}
private static boolean isMoistened(World world, int x, int y, int z) {
for (int i = -2; i < 3; i++) {
for (int j = -2; j < 3; j++) {
Block block = world.getBlock(x + i, y, z + j);
@@ -165,7 +158,6 @@ public class BlockSoil extends Block implements IItemTyped {
}
}
}
return false;
}
@@ -71,7 +71,7 @@ public class CircuitBoard<T> implements ICircuitBoard {
@Override
public void readFromNBT(NBTTagCompound nbttagcompound) {
type = EnumCircuitBoardType.values()[nbttagcompound.getShort("T")];
type = EnumCircuitBoardType.VALUES[nbttagcompound.getShort("T")];
// Layout
if (nbttagcompound.hasKey("LY")) {
@@ -15,6 +15,11 @@ public enum EnumCircuitBoardType {
REFINED((short) 3, 0x191919, 0xc9c9c9),
INTRICATE((short) 4, 0x191919, 0xe2cb6b);
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumCircuitBoardType[] VALUES = values();
private final short sockets;
private final int primaryColor;
private final int secondaryColor;
@@ -63,7 +63,7 @@ public class GuiSolderingIron extends GuiForestry<ContainerSolderingIron, ItemIn
try {
ICircuitSocketType socketType = layout.getSocketType();
if (CircuitSocketType.FARM.equals(socketType)) {
FarmDirection farmDirection = FarmDirection.values()[i];
FarmDirection farmDirection = FarmDirection.fromOrdinal(i);
String farmDirectionString = farmDirection.toString().toLowerCase(Locale.ENGLISH);
String localizedDirection = StringUtil.localize("gui.solder." + farmDirectionString);
fontRendererObj.drawString(
@@ -50,7 +50,7 @@ public class ItemCircuitBoard extends ItemForestryMultiPass {
@Override
public int getColorFromItemStack(ItemStack itemstack, int pass) {
EnumCircuitBoardType type = EnumCircuitBoardType.values()[itemstack.getItemDamage()];
EnumCircuitBoardType type = EnumCircuitBoardType.VALUES[itemstack.getItemDamage()];
if (pass == 0) {
return type.getPrimaryColor();
} else {
@@ -60,7 +60,7 @@ public class ItemCircuitBoard extends ItemForestryMultiPass {
@Override
public String getUnlocalizedName(ItemStack stack) {
EnumCircuitBoardType type = EnumCircuitBoardType.values()[stack.getItemDamage()];
EnumCircuitBoardType type = EnumCircuitBoardType.VALUES[stack.getItemDamage()];
return "item.for.circuitboard." + type.toString().toLowerCase(Locale.ENGLISH);
}
@@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.minecart.MinecartInteractEvent;
@@ -29,6 +28,7 @@ import forestry.core.gui.GuiHandler;
import forestry.core.gui.IGuiHandlerEntity;
import forestry.core.gui.IHintSource;
import forestry.core.tiles.ITitled;
import forestry.core.utils.StringUtil;
public abstract class EntityMinecartForestry extends EntityMinecart
implements ITitled, IRestrictedAccess, IHintSource, IGuiHandlerEntity {
@@ -111,7 +111,7 @@ public abstract class EntityMinecartForestry extends EntityMinecart
@Override
public String getCommandSenderName() {
return StatCollector.translateToLocal(getUnlocalizedTitle());
return StringUtil.localizeGuiTitle(getUnlocalizedTitle());
}
/* ITitled */
@@ -193,7 +193,7 @@ public class BlockForestryFluid extends BlockFluidClassic {
super.updateTick(world, x, y, z, rand);
// Start fires if the fluid is lava-like
if (getMaterial() == Material.lava) {
if (getMaterial() == Material.lava && world.checkChunksExist(x - 4, y, z - 4, x + 4, y, z + 4)) {
int rangeUp = rand.nextInt(3);
for (int i = 0; i < rangeUp; ++i) {
@@ -10,9 +10,9 @@ package forestry.core.gui;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.util.StatCollector;
import forestry.core.tiles.ITitled;
import forestry.core.utils.StringUtil;
public abstract class GuiForestryTitled<C extends Container, I extends ITitled & IInventory> extends GuiForestry<C, I> {
@@ -24,7 +24,7 @@ public abstract class GuiForestryTitled<C extends Container, I extends ITitled &
protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY);
String name = StatCollector.translateToLocal(inventory.getUnlocalizedTitle());
String name = StringUtil.localizeGuiTitle(inventory.getUnlocalizedTitle());
textLayout.line = 6;
textLayout.drawCenteredLine(name, 0, fontColor.get("gui.title"));
bindTexture(textureFile);
@@ -121,11 +121,11 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS
}
// Illegal type
if (blank.getItemDamage() < 0 || blank.getItemDamage() >= EnumCircuitBoardType.values().length) {
if (blank.getItemDamage() < 0 || blank.getItemDamage() >= EnumCircuitBoardType.VALUES.length) {
return;
}
EnumCircuitBoardType type = EnumCircuitBoardType.values()[blank.getItemDamage()];
EnumCircuitBoardType type = EnumCircuitBoardType.VALUES[blank.getItemDamage()];
if (getCircuitCount() != type.getSockets()) {
return;
}
@@ -172,7 +172,7 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS
if (blankCircuitBoard == null) {
errorStates.add(EnumErrorCode.NO_CIRCUIT_BOARD);
} else {
EnumCircuitBoardType type = EnumCircuitBoardType.values()[blankCircuitBoard.getItemDamage()];
EnumCircuitBoardType type = EnumCircuitBoardType.VALUES[blankCircuitBoard.getItemDamage()];
int circuitCount = 0;
for (short i = 0; i < type.getSockets(); i++) {
@@ -34,6 +34,9 @@ public class ItemFruit extends ItemForestryFood {
DATES("cropDate"),
PAPAYA("cropPapaya"); // , COCONUT("cropCoconut");
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumFruit[] VALUES = values();
private final String oreDict;
@@ -94,13 +97,13 @@ public class ItemFruit extends ItemForestryFood {
@SideOnly(Side.CLIENT)
@Override
public IIcon getIconFromDamage(int meta) {
return EnumFruit.values()[meta].getIcon();
return EnumFruit.VALUES[meta].getIcon();
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
for (int i = 0; i < EnumFruit.values().length; i++) {
for (int i = 0; i < EnumFruit.VALUES.length; i++) {
itemList.add(new ItemStack(this, 1, i));
}
}
@@ -194,7 +194,7 @@ public class ItemRegistryCore extends ItemRegistry {
// FRUITS
fruits = registerItem(new ItemFruit(), "fruits");
for (ItemFruit.EnumFruit def : ItemFruit.EnumFruit.values()) {
for (ItemFruit.EnumFruit def : ItemFruit.EnumFruit.VALUES) {
ItemStack fruit = new ItemStack(fruits, 1, def.ordinal());
OreDictionary.registerOre(def.getOreDict(), fruit);
}
@@ -8,15 +8,19 @@
******************************************************************************/
package forestry.core.render;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import net.minecraft.client.resources.IResource;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.util.ResourceLocation;
public class FontColour {
// private static final ResourceLocation colourDefinitions = new
// ForestryResource("/config/forestry/colour.properties");
private static final ResourceLocation colourDefinitions = new ForestryResource("config/colour.properties");
private static final String defaultColourDefinitions = "/assets/forestry/config/colour.properties";
private final Properties defaultMappings = new Properties();
private final Properties mappings = new Properties();
@@ -30,17 +34,30 @@ public class FontColour {
}
public void load(IResourceManager texturepack) {
try {
// InputStream fontStream = texturepack.func_110536_a(colourDefinitions).func_110527_b();
InputStream defaultFontStream = FontColour.class.getResourceAsStream("/config/forestry/colour.properties");
// mappings.load((fontStream == null) ? defaultFontStream : fontStream);
mappings.load(defaultFontStream);
defaultMappings.load(defaultFontStream);
mappings.clear();
defaultMappings.clear();
// if (fontStream != null)
// fontStream.close();
defaultFontStream.close();
} catch (Exception e) {
try (InputStream defaultFontStream = FontColour.class.getResourceAsStream(defaultColourDefinitions)) {
if (defaultFontStream != null) {
defaultMappings.load(defaultFontStream);
mappings.putAll(defaultMappings);
}
} catch (IOException e) {
e.printStackTrace();
}
if (texturepack == null) {
return;
}
try {
IResource resource = texturepack.getResource(colourDefinitions);
try (InputStream fontStream = resource.getInputStream()) {
mappings.load(fontStream);
}
} catch (FileNotFoundException ignored) {
// Resource pack does not provide an override.
} catch (IOException e) {
e.printStackTrace();
}
}
@@ -235,7 +235,7 @@ public abstract class BlockUtil {
private static Class<? extends Block> GTBlockMachines_Class;
private static Block GTBlockMachines;
private static final boolean bw = Loader.isModLoaded("bartworks");
private static final boolean gt = Loader.isModLoaded("gregtech");
private static final boolean gt = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi");
static {
if (bw) try {
@@ -268,11 +268,13 @@ public abstract class BlockUtil {
} while (stillInside.test(tile));
block = world.getBlock(x, y - depth, z);
if (bw && BW_MetaGenerated_WerkstoffBlocksClass.isInstance(block)) {
if (bw && BW_MetaGenerated_WerkstoffBlocksClass != null
&& BWBlocks != null
&& BW_MetaGenerated_WerkstoffBlocksClass.isInstance(block)) {
return new ItemStack(BWBlocks, 1, block.getDamageValue(world, x, y - depth, z));
}
if (gt && GTBlockMachines_Class.isInstance(block)) {
if (gt && GTBlockMachines_Class != null && GTBlockMachines != null && GTBlockMachines_Class.isInstance(block)) {
return new ItemStack(GTBlockMachines, 1, block.getDamageValue(world, x, y - depth, z));
}
@@ -45,18 +45,18 @@ public class ClimateUtil implements IClimateHelper {
case BOTH_4:
case BOTH_3:
case BOTH_2:
if (prefered.ordinal() + 2 < EnumHumidity.values().length) {
tolerated.add(EnumHumidity.values()[prefered.ordinal() + 2]);
if (prefered.ordinal() + 2 < EnumHumidity.VALUES.length) {
tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 2]);
}
if (prefered.ordinal() - 2 >= 0) {
tolerated.add(EnumHumidity.values()[prefered.ordinal() - 2]);
tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 2]);
}
case BOTH_1:
if (prefered.ordinal() + 1 < EnumHumidity.values().length) {
tolerated.add(EnumHumidity.values()[prefered.ordinal() + 1]);
if (prefered.ordinal() + 1 < EnumHumidity.VALUES.length) {
tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 1]);
}
if (prefered.ordinal() - 1 >= 0) {
tolerated.add(EnumHumidity.values()[prefered.ordinal() - 1]);
tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 1]);
}
return tolerated;
@@ -64,12 +64,12 @@ public class ClimateUtil implements IClimateHelper {
case UP_4:
case UP_3:
case UP_2:
if (prefered.ordinal() + 2 < EnumHumidity.values().length) {
tolerated.add(EnumHumidity.values()[prefered.ordinal() + 2]);
if (prefered.ordinal() + 2 < EnumHumidity.VALUES.length) {
tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 2]);
}
case UP_1:
if (prefered.ordinal() + 1 < EnumHumidity.values().length) {
tolerated.add(EnumHumidity.values()[prefered.ordinal() + 1]);
if (prefered.ordinal() + 1 < EnumHumidity.VALUES.length) {
tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 1]);
}
return tolerated;
@@ -78,11 +78,11 @@ public class ClimateUtil implements IClimateHelper {
case DOWN_3:
case DOWN_2:
if (prefered.ordinal() - 2 >= 0) {
tolerated.add(EnumHumidity.values()[prefered.ordinal() - 2]);
tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 2]);
}
case DOWN_1:
if (prefered.ordinal() - 1 >= 0) {
tolerated.add(EnumHumidity.values()[prefered.ordinal() - 1]);
tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 1]);
}
return tolerated;
@@ -96,85 +96,86 @@ public class ClimateUtil implements IClimateHelper {
ArrayList<EnumTemperature> tolerated = new ArrayList<>();
tolerated.add(prefered);
final EnumTemperature[] TEMP_VALUES = EnumTemperature.VALUES;
switch (tolerance) {
case BOTH_5:
if (prefered.ordinal() + 5 < EnumTemperature.values().length) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() + 5]);
if (prefered.ordinal() + 5 < TEMP_VALUES.length) {
tolerated.add(TEMP_VALUES[prefered.ordinal() + 5]);
}
if (prefered.ordinal() - 5 >= 0) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() - 5]);
tolerated.add(TEMP_VALUES[prefered.ordinal() - 5]);
}
case BOTH_4:
if (prefered.ordinal() + 4 < EnumTemperature.values().length) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() + 4]);
if (prefered.ordinal() + 4 < TEMP_VALUES.length) {
tolerated.add(TEMP_VALUES[prefered.ordinal() + 4]);
}
if (prefered.ordinal() - 4 >= 0) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() - 4]);
tolerated.add(TEMP_VALUES[prefered.ordinal() - 4]);
}
case BOTH_3:
if (prefered.ordinal() + 3 < EnumTemperature.values().length) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() + 3]);
if (prefered.ordinal() + 3 < TEMP_VALUES.length) {
tolerated.add(TEMP_VALUES[prefered.ordinal() + 3]);
}
if (prefered.ordinal() - 3 >= 0) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() - 3]);
tolerated.add(TEMP_VALUES[prefered.ordinal() - 3]);
}
case BOTH_2:
if (prefered.ordinal() + 2 < EnumTemperature.values().length) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() + 2]);
if (prefered.ordinal() + 2 < TEMP_VALUES.length) {
tolerated.add(TEMP_VALUES[prefered.ordinal() + 2]);
}
if (prefered.ordinal() - 2 >= 0) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() - 2]);
tolerated.add(TEMP_VALUES[prefered.ordinal() - 2]);
}
case BOTH_1:
if (prefered.ordinal() + 1 < EnumTemperature.values().length) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() + 1]);
if (prefered.ordinal() + 1 < TEMP_VALUES.length) {
tolerated.add(TEMP_VALUES[prefered.ordinal() + 1]);
}
if (prefered.ordinal() - 1 >= 0) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() - 1]);
tolerated.add(TEMP_VALUES[prefered.ordinal() - 1]);
}
return tolerated;
case UP_5:
if (prefered.ordinal() + 5 < EnumTemperature.values().length) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() + 5]);
if (prefered.ordinal() + 5 < TEMP_VALUES.length) {
tolerated.add(TEMP_VALUES[prefered.ordinal() + 5]);
}
case UP_4:
if (prefered.ordinal() + 4 < EnumTemperature.values().length) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() + 4]);
if (prefered.ordinal() + 4 < TEMP_VALUES.length) {
tolerated.add(TEMP_VALUES[prefered.ordinal() + 4]);
}
case UP_3:
if (prefered.ordinal() + 3 < EnumTemperature.values().length) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() + 3]);
if (prefered.ordinal() + 3 < TEMP_VALUES.length) {
tolerated.add(TEMP_VALUES[prefered.ordinal() + 3]);
}
case UP_2:
if (prefered.ordinal() + 2 < EnumTemperature.values().length) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() + 2]);
if (prefered.ordinal() + 2 < TEMP_VALUES.length) {
tolerated.add(TEMP_VALUES[prefered.ordinal() + 2]);
}
case UP_1:
if (prefered.ordinal() + 1 < EnumTemperature.values().length) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() + 1]);
if (prefered.ordinal() + 1 < TEMP_VALUES.length) {
tolerated.add(TEMP_VALUES[prefered.ordinal() + 1]);
}
return tolerated;
case DOWN_5:
if (prefered.ordinal() - 5 >= 0) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() - 5]);
tolerated.add(TEMP_VALUES[prefered.ordinal() - 5]);
}
case DOWN_4:
if (prefered.ordinal() - 4 >= 0) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() - 4]);
tolerated.add(TEMP_VALUES[prefered.ordinal() - 4]);
}
case DOWN_3:
if (prefered.ordinal() - 3 >= 0) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() - 3]);
tolerated.add(TEMP_VALUES[prefered.ordinal() - 3]);
}
case DOWN_2:
if (prefered.ordinal() - 2 >= 0) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() - 2]);
tolerated.add(TEMP_VALUES[prefered.ordinal() - 2]);
}
case DOWN_1:
if (prefered.ordinal() - 1 >= 0) {
tolerated.add(EnumTemperature.values()[prefered.ordinal() - 1]);
tolerated.add(TEMP_VALUES[prefered.ordinal() - 1]);
}
return tolerated;
@@ -38,6 +38,17 @@ public class StringUtil {
.replace("\\%", "@");
}
public static String localizeGuiTitle(String unlocalizedKey) {
String titleKey = unlocalizedKey + ".title";
String translated;
if (StatCollector.canTranslate(titleKey)) {
translated = StatCollector.translateToLocal(titleKey);
} else {
translated = StatCollector.translateToLocal(unlocalizedKey);
}
return translated.replace("\\n", "\n").replace("@", "%").replace("\\%", "@");
}
public static String localizeAndFormat(String key, Object... args) {
return localizeAndFormatRaw("for." + key, args);
}
@@ -15,7 +15,6 @@ import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
import net.minecraftforge.fluids.FluidStack;
@@ -26,6 +25,7 @@ import codechicken.nei.PositionedStack;
import forestry.core.recipes.nei.NEIUtils;
import forestry.core.recipes.nei.PositionedFluidTank;
import forestry.core.recipes.nei.RecipeHandlerBase;
import forestry.core.utils.StringUtil;
import forestry.factory.gui.GuiBottler;
import forestry.factory.recipes.BottlerRecipe;
@@ -89,7 +89,7 @@ public class NEIHandlerBottler extends RecipeHandlerBase {
@Override
public String getRecipeName() {
return StatCollector.translateToLocal("tile.for.factory.0.name");
return StringUtil.localizeGuiTitle("tile.for.factory.0.name");
}
@Override
@@ -15,7 +15,6 @@ import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidStack;
import codechicken.lib.gui.GuiDraw;
@@ -28,6 +27,7 @@ import forestry.api.recipes.RecipeManagers;
import forestry.core.recipes.nei.NEIUtils;
import forestry.core.recipes.nei.PositionedFluidTank;
import forestry.core.recipes.nei.RecipeHandlerBase;
import forestry.core.utils.StringUtil;
import forestry.factory.gui.GuiCarpenter;
public class NEIHandlerCarpenter extends RecipeHandlerBase {
@@ -125,7 +125,7 @@ public class NEIHandlerCarpenter extends RecipeHandlerBase {
@Override
public String getRecipeName() {
return StatCollector.translateToLocal("tile.for.factory.1.name");
return StringUtil.localizeGuiTitle("tile.for.factory.1.name");
}
@Override
@@ -18,7 +18,6 @@ import java.util.Set;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
@@ -26,6 +25,7 @@ import forestry.api.recipes.ICentrifugeRecipe;
import forestry.api.recipes.RecipeManagers;
import forestry.core.recipes.nei.PositionedStackAdv;
import forestry.core.recipes.nei.RecipeHandlerBase;
import forestry.core.utils.StringUtil;
import forestry.factory.gui.GuiCentrifuge;
public class NEIHandlerCentrifuge extends RecipeHandlerBase {
@@ -109,7 +109,7 @@ public class NEIHandlerCentrifuge extends RecipeHandlerBase {
@Override
public String getRecipeName() {
return StatCollector.translateToLocal("tile.for.factory.2.name");
return StringUtil.localizeGuiTitle("tile.for.factory.2.name");
}
@Override
@@ -18,7 +18,6 @@ import java.util.Map;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -31,6 +30,7 @@ import forestry.api.recipes.RecipeManagers;
import forestry.core.recipes.nei.NEIUtils;
import forestry.core.recipes.nei.PositionedFluidTank;
import forestry.core.recipes.nei.RecipeHandlerBase;
import forestry.core.utils.StringUtil;
import forestry.factory.gui.GuiFabricator;
import forestry.factory.recipes.FabricatorSmeltingRecipeManager;
@@ -140,7 +140,7 @@ public class NEIHandlerFabricator extends RecipeHandlerBase {
@Override
public String getRecipeName() {
return StatCollector.translateToLocal("tile.for.factory2.0.name");
return StringUtil.localizeGuiTitle("tile.for.factory2.0.name");
}
@Override
@@ -16,7 +16,6 @@ import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidStack;
import codechicken.lib.gui.GuiDraw;
@@ -32,6 +31,7 @@ import forestry.core.config.Constants;
import forestry.core.recipes.nei.NEIUtils;
import forestry.core.recipes.nei.PositionedFluidTank;
import forestry.core.recipes.nei.RecipeHandlerBase;
import forestry.core.utils.StringUtil;
import forestry.factory.gui.GuiFermenter;
public class NEIHandlerFermenter extends RecipeHandlerBase {
@@ -118,7 +118,7 @@ public class NEIHandlerFermenter extends RecipeHandlerBase {
@Override
public String getRecipeName() {
return StatCollector.translateToLocal("tile.for.factory.3.name");
return StringUtil.localizeGuiTitle("tile.for.factory.3.name");
}
@Override
@@ -15,7 +15,6 @@ import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@@ -27,6 +26,7 @@ import forestry.api.recipes.IMoistenerRecipe;
import forestry.api.recipes.RecipeManagers;
import forestry.core.recipes.nei.PositionedFluidTank;
import forestry.core.recipes.nei.RecipeHandlerBase;
import forestry.core.utils.StringUtil;
import forestry.factory.gui.GuiMoistener;
public class NEIHandlerMoistener extends RecipeHandlerBase {
@@ -88,7 +88,7 @@ public class NEIHandlerMoistener extends RecipeHandlerBase {
@Override
public String getRecipeName() {
return StatCollector.translateToLocal("tile.for.factory.4.name");
return StringUtil.localizeGuiTitle("tile.for.factory.4.name");
}
@Override
@@ -18,7 +18,6 @@ import java.util.Random;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidStack;
import codechicken.nei.NEIServerUtils;
@@ -30,6 +29,7 @@ import forestry.core.recipes.nei.NEIUtils;
import forestry.core.recipes.nei.PositionedFluidTank;
import forestry.core.recipes.nei.PositionedStackAdv;
import forestry.core.recipes.nei.RecipeHandlerBase;
import forestry.core.utils.StringUtil;
import forestry.factory.gui.GuiSqueezer;
import forestry.factory.recipes.ISqueezerContainerRecipe;
import forestry.factory.recipes.SqueezerRecipeManager;
@@ -165,7 +165,7 @@ public class NEIHandlerSqueezer extends RecipeHandlerBase {
@Override
public String getRecipeName() {
return StatCollector.translateToLocal("tile.for.factory.5.name");
return StringUtil.localizeGuiTitle("tile.for.factory.5.name");
}
@Override
@@ -14,7 +14,6 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidStack;
import codechicken.lib.gui.GuiDraw;
@@ -24,6 +23,7 @@ import forestry.api.recipes.RecipeManagers;
import forestry.core.recipes.nei.NEIUtils;
import forestry.core.recipes.nei.PositionedFluidTank;
import forestry.core.recipes.nei.RecipeHandlerBase;
import forestry.core.utils.StringUtil;
import forestry.factory.gui.GuiStill;
public class NEIHandlerStill extends RecipeHandlerBase {
@@ -71,7 +71,7 @@ public class NEIHandlerStill extends RecipeHandlerBase {
@Override
public String getRecipeName() {
return StatCollector.translateToLocal("tile.for.factory.6.name");
return StringUtil.localizeGuiTitle("tile.for.factory.6.name");
}
@Override
@@ -61,7 +61,7 @@ public class BlockFarm extends BlockStructure {
continue;
}
for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) {
for (EnumFarmBlockTexture block : EnumFarmBlockTexture.VALUES) {
ItemStack stack = new ItemStack(item, 1, i);
NBTTagCompound compound = new NBTTagCompound();
block.saveToCompound(compound);
@@ -72,51 +72,54 @@ public class BlockMushroom extends BlockSapling implements IItemTyped {
}
@Override
public void updateTick(World world, int i, int j, int k, Random random) {
public void updateTick(World world, int x, int y, int z, Random random) {
if (world.isRemote) {
return;
}
int meta = world.getBlockMetadata(i, j, k);
MushroomType type = getTypeFromMeta(meta);
int maturity = meta >> 2;
final int meta = world.getBlockMetadata(x, y, z);
final MushroomType type = getTypeFromMeta(meta);
final int maturity = meta >> 2;
tickGermling(world, i, j, k, random, type, maturity);
tickGermling(world, x, y, z, random, type, maturity);
}
private void tickGermling(World world, int i, int j, int k, Random random, MushroomType type, int maturity) {
int lightvalue = world.getBlockLightValue(i, j + 1, k);
private void tickGermling(World world, int x, int y, int z, Random random, MushroomType type, int maturity) {
if (random.nextInt(2) != 0) {
return;
}
if (maturity != 3) {
maturity = 3;
int matX = maturity << 2;
int meta = (matX | type.ordinal());
world.setBlockMetadataWithNotify(i, j, k, meta, Constants.FLAG_BLOCK_SYNCH);
} else if (lightvalue <= 7) {
func_149878_d(world, i, j, k, random);
final int matX = maturity << 2;
final int meta = (matX | type.ordinal());
world.setBlockMetadataWithNotify(x, y, z, meta, Constants.FLAG_BLOCK_SYNCH);
} else {
if (world.checkChunksExist(x - 1, y, z - 1, x + 1, y, z + 1)) {
final int lightvalue = world.getBlockLightValue(x, y + 1, z);
if (lightvalue <= 7) {
func_149878_d(world, x, y, z, random);
}
}
}
}
@Override
public void func_149878_d(World world, int i, int j, int k, Random random) {
MushroomType type = getTypeFromMeta(world.getBlockMetadata(i, j, k));
public void func_149878_d(World world, int x, int y, int z, Random random) {
MushroomType type = getTypeFromMeta(world.getBlockMetadata(x, y, z));
world.setBlockToAir(i, j, k);
if (!generators[type.ordinal()].generate(world, random, i, j, k)) {
world.setBlock(i, j, k, this, type.ordinal(), 0);
world.setBlockToAir(x, y, z);
if (!generators[type.ordinal()].generate(world, random, x, y, z)) {
world.setBlock(x, y, z, this, type.ordinal(), 0);
}
}
@Override
public MushroomType getTypeFromMeta(int meta) {
meta %= MushroomType.values().length;
return MushroomType.values()[meta];
return switch (meta % 2) {
case 0 -> MushroomType.BROWN;
case 1 -> MushroomType.RED;
default -> throw new IllegalStateException("Unexpected value: " + meta);
};
}
/* ICONS */
@@ -135,15 +138,10 @@ public class BlockMushroom extends BlockSapling implements IItemTyped {
@SideOnly(Side.CLIENT)
@Override
public IIcon getIcon(int side, int meta) {
MushroomType type = getTypeFromMeta(meta);
switch (type) {
case BROWN:
return Blocks.brown_mushroom.getIcon(side, meta);
case RED:
return Blocks.red_mushroom.getIcon(side, meta);
default:
return null;
}
final MushroomType type = getTypeFromMeta(meta);
return switch (type) {
case BROWN -> Blocks.brown_mushroom.getIcon(side, meta);
case RED -> Blocks.red_mushroom.getIcon(side, meta);
};
}
}
@@ -61,7 +61,7 @@ public class CircuitFarmLogic extends Circuit {
} catch (Throwable e) {
// uses older version of the API that doesn't implement setManual
}
housing.setFarmLogic(FarmDirection.values()[slot], logic);
housing.setFarmLogic(FarmDirection.fromOrdinal(slot), logic);
}
@Override
@@ -75,8 +75,7 @@ public class CircuitFarmLogic extends Circuit {
if (farmHousing == null) {
return;
}
farmHousing.resetFarmLogic(FarmDirection.values()[slot]);
farmHousing.resetFarmLogic(FarmDirection.fromOrdinal(slot));
}
@Override
@@ -372,7 +372,7 @@ public class FarmController extends RectangularMultiblockControllerBase
}
private void refreshFarmLogics() {
for (FarmDirection direction : FarmDirection.values()) {
for (FarmDirection direction : FarmDirection.VALUES) {
resetFarmLogic(direction);
}
@@ -475,7 +475,7 @@ public class FarmController extends RectangularMultiblockControllerBase
// Cultivation and collection
FarmWorkStatus farmWorkStatus = new FarmWorkStatus();
for (FarmDirection farmSide : FarmDirection.values()) {
for (FarmDirection farmSide : FarmDirection.VALUES) {
IFarmLogic logic = getFarmLogic(farmSide);
if (logic == null) {
@@ -541,7 +541,7 @@ public class FarmController extends RectangularMultiblockControllerBase
private static void createTargets(World world, Map<FarmDirection, List<FarmTarget>> targets, Vect targetStart,
final int allowedExtent, final int farmSizeNorthSouth, final int farmSizeEastWest) {
for (FarmDirection farmSide : FarmDirection.values()) {
for (FarmDirection farmSide : FarmDirection.VALUES) {
final int farmWidth;
if (farmSide == FarmDirection.NORTH || farmSide == FarmDirection.SOUTH) {
@@ -106,7 +106,7 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
return false;
}
for (FarmDirection farmDirection : FarmDirection.values()) {
for (FarmDirection farmDirection : FarmDirection.VALUES) {
IFarmLogic logic = farmController.getFarmLogic(farmDirection);
if (logic.isAcceptedGermling(itemstack)) {
return true;
@@ -122,7 +122,7 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn
return false;
}
for (FarmDirection farmDirection : FarmDirection.values()) {
for (FarmDirection farmDirection : FarmDirection.VALUES) {
IFarmLogic logic = farmController.getFarmLogic(farmDirection);
if (logic.isAcceptedResource(itemstack)) {
return true;
@@ -45,8 +45,17 @@ public enum EnumFarmBlockTexture {
private static final int TYPE_VALVE = 6;
private static final int TYPE_CONTROL = 7;
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumFarmBlockTexture[] VALUES = values();
@SideOnly(Side.CLIENT)
private static List<IIcon> icons;
private final ItemStack base;
EnumFarmBlockTexture(ItemStack base) {
this.base = base;
}
@SideOnly(Side.CLIENT)
public static void registerIcons(IIconRegister register) {
@@ -61,12 +70,6 @@ public enum EnumFarmBlockTexture {
TextureManager.registerTex(register, "farm/control"));
}
private final ItemStack base;
EnumFarmBlockTexture(ItemStack base) {
this.base = base;
}
@SideOnly(Side.CLIENT)
public static IIcon getIcon(BlockFarmType type, int side) {
switch (type) {
@@ -109,11 +112,10 @@ public enum EnumFarmBlockTexture {
public static EnumFarmBlockTexture getFromCompound(NBTTagCompound compound) {
if (compound != null) {
int farmBlockOrdinal = compound.getInteger("FarmBlock");
if (farmBlockOrdinal < EnumFarmBlockTexture.values().length) {
return EnumFarmBlockTexture.values()[farmBlockOrdinal];
if (farmBlockOrdinal < EnumFarmBlockTexture.VALUES.length) {
return EnumFarmBlockTexture.VALUES[farmBlockOrdinal];
}
}
return EnumFarmBlockTexture.BRICK_STONE;
}
}
@@ -57,7 +57,7 @@ public enum ButterflyBranchDefinition implements IBranchDefinition {
@Override
public IAllele[] getTemplate() {
if (defaultTemplate == null) {
defaultTemplate = new IAllele[EnumButterflyChromosome.values().length];
defaultTemplate = new IAllele[EnumButterflyChromosome.VALUES.length];
AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALL);
AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWEST);
@@ -245,7 +245,7 @@ public class ButterflyHelper extends SpeciesRoot implements IButterflyRoot {
@Override
public IChromosomeType[] getKaryotype() {
return EnumButterflyChromosome.values();
return EnumButterflyChromosome.VALUES;
}
@Override
@@ -9,7 +9,6 @@
package forestry.mail.gui;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.StatCollector;
import forestry.core.config.Constants;
import forestry.core.gui.GuiForestry;
@@ -26,7 +25,7 @@ public class GuiTrader extends GuiForestry<ContainerTrader, TileTrader> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
String name = StatCollector.translateToLocal(inventory.getUnlocalizedTitle());
String name = StringUtil.localizeGuiTitle(inventory.getUnlocalizedTitle());
this.fontRendererObj.drawString(name, textLayout.getCenteredOffset(name), 6, fontColor.get("gui.mail.text"));
String receive = StringUtil.localize("gui.mail.receive");
@@ -300,7 +300,7 @@ public class PluginFarming extends ForestryPlugin {
ItemStack valve = blocks.farm.get(BlockFarmType.VALVE, 1);
ItemStack control = blocks.farm.get(BlockFarmType.CONTROL, 1);
for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) {
for (EnumFarmBlockTexture block : EnumFarmBlockTexture.VALUES) {
NBTTagCompound compound = new NBTTagCompound();
block.saveToCompound(compound);
@@ -47,6 +47,7 @@ import forestry.plugins.compat.PluginBuildCraftTransport;
import forestry.plugins.compat.PluginChisel;
import forestry.plugins.compat.PluginEnderIO;
import forestry.plugins.compat.PluginErebus;
import forestry.plugins.compat.PluginEtFuturumRequiem;
import forestry.plugins.compat.PluginExtraUtilities;
import forestry.plugins.compat.PluginGrowthCraft;
import forestry.plugins.compat.PluginHarvestCraft;
@@ -118,7 +119,8 @@ public class PluginManager {
NATURA(new PluginNatura()),
PLANTMEGAPACK(new PluginPlantMegaPack()),
ROTARYCRAFT(new PluginRotaryCraft()),
WITCHERY(new PluginWitchery());
WITCHERY(new PluginWitchery()),
EFR(new PluginEtFuturumRequiem());
static {
ForestryAPI.enabledPlugins = new HashSet<>();
@@ -0,0 +1,65 @@
package forestry.plugins.compat;
import net.minecraft.block.Block;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.api.apiculture.FlowerManager;
import forestry.core.utils.ModUtil;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.Plugin;
import forestry.plugins.PluginManager;
@Plugin(
pluginID = "EtFuturumRequiem",
name = "EtFuturumRequiem",
unlocalizedDescription = "for.plugin.etfuturum.description")
public class PluginEtFuturumRequiem extends ForestryPlugin {
private static final String EFR = "etfuturum";
@Override
public boolean isAvailable() {
return ModUtil.isModLoaded(EFR);
}
@Override
public String getFailMessage() {
return "EtFuturumRequiem not found";
}
@Override
public void doInit() {
super.doInit();
if (PluginManager.Module.APICULTURE.isEnabled()) {
addFlowers();
}
}
private void addFlowers() {
Block CornFlower = GameRegistry.findBlock(EFR, "cornflower");
Block Lily = GameRegistry.findBlock(EFR, "lily_of_the_valley");
Block Petals = GameRegistry.findBlock(EFR, "pink_petals");
Block Rose = GameRegistry.findBlock(EFR, "rose");
Block WitherRose = GameRegistry.findBlock(EFR, "wither_rose");
Block ChorusFlower = GameRegistry.findBlock(EFR, "chorus_flower");
if (CornFlower != null) {
FlowerManager.flowerRegistry.registerAcceptableFlower(CornFlower, FlowerManager.FlowerTypeVanilla);
}
if (Lily != null) {
FlowerManager.flowerRegistry.registerAcceptableFlower(Lily, FlowerManager.FlowerTypeVanilla);
}
if (Petals != null) {
FlowerManager.flowerRegistry.registerAcceptableFlower(Petals, FlowerManager.FlowerTypeVanilla);
}
if (Rose != null) {
FlowerManager.flowerRegistry.registerAcceptableFlower(Rose, FlowerManager.FlowerTypeVanilla);
}
if (WitherRose != null) {
FlowerManager.flowerRegistry.registerAcceptableFlower(WitherRose, FlowerManager.FlowerTypeNether);
}
if (ChorusFlower != null) {
FlowerManager.flowerRegistry.registerAcceptableFlower(ChorusFlower, FlowerManager.FlowerTypeEnd);
}
}
}
@@ -1,6 +1,6 @@
# Add a file of this format in your texture packs zip as
# /config/forestry/colour.properties to configure font colours.
# A file at that location inside the zip of the active texture pack
# Add a file of this format in your resource pack zip as
# /assets/forestry/config/colour.properties to configure font colours.
# A file at that location inside the zip of the active resource pack
# will take precedence over the default.
#
# Hex format without leading 0x
@@ -48,4 +48,4 @@ ledger.farm.text=000000
ledger.search_ingredients.background=ffffff
ledger.search_ingredients.header=587b96
ledger.search_ingredients.text=000000
ledger.search_ingredients.text=000000
@@ -1738,6 +1738,7 @@ for.plugin.growthcraft.description=Compatibility plugin for GrowthCraft
for.plugin.erebus.description=Compatibility plugin for Erebus
for.plugin.rotarycraft.description=Compatibility plugin for RotaryCraft
for.plugin.minefactoryreloaded.description=Compatibility plugin for MineFactoryReloaded
for.plugin.etfuturum.description=Compatibility plugin for EtFuturumRequiem
####################
# CONFIG FILES
Binary file not shown.

Before

Width:  |  Height:  |  Size: 411 B

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 447 B

After

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 212 B

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 467 B

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 B

After

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 236 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 349 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 359 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 209 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 B

After

Width:  |  Height:  |  Size: 326 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 359 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 239 B

After

Width:  |  Height:  |  Size: 233 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 379 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 371 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 221 B

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 168 B

After

Width:  |  Height:  |  Size: 161 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 B

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 B

After

Width:  |  Height:  |  Size: 113 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 B

After

Width:  |  Height:  |  Size: 113 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 334 B

Loaded 100 of 234 files, more files were not shown because too many files have changed in this diff. Show more