mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-15 09:34:57 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e1398438d | ||
|
|
a02df943ed | ||
|
|
f88742e7ab | ||
|
|
fb2ff8aef3 | ||
|
|
3f41c5e8f8 | ||
|
|
81b1de6925 | ||
|
|
278d091b08 | ||
|
|
1552ad1b68 | ||
|
|
bf94b22345 | ||
|
|
c89b61682a | ||
|
|
43fc136fe3 | ||
|
|
ea52fa0d55 | ||
|
|
725d556718 | ||
|
|
d88c007fbb | ||
|
|
485333c6aa | ||
|
|
240802082e | ||
|
|
6f182e932d | ||
|
|
d08b42f18c | ||
|
|
57cc915a1e | ||
|
|
d7c5940596 | ||
|
|
79a6af701b | ||
|
|
4c0b503b8b | ||
|
|
2a6f3771a3 | ||
|
|
04a7c96b4d | ||
|
|
6d0a001b9e | ||
|
|
e2c2ff8d30 | ||
|
|
586f5bf093 | ||
|
|
755301d313 | ||
|
|
33f3389b84 | ||
|
|
c9167b8316 | ||
|
|
1ed646b147 | ||
|
|
7a7930d7eb | ||
|
|
3dccc7e06d | ||
|
|
18e26956ef | ||
|
|
713b0f9d9e | ||
|
|
c6f2e3c7b3 | ||
|
|
c6d8518d82 | ||
|
|
98711e5d34 | ||
|
|
5caab59507 | ||
|
|
41d47d99ca | ||
|
|
3c6d5d04d0 |
No files matched your search
@@ -30,3 +30,4 @@ src/main/resources/mixins.*.json
|
||||
*.bat
|
||||
*.DS_Store
|
||||
!gradlew.bat
|
||||
layout.json
|
||||
+4
-4
@@ -2,10 +2,10 @@
|
||||
|
||||
dependencies {
|
||||
api('curse.maven:cofh-lib-220333:2388748')
|
||||
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta6:api')
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.35-GTNH:dev')
|
||||
compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.0:api')
|
||||
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
|
||||
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.55:api')
|
||||
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
|
||||
compileOnly('curse.maven:craftguide-75557:2459320')
|
||||
}
|
||||
+42
-7
@@ -14,7 +14,7 @@ modId = Forestry
|
||||
modGroup = forestry
|
||||
|
||||
# Whether to use modGroup as the maven publishing group.
|
||||
# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
|
||||
# When false, com.github.GTNewHorizons is used.
|
||||
useModGroupForPublishing = false
|
||||
|
||||
# Updates your build.gradle and settings.gradle automatically whenever an update is available.
|
||||
@@ -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.
|
||||
@@ -80,7 +104,7 @@ apiPackage = api
|
||||
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
|
||||
# There can be multiple files in a space-separated list.
|
||||
# Example value: mymodid_at.cfg nei_at.cfg
|
||||
accessTransformersFile =
|
||||
accessTransformersFile = forestry_at.cfg
|
||||
|
||||
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
|
||||
usesMixins = false
|
||||
@@ -96,7 +120,9 @@ usesMixinDebug = false
|
||||
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
|
||||
mixinPlugin =
|
||||
|
||||
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
|
||||
# Specify the package that contains all of your Mixins. The package must exist or
|
||||
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
|
||||
# it must match with this or the build will fail.
|
||||
mixinsPackage =
|
||||
|
||||
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
|
||||
@@ -151,7 +177,7 @@ modrinthProjectId =
|
||||
# type can be one of [project, version],
|
||||
# and the name is the Modrinth project or version slug/id of the other mod.
|
||||
# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
|
||||
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
|
||||
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
|
||||
modrinthRelations =
|
||||
|
||||
# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
|
||||
@@ -172,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.
|
||||
@@ -201,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
|
||||
@@ -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
|
||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
@@ -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.
|
||||
@@ -86,8 +86,7 @@ done
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||
' "$PWD" ) || exit
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@@ -115,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.
|
||||
@@ -173,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" )
|
||||
|
||||
@@ -206,15 +203,14 @@ fi
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
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
@@ -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
@@ -17,7 +17,7 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.20'
|
||||
}
|
||||
|
||||
|
||||
@@ -12,11 +12,15 @@ public interface IClimateControlled {
|
||||
|
||||
/**
|
||||
* Change the temperature, but not lower than boundaryDown or higher than boundaryUp.
|
||||
*
|
||||
* When used in an alveary the change applies a 20x stronger effect
|
||||
*/
|
||||
void addTemperatureChange(float change, float boundaryDown, float boundaryUp);
|
||||
|
||||
/**
|
||||
* Change the humidity, but not lower than boundaryDown or higher than boundaryUp.
|
||||
*
|
||||
* When used in an alveary the change applies a 20x stronger effect
|
||||
*/
|
||||
void addHumidityChange(float change, float boundaryDown, float boundaryUp);
|
||||
}
|
||||
@@ -9,33 +9,37 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
public class RainSubstrate {
|
||||
|
||||
public enum WeatherState {
|
||||
CLEAR,
|
||||
RAIN,
|
||||
STORM
|
||||
}
|
||||
|
||||
/**
|
||||
* Rain substrate capable of activating the rainmaker.
|
||||
*/
|
||||
public ItemStack item;
|
||||
/**
|
||||
* Duration of the rain shower triggered by this substrate in Minecraft ticks.
|
||||
* Duration of the weather event triggered by this substrate in Minecraft ticks.
|
||||
*/
|
||||
public int duration;
|
||||
/**
|
||||
* Speed of activation sequence triggered.
|
||||
*/
|
||||
public float speed;
|
||||
/**
|
||||
* The type of weather triggered.
|
||||
*/
|
||||
public WeatherState weather;
|
||||
|
||||
public boolean reverse;
|
||||
|
||||
public RainSubstrate(ItemStack item, int duration, float speed) {
|
||||
this(item, duration, speed, false);
|
||||
public RainSubstrate(ItemStack item, float speed, WeatherState weather) {
|
||||
this(item, 0, speed, weather);
|
||||
}
|
||||
|
||||
public RainSubstrate(ItemStack item, float speed) {
|
||||
this(item, 0, speed, true);
|
||||
}
|
||||
|
||||
public RainSubstrate(ItemStack item, int duration, float speed, boolean reverse) {
|
||||
public RainSubstrate(ItemStack item, int duration, float speed, WeatherState weather) {
|
||||
this.item = item;
|
||||
this.duration = duration;
|
||||
this.speed = speed;
|
||||
this.reverse = reverse;
|
||||
this.weather = weather;
|
||||
}
|
||||
}
|
||||
@@ -49,6 +49,14 @@ public interface IAlvearyComponent<T extends IMultiblockLogicAlveary> extends IM
|
||||
* @param alveary the climate controlled alveary
|
||||
*/
|
||||
void changeClimate(int tickCount, IClimateControlled alveary);
|
||||
|
||||
/**
|
||||
* Get the priority of this climatiser. Called when alveary is constructed.
|
||||
* {@link #changeClimate(int, IClimateControlled)} are run in descending priority.
|
||||
*/
|
||||
default int getPriority() {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -9,6 +9,8 @@ import net.minecraft.util.ChunkCoordinates;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
import forestry.core.inventory.IInventoryAdapter;
|
||||
|
||||
/**
|
||||
* Basic interface for a multiblock machine component. Implemented by TileEntities.
|
||||
*/
|
||||
@@ -45,4 +47,15 @@ public interface IMultiblockComponent {
|
||||
* Called when the machine is broken for game reasons, e.g. a player removed a block or an explosion occurred.
|
||||
*/
|
||||
void onMachineBroken();
|
||||
|
||||
/**
|
||||
* A component with a separate inventory, like the Alveary Swarmer or Alveary Sieve.
|
||||
*/
|
||||
interface HasInventory {
|
||||
|
||||
/**
|
||||
* Called when this part is destroyed to drop its contents.
|
||||
*/
|
||||
IInventoryAdapter getInternalInventory();
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,10 @@
|
||||
******************************************************************************/
|
||||
package forestry.apiculture;
|
||||
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
@@ -73,4 +76,27 @@ public class InventoryBeeHousing extends InventoryAdapterRestricted implements I
|
||||
public final boolean addProduct(ItemStack product, boolean all) {
|
||||
return InventoryUtil.tryAddStack(this, product, SLOT_PRODUCT_1, SLOT_PRODUCT_COUNT, all, true);
|
||||
}
|
||||
|
||||
public void dumpInventoryIntoWorld(World world, ChunkCoordinates coordinates) {
|
||||
if (world.isRemote) {
|
||||
return;
|
||||
}
|
||||
for (int i = 0; i < SLOT_PRODUCT_COUNT; i++) {
|
||||
ItemStack stack = getStackInSlot(i);
|
||||
if (stack == null) {
|
||||
continue;
|
||||
}
|
||||
setInventorySlotContents(i, null);
|
||||
|
||||
EntityItem entityitem = new EntityItem(
|
||||
world,
|
||||
coordinates.posX + 0.5,
|
||||
coordinates.posY + 0.5,
|
||||
coordinates.posZ + 0.5,
|
||||
stack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
world.spawnEntityInWorld(entityitem);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -213,6 +213,7 @@ public final class FlowerRegistry implements IFlowerRegistry, IFlowerGrowthHelpe
|
||||
|
||||
private static boolean isAcceptedFlower(String flowerType, Set<Block> acceptedBlocks, Set<Flower> acceptedFlowers,
|
||||
World world, int x, int y, int z) {
|
||||
if (!world.blockExists(x, y, z)) return false;
|
||||
Block block = world.getBlock(x, y, z);
|
||||
|
||||
final int meta;
|
||||
|
||||
@@ -24,7 +24,7 @@ public class GrowthRuleDirtGrass implements IFlowerGrowthRule {
|
||||
@Override
|
||||
public boolean growFlower(IFlowerRegistry flowerRegistry, String flowerType, World world, IIndividual individual,
|
||||
int x, int y, int z) {
|
||||
if (!world.isAirBlock(x, y, z)) {
|
||||
if (!world.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ public class GrowthRuleDirtGrass implements IFlowerGrowthRule {
|
||||
|
||||
@Override
|
||||
public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) {
|
||||
if (!world.isAirBlock(x, y, z)) {
|
||||
if (!world.blockExists(x, y, z) || !world.isAirBlock(x, y, z)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -34,6 +34,10 @@ public class GrowthRuleFlowerPot implements IFlowerGrowthRule {
|
||||
}
|
||||
|
||||
private static boolean growFlower(String flowerType, World world, int x, int y, int z) {
|
||||
if (!world.blockExists(x, y, z)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
TileEntity tile = world.getTileEntity(x, y, z);
|
||||
if (!(tile instanceof TileEntityFlowerPot)) {
|
||||
return false;
|
||||
|
||||
@@ -773,6 +773,9 @@ public class Bee extends IndividualLiving implements IBee {
|
||||
for (int i = 0; i < 20; i++) {
|
||||
Vect randomPos = Vect.getRandomPositionInArea(random, area);
|
||||
Vect blockPos = Vect.add(housingPos, randomPos, offset);
|
||||
if (!world.blockExists(blockPos.x, blockPos.y, blockPos.z)) {
|
||||
continue;
|
||||
}
|
||||
TileEntity tile = world.getTileEntity(blockPos.x, blockPos.y, blockPos.z);
|
||||
|
||||
if (tile instanceof IPollinatable) {
|
||||
|
||||
@@ -331,7 +331,7 @@ public enum BeeDefinition implements IBeeDefinition {
|
||||
@Override
|
||||
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
|
||||
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.55f)
|
||||
.addProduct(PluginCore.items.ash.getItemStack(), 0.15f).setTemperature(EnumTemperature.HELLISH)
|
||||
.addProduct(PluginCore.items.getAsh(), 0.15f).setTemperature(EnumTemperature.HELLISH)
|
||||
.setHumidity(EnumHumidity.ARID);
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.World;
|
||||
@@ -107,11 +108,8 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
|
||||
}
|
||||
|
||||
// Some mods might use this logic? Idk, just a safety check. Might stop griefing.
|
||||
if (!world.canMineBlock(
|
||||
housing.getWorld().func_152378_a(housing.getOwner().getId()),
|
||||
posHousing.x,
|
||||
posHousing.y,
|
||||
posHousing.z)) {
|
||||
EntityPlayer player = world.func_152378_a(housing.getOwner().getId());
|
||||
if (player == null || !world.canMineBlock(player, posHousing.x, posHousing.y, posHousing.z)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -27,6 +27,10 @@ public abstract class AlleleEffectThrottled extends AlleleEffect {
|
||||
this.requiresWorkingQueen = requiresWorking;
|
||||
}
|
||||
|
||||
public int getThrottle() {
|
||||
return throttle;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCombinable() {
|
||||
return isCombinable;
|
||||
|
||||
@@ -71,9 +71,8 @@ public class ItemHabitatLocator extends ItemWithGui {
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) {
|
||||
BiomeGenBase currentBiome = player.worldObj.getBiomeGenForCoords((int) player.posX, (int) player.posZ);
|
||||
|
||||
float temperatureValue = currentBiome
|
||||
.getFloatTemperature((int) player.posX, (int) player.posY, (int) player.posZ);
|
||||
EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue);
|
||||
EnumTemperature temperature = EnumTemperature
|
||||
.getFromBiome(currentBiome, (int) player.posX, (int) player.posY, (int) player.posZ);
|
||||
EnumHumidity humidity = EnumHumidity.getFromValue(currentBiome.rainfall);
|
||||
|
||||
list.add(StringUtil.localize("gui.currentBiome") + ": " + currentBiome.biomeName);
|
||||
|
||||
@@ -9,8 +9,10 @@
|
||||
package forestry.apiculture.multiblock;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -59,7 +61,9 @@ public class AlvearyController extends RectangularMultiblockControllerBase
|
||||
// PARTS
|
||||
private final Set<IBeeModifier> beeModifiers = new HashSet<>();
|
||||
private final Set<IBeeListener> beeListeners = new HashSet<>();
|
||||
private final Set<IAlvearyComponent.Climatiser> climatisers = new HashSet<>();
|
||||
private final Set<IAlvearyComponent.Climatiser> climatisers = new TreeSet<>(
|
||||
Comparator.comparingInt(IAlvearyComponent.Climatiser::getPriority).thenComparingInt(Object::hashCode)
|
||||
.reversed());
|
||||
private final Set<IAlvearyComponent.Active> activeComponents = new HashSet<>();
|
||||
|
||||
// CLIENT
|
||||
@@ -155,6 +159,8 @@ public class AlvearyController extends RectangularMultiblockControllerBase
|
||||
activeComponents.remove(oldPart);
|
||||
}
|
||||
}
|
||||
|
||||
inventory.dumpInventoryIntoWorld(this.worldObj, oldPart.getCoordinates());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -233,26 +239,24 @@ public class AlvearyController extends RectangularMultiblockControllerBase
|
||||
beekeepingLogic.doWork();
|
||||
}
|
||||
|
||||
tempChange = 0;
|
||||
humidChange = 0;
|
||||
for (IAlvearyComponent.Climatiser climatiser : climatisers) {
|
||||
climatiser.changeClimate(tickCount, this);
|
||||
}
|
||||
|
||||
tempChange = equalizeChange(tempChange);
|
||||
humidChange = equalizeChange(humidChange);
|
||||
|
||||
return canWork;
|
||||
}
|
||||
|
||||
private static float equalizeChange(float change) {
|
||||
if (change == 0) {
|
||||
return 0;
|
||||
private float applyChange(float base, float currentChange, float extraChange, float boundaryDown,
|
||||
float boundaryUp) {
|
||||
float boundedNewChange = Math.max(boundaryDown, Math.min(base + currentChange + (extraChange * 20), boundaryUp))
|
||||
- base;
|
||||
if (extraChange > 0) {
|
||||
return Math.max(currentChange, boundedNewChange);
|
||||
} else {
|
||||
return Math.min(currentChange, boundedNewChange);
|
||||
}
|
||||
|
||||
change *= 0.95f;
|
||||
if (change <= 0.001f && change >= -0.001f) {
|
||||
change = 0;
|
||||
}
|
||||
return change;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -410,19 +414,13 @@ public class AlvearyController extends RectangularMultiblockControllerBase
|
||||
ChunkCoordinates coordinates = getCoordinates();
|
||||
|
||||
float temperature = getBiome().getFloatTemperature(coordinates.posX, coordinates.posY, coordinates.posZ);
|
||||
|
||||
tempChange += change;
|
||||
tempChange = Math.max(boundaryDown - temperature, tempChange);
|
||||
tempChange = Math.min(boundaryUp - temperature, tempChange);
|
||||
tempChange = applyChange(temperature, tempChange, change, boundaryDown, boundaryUp);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
|
||||
float humidity = getBiome().rainfall;
|
||||
|
||||
humidChange += change;
|
||||
humidChange = Math.max(boundaryDown - humidity, humidChange);
|
||||
humidChange = Math.min(boundaryUp - humidity, humidChange);
|
||||
humidChange = applyChange(humidity, humidChange, change, boundaryDown, boundaryUp);
|
||||
}
|
||||
|
||||
/* GUI */
|
||||
|
||||
@@ -19,6 +19,7 @@ import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
||||
import forestry.api.core.IClimateControlled;
|
||||
import forestry.api.multiblock.IAlvearyComponent;
|
||||
import forestry.api.multiblock.IMultiblockComponent;
|
||||
import forestry.apiculture.blocks.BlockAlveary;
|
||||
import forestry.apiculture.gui.ContainerAlvearyHygroregulator;
|
||||
import forestry.apiculture.gui.GuiAlvearyHygroregulator;
|
||||
@@ -31,8 +32,8 @@ import forestry.core.fluids.tanks.FilteredTank;
|
||||
import forestry.core.inventory.IInventoryAdapter;
|
||||
import forestry.core.tiles.ILiquidTankTile;
|
||||
|
||||
public class TileAlvearyHygroregulator extends TileAlveary
|
||||
implements IInventory, ILiquidTankTile, IFluidHandler, IAlvearyComponent.Climatiser {
|
||||
public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankTile, IFluidHandler,
|
||||
IAlvearyComponent.Climatiser, IMultiblockComponent.HasInventory {
|
||||
|
||||
private final HygroregulatorRecipe[] recipes;
|
||||
|
||||
@@ -56,9 +57,9 @@ public class TileAlvearyHygroregulator extends TileAlveary
|
||||
this.tankManager = new TankManager(this, liquidTank);
|
||||
|
||||
this.recipes = new HygroregulatorRecipe[] {
|
||||
new HygroregulatorRecipe(new FluidStack(water, 1), 1, +0.01f, -0.0005f),
|
||||
new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.0005f),
|
||||
new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.001f) };
|
||||
new HygroregulatorRecipe(new FluidStack(water, 1), 1, +0.01f, -0.005f),
|
||||
new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.005f),
|
||||
new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.01f) };
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -111,6 +112,11 @@ public class TileAlvearyHygroregulator extends TileAlveary
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPriority() {
|
||||
return 100;
|
||||
}
|
||||
|
||||
/* SAVING & LOADING */
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound nbttagcompound) {
|
||||
|
||||
@@ -18,6 +18,7 @@ import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import forestry.api.multiblock.IAlvearyComponent;
|
||||
import forestry.api.multiblock.IMultiblockComponent;
|
||||
import forestry.apiculture.blocks.BlockAlveary;
|
||||
import forestry.apiculture.gui.ContainerAlvearySieve;
|
||||
import forestry.apiculture.gui.GuiAlvearySieve;
|
||||
@@ -25,7 +26,8 @@ import forestry.apiculture.inventory.InventoryAlvearySieve;
|
||||
import forestry.core.inventory.IInventoryAdapter;
|
||||
import forestry.core.inventory.watchers.ISlotPickupWatcher;
|
||||
|
||||
public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.BeeListener {
|
||||
public class TileAlvearySieve extends TileAlveary
|
||||
implements IAlvearyComponent.BeeListener, IMultiblockComponent.HasInventory {
|
||||
|
||||
private final IBeeListener beeListener;
|
||||
private final InventoryAlvearySieve inventory;
|
||||
|
||||
@@ -22,6 +22,7 @@ import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.multiblock.IAlvearyComponent;
|
||||
import forestry.api.multiblock.IMultiblockComponent;
|
||||
import forestry.apiculture.blocks.BlockAlveary;
|
||||
import forestry.apiculture.gui.ContainerAlvearySwarmer;
|
||||
import forestry.apiculture.gui.GuiAlvearySwarmer;
|
||||
@@ -37,7 +38,8 @@ import forestry.core.proxy.Proxies;
|
||||
import forestry.core.tiles.IActivatable;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
|
||||
public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, IActivatable, IAlvearyComponent.Active {
|
||||
public class TileAlvearySwarmer extends TileAlveary
|
||||
implements ISidedInventory, IActivatable, IAlvearyComponent.Active, IMultiblockComponent.HasInventory {
|
||||
|
||||
private final InventorySwarmer inventory;
|
||||
private final Deque<ItemStack> pendingSpawns = new ArrayDeque<>();
|
||||
|
||||
@@ -1148,6 +1148,14 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
|
||||
return species.getUID();
|
||||
}
|
||||
|
||||
public EnumWoodType getWoodType() {
|
||||
return woodType;
|
||||
}
|
||||
|
||||
public ItemStack getVanillaWood() {
|
||||
return vanillaWood;
|
||||
}
|
||||
|
||||
@Override
|
||||
public final ITreeGenome getGenome() {
|
||||
return genome;
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.blocks;
|
||||
|
||||
import static forestry.Forestry.isDreamcraftLoaded;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@@ -52,7 +54,7 @@ public class BlockResourceOre extends Block {
|
||||
public void dropBlockAsItemWithChance(World world, int x, int y, int z, int metadata, float par6, int par7) {
|
||||
super.dropBlockAsItemWithChance(world, x, y, z, metadata, par6, par7);
|
||||
|
||||
if (metadata == 0) {
|
||||
if (metadata == 0 && !isDreamcraftLoaded) {
|
||||
this.dropXpOnBlockBreak(world, x, y, z, MathHelper.getRandomIntegerInRange(world.rand, 1, 4));
|
||||
}
|
||||
}
|
||||
@@ -61,7 +63,7 @@ public class BlockResourceOre extends Block {
|
||||
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
|
||||
ArrayList<ItemStack> drops = new ArrayList<>();
|
||||
|
||||
if (metadata == ResourceType.APATITE.ordinal()) {
|
||||
if (metadata == ResourceType.APATITE.ordinal() && !isDreamcraftLoaded) {
|
||||
int fortuneModifier = world.rand.nextInt(fortune + 2) - 1;
|
||||
if (fortuneModifier < 0) {
|
||||
fortuneModifier = 0;
|
||||
|
||||
@@ -116,6 +116,12 @@ public abstract class BlockStructure extends BlockForestry {
|
||||
InventoryUtil.dropSockets((ISocketable) tile, world, x, y, z);
|
||||
}
|
||||
}
|
||||
|
||||
if (tile instanceof IMultiblockComponent.HasInventory) {
|
||||
IMultiblockComponent.HasInventory hasInventory = (IMultiblockComponent.HasInventory) tile;
|
||||
|
||||
InventoryUtil.dropInventory(hasInventory.getInternalInventory(), world, x, y, z);
|
||||
}
|
||||
}
|
||||
super.breakBlock(world, x, y, z, block, meta);
|
||||
}
|
||||
|
||||
@@ -137,6 +137,7 @@ public class Config {
|
||||
public static boolean enableHints = true;
|
||||
public static final LinkedListMultimap<String, String> hints = LinkedListMultimap.create();
|
||||
public static boolean enableEnergyStat = true;
|
||||
public static boolean showBackpackDurability = true;
|
||||
|
||||
public static boolean isStructureEnabled(String uid) {
|
||||
return !Config.disabledStructures.contains(uid);
|
||||
@@ -301,6 +302,9 @@ public class Config {
|
||||
configCommon.moveProperty("tweaks.gui", "mail.alert", "tweaks.gui.mail.alert");
|
||||
configCommon.renameProperty("tweaks.gui.mail.alert", "mail.alert", "enabled");
|
||||
|
||||
showBackpackDurability = configCommon
|
||||
.getBooleanLocalized("tweaks.gui", "showBackpackDurability", showBackpackDurability);
|
||||
|
||||
mailAlertEnabled = configCommon.getBooleanLocalized("tweaks.gui.mail.alert", "enabled", mailAlertEnabled);
|
||||
mailAlertXPosition = configCommon.getEnumLocalized(
|
||||
"tweaks.gui.mail.alert",
|
||||
|
||||
@@ -109,6 +109,7 @@ public class Constants implements IForestryConstants {
|
||||
public static final int MACHINE_MAX_ENERGY = 5000;
|
||||
|
||||
public static final int RAINMAKER_RAIN_DURATION_IODINE = 10000;
|
||||
public static final int RAINMAKER_RAIN_DURATION_PHOSPHORICIODINE = 10000;
|
||||
|
||||
public static final int STILL_DESTILLATION_DURATION = 100;
|
||||
public static final int STILL_DESTILLATION_INPUT = 10;
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -176,4 +176,8 @@ public abstract class Mutation implements IMutationCustom {
|
||||
public boolean isSecret() {
|
||||
return isSecret;
|
||||
}
|
||||
|
||||
public List<IMutationCondition> getMutationConditions() {
|
||||
return mutationConditions;
|
||||
}
|
||||
}
|
||||
@@ -53,4 +53,13 @@ public abstract class ContainerItemInventory<I extends ItemInventory> extends Co
|
||||
inventory.onSlotClick(player);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void detectAndSendChanges() {
|
||||
if (!inventory.isParentItemEquipped()) {
|
||||
inventory.getPlayer().closeScreen();
|
||||
return;
|
||||
}
|
||||
super.detectAndSendChanges();
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -78,6 +78,14 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isParentItemEquipped() {
|
||||
return isSameItemInventory(player.getCurrentEquippedItem(), parent);
|
||||
}
|
||||
|
||||
public EntityPlayer getPlayer() {
|
||||
return player;
|
||||
}
|
||||
|
||||
public boolean isParentItemInventory(ItemStack itemStack) {
|
||||
ItemStack parent = getParent();
|
||||
return isSameItemInventory(parent, itemStack);
|
||||
|
||||
@@ -31,7 +31,7 @@ public class ItemForestryTool extends ItemForestry {
|
||||
setMaxDamage(200);
|
||||
this.remnants = remnants;
|
||||
if (remnants != null) {
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
MinecraftForge.EVENT_BUS.register(new EventHandler());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,20 +53,6 @@ public class ItemForestryTool extends ItemForestry {
|
||||
return ForgeHooks.canToolHarvestBlock(block, 0, stack);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onDestroyCurrentItem(PlayerDestroyItemEvent event) {
|
||||
if (event.original == null || event.original.getItem() != this) {
|
||||
return;
|
||||
}
|
||||
|
||||
EntityPlayer player = event.entityPlayer;
|
||||
World world = player.worldObj;
|
||||
|
||||
if (!world.isRemote && remnants != null) {
|
||||
ItemStackUtil.dropItemStackAsEntity(remnants.copy(), world, player.posX, player.posY, player.posZ);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(ItemStack itemstack, World world, Block block, int x, int y, int z,
|
||||
EntityLivingBase entityliving) {
|
||||
@@ -80,4 +66,21 @@ public class ItemForestryTool extends ItemForestry {
|
||||
public boolean isFull3D() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public class EventHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public void onDestroyCurrentItem(PlayerDestroyItemEvent event) {
|
||||
if (event.original == null || event.original.getItem() != ItemForestryTool.this) {
|
||||
return;
|
||||
}
|
||||
|
||||
EntityPlayer player = event.entityPlayer;
|
||||
World world = player.worldObj;
|
||||
|
||||
if (!world.isRemote && remnants != null) {
|
||||
ItemStackUtil.dropItemStackAsEntity(remnants.copy(), world, player.posX, player.posY, player.posZ);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,8 @@ package forestry.core.items;
|
||||
|
||||
import static forestry.Forestry.isDreamcraftLoaded;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
@@ -65,7 +67,7 @@ public class ItemRegistryCore extends ItemRegistry {
|
||||
|
||||
/* Peat */
|
||||
public final ItemForestry peat;
|
||||
public final ItemForestry ash;
|
||||
private final ItemForestry ash;
|
||||
public final ItemForestry bituminousPeat;
|
||||
|
||||
/* Moistener */
|
||||
@@ -76,6 +78,7 @@ public class ItemRegistryCore extends ItemRegistry {
|
||||
/* Rainmaker */
|
||||
public final ItemForestry iodineCharge;
|
||||
public final ItemForestry phosphor;
|
||||
public final ItemForestry phosphorCharge;
|
||||
|
||||
/* Misc */
|
||||
public final ItemCraftingMaterial craftingMaterial;
|
||||
@@ -179,8 +182,8 @@ public class ItemRegistryCore extends ItemRegistry {
|
||||
|
||||
// / RAINMAKER SUBSTRATES
|
||||
iodineCharge = registerItem(new ItemForestry(), "iodineCapsule");
|
||||
|
||||
phosphor = registerItem(new ItemForestry(), "phosphor");
|
||||
phosphorCharge = registerItem(new ItemForestry(), "phosphoricIodineCapsule");
|
||||
|
||||
// / BEE RESOURCES
|
||||
beeswax = registerItem(new ItemForestry(), "beeswax");
|
||||
@@ -196,4 +199,12 @@ public class ItemRegistryCore extends ItemRegistry {
|
||||
OreDictionary.registerOre(def.getOreDict(), fruit);
|
||||
}
|
||||
}
|
||||
|
||||
public ItemStack getAsh() {
|
||||
List<ItemStack> options = OreDictionary.getOres("dustAsh");
|
||||
for (ItemStack option : options) {
|
||||
if (option.getItem() != ash) return option.copy();
|
||||
}
|
||||
return ash.getItemStack();
|
||||
}
|
||||
}
|
||||
@@ -112,18 +112,12 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
|
||||
public List<String> handleTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, int recipe) {
|
||||
super.handleTooltip(guiRecipe, currenttip, recipe);
|
||||
CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
|
||||
|
||||
if (GuiContainerManager.shouldShowTooltip(guiRecipe)) {
|
||||
Point mouse = GuiDraw.getMousePosition();
|
||||
int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
|
||||
|
||||
if (recipeIndex >= 0) {
|
||||
Point offset = guiRecipe.getRecipePosition(recipeIndex);
|
||||
Point relMouse = new Point(
|
||||
mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
|
||||
mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
|
||||
|
||||
currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
|
||||
}
|
||||
Point offset = guiRecipe.getRecipePosition(recipe);
|
||||
Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
|
||||
currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
|
||||
}
|
||||
|
||||
return currenttip;
|
||||
@@ -135,18 +129,10 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
|
||||
super.handleItemTooltip(guiRecipe, itemStack, currenttip, recipe);
|
||||
CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
|
||||
Point mouse = GuiDraw.getMousePosition();
|
||||
int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
|
||||
Point offset = guiRecipe.getRecipePosition(recipe);
|
||||
Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
|
||||
|
||||
if (recipeIndex >= 0) {
|
||||
Point offset = guiRecipe.getRecipePosition(recipeIndex);
|
||||
Point relMouse = new Point(
|
||||
mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
|
||||
mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
|
||||
|
||||
currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
|
||||
}
|
||||
|
||||
return currenttip;
|
||||
return this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
|
||||
}
|
||||
|
||||
public List<String> provideTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, CachedBaseRecipe crecipe,
|
||||
@@ -210,11 +196,9 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
|
||||
|
||||
protected boolean transferFluidTank(GuiRecipe<?> guiRecipe, int recipe, boolean usage) {
|
||||
CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
|
||||
Point mousepos = GuiDraw.getMousePosition();
|
||||
Point mouse = GuiDraw.getMousePosition();
|
||||
Point offset = guiRecipe.getRecipePosition(recipe);
|
||||
Point relMouse = new Point(
|
||||
mousepos.x - (guiRecipe.width - 176) / 2 - offset.x,
|
||||
mousepos.y - (guiRecipe.height - 166) / 2 - offset.y);
|
||||
Point relMouse = new Point(mouse.x - guiRecipe.guiLeft - offset.x, mouse.y - guiRecipe.guiTop - offset.y);
|
||||
|
||||
if (crecipe.getFluidTanks() != null) {
|
||||
for (PositionedFluidTank tank : crecipe.getFluidTanks()) {
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,7 +37,8 @@ public class EscritoireTextSource {
|
||||
EnumSet<Notes> multipleTranslationNoteLevels = EnumSet
|
||||
.of(Notes.level1, Notes.level2, Notes.level3, Notes.level4, Notes.success, Notes.failure);
|
||||
for (Notes notesLevel : multipleTranslationNoteLevels) {
|
||||
int levelCount = Integer.valueOf(StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count"));
|
||||
int levelCount = Integer.valueOf(
|
||||
StringUtil.localize("gui.escritoire.notes." + notesLevel + ".count").replaceAll("§\\d", ""));
|
||||
for (int i = 1; i <= levelCount; i++) {
|
||||
String note = StringUtil.localize("gui.escritoire.notes." + notesLevel + '.' + i);
|
||||
researchNotes.put(notesLevel, note);
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
@@ -96,6 +96,8 @@ public class GeneticsUtil {
|
||||
* altering the world by changing vanilla leaves to forestry ones.
|
||||
*/
|
||||
public static ICheckPollinatable getCheckPollinatable(World world, final int x, final int y, final int z) {
|
||||
if (!world.blockExists(x, y, z)) return null;
|
||||
|
||||
TileEntity tile = world.getTileEntity(x, y, z);
|
||||
|
||||
if (tile instanceof IPollinatable) {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory {
|
||||
return i;
|
||||
}
|
||||
|
||||
if (waste.getItem() != PluginCore.items.ash) {
|
||||
if (waste.getItem() != PluginCore.items.getAsh().getItem()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -182,7 +182,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory {
|
||||
if (wasteSlot >= 0) {
|
||||
IInventoryAdapter inventory = getInternalInventory();
|
||||
if (inventory.getStackInSlot(wasteSlot) == null) {
|
||||
inventory.setInventorySlotContents(wasteSlot, PluginCore.items.ash.getItemStack());
|
||||
inventory.setInventorySlotContents(wasteSlot, PluginCore.items.getAsh());
|
||||
} else {
|
||||
inventory.getStackInSlot(wasteSlot).stackSize++;
|
||||
}
|
||||
|
||||
@@ -26,16 +26,14 @@ public class InventoryRainmaker extends InventoryAdapterTile<TileMillRainmaker>
|
||||
@Override
|
||||
public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
|
||||
if (slotIndex == SLOT_SUBSTRATE) {
|
||||
if (getStackInSlot(SLOT_SUBSTRATE) != null) {
|
||||
return false;
|
||||
}
|
||||
if (FuelManager.rainSubstrate.containsKey(itemStack) && tile.charge == 0 && tile.progress == 0) {
|
||||
RainSubstrate substrate = FuelManager.rainSubstrate.get(itemStack);
|
||||
if (tile.getWorld().isRaining() && substrate.reverse) {
|
||||
return true;
|
||||
} else if (!tile.getWorld().isRaining() && !substrate.reverse) {
|
||||
return true;
|
||||
}
|
||||
return tile.isValidSubstrate(substrate);
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -10,6 +10,7 @@ package forestry.factory.tiles;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.storage.WorldInfo;
|
||||
|
||||
import forestry.api.fuels.FuelManager;
|
||||
import forestry.api.fuels.RainSubstrate;
|
||||
@@ -20,7 +21,7 @@ import forestry.factory.inventory.InventoryRainmaker;
|
||||
public class TileMillRainmaker extends TileMill {
|
||||
|
||||
private int duration;
|
||||
private boolean reverse;
|
||||
private RainSubstrate.WeatherState weather;
|
||||
|
||||
public TileMillRainmaker() {
|
||||
super(null);
|
||||
@@ -39,9 +40,9 @@ public class TileMillRainmaker extends TileMill {
|
||||
}
|
||||
|
||||
// We don't have a gui, but we can be activated
|
||||
if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0) {
|
||||
if (FuelManager.rainSubstrate.containsKey(player.inventory.getCurrentItem()) && charge == 0 && progress == 0) {
|
||||
RainSubstrate substrate = FuelManager.rainSubstrate.get(player.inventory.getCurrentItem());
|
||||
if (substrate.item.isItemEqual(player.inventory.getCurrentItem())) {
|
||||
if (isValidSubstrate(substrate)) {
|
||||
addCharge(substrate);
|
||||
player.inventory.getCurrentItem().stackSize--;
|
||||
}
|
||||
@@ -49,6 +50,17 @@ public class TileMillRainmaker extends TileMill {
|
||||
sendNetworkUpdate();
|
||||
}
|
||||
|
||||
public boolean isValidSubstrate(RainSubstrate substrate) {
|
||||
boolean thundering = getWorld().isThundering();
|
||||
boolean raining = getWorld().isRaining();
|
||||
|
||||
return switch (substrate.weather) {
|
||||
case CLEAR -> (thundering || raining);
|
||||
case RAIN -> (thundering || !raining);
|
||||
case STORM -> (!thundering);
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound nbttagcompound) {
|
||||
super.readFromNBT(nbttagcompound);
|
||||
@@ -57,7 +69,7 @@ public class TileMillRainmaker extends TileMill {
|
||||
progress = nbttagcompound.getFloat("Progress");
|
||||
stage = nbttagcompound.getInteger("Stage");
|
||||
duration = nbttagcompound.getInteger("Duration");
|
||||
reverse = nbttagcompound.getBoolean("Reverse");
|
||||
weather = RainSubstrate.WeatherState.valueOf(nbttagcompound.getString("Weather"));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -68,14 +80,14 @@ public class TileMillRainmaker extends TileMill {
|
||||
nbttagcompound.setFloat("Progress", progress);
|
||||
nbttagcompound.setInteger("Stage", stage);
|
||||
nbttagcompound.setInteger("Duration", duration);
|
||||
nbttagcompound.setBoolean("Reverse", reverse);
|
||||
nbttagcompound.setString("Weather", weather.name());
|
||||
}
|
||||
|
||||
public void addCharge(RainSubstrate substrate) {
|
||||
charge = 1;
|
||||
speed = substrate.speed;
|
||||
duration = substrate.duration;
|
||||
reverse = substrate.reverse;
|
||||
weather = substrate.weather;
|
||||
sendNetworkUpdate();
|
||||
}
|
||||
|
||||
@@ -103,15 +115,26 @@ public class TileMillRainmaker extends TileMill {
|
||||
}
|
||||
|
||||
if (!worldObj.isRemote) {
|
||||
if (reverse) {
|
||||
worldObj.getWorldInfo().setRaining(false);
|
||||
} else {
|
||||
worldObj.getWorldInfo().setRaining(true);
|
||||
worldObj.getWorldInfo().setRainTime(duration);
|
||||
WorldInfo world = worldObj.getWorldInfo();
|
||||
switch (weather) {
|
||||
case CLEAR:
|
||||
world.setRaining(false);
|
||||
world.setThundering(false);
|
||||
break;
|
||||
case STORM:
|
||||
world.setRaining(true);
|
||||
world.setRainTime(duration);
|
||||
world.setThundering(true);
|
||||
world.setThunderTime(duration);
|
||||
break;
|
||||
case RAIN:
|
||||
world.setRaining(true);
|
||||
world.setRainTime(duration);
|
||||
world.setThundering(false);
|
||||
break;
|
||||
}
|
||||
charge = 0;
|
||||
duration = 0;
|
||||
reverse = false;
|
||||
sendNetworkUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,11 +18,10 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.mojang.realmsclient.gui.ChatFormatting;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
@@ -93,7 +92,7 @@ public class ItemButterflyGE extends ItemGE {
|
||||
@Override
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) {
|
||||
super.addInformation(itemstack, player, list, flag);
|
||||
if (Config.disableButterfly && type == EnumFlutterType.BUTTERFLY) list.add(ChatFormatting.RED + "Disabled");
|
||||
if (Config.disableButterfly && type == EnumFlutterType.BUTTERFLY) list.add(EnumChatFormatting.RED + "Disabled");
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -137,7 +137,7 @@ public class PluginCore extends ForestryPlugin {
|
||||
crateRegistry.registerCrate(items.fertilizerCompound, "cratedFertilizer");
|
||||
crateRegistry.registerCrate(items.mulch, "cratedMulch");
|
||||
crateRegistry.registerCrate(items.phosphor, "cratedPhosphor");
|
||||
crateRegistry.registerCrate(items.ash, "cratedAsh");
|
||||
crateRegistry.registerCrateUsingOreDict(items.getAsh(), "cratedAsh");
|
||||
if (!isDreamcraftLoaded) {
|
||||
crateRegistry.registerCrate(items.apatite, "cratedApatite");
|
||||
crateRegistry.registerCrateUsingOreDict(items.ingotTin, "cratedTin");
|
||||
@@ -207,7 +207,7 @@ public class PluginCore extends ForestryPlugin {
|
||||
0.5f);
|
||||
RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.TIN, 1), items.ingotTin, 0.5f);
|
||||
}
|
||||
RecipeUtil.addSmelting(new ItemStack(items.peat), items.ash, 0.0f);
|
||||
RecipeUtil.addSmelting(new ItemStack(items.peat), items.getAsh(), 0.0f);
|
||||
|
||||
/* BRONZE INGOTS */
|
||||
if (Config.isCraftingBronzeEnabled()) {
|
||||
|
||||
@@ -222,9 +222,23 @@ public class PluginFactory extends ForestryPlugin {
|
||||
// Set rain substrates
|
||||
ItemStack iodineCharge = coreItems.iodineCharge.getItemStack();
|
||||
ItemStack dissipationCharge = coreItems.craftingMaterial.getDissipationCharge();
|
||||
ItemStack phosphorCharge = coreItems.phosphorCharge.getItemStack();
|
||||
FuelManager.rainSubstrate.put(
|
||||
iodineCharge,
|
||||
new RainSubstrate(
|
||||
iodineCharge,
|
||||
Constants.RAINMAKER_RAIN_DURATION_IODINE,
|
||||
0.01f,
|
||||
RainSubstrate.WeatherState.RAIN));
|
||||
FuelManager.rainSubstrate
|
||||
.put(iodineCharge, new RainSubstrate(iodineCharge, Constants.RAINMAKER_RAIN_DURATION_IODINE, 0.01f));
|
||||
FuelManager.rainSubstrate.put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f));
|
||||
.put(dissipationCharge, new RainSubstrate(dissipationCharge, 0.075f, RainSubstrate.WeatherState.CLEAR));
|
||||
FuelManager.rainSubstrate.put(
|
||||
phosphorCharge,
|
||||
new RainSubstrate(
|
||||
phosphorCharge,
|
||||
Constants.RAINMAKER_RAIN_DURATION_PHOSPHORICIODINE,
|
||||
0.008f,
|
||||
RainSubstrate.WeatherState.STORM));
|
||||
|
||||
for (BlockFactoryTesrType type : BlockFactoryTesrType.VALUES) {
|
||||
MachineDefinition machineDefinition = new MachineDefinition(type);
|
||||
@@ -594,6 +608,15 @@ public class PluginFactory extends ForestryPlugin {
|
||||
PluginFluids.items.canEmpty,
|
||||
'Z',
|
||||
beeItems.honeydew);
|
||||
RecipeManagers.carpenterManager.addRecipe(
|
||||
5,
|
||||
PluginCore.items.iodineCharge.getItemStack(),
|
||||
PluginCore.items.phosphorCharge.getItemStack(),
|
||||
"# #",
|
||||
" # ",
|
||||
"# #",
|
||||
'#',
|
||||
PluginCore.items.phosphor.getItemStack());
|
||||
}
|
||||
|
||||
// Ender pearl
|
||||
|
||||
@@ -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<>();
|
||||
|
||||
@@ -449,10 +449,15 @@ public class PluginStorage extends ForestryPlugin {
|
||||
String oreName = OreDictionary.getOreName(oreId);
|
||||
addCrating(crateStack, oreName);
|
||||
}
|
||||
if (oreIds.length > 0 && oreIds[0] == OreDictionary.getOreID("dustAsh")) {
|
||||
addUncrating(crateStack, PluginCore.items.getAsh());
|
||||
} else {
|
||||
addUncrating(crateStack, uncrated);
|
||||
}
|
||||
} else {
|
||||
addCrating(crateStack, uncrated);
|
||||
addUncrating(crateStack, uncrated);
|
||||
}
|
||||
addUncrating(crateStack, uncrated);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -197,8 +197,6 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
|
||||
FlowerManager.FlowerTypeVanilla,
|
||||
FlowerManager.FlowerTypeSnow,
|
||||
FlowerManager.FlowerTypeMushrooms); // Swampflower
|
||||
// FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 2, 1.0, FlowerManager.FlowerTypeNether);
|
||||
// //Deathbloom
|
||||
FlowerManager.flowerRegistry.registerPlantableFlower(
|
||||
flowers,
|
||||
3,
|
||||
@@ -248,16 +246,8 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
|
||||
1.0,
|
||||
FlowerManager.FlowerTypeVanilla,
|
||||
FlowerManager.FlowerTypeSnow); // Waterlily
|
||||
FlowerManager.flowerRegistry.registerPlantableFlower(
|
||||
flowers,
|
||||
11,
|
||||
1.0,
|
||||
FlowerManager.FlowerTypeVanilla,
|
||||
FlowerManager.FlowerTypeSnow); // EnderLotus (does not actually spawn in the end)
|
||||
FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 12, 1.0, FlowerManager.FlowerTypeCacti); // Bromeliad
|
||||
FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 13, 1.0, FlowerManager.FlowerTypeNether); // EyeBulb
|
||||
// FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 14, 1.0, FlowerManager.FlowerTypeNether);
|
||||
// // Unlisted top of the eyebulb
|
||||
FlowerManager.flowerRegistry.registerPlantableFlower(
|
||||
flowers,
|
||||
15,
|
||||
@@ -283,8 +273,6 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
|
||||
FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 3, 1.0, FlowerManager.FlowerTypeVanilla); // Lavender
|
||||
FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 4, 1.0, FlowerManager.FlowerTypeVanilla); // Goldenrod
|
||||
FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 5, 1.0, FlowerManager.FlowerTypeVanilla); // Bluebells
|
||||
FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 6, 1.0, FlowerManager.FlowerTypeVanilla); // Miner's
|
||||
// delight
|
||||
FlowerManager.flowerRegistry.registerPlantableFlower(
|
||||
flowers2,
|
||||
7,
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -348,4 +348,17 @@ public class ItemBackpack extends ItemWithGui {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getDurabilityForDisplay(final ItemStack stack) {
|
||||
final int occupied = ItemInventory.getOccupiedSlotCount(stack);
|
||||
final int max = getBackpackSize();
|
||||
|
||||
return 1.0d - (occupied + 1.0d) / (max + 1.0d);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean showDurabilityBar(final ItemStack stack) {
|
||||
return Config.showBackpackDurability && ItemInventory.getOccupiedSlotCount(stack) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
# Forestry Access Transformer configuration file
|
||||
public net.minecraft.client.gui.inventory.GuiContainer field_146999_f #xSize
|
||||
public net.minecraft.client.gui.inventory.GuiContainer field_147000_g #ySize
|
||||
public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft
|
||||
public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop
|
||||
Executable → Regular
+4
-4
@@ -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
|
||||
@@ -171,6 +171,7 @@ for.gui.imprinter.name=GENOME IMPRINTER
|
||||
for.gui.inactive=Inactive
|
||||
for.gui.life=Life
|
||||
for.gui.lifespan=Lifespan
|
||||
for.gui.none=None
|
||||
for.gui.normal=Normal
|
||||
for.gui.jubilance=Jubilance: %s
|
||||
|
||||
@@ -423,6 +424,122 @@ for.hints.usesofash.tag=Use your ash!
|
||||
|
||||
for.item.crated.grammar=Crated %s
|
||||
for.item.crated.unknown=Crate with unknown content
|
||||
item.cratedAcaciaSapling.name=Crated Acacia Sapling
|
||||
item.cratedAcaciaWood.name=Crated Acacia Wood
|
||||
item.cratedApples.name=Crated Apple
|
||||
item.cratedAsh.name=Crated Ash
|
||||
item.cratedBeeswax.name=Crated Beeswax
|
||||
item.cratedBirchSapling.name=Crated Birch Sapling
|
||||
item.cratedBirchWood.name=Crated Birch Wood
|
||||
item.cratedBogearth.name=Crated Bog Earth
|
||||
item.cratedBrass.name=Crated Bronze Ingot
|
||||
item.cratedBrick.name=Crated Bricks
|
||||
item.cratedCacti.name=Crated Cactus
|
||||
item.cratedCarrots.name=Crated Carrot
|
||||
item.cratedCharcoal.name=Crated Charcoal
|
||||
item.cratedCherry.name=Crated Cherry
|
||||
item.cratedChestnut.name=Crated Chestnut
|
||||
item.cratedClay.name=Crated Clay
|
||||
item.cratedCoal.name=Crated Coal
|
||||
item.cratedCobblestone.name=Crated Cobblestone
|
||||
item.cratedCocoaComb.name=Crated Cocoa Comb
|
||||
item.cratedCookies.name=Crated Cookie
|
||||
item.cratedCrystallinePollen.name=Crated Crystalline Pollen Cluster
|
||||
item.cratedDarkOakSapling.name=Crated Dark Oak Sapling
|
||||
item.cratedDarkOakWood.name=Crated Dark Oak Wood
|
||||
item.cratedDates.name=Crated Date
|
||||
item.cratedDirt.name=Crated Dirt
|
||||
item.cratedDrippingCombs.name=Crated Dripping Comb
|
||||
item.cratedFertilizer.name=Crated Fertilizer
|
||||
item.cratedFrozenCombs.name=Crated Frozen Comb
|
||||
item.cratedGlowstone.name=Crated Glowstone Dust
|
||||
item.cratedGravel.name=Crated Gravel
|
||||
item.cratedHoneycombs.name=Crated Honey Comb
|
||||
item.cratedHoneydew.name=Crated Honeydew
|
||||
item.cratedHumus.name=Crated Humus
|
||||
item.cratedJungleSapling.name=Crated Jungle Sapling
|
||||
item.cratedJungleWood.name=Crated Jungle Wood
|
||||
item.cratedLapis.name=Crated Lapis Lazuli
|
||||
item.cratedLemon.name=Crated Lemon
|
||||
item.cratedMellowCombs.name=Crated Mellow Comb
|
||||
item.cratedMossyCombs.name=Crated Mossy Comb
|
||||
item.cratedMulch.name=Crated Mulch
|
||||
item.cratedMycelium.name=Crated Mycelium
|
||||
item.cratedMysteriousCombs.name=Crated Mysterious Comb
|
||||
item.cratedNaturaBarley.name=Crated Barley
|
||||
item.cratedNaturaBerryBlack.name=Crated Blackberry
|
||||
item.cratedNaturaBerryBlight.name=Crated Blightberry
|
||||
item.cratedNaturaBerryBlue.name=Crated Blueberry
|
||||
item.cratedNaturaBerryDusk.name=Crated Duskberry
|
||||
item.cratedNaturaBerryMalo.name=Crated Maloberry
|
||||
item.cratedNaturaBerryRasp.name=Crated Raspberry
|
||||
item.cratedNaturaBerrySky.name=Crated Skyberry
|
||||
item.cratedNaturaBerrySting.name=Crated Stingberry
|
||||
item.cratedNaturaBlockHeatsand.name=Crated Heat Sand
|
||||
item.cratedNaturaBlockTainted.name=Crated Tainted Soil
|
||||
item.cratedNaturaBlueGlowshroom.name=Crated Blue Glowshroom
|
||||
item.cratedNaturaGreenGlowshroom.name=Crated Green Glowshroom
|
||||
item.cratedNaturaLogBloodwood.name=Crated Bloodwood
|
||||
item.cratedNaturaLogDarkwood.name=Crated Darkwood
|
||||
item.cratedNaturaLogEucalyptus.name=Crated Eucalyptus Wood
|
||||
item.cratedNaturaLogFusewood.name=Crated Fusewood
|
||||
item.cratedNaturaLogGhostwood.name=Crated Ghostwood
|
||||
item.cratedNaturaLogHopseed.name=Crated Hopseed Wood
|
||||
item.cratedNaturaLogSakura.name=Crated Sakura Wood
|
||||
item.cratedNaturaLogWillow.name=Crated Willow Wood
|
||||
item.cratedNaturaPotashApple.name=Crated Potash Apple
|
||||
item.cratedNaturaPurpleGlowshroom.name=Crated Purple Glowshroom
|
||||
item.cratedNaturaSaplingBlood.name=Crated Blood Sapling
|
||||
item.cratedNaturaSaplingDarkwood.name=Crated Darkwood Sapling
|
||||
item.cratedNaturaSaplingEucalyptus.name=Crated Eucalyptus Sapling
|
||||
item.cratedNaturaSaplingFusewood.name=Crated Fusewood Sapling
|
||||
item.cratedNaturaSaplingGhostwood.name=Crated Ghostwood Sapling
|
||||
item.cratedNaturaSaplingHopseed.name=Crated Hopseed Sapling
|
||||
item.cratedNaturaSaplingMaple.name=Crated Maple Sapling
|
||||
item.cratedNaturaSaplingPurpleheart.name=Crated Amaranth Sapling
|
||||
item.cratedNaturaSaplingRedwood.name=Crated Redwood Sapling
|
||||
item.cratedNaturaSaplingSakura.name=Crated Sakura Sapling
|
||||
item.cratedNaturaSaplingSilverbell.name=Crated Silverbell Sapling
|
||||
item.cratedNaturaSaplingTiger.name=Crated Tigerwood Sapling
|
||||
item.cratedNaturaSaplingWillow.name=Crated Willow Sapling
|
||||
item.cratedNetherbrick.name=Crated Nether Brick
|
||||
item.cratedNetherrack.name=Crated Netherrack
|
||||
item.cratedNetherwart.name=Crated Nether Wart
|
||||
item.cratedObsidian.name=Crated Obsidian
|
||||
item.cratedPapaya.name=Crated Papaya
|
||||
item.cratedParchedCombs.name=Crated Parched Comb
|
||||
item.cratedPeat.name=Crated Peat
|
||||
item.cratedPhosphor.name=Crated Phosphor
|
||||
item.cratedPlum.name=Crated Plum
|
||||
item.cratedPodzol.name=Crated Podzol
|
||||
item.cratedPollen.name=Crated Pollen Cluster
|
||||
item.cratedPotatoes.name=Crated Potato
|
||||
item.cratedPowderyCombs.name=Crated Powdery Comb
|
||||
item.cratedPropolis.name=Crated Propolis
|
||||
item.cratedRedSand.name=Crated Red Sand
|
||||
item.cratedRedstone.name=Crated Redstone
|
||||
item.cratedReeds.name=Crated Sugar Canes
|
||||
item.cratedRefractoryWax.name=Crated Refractory Wax
|
||||
item.cratedResin.name=Crated Sticky Resin
|
||||
item.cratedRoyalJelly.name=Crated Royal Jelly
|
||||
item.cratedRubber.name=Crated Rubber
|
||||
item.cratedSand.name=Crated Sand
|
||||
item.cratedSandstone.name=Crated Sandstone
|
||||
item.cratedSaplings.name=Crated Oak Sapling
|
||||
item.cratedScrap.name=Crated Scrap
|
||||
item.cratedSeeds.name=Crated Seeds
|
||||
item.cratedSilkyCombs.name=Crated Silky Comb
|
||||
item.cratedSilver.name=Crated Silver Ingot
|
||||
item.cratedSimmeringCombs.name=Crated Simmering Comb
|
||||
item.cratedSoulsand.name=Crated Soul Sand
|
||||
item.cratedSpruceSapling.name=Crated Spruce Sapling
|
||||
item.cratedSpruceWood.name=Crated Spruce Wood
|
||||
item.cratedStone.name=Crated Stone
|
||||
item.cratedStringyCombs.name=Crated Stringy Comb
|
||||
item.cratedWalnut.name=Crated Walnut
|
||||
item.cratedWheat.name=Crated Wheat
|
||||
item.cratedWheatenCombs.name=Crated Wheaten Comb
|
||||
item.cratedWood.name=Crated Oak Wood
|
||||
|
||||
for.no=No
|
||||
|
||||
@@ -493,6 +610,7 @@ item.for.habitatLocator.name=Habitat Locator
|
||||
item.for.cart.beehouse.name=Minecart with Bee House
|
||||
item.for.cart.apiary.name=Minecart with Apiary
|
||||
|
||||
item.for.beeCombs.name=Comb
|
||||
item.for.beeCombs.cocoa.name=Cocoa Comb
|
||||
item.for.beeCombs.darkened.name=Darkened Comb
|
||||
item.for.beeCombs.dripping.name=Dripping Comb
|
||||
@@ -513,6 +631,7 @@ item.for.beeCombs.wheaten.name=Wheaten Comb
|
||||
|
||||
item.for.beeswax.name=Beeswax
|
||||
|
||||
item.for.beverage.name=Mead
|
||||
item.for.beverage.meadCurative.name=Curative Mead
|
||||
item.for.beverage.meadShort.name=Short Mead
|
||||
item.for.beverage.mead.name=Mead
|
||||
@@ -550,11 +669,13 @@ item.for.canSeedOil.name=Seed Oil Can
|
||||
item.for.canShortMead.name=Short Mead Can
|
||||
item.for.carton.name=Carton
|
||||
|
||||
item.for.chipsets.name=Circuit Board
|
||||
item.for.circuitboard.basic.name=Basic Circuit Board
|
||||
item.for.circuitboard.enhanced.name=Enhanced Circuit Board
|
||||
item.for.circuitboard.intricate.name=Intricate Circuit Board
|
||||
item.for.circuitboard.refined.name=Refined Circuit Board
|
||||
|
||||
item.for.craftingMaterial.name=Crafting Material
|
||||
item.for.craftingMaterial.dissipationCharge.name=Dissipation Charge
|
||||
item.for.craftingMaterial.iceShard.name=Ice Shard
|
||||
item.for.craftingMaterial.pulsatingDust.name=Pulsating Dust
|
||||
@@ -585,6 +706,7 @@ for.frame.tooltip.production=Production:
|
||||
for.frame.tooltip.flowering=Flowering:
|
||||
for.frame.tooltip.geneticDecay=Genetic Decay:
|
||||
|
||||
item.for.fruits.name=Fruit
|
||||
item.for.fruits.cherry.name=Cherry
|
||||
item.for.fruits.chestnut.name=Chestnut
|
||||
item.for.fruits.dates.name=Date
|
||||
@@ -601,6 +723,7 @@ item.for.hardenedMachine.name=Hardened Casing
|
||||
|
||||
item.for.honeydew.name=Honeydew
|
||||
|
||||
item.for.honeyDrop.name=Drop
|
||||
item.for.honeyDrop.charged.name=Charged Drop
|
||||
item.for.honeyDrop.honey.name=Honey Drop
|
||||
item.for.honeyDrop.omega.name=Omega Drop
|
||||
@@ -632,11 +755,15 @@ item.for.naturalistHelmet.name=Spectacles
|
||||
item.for.oakStick.name=Impregnated Stick
|
||||
item.for.peat.name=Peat
|
||||
item.for.phosphor.name=Phosphor
|
||||
item.for.phosphoricIodineCapsule.name=Phosphoric Iodine Capsule
|
||||
item.for.pipette.name=Pipette
|
||||
|
||||
item.for.pollenFertile.name=Fertile Pollen
|
||||
item.for.pollen.name=Pollen Cluster
|
||||
item.for.pollen.crystalline.name=Crystalline Pollen Cluster
|
||||
item.for.pollen.normal.name=Pollen Cluster
|
||||
|
||||
item.for.propolis.name=Propolis
|
||||
item.for.propolis.normal.name=Propolis
|
||||
item.for.propolis.pulsating.name=Pulsating Propolis
|
||||
item.for.propolis.silky.name=Silky Propolis
|
||||
@@ -674,6 +801,7 @@ item.for.stamps.name=Stamp
|
||||
item.for.sturdyMachine.name=Sturdy Casing
|
||||
item.for.tent.name=Survivalist's Tent
|
||||
|
||||
item.for.thermionicTubes.name=Electron Tube
|
||||
item.for.thermionicTubes.ex-0.name=Copper Electron Tube
|
||||
item.for.thermionicTubes.ex-1.name=Tin Electron Tube
|
||||
item.for.thermionicTubes.ex-2.name=Bronze Electron Tube
|
||||
@@ -715,15 +843,18 @@ itemGroup.arboriculture=Arboriculture
|
||||
itemGroup.forestry=Forestry
|
||||
itemGroup.lepidopterology=Lepidopterology
|
||||
|
||||
tile.for.core.name=Analyzer / Escritoire
|
||||
tile.for.core.0.name=Analyzer
|
||||
tile.for.core.1.name=Escritoire
|
||||
|
||||
tile.for.engine.name=Engine
|
||||
tile.for.engine.0.name=Electrical Engine
|
||||
tile.for.engine.1.name=Peat-fired Engine
|
||||
tile.for.engine.2.name=Biogas Engine
|
||||
tile.for.engine.3.name=Bio Generator
|
||||
tile.for.engine.4.name=Clockwork Engine
|
||||
|
||||
tile.for.factory.name=Machine
|
||||
tile.for.factory.0.name=Bottler
|
||||
tile.for.factory.1.name=Carpenter
|
||||
tile.for.factory.2.name=Centrifuge
|
||||
@@ -732,23 +863,28 @@ tile.for.factory.4.name=Moistener
|
||||
tile.for.factory.5.name=Squeezer
|
||||
tile.for.factory.6.name=Still
|
||||
tile.for.factory.7.name=Rainmaker
|
||||
tile.for.factory2.name=Machine
|
||||
tile.for.factory2.0.name=Thermionic Fabricator
|
||||
tile.for.factory2.1.name=Raintank
|
||||
tile.for.factory2.2.name=Worktable
|
||||
|
||||
tile.for.mail.name=Mailbox
|
||||
tile.for.mail.0.name=Mailbox
|
||||
tile.for.mail.1.name=Trade Station
|
||||
tile.for.mail.2.name=Stamp Collector
|
||||
|
||||
tile.for.resources.name=Ore
|
||||
tile.for.resources.0.name=Apatite Ore
|
||||
tile.for.resources.1.name=Copper Ore
|
||||
tile.for.resources.2.name=Tin Ore
|
||||
|
||||
tile.for.resourceStorage.name=Block
|
||||
tile.for.resourceStorage.0.name=Block of Apatite
|
||||
tile.for.resourceStorage.1.name=Block of Copper
|
||||
tile.for.resourceStorage.2.name=Block of Tin
|
||||
tile.for.resourceStorage.3.name=Block of Bronze
|
||||
|
||||
tile.for.soil.name=Soil
|
||||
tile.for.soil.0.name=Humus
|
||||
tile.for.soil.1.name=Bog Earth
|
||||
tile.for.soil.2.name=Peat
|
||||
@@ -915,6 +1051,8 @@ for.errors.wrongStacksize.help=Only single items can be used here.
|
||||
# APICULTURE
|
||||
####################
|
||||
|
||||
item.for.beeLarvaeGE.name=Larvae
|
||||
|
||||
entity.Villager.apiarist=Apiarist
|
||||
|
||||
death.bee.aggressive.player=%1$s encountered a swarm of bees. %2$s stole his apiarist's suit.
|
||||
@@ -1129,6 +1267,7 @@ item.for.beePrincessGE.name=Princess
|
||||
item.for.beeQueenGE.name=Queen
|
||||
item.for.beeDroneGE.name=Drone
|
||||
|
||||
tile.for.alveary.name=Alveary Part
|
||||
tile.for.alveary.0.name=Alveary
|
||||
tile.for.alveary.1.name=Alveary Entrance
|
||||
tile.for.alveary.2.name=Swarmer
|
||||
@@ -1138,10 +1277,13 @@ tile.for.alveary.5.name=Alveary Hygroregulator
|
||||
tile.for.alveary.6.name=Alveary Stabiliser
|
||||
tile.for.alveary.7.name=Alveary Sieve
|
||||
|
||||
tile.for.apiculture.name=Apiary
|
||||
tile.for.apiculture.0.name=Apiary
|
||||
tile.for.apicultureChest.name=Apiarist's Chest
|
||||
tile.for.apicultureChest.0.name=Apiarist's Chest
|
||||
tile.for.apiculture.2.name=Bee House
|
||||
|
||||
tile.for.beehives.name=Hive
|
||||
tile.for.beehives.1.name=Forest Hive
|
||||
tile.for.beehives.2.name=Meadows Hive
|
||||
tile.for.beehives.3.name=Modest Hive
|
||||
@@ -1151,11 +1293,13 @@ tile.for.beehives.6.name=Wintry Hive
|
||||
tile.for.beehives.7.name=Marshy Hive
|
||||
tile.for.beehives.8.name=Swarm Hive
|
||||
|
||||
tile.for.candle.name=Candle
|
||||
tile.for.candle.dyed.lit.name=Lit Dyed Candle
|
||||
tile.for.candle.dyed.stump.name=Unlit Dyed Candle
|
||||
tile.for.candle.lit.name=Lit Candle
|
||||
tile.for.candle.stump.name=Unlit Candle
|
||||
|
||||
tile.for.stump.name=Candle Stump
|
||||
tile.for.stump.0.name=Candle Stump
|
||||
|
||||
####################
|
||||
@@ -1270,8 +1414,10 @@ for.trees.grammar.germling.type=Germling
|
||||
for.trees.grammar.germling=%SPECIES %TYPE
|
||||
for.trees.grammar.pollen.type=Pollen
|
||||
for.trees.grammar.pollen=%SPECIES %TYPE
|
||||
tile.for.saplingGE.name=Sapling
|
||||
for.trees.grammar.sapling.type=Sapling
|
||||
for.trees.grammar.sapling=%SPECIES %TYPE
|
||||
tile.for.leaves.name=Leaves
|
||||
for.trees.grammar.leaves.type=Leaves
|
||||
for.trees.grammar.leaves=%SPECIES %TYPE
|
||||
|
||||
@@ -1313,10 +1459,21 @@ for.trees.species.padauk=Padauk
|
||||
for.trees.species.cocobolo=Cocobolo
|
||||
for.trees.species.zebrawood=Zebrawood
|
||||
|
||||
tile.for.fences.name=Fence
|
||||
for.fences.grammar=%TYPE Fence
|
||||
tile.for.logs.name=Wood
|
||||
tile.for.logsFireproof.name=Wood (Fireproof)
|
||||
for.log.grammar=%TYPE Wood
|
||||
tile.for.planks.name=Wood Planks
|
||||
tile.for.planksFireproof.name=Wood Planks (Fireproof)
|
||||
for.planks.grammar=%TYPE Wood Planks
|
||||
tile.for.slabs.name=Wood Slab
|
||||
tile.for.slabsFireproof.name=Wood Slab (Fireproof)
|
||||
tile.for.slabsDouble.name=Wood Slab
|
||||
tile.for.slabsDoubleFireproof.name=Wood Slab (Fireproof)
|
||||
for.slab.grammar=%TYPE Wood Slab
|
||||
tile.for.stairs.name=Stairs
|
||||
tile.for.stairsFireproof.name=Stairs (Fireproof)
|
||||
for.stairs.grammar=%TYPE Stairs
|
||||
|
||||
for.trees.woodType.larch=Larch
|
||||
@@ -1349,15 +1506,19 @@ for.trees.woodType.padauk=Padauk
|
||||
for.trees.woodType.cocobolo=Cocobolo
|
||||
for.trees.woodType.zebrawood=Zebrawood
|
||||
|
||||
tile.for.fencesFireproof.name=Fence (Fireproof)
|
||||
tile.for.fireproof=%s (Fireproof)
|
||||
|
||||
item.for.grafter.name=Grafter
|
||||
item.for.grafterProven.name=Proven Grafter
|
||||
|
||||
tile.for.arboriculture.name=Arborist's Chest
|
||||
tile.for.arboriculture.0.name=Arborist's Chest
|
||||
|
||||
item.for.sapling.name=Sapling
|
||||
tile.for.saplingGE.0.name=Sapling
|
||||
tile.for.leaves.0.name=Leaves
|
||||
tile.for.pods.name=Pod
|
||||
tile.for.pods.0.name=Pod
|
||||
|
||||
####################
|
||||
@@ -1411,12 +1572,14 @@ for.trigger.lowFertilizer=Fertilizer
|
||||
for.trigger.lowLiquid=Water Tank
|
||||
for.trigger.lowSoil=Soil
|
||||
|
||||
tile.for.ffarm.name=Farm Block
|
||||
tile.for.ffarm.0.name=Farm Block
|
||||
tile.for.ffarm.2.name=Farm Gearbox
|
||||
tile.for.ffarm.3.name=Farm Hatch
|
||||
tile.for.ffarm.4.name=Farm Valve
|
||||
tile.for.ffarm.5.name=Farm Control
|
||||
|
||||
tile.for.mushroom.name=Mushroom
|
||||
tile.for.mushroom.0.name=Mushroom
|
||||
tile.for.mushroom.1.name=Mushroom
|
||||
|
||||
@@ -1424,6 +1587,9 @@ tile.for.mushroom.1.name=Mushroom
|
||||
# LEPIDOPTEROLOGY
|
||||
####################
|
||||
|
||||
item.for.serumGE.name=Serum
|
||||
item.for.caterpillarGE.name=Caterpillar
|
||||
item.for.butterflyGE.name=Butterfly
|
||||
entity.Forestry.butterflyGE.name=Butterfly
|
||||
|
||||
for.chat.command.forestry.butterfly.desc=- %s : Butterfly Commands
|
||||
@@ -1482,6 +1648,7 @@ item.for.butterfly.name=Butterfly
|
||||
item.for.flutterlyzer.name=Flutterlyzer
|
||||
item.for.lepidopteristBag.name=Lepidopterist's Backpack
|
||||
item.for.moth.name=Moth
|
||||
tile.for.lepidopterology.name=Lepidopterist's Chest
|
||||
tile.for.lepidopterology.0.name=Lepidopterist's Chest
|
||||
|
||||
####################
|
||||
@@ -1571,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
|
||||
@@ -1614,6 +1782,7 @@ for.config.crafting.stamps.disabled.comment=Disables the crafting recipe for cer
|
||||
|
||||
for.config.tweaks=Tweaks
|
||||
|
||||
for.config.tweaks.gui.showBackpackDurability=Shows a durability bar on backpacks indicating how full they are.
|
||||
for.config.tweaks.gui.mail.alert.enabled=Mail Alert
|
||||
for.config.tweaks.gui.mail.alert.enabled.comment=Enables the new mail alert box.
|
||||
for.config.tweaks.gui.mail.alert.xPosition=Horizontal Position
|
||||
|
||||
@@ -150,7 +150,7 @@ gui.maxspeed=Mбximo
|
||||
gui.fastest=Rбpida++
|
||||
gui.faster=Rбpida+
|
||||
gui.fast=Rбpida
|
||||
gui.slowLenta
|
||||
gui.slow=Lenta
|
||||
gui.slower=Lenta+
|
||||
gui.slowest=Lenta++
|
||||
gui.longestlife=Longa++
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 789 B |
Reference in new issue
Block a user