Compare commits

..
4 Commits
Author SHA1 Message Date
Astatine5985 b8d12e37bf Isolator crash fix revision (#56)
Co-authored-by: Maya <[email protected]>
(cherry picked from commit 5f1b5daa24)
2025-02-23 16:48:09 +01:00
glowredman 59b01f2c6c Add Localization, Fix Carpentry Hammer / Master Carpentry Hammer Names being reverse (#57)
(cherry picked from commit 0db05cb60c)
2024-12-30 21:17:05 +01:00
Martin Robertz 88a1b2d560 update 2024-12-29 00:13:30 +01:00
Guillaume Mercier 3970cec1af prevent npe and log bad requests (#55)
(cherry picked from commit 7059206cb0)
2024-12-29 00:11:48 +01:00
2206 changed files with 2407 additions and 2501 deletions

No files matched your search

-1
View File
@@ -32,7 +32,6 @@
*.[dD][lL][lL] binary *.[dD][lL][lL] binary
*.[dD][yY][lL][iI][bB] binary *.[dD][yY][lL][iI][bB] binary
*.[pP][sS][dD] binary *.[pP][sS][dD] binary
*.[pP][dD][nN] binary
*.[tT][tT][fF] binary *.[tT][tT][fF] binary
*.[oO][tT][fF] binary *.[oO][tT][fF] binary
+2 -2
View File
@@ -3,9 +3,9 @@ name: Build and test
on: on:
pull_request: pull_request:
branches: [ master, main, release/** ] branches: [ master, main ]
push: push:
branches: [ master, main, release/** ] branches: [ master, main ]
jobs: jobs:
build-and-test: build-and-test:
-17
View File
@@ -1,17 +0,0 @@
name: Optimize images
on:
pull_request:
branches: [ master, main, release/** ]
paths:
- "**/*.png"
push:
branches: [ master, main, release/** ]
paths:
- "**/*.png"
jobs:
optimize-images:
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
secrets: inherit
+1 -2
View File
@@ -28,7 +28,6 @@ whitelist.json
*.iws *.iws
src/main/resources/mixins.*([!.]).json src/main/resources/mixins.*([!.]).json
*.bat *.bat
*.sh
*.DS_Store *.DS_Store
!gradlew.bat !gradlew.bat
.factorypath .factorypath
@@ -36,4 +35,4 @@ addon.local.gradle
addon.local.gradle.kts addon.local.gradle.kts
addon.late.local.gradle addon.late.local.gradle
addon.late.local.gradle.kts addon.late.local.gradle.kts
layout.json layout.json
Binary file not shown.

Before

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 B

+6 -6
View File
@@ -1,12 +1,12 @@
// Add your dependencies here // Add your dependencies here
dependencies { dependencies {
api('com.github.GTNewHorizons:ForestryMC:4.11.39:dev') api('com.github.GTNewHorizons:ForestryMC:4.9.20:dev')
implementation('com.github.GTNewHorizons:GTNHLib:0.11.54:dev') implementation('com.github.GTNewHorizons:GTNHLib:0.5.23:dev')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.162-GTNH:dev') devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.53-GTNH:dev')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.64:api') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
compileOnly("curse.maven:extrabiomesxl-60041:2273301") compileOnly("curse.maven:extrabiomesxl-60041:2273301")
} }
+6 -43
View File
@@ -14,7 +14,7 @@ modId = BinnieCore
modGroup = binnie modGroup = binnie
# Whether to use modGroup as the maven publishing group. # Whether to use modGroup as the maven publishing group.
# When false, com.github.GTNewHorizons is used. # Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
useModGroupForPublishing = false useModGroupForPublishing = false
# Updates your build.gradle and settings.gradle automatically whenever an update is available. # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -39,33 +39,9 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE. # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
developmentEnvironmentUserName = Developer developmentEnvironmentUserName = Developer
# Enables modern Java syntax support. Valid values: # Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
# - false: No modern syntax, Java 8 only # See https://github.com/bsideup/jabel for details on how this works.
# - jabel: Jabel syntax-only support, compiles to J8 bytecode enableModernJavaSyntax = true
# - 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. # Enables injecting missing generics into the decompiled source code for a better coding experience.
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types. # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -120,9 +96,7 @@ usesMixinDebug = false
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
mixinPlugin = mixinPlugin =
# Specify the package that contains all of your Mixins. The package must exist or # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
# 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 = mixinsPackage =
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -177,7 +151,7 @@ modrinthProjectId =
# type can be one of [project, version], # type can be one of [project, version],
# and the name is the Modrinth project or version slug/id of the other mod. # 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 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
# Note: UniMixins is automatically set as a required dependency if usesMixins = true. # Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
modrinthRelations = modrinthRelations =
# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -186,11 +160,6 @@ modrinthRelations =
# Leave this empty if you don't want to publish on CurseForge. # Leave this empty if you don't want to publish on CurseForge.
curseForgeProjectId = curseForgeProjectId =
# Comma-separated supported CurseForge environments: client, server (case-insensitive).
# Use client or server for mods that only support one environment. Defaults to client,server.
# These tags describe where the mod can run, not whether installation is required on both sides.
curseForgeEnvironments = client,server
# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge. # The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
# Syntax: type1:name1;type2:name2;... # Syntax: type1:name1;type2:name2;...
# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible], # Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
@@ -203,12 +172,6 @@ curseForgeRelations =
# projects. New projects should not use this parameter. # projects. New projects should not use this parameter.
customArchiveBaseName = binnie-mods customArchiveBaseName = binnie-mods
# 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. # 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'. # 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. # The check is ONLY performed if the version is a git tag.
-12
View File
@@ -1,12 +0,0 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9064f22734b42ac03e85df04b632e167/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/4d0277c49991306ac78048580fe34bcf/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a9fa3b809e484a1e1ac4308a5dda661a/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/aa99913fa6d767d899ffc96082da01ca/redirect
toolchainVersion=25
Binary file not shown.
+1 -3
View File
@@ -1,9 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000 networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
Vendored
+11 -7
View File
@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# Copyright © 2015 the original authors. # Copyright © 2015-2021 the original authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
############################################################################## ##############################################################################
# #
# gradlew start up script for POSIX generated by Gradle. # Gradle start up script for POSIX generated by Gradle.
# #
# Important for running: # Important for running:
# #
@@ -29,7 +29,7 @@
# bash, then to run this script, type that shell name before the whole # bash, then to run this script, type that shell name before the whole
# command line, like: # command line, like:
# #
# ksh gradlew # ksh Gradle
# #
# Busybox and similar reduced shells will NOT work, because this script # Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features: # requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +86,8 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # 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\n' "$PWD" ) || exit APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@@ -114,6 +115,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;; NONSTOP* ) nonstop=true ;;
esac esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
@@ -171,6 +173,7 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" ) JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -203,14 +206,15 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped. # 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 # * 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. # treated as '${Hostname}' itself on the command line.
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ -classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@" "$@"
# Stop when "xargs" is not available. # Stop when "xargs" is not available.
Vendored
+24 -12
View File
@@ -19,12 +19,12 @@
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem gradlew startup script for Windows @rem Gradle startup script for Windows
@rem @rem
@rem ########################################################################## @rem ##########################################################################
@rem Set local scope for the variables, and ensure extensions are enabled @rem Set local scope for the variables with windows NT shell
setlocal EnableExtensions if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2 echo location of your Java installation. 1>&2
"%COMSPEC%" /c exit 1 goto fail
:findJavaFromJavaHome :findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,18 +65,30 @@ echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2 echo location of your Java installation. 1>&2
"%COMSPEC%" /c exit 1 goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute gradlew @rem Execute Gradle
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
@rem which allows us to clear the local environment before executing the java command
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
:exitWithErrorLevel :end
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts @rem End local scope for the variables with windows NT shell
"%COMSPEC%" /c exit %ERRORLEVEL% if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
+1 -1
View File
@@ -17,5 +17,5 @@ pluginManagement {
} }
plugins { plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.34' id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
} }
+4
View File
@@ -5,15 +5,19 @@ import java.util.List;
import binnie.core.ManagerBase; import binnie.core.ManagerBase;
import binnie.core.genetics.ManagerGenetics; import binnie.core.genetics.ManagerGenetics;
import binnie.core.item.ManagerItem;
import binnie.core.liquid.ManagerLiquid; import binnie.core.liquid.ManagerLiquid;
import binnie.core.machines.ManagerMachine; import binnie.core.machines.ManagerMachine;
import binnie.core.mod.config.ManagerConfig;
import binnie.core.resource.ManagerResource; import binnie.core.resource.ManagerResource;
public final class Binnie { public final class Binnie {
public static List<ManagerBase> Managers = new ArrayList<>(); public static List<ManagerBase> Managers = new ArrayList<>();
public static ManagerGenetics Genetics = new ManagerGenetics(); public static ManagerGenetics Genetics = new ManagerGenetics();
public static ManagerConfig Configuration = new ManagerConfig();
public static ManagerLiquid Liquid = new ManagerLiquid(); public static ManagerLiquid Liquid = new ManagerLiquid();
public static ManagerMachine Machine = new ManagerMachine(); public static ManagerMachine Machine = new ManagerMachine();
public static ManagerItem Item = new ManagerItem();
public static ManagerResource Resource = new ManagerResource(); public static ManagerResource Resource = new ManagerResource();
} }
+145 -153
View File
@@ -6,7 +6,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.BonemealEvent; import net.minecraftforge.event.entity.player.BonemealEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.BlockEvent;
@@ -64,41 +63,35 @@ public class Botany extends AbstractMod {
@SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer") @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
public static Proxy proxy; public static Proxy proxy;
// Genetics module
public static BlockFlower flower; public static BlockFlower flower;
public static ItemFlower flowerItem;
public static Item pollen;
public static Item seed; public static Item seed;
public static Item pollen;
public static ItemDictionary database; public static ItemDictionary database;
// Gardening module
public static BlockPlant plant; public static BlockPlant plant;
public static ItemTrowel trowelWood;
public static ItemTrowel trowelStone;
public static ItemTrowel trowelIron;
public static ItemTrowel trowelDiamond;
public static ItemTrowel trowelGold;
public static BlockSoil soil; public static BlockSoil soil;
public static BlockSoil loam; public static BlockSoil loam;
public static BlockSoil flowerbed; public static BlockSoil flowerbed;
public static BlockSoil soilNoWeed; public static BlockSoil soilNoWeed;
public static BlockSoil loamNoWeed; public static BlockSoil loamNoWeed;
public static BlockSoil flowerbedNoWeed; public static BlockSoil flowerbedNoWeed;
public static BlockCeramic ceramic;
public static BlockStained stained;
public static BlockCeramicPatterned ceramicTile;
public static BlockCeramicBrick ceramicBrick;
public static ItemSoilMeter soilMeter;
public static ItemInsulatedTube insulatedTube; public static ItemInsulatedTube insulatedTube;
public static ItemTrowel trowelWood; public static ItemSoilMeter soilMeter;
public static ItemTrowel trowelStone;
public static ItemTrowel trowelIron;
public static ItemTrowel trowelDiamond;
public static ItemTrowel trowelGold;
public static ItemMisc misc; public static ItemMisc misc;
public static ItemFlower flowerItem;
public static ItemPigment pigment; public static ItemPigment pigment;
public static ItemClay clay; public static ItemClay clay;
public static BlockCeramic ceramic;
public static BlockCeramicPatterned ceramicTile;
public static BlockStained stained;
public static BlockCeramicBrick ceramicBrick;
public Botany() { public Botany() {
Botany.instance = this; Botany.instance = this;
MinecraftForge.EVENT_BUS.register(new EventHandler());
} }
@Mod.EventHandler @Mod.EventHandler
@@ -149,6 +142,118 @@ public class Botany extends AbstractMod {
return PacketHandler.class; return PacketHandler.class;
} }
@SubscribeEvent
public void onShearFlower(PlayerInteractEvent event) {
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
return;
}
if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null
&& event.entityPlayer.getHeldItem().getItem() == Items.shears) {
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (tile instanceof TileEntityFlower tileFlower) {
tileFlower.onShear();
event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
}
}
if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null
&& event.entityPlayer.getHeldItem().getItem() == Botany.pollen) {
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (tile instanceof TileEntityFlower tileFlower) {
IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem());
if (pollen != null && tileFlower.canMateWith(pollen)) {
tileFlower.mateWith(pollen);
if (!event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem = event.entityPlayer.getHeldItem();
heldItem.stackSize--;
}
}
}
}
}
@SubscribeEvent
public void onFertiliseSoil(PlayerInteractEvent event) {
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || event.world == null) {
return;
}
if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
return;
}
int y = event.y;
Block block = event.world.getBlock(event.x, y, event.z);
if (!Gardening.isSoil(block)) {
block = event.world.getBlock(event.x, --y, event.z);
}
if (!Gardening.isSoil(block)) {
return;
}
IBlockSoil soil = (IBlockSoil) block;
if (Gardening.isNutrientFertiliser(event.entityPlayer.getHeldItem())
&& soil.getType(event.world, event.x, y, event.z) != EnumSoilType.FLOWERBED) {
EnumSoilType type = soil.getType(event.world, event.x, y, event.z);
int next = Math.min(type.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.values()[next])
&& !event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem = event.entityPlayer.getHeldItem();
heldItem.stackSize--;
return;
}
}
if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem())
&& soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ACID) {
EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
int next = Math.max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0);
if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next])
&& !event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem2 = event.entityPlayer.getHeldItem();
heldItem2.stackSize--;
return;
}
}
if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem())
&& soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ALKALINE) {
EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
int next = Math.min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next])
&& !event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem3 = event.entityPlayer.getHeldItem();
heldItem3.stackSize--;
return;
}
}
if (Gardening.isWeedkiller(event.entityPlayer.getHeldItem())
&& Gardening.addWeedKiller(event.world, event.x, y, event.z)
&& !event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem4 = event.entityPlayer.getHeldItem();
heldItem4.stackSize--;
}
}
@SubscribeEvent
public void plantVanilla(BlockEvent.PlaceEvent event) {
World world = event.world;
int x = event.x;
int y = event.y;
int z = event.z;
Block block = world.getBlock(x, y - 1, z);
if (!(block instanceof IBlockSoil)) {
return;
}
IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
if (flower != null) {
Gardening.plant(world, x, y, z, flower, event.player.getGameProfile());
}
}
@Deprecated @Deprecated
public void onPlantVanilla(PlayerInteractEvent event) { public void onPlantVanilla(PlayerInteractEvent event) {
if (!BinnieCore.proxy.isSimulating(event.world) if (!BinnieCore.proxy.isSimulating(event.world)
@@ -182,6 +287,27 @@ public class Botany extends AbstractMod {
} }
} }
@SubscribeEvent
public void onBonemeal(BonemealEvent event) {
Block block = event.world.getBlock(event.x, event.y, event.z);
if (Gardening.isSoil(block)) {
IBlockSoil soil = (IBlockSoil) block;
if (soil.fertilise(event.world, event.x, event.y, event.z, EnumSoilType.LOAM)) {
event.setResult(Event.Result.ALLOW);
}
}
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) {
event.setResult(Event.Result.ALLOW);
}
}
@Override
public boolean isActive() {
return BinnieCore.isBotanyActive();
}
@Mod.EventHandler @Mod.EventHandler
public void onIMC(FMLInterModComms.IMCEvent event) { public void onIMC(FMLInterModComms.IMCEvent event) {
for (FMLInterModComms.IMCMessage message : event.getMessages()) { for (FMLInterModComms.IMCMessage message : event.getMessages()) {
@@ -212,138 +338,4 @@ public class Botany extends AbstractMod {
super(Botany.instance); super(Botany.instance);
} }
} }
public static class EventHandler {
@SubscribeEvent
public void onShearFlower(PlayerInteractEvent event) {
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
return;
}
if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null
&& event.entityPlayer.getHeldItem().getItem() == Items.shears) {
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (tile instanceof TileEntityFlower tileFlower) {
tileFlower.onShear();
event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
}
}
if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null
&& event.entityPlayer.getHeldItem().getItem() == Botany.pollen) {
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (tile instanceof TileEntityFlower tileFlower) {
IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem());
if (pollen != null && tileFlower.canMateWith(pollen)) {
tileFlower.mateWith(pollen);
if (!event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem = event.entityPlayer.getHeldItem();
heldItem.stackSize--;
}
}
}
}
}
@SubscribeEvent
public void onFertiliseSoil(PlayerInteractEvent event) {
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || event.world == null) {
return;
}
if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
return;
}
int y = event.y;
Block block = event.world.getBlock(event.x, y, event.z);
if (!Gardening.isSoil(block)) {
block = event.world.getBlock(event.x, --y, event.z);
}
if (!Gardening.isSoil(block)) {
return;
}
IBlockSoil soil = (IBlockSoil) block;
if (Gardening.isNutrientFertiliser(event.entityPlayer.getHeldItem())
&& soil.getType(event.world, event.x, y, event.z) != EnumSoilType.FLOWERBED) {
EnumSoilType type = soil.getType(event.world, event.x, y, event.z);
int next = Math
.min(type.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.VALUES[next])
&& !event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem = event.entityPlayer.getHeldItem();
heldItem.stackSize--;
return;
}
}
if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem())
&& soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ACID) {
EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
int next = Math
.max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0);
if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.VALUES[next])
&& !event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem2 = event.entityPlayer.getHeldItem();
heldItem2.stackSize--;
return;
}
}
if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem())
&& soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ALKALINE) {
EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
int next = Math
.min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.VALUES[next])
&& !event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem3 = event.entityPlayer.getHeldItem();
heldItem3.stackSize--;
return;
}
}
if (Gardening.isWeedkiller(event.entityPlayer.getHeldItem())
&& Gardening.addWeedKiller(event.world, event.x, y, event.z)
&& !event.entityPlayer.capabilities.isCreativeMode) {
ItemStack heldItem4 = event.entityPlayer.getHeldItem();
heldItem4.stackSize--;
}
}
@SubscribeEvent
public void plantVanilla(BlockEvent.PlaceEvent event) {
World world = event.world;
int x = event.x;
int y = event.y;
int z = event.z;
Block block = world.getBlock(x, y - 1, z);
if (!(block instanceof IBlockSoil)) {
return;
}
IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
if (flower != null) {
Gardening.plant(world, x, y, z, flower, event.player.getGameProfile());
}
}
@SubscribeEvent
public void onBonemeal(BonemealEvent event) {
Block block = event.world.getBlock(event.x, event.y, event.z);
if (Gardening.isSoil(block)) {
IBlockSoil soil = (IBlockSoil) block;
if (soil.fertilise(event.world, event.x, event.y, event.z, EnumSoilType.LOAM)) {
event.setResult(Event.Result.ALLOW);
}
}
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) {
event.setResult(Event.Result.ALLOW);
}
}
}
} }
@@ -6,11 +6,6 @@ public enum EnumAcidity {
NEUTRAL, NEUTRAL,
ALKALINE; ALKALINE;
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumAcidity[] VALUES = values();
public String getID() { public String getID() {
return name().toLowerCase(); return name().toLowerCase();
} }
@@ -24,10 +24,6 @@ public enum EnumFlowerChromosome implements IChromosomeType {
SAPPINESS(IAlleleFloat.class), SAPPINESS(IAlleleFloat.class),
STEM(IAlleleInteger.class); STEM(IAlleleInteger.class);
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumFlowerChromosome[] VALUES = values();
private final Class<? extends IAllele> cls; private final Class<? extends IAllele> cls;
EnumFlowerChromosome(Class<? extends IAllele> cls) { EnumFlowerChromosome(Class<? extends IAllele> cls) {
@@ -6,11 +6,6 @@ public enum EnumMoisture {
NORMAL, NORMAL,
DAMP; DAMP;
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumMoisture[] VALUES = values();
public String getID() { public String getID() {
return name().toLowerCase(); return name().toLowerCase();
} }
@@ -6,11 +6,6 @@ public enum EnumSoilType {
LOAM, LOAM,
FLOWERBED; FLOWERBED;
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumSoilType[] VALUES = values();
public String getID() { public String getID() {
return name().toLowerCase(); return name().toLowerCase();
} }
@@ -93,7 +93,7 @@ public class BlockCeramic extends Block implements IBlockMetadata {
@Override @Override
public void getSubBlocks(Item item, CreativeTabs tabs, List<ItemStack> itemList) { public void getSubBlocks(Item item, CreativeTabs tabs, List<ItemStack> itemList) {
for (EnumFlowerColor c : EnumFlowerColor.VALUES) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal())); itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
} }
} }
@@ -102,12 +102,12 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
@Override @Override
public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) { public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) {
for (EnumFlowerColor c : EnumFlowerColor.VALUES) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
BlockType type = new BlockType(c, c, TileType.Tile); BlockType type = new BlockType(c, c, TileType.Tile);
itemList.add(TileEntityMetadata.getItemStack(this, type.ordinal())); itemList.add(TileEntityMetadata.getItemStack(this, type.ordinal()));
} }
for (TileType type2 : TileType.VALUES) { for (TileType type2 : TileType.values()) {
if (type2.canDouble()) { if (type2.canDouble()) {
itemList.add(new BlockType(EnumFlowerColor.BROWN, EnumFlowerColor.GOLD, type2).getStack(1)); itemList.add(new BlockType(EnumFlowerColor.BROWN, EnumFlowerColor.GOLD, type2).getStack(1));
} }
@@ -130,13 +130,13 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
@Override @Override
public IIcon getIcon(int side, int meta) { public IIcon getIcon(int side, int meta) {
return TileType.get(meta >>> 16 & 0xFF).icons[MultipassBlockRenderer.getLayer()]; return getType(meta).getIcon(MultipassBlockRenderer.getLayer());
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) { public void registerBlockIcons(IIconRegister register) {
for (TileType type : TileType.VALUES) { for (TileType type : TileType.values()) {
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
type.icons[i] = Botany.proxy.getIcon(register, "ceramic." + type.id + "." + i); type.icons[i] = Botany.proxy.getIcon(register, "ceramic." + type.id + "." + i);
} }
@@ -167,9 +167,6 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public int getRenderColor(int meta) { public int getRenderColor(int meta) {
if (!MultipassBlockRenderer.isRendering()) {
return EnumFlowerColor.get(meta & 0xFF).getColor(false);
}
return colorMultiplier(meta); return colorMultiplier(meta);
} }
@@ -180,14 +177,14 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
@Override @Override
public int colorMultiplier(int meta) { public int colorMultiplier(int meta) {
int layer = MultipassBlockRenderer.getLayer(); BlockType type = getType(meta);
if (layer == 0) { if (MultipassBlockRenderer.getLayer() == 0) {
return 0xffffff; return 0xffffff;
} }
if (layer == 1) { if (MultipassBlockRenderer.getLayer() == 1) {
return EnumFlowerColor.get(meta & 0xFF).getColor(false); return type.color1.getColor(false);
} }
return EnumFlowerColor.get(meta >>> 8 & 0xFF).getColor(false); return type.color2.getColor(false);
} }
@Override @Override
@@ -208,10 +205,6 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"), VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"),
VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks"); VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks");
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final TileType[] VALUES = values();
private final String id; private final String id;
private final String name; private final String name;
private final IIcon[] icons; private final IIcon[] icons;
@@ -223,7 +216,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
} }
public static TileType get(int id) { public static TileType get(int id) {
return VALUES[id % VALUES.length]; return values()[id % values().length];
} }
public boolean canDouble() { public boolean canDouble() {
@@ -34,7 +34,6 @@ public class BlockStained extends Block implements IBlockMetadata {
public BlockStained() { public BlockStained() {
super(Material.glass); super(Material.glass);
setHardness(0.3f);
setCreativeTab(CreativeTabBotany.instance); setCreativeTab(CreativeTabBotany.instance);
setBlockName("stained"); setBlockName("stained");
} }
@@ -124,7 +123,7 @@ public class BlockStained extends Block implements IBlockMetadata {
@Override @Override
public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) { public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> itemList) {
for (EnumFlowerColor c : EnumFlowerColor.VALUES) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal())); itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
} }
} }
@@ -16,7 +16,7 @@ public class CeramicColor implements IDesignMaterial {
static { static {
CeramicColor.map = new LinkedHashMap<>(); CeramicColor.map = new LinkedHashMap<>();
for (EnumFlowerColor c : EnumFlowerColor.VALUES) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
CeramicColor.map.put(c, new CeramicColor(c)); CeramicColor.map.put(c, new CeramicColor(c));
} }
} }
@@ -74,7 +74,7 @@ public class CeramicDesignSystem implements IDesignSystem {
@Override @Override
public void registerIcons(IIconRegister register) { public void registerIcons(IIconRegister register) {
for (EnumPattern pattern : EnumPattern.VALUES) { for (EnumPattern pattern : EnumPattern.values()) {
primary.put( primary.put(
pattern.ordinal(), pattern.ordinal(),
BinnieCore.proxy.getIcon( BinnieCore.proxy.getIcon(
@@ -52,7 +52,7 @@ public class CeramicTileRecipe implements IRecipe {
} }
} }
for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.VALUES) { for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.values()) {
ItemStack stack2 = type.getRecipe(stacks); ItemStack stack2 = type.getRecipe(stacks);
if (stack2 != null) { if (stack2 != null) {
return stack2; return stack2;
@@ -91,7 +91,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
} }
}; };
List<IFlowerColor> colors = new ArrayList<>(); List<IFlowerColor> colors = new ArrayList<>();
Collections.addAll(colors, EnumFlowerColor.VALUES); Collections.addAll(colors, EnumFlowerColor.values());
listBox.setOptions(colors); listBox.setOptions(colors);
} }
} }
@@ -129,7 +129,7 @@ public class GardenLogic extends FarmLogic {
if (pH.ordinal() < acidity.ordinal()) { if (pH.ordinal() < acidity.ordinal()) {
ItemStack stack = getAvailableAlkaline(); ItemStack stack = getAvailableAlkaline();
if (stack != null && soil if (stack != null && soil
.setPH(world, position.x, position.y, position.z, EnumAcidity.VALUES[pH.ordinal() + 1])) { .setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() + 1])) {
housing.getFarmInventory().removeResources(new ItemStack[] { stack }); housing.getFarmInventory().removeResources(new ItemStack[] { stack });
continue; continue;
} }
@@ -138,7 +138,7 @@ public class GardenLogic extends FarmLogic {
if (pH.ordinal() > acidity.ordinal()) { if (pH.ordinal() > acidity.ordinal()) {
ItemStack stack = getAvailableAcid(); ItemStack stack = getAvailableAcid();
if (stack != null && soil if (stack != null && soil
.setPH(world, position.x, position.y, position.z, EnumAcidity.VALUES[pH.ordinal() - 1])) { .setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() - 1])) {
housing.getFarmInventory().removeResources(new ItemStack[] { stack }); housing.getFarmInventory().removeResources(new ItemStack[] { stack });
continue; continue;
} }
@@ -55,7 +55,7 @@ public class BlockFlower extends BlockContainer {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) { public void registerBlockIcons(IIconRegister register) {
for (EnumFlowerType type : EnumFlowerType.VALUES) { for (EnumFlowerType type : EnumFlowerType.values()) {
type.registerIcons(register); type.registerIcons(register);
} }
} }
@@ -1,7 +1,5 @@
package binnie.botany.flower; package binnie.botany.flower;
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
import java.util.List; import java.util.List;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@@ -11,8 +9,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
@@ -21,25 +17,18 @@ import net.minecraft.world.World;
import binnie.Binnie; import binnie.Binnie;
import binnie.botany.Botany; import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany; import binnie.botany.CreativeTabBotany;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IFlower; import binnie.botany.api.IFlower;
import binnie.botany.api.IFlowerColor; import binnie.botany.api.IFlowerColor;
import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerGenome;
import binnie.botany.api.IFlowerType; import binnie.botany.api.IFlowerType;
import binnie.botany.core.BotanyCore; import binnie.botany.core.BotanyCore;
import binnie.botany.genetics.AlleleColor;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.botany.genetics.EnumFlowerType; import binnie.botany.genetics.EnumFlowerType;
import binnie.botany.genetics.Flower; import binnie.botany.genetics.Flower;
import binnie.botany.genetics.FlowerSpecies;
import binnie.core.BinnieCore; import binnie.core.BinnieCore;
import binnie.core.util.I18N; import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IIndividual; import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IPollinatable; import forestry.api.genetics.IPollinatable;
import forestry.core.config.Config; import forestry.core.config.Config;
@@ -50,8 +39,6 @@ public abstract class ItemBotany extends Item {
setCreativeTab(CreativeTabBotany.instance); setCreativeTab(CreativeTabBotany.instance);
setUnlocalizedName(name); setUnlocalizedName(name);
hasSubtypes = true; hasSubtypes = true;
registerItem(this, getUnlocalizedName().substring(5));
} }
@Override @Override
@@ -70,44 +57,12 @@ public abstract class ItemBotany extends Item {
return false; return false;
} }
static IAllele getRenderAllele(ItemStack stack, EnumFlowerChromosome chromosome, boolean active) {
if (stack == null || !stack.hasTagCompound()) return null;
NBTTagCompound genome = stack.getTagCompound().getCompoundTag("Genome");
NBTTagList chromosomes = genome.getTagList("Chromosomes", 10);
int slot = chromosome.ordinal();
NBTTagCompound chromosomeTag = null;
for (int index = chromosomes.tagCount() - 1; index >= 0; index--) {
NBTTagCompound candidate = chromosomes.getCompoundTagAt(index);
if (candidate.getByte("Slot") == slot) {
chromosomeTag = candidate;
break;
}
}
if (chromosomeTag == null) return null;
Class<? extends IAllele> alleleClass = chromosome.getAlleleClass();
IAllele primary = AlleleManager.alleleRegistry.getAllele(chromosomeTag.getString("UID0"));
if (!alleleClass.isInstance(primary)) return null;
IAllele secondary = AlleleManager.alleleRegistry.getAllele(chromosomeTag.getString("UID1"));
if (!alleleClass.isInstance(secondary)) return null;
if (!active) return primary;
if (primary.isDominant()) return primary;
return secondary.isDominant() ? secondary : primary;
}
@Override @Override
public boolean hasEffect(ItemStack stack, int pass) { public boolean hasEffect(ItemStack stack, int pass) {
if (!stack.hasTagCompound()) { if (!stack.hasTagCompound()) {
return false; return false;
} }
IAllele allele = getRenderAllele(stack, EnumFlowerChromosome.SPECIES, false);
if (allele instanceof IAlleleFlowerSpecies species) {
return species.hasEffect();
}
IIndividual individual = getIndividual(stack); IIndividual individual = getIndividual(stack);
return individual != null && individual.getGenome() != null && individual.hasEffect(); return individual != null && individual.getGenome() != null && individual.hasEffect();
} }
@@ -193,17 +148,6 @@ public abstract class ItemBotany extends Item {
@Override @Override
public int getColorFromItemStack(ItemStack itemstack, int renderPass) { public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
if (!itemstack.hasTagCompound()) {
return (renderPass == 0 ? EnumFlowerColor.GREEN : EnumFlowerColor.RED).getColor(false);
}
EnumFlowerChromosome chromosome = renderPass == 0 ? EnumFlowerChromosome.STEM
: renderPass == 1 ? EnumFlowerChromosome.PRIMARY : EnumFlowerChromosome.SECONDARY;
IAllele allele = getRenderAllele(itemstack, chromosome, true);
if (allele instanceof AlleleColor color) {
return color.getColor().getColor(itemstack.getTagCompound().getBoolean("Wilt"));
}
IFlower flower = BotanyCore.speciesRoot.getMember(itemstack); IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
if (flower == null || flower.getGenome() == null) { if (flower == null || flower.getGenome() == null) {
return 0xffffff; return 0xffffff;
@@ -229,32 +173,19 @@ public abstract class ItemBotany extends Item {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public IIcon getIcon(ItemStack itemstack, int renderPass) { public IIcon getIcon(ItemStack itemstack, int renderPass) {
IAlleleFlowerSpecies species = FlowerSpecies.POPPY; IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
boolean flowered = false; if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) {
return EnumFlowerType.ALLIUM.getBlank();
if (itemstack.hasTagCompound()) {
IAllele allele = getRenderAllele(itemstack, EnumFlowerChromosome.SPECIES, false);
if (allele instanceof IAlleleFlowerSpecies flowerSpecies) {
species = flowerSpecies;
flowered = itemstack.getTagCompound().getBoolean("Flowered");
} else {
IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) {
return EnumFlowerType.ALLIUM.getBlank();
}
species = flower.getGenome().getPrimary();
flowered = flower.hasFlowered();
}
} }
IFlowerType type = species.getType(); IFlowerType type = flower.getGenome().getPrimary().getType();
if (renderPass == 0) { if (renderPass == 0) {
return type.getStem(getStage(), flowered, type.getSections() - 1); return type.getStem(getStage(), flower.hasFlowered(), type.getSections() - 1);
} }
if (renderPass == 1) { if (renderPass == 1) {
return type.getPetalIcon(getStage(), flowered, type.getSections() - 1); return type.getPetalIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
} }
return type.getVariantIcon(getStage(), flowered, type.getSections() - 1); return type.getVariantIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
} }
@Override @Override
@@ -1,7 +1,5 @@
package binnie.botany.flower; package binnie.botany.flower;
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
import java.util.List; import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@@ -27,8 +25,6 @@ public class ItemInsulatedTube extends Item {
setUnlocalizedName("insulatedTube"); setUnlocalizedName("insulatedTube");
setCreativeTab(CreativeTabBotany.instance); setCreativeTab(CreativeTabBotany.instance);
setHasSubtypes(true); setHasSubtypes(true);
registerItem(this, getUnlocalizedName().substring(5));
} }
public static ItemStack getInsulateStack(ItemStack stack) { public static ItemStack getInsulateStack(ItemStack stack) {
@@ -38,8 +34,8 @@ public class ItemInsulatedTube extends Item {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
for (Material mat : Material.VALUES) { for (Material mat : Material.values()) {
for (Insulate ins : Insulate.VALUES) { for (Insulate ins : Insulate.values()) {
list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128));
} }
} }
@@ -97,8 +93,6 @@ public class ItemInsulatedTube extends Item {
Bronze(0xddc276, "bronze"), Bronze(0xddc276, "bronze"),
Iron(0xd8d8d8, "iron"); Iron(0xd8d8d8, "iron");
public static final Material[] VALUES = values();
private final int color; private final int color;
private final String name; private final String name;
@@ -108,7 +102,7 @@ public class ItemInsulatedTube extends Item {
} }
public static Material get(int i) { public static Material get(int i) {
return VALUES[i % VALUES.length]; return values()[i % values().length];
} }
public int getColor() { public int getColor() {
@@ -129,8 +123,6 @@ public class ItemInsulatedTube extends Item {
Stone(0x6d6d6d, "smoothStone"), Stone(0x6d6d6d, "smoothStone"),
Sandstone(0xc1b989, "sandstone"); Sandstone(0xc1b989, "sandstone");
public static final Insulate[] VALUES = values();
private final int color; private final int color;
private final String name; private final String name;
@@ -140,7 +132,7 @@ public class ItemInsulatedTube extends Item {
} }
public static Insulate get(int i) { public static Insulate get(int i) {
return VALUES[i / 128 % VALUES.length]; return values()[i / 128 % values().length];
} }
public int getColor() { public int getColor() {
@@ -48,7 +48,7 @@ public class BlockPlant extends BlockBush {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) { public void registerBlockIcons(IIconRegister register) {
for (Type t : Type.VALUES) { for (Type t : Type.values()) {
t.icon = Botany.proxy.getIcon(register, t.name().toLowerCase()); t.icon = Botany.proxy.getIcon(register, t.name().toLowerCase());
} }
} }
@@ -61,7 +61,7 @@ public class BlockPlant extends BlockBush {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta) { public IIcon getIcon(int side, int meta) {
return Type.VALUES[meta % Type.VALUES.length].icon; return Type.values()[meta % Type.values().length].icon;
} }
@Override @Override
@@ -72,7 +72,7 @@ public class BlockPlant extends BlockBush {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) { public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
for (Type type : Type.VALUES) { for (Type type : Type.values()) {
list.add(type.get()); list.add(type.get());
} }
} }
@@ -135,7 +135,6 @@ public class BlockPlant extends BlockBush {
DeadFlower("deadFlower"), DeadFlower("deadFlower"),
DecayingFlower("decayingFlower"); DecayingFlower("decayingFlower");
public static final Type[] VALUES = values();
public IIcon icon; public IIcon icon;
private final String name; private final String name;
@@ -145,7 +144,7 @@ public class BlockPlant extends BlockBush {
} }
public static Type get(int id) { public static Type get(int id) {
return VALUES[id % VALUES.length]; return values()[id % values().length];
} }
public ItemStack get() { public ItemStack get() {
@@ -81,8 +81,8 @@ public class BlockSoil extends Block implements IBlockSoil {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register) { public void registerBlockIcons(IIconRegister register) {
for (EnumMoisture moisture : EnumMoisture.VALUES) { for (EnumMoisture moisture : EnumMoisture.values()) {
for (EnumAcidity pH : EnumAcidity.VALUES) { for (EnumAcidity pH : EnumAcidity.values()) {
int index = moisture.ordinal() + pH.ordinal() * 3; int index = moisture.ordinal() + pH.ordinal() * 3;
String id = "soil/" + getType().getID() + "." + pH.getID() + "." + moisture.getID(); String id = "soil/" + getType().getID() + "." + pH.getID() + "." + moisture.getID();
iconsTop[index] = Botany.proxy.getIcon(register, id + ".0"); iconsTop[index] = Botany.proxy.getIcon(register, id + ".0");
@@ -104,8 +104,8 @@ public class BlockSoil extends Block implements IBlockSoil {
@Override @Override
public void updateTick(World world, int x, int y, int z, Random random) { public void updateTick(World world, int x, int y, int z, Random random) {
int meta = world.getBlockMetadata(x, y, z); int meta = world.getBlockMetadata(x, y, z);
EnumMoisture moisture = EnumMoisture.VALUES[meta % 3]; EnumMoisture moisture = EnumMoisture.values()[meta % 3];
EnumAcidity acidity = EnumAcidity.VALUES[meta / 3]; EnumAcidity acidity = EnumAcidity.values()[meta / 3];
EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, x, y, z); EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, x, y, z);
if (desiredMoisture.ordinal() > moisture.ordinal()) { if (desiredMoisture.ordinal() > moisture.ordinal()) {
moisture = ((moisture == EnumMoisture.DRY) ? EnumMoisture.NORMAL : EnumMoisture.DAMP); moisture = ((moisture == EnumMoisture.DRY) ? EnumMoisture.NORMAL : EnumMoisture.DAMP);
@@ -141,12 +141,12 @@ public class BlockSoil extends Block implements IBlockSoil {
@Override @Override
public EnumAcidity getPH(World world, int x, int y, int z) { public EnumAcidity getPH(World world, int x, int y, int z) {
return EnumAcidity.VALUES[world.getBlockMetadata(x, y, z) / 3]; return EnumAcidity.values()[world.getBlockMetadata(x, y, z) / 3];
} }
@Override @Override
public EnumMoisture getMoisture(World world, int x, int y, int z) { public EnumMoisture getMoisture(World world, int x, int y, int z) {
return EnumMoisture.VALUES[world.getBlockMetadata(x, y, z) % 3]; return EnumMoisture.values()[world.getBlockMetadata(x, y, z) % 3];
} }
@Override @Override
@@ -233,8 +233,8 @@ public class Gardening {
BiomeGenBase biome = world.getBiomeGenForCoords(x, z); BiomeGenBase biome = world.getBiomeGenForCoords(x, z);
return canTolerate( return canTolerate(
flower, flower,
EnumAcidity.VALUES[soilMeta / 3 % 3], EnumAcidity.values()[soilMeta / 3 % 3],
EnumMoisture.VALUES[soilMeta % 3], EnumMoisture.values()[soilMeta % 3],
EnumTemperature.getFromValue(biome.temperature)); EnumTemperature.getFromValue(biome.temperature));
} }
@@ -33,8 +33,8 @@ public class ItemSoil extends ItemBlock {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) { public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
super.addInformation(stack, player, tooltip, advanced); super.addInformation(stack, player, tooltip, advanced);
EnumMoisture moisture = EnumMoisture.VALUES[stack.getItemDamage() % 3]; EnumMoisture moisture = EnumMoisture.values()[stack.getItemDamage() % 3];
EnumAcidity acidity = EnumAcidity.VALUES[stack.getItemDamage() / 3]; EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3];
String info = ""; String info = "";
if (moisture == EnumMoisture.DRY) { if (moisture == EnumMoisture.DRY) {
@@ -1,7 +1,5 @@
package binnie.botany.gardening; package binnie.botany.gardening;
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@@ -30,8 +28,6 @@ public class ItemSoilMeter extends Item {
setCreativeTab(CreativeTabBotany.instance); setCreativeTab(CreativeTabBotany.instance);
setUnlocalizedName("soilMeter"); setUnlocalizedName("soilMeter");
setMaxStackSize(1); setMaxStackSize(1);
registerItem(this, getUnlocalizedName().substring(5));
} }
@Override @Override
@@ -1,7 +1,5 @@
package binnie.botany.gardening; package binnie.botany.gardening;
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@@ -30,8 +28,6 @@ public class ItemTrowel extends Item {
setCreativeTab(CreativeTabBotany.instance); setCreativeTab(CreativeTabBotany.instance);
setUnlocalizedName("trowel" + material); setUnlocalizedName("trowel" + material);
locName = "trowel" + material; locName = "trowel" + material;
registerItem(this, getUnlocalizedName().substring(5));
} }
@Override @Override
@@ -18,7 +18,7 @@ public class ItemWeed extends ItemBlock {
@Override @Override
public String getItemStackDisplayName(ItemStack stack) { public String getItemStackDisplayName(ItemStack stack) {
return BlockPlant.Type.VALUES[stack.getItemDamage()].getName(); return BlockPlant.Type.values()[stack.getItemDamage()].getName();
} }
@Override @Override
@@ -12,6 +12,7 @@ import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe;
import binnie.Binnie;
import binnie.botany.Botany; import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany; import binnie.botany.CreativeTabBotany;
import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumAcidity;
@@ -36,7 +37,6 @@ import binnie.core.block.ItemMetadata;
import binnie.core.block.ItemMetadataRenderer; import binnie.core.block.ItemMetadataRenderer;
import binnie.core.block.MultipassItemRenderer; import binnie.core.block.MultipassItemRenderer;
import binnie.core.block.TileEntityMetadata; import binnie.core.block.TileEntityMetadata;
import binnie.core.item.ItemMisc;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
public class ModuleGardening implements IInitializable { public class ModuleGardening implements IInitializable {
@@ -75,7 +75,7 @@ public class ModuleGardening implements IInitializable {
Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron"); Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron");
Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond"); Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond");
Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold"); Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
Botany.misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values()); Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance);
Botany.pigment = new ItemPigment(); Botany.pigment = new ItemPigment();
Botany.clay = new ItemClay(); Botany.clay = new ItemClay();
@@ -109,7 +109,7 @@ public class ModuleGardening implements IInitializable {
for (boolean manual : new boolean[] { true, false }) { for (boolean manual : new boolean[] { true, false }) {
for (boolean fertilised : new boolean[] { true, false }) { for (boolean fertilised : new boolean[] { true, false }) {
for (EnumMoisture moist : EnumMoisture.VALUES) { for (EnumMoisture moist : EnumMoisture.values()) {
ItemStack icon = (moist == EnumMoisture.DRY) ? yellow ItemStack icon = (moist == EnumMoisture.DRY) ? yellow
: ((moist == EnumMoisture.NORMAL) ? red : blue); : ((moist == EnumMoisture.NORMAL) ? red : blue);
int insulate = 2 - moist.ordinal(); int insulate = 2 - moist.ordinal();
@@ -258,7 +258,7 @@ public class ModuleGardening implements IInitializable {
GameRegistry GameRegistry
.addRecipe(BotanyItems.Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel); .addRecipe(BotanyItems.Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel);
for (EnumFlowerColor c : EnumFlowerColor.VALUES) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
ItemStack clay = new ItemStack(Botany.clay, 1, c.ordinal()); ItemStack clay = new ItemStack(Botany.clay, 1, c.ordinal());
ItemStack pigment = new ItemStack(Botany.pigment, 1, c.ordinal()); ItemStack pigment = new ItemStack(Botany.pigment, 1, c.ordinal());
GameRegistry.addShapelessRecipe(clay, Items.clay_ball, Items.clay_ball, Items.clay_ball, pigment); GameRegistry.addShapelessRecipe(clay, Items.clay_ball, Items.clay_ball, Items.clay_ball, pigment);
@@ -276,9 +276,9 @@ public class ModuleGardening implements IInitializable {
return null; return null;
} }
return new ItemStack( return new ItemStack(
Gardening.getSoilBlock(EnumSoilType.VALUES[type]), Gardening.getSoilBlock(EnumSoilType.values()[type]),
1, 1,
BlockSoil.getMeta(EnumAcidity.VALUES[pH], EnumMoisture.VALUES[moisture])); BlockSoil.getMeta(EnumAcidity.values()[pH], EnumMoisture.values()[moisture]));
} }
private void addAcidFertiliser(ItemStack stack, int strengthMax) { private void addAcidFertiliser(ItemStack stack, int strengthMax) {
@@ -92,10 +92,7 @@ public enum EnumFlowerColor implements IFlowerColor {
YELLOW("yellow", 0xffff00), YELLOW("yellow", 0xffff00),
YELLOW_GREEN("yellowGreen", 0x9acd32); YELLOW_GREEN("yellowGreen", 0x9acd32);
/** private static final EnumFlowerColor[] ALL_VALUES = values();
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumFlowerColor[] VALUES = values();
private final int color; private final int color;
private final int colorDis; private final int colorDis;
private final String name; private final String name;
@@ -2967,7 +2964,7 @@ public enum EnumFlowerColor implements IFlowerColor {
} }
public static EnumFlowerColor get(int i) { public static EnumFlowerColor get(int i) {
return VALUES[Math.max(0, i) % VALUES.length]; return ALL_VALUES[Math.max(0, i) % ALL_VALUES.length];
} }
@Override @Override
@@ -57,10 +57,6 @@ public enum EnumFlowerType implements IFlowerType {
DELPHINIUM(2), DELPHINIUM(2),
HOLLYHOCK(2); HOLLYHOCK(2);
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumFlowerType[] VALUES = values();
private final int sections; private final int sections;
private final IIcon[] stem; private final IIcon[] stem;
private final IIcon[] petal; private final IIcon[] petal;
@@ -232,7 +232,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
@Override @Override
public IChromosomeType[] getKaryotype() { public IChromosomeType[] getKaryotype() {
return EnumFlowerChromosome.VALUES; return EnumFlowerChromosome.values();
} }
@Override @Override
@@ -496,7 +496,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
@Override @Override
public EnumHumidity getHumidity() { public EnumHumidity getHumidity() {
return EnumHumidity.VALUES[getMoisture().ordinal()]; return EnumHumidity.values()[getMoisture().ordinal()];
} }
@Override @Override
@@ -8,14 +8,8 @@ import forestry.core.genetics.alleles.EnumAllele;
public class FlowerTemplates { public class FlowerTemplates {
private static IAllele[] defaultTemplate;
public static IAllele[] getDefaultTemplate() { public static IAllele[] getDefaultTemplate() {
if (defaultTemplate != null) { IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length];
return defaultTemplate.clone();
}
IAllele[] alleles = new IAllele[EnumFlowerChromosome.VALUES.length];
alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.POPPY; alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.POPPY;
alleles[EnumFlowerChromosome.PRIMARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED); alleles[EnumFlowerChromosome.PRIMARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
alleles[EnumFlowerChromosome.SECONDARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED); alleles[EnumFlowerChromosome.SECONDARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
@@ -28,13 +22,6 @@ public class FlowerTemplates {
alleles[EnumFlowerChromosome.PH_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE); alleles[EnumFlowerChromosome.PH_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
alleles[EnumFlowerChromosome.SAPPINESS.ordinal()] = AlleleHelper.getAllele(EnumAllele.Sappiness.AVERAGE); alleles[EnumFlowerChromosome.SAPPINESS.ordinal()] = AlleleHelper.getAllele(EnumAllele.Sappiness.AVERAGE);
alleles[EnumFlowerChromosome.STEM.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.GREEN); alleles[EnumFlowerChromosome.STEM.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.GREEN);
return alleles;
for (IAllele allele : alleles) {
// Do not cache a partial template during registry initialization.
if (allele == null) return alleles;
}
defaultTemplate = alleles;
return defaultTemplate.clone();
} }
} }
@@ -1,7 +1,5 @@
package binnie.botany.genetics; package binnie.botany.genetics;
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
import java.util.List; import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@@ -27,8 +25,6 @@ public class ItemDictionary extends Item {
setCreativeTab(CreativeTabBotany.instance); setCreativeTab(CreativeTabBotany.instance);
setUnlocalizedName("database"); setUnlocalizedName("database");
setMaxStackSize(1); setMaxStackSize(1);
registerItem(this, getUnlocalizedName().substring(5));
} }
@Override @Override
@@ -42,7 +42,7 @@ public class ModuleGenetics implements IInitializable {
@Override @Override
public void init() { public void init() {
for (EnumFlowerColor color : EnumFlowerColor.VALUES) { for (EnumFlowerColor color : EnumFlowerColor.values()) {
AlleleManager.alleleRegistry.registerAllele(color.getAllele()); AlleleManager.alleleRegistry.registerAllele(color.getAllele());
} }
@@ -1,7 +1,5 @@
package binnie.botany.items; package binnie.botany.items;
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
import java.util.List; import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,8 +22,6 @@ public class ItemClay extends Item {
setUnlocalizedName("clay"); setUnlocalizedName("clay");
setHasSubtypes(true); setHasSubtypes(true);
setCreativeTab(CreativeTabBotany.instance); setCreativeTab(CreativeTabBotany.instance);
registerItem(this, getUnlocalizedName().substring(5));
} }
@Override @Override
@@ -49,7 +45,7 @@ public class ItemClay extends Item {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
for (EnumFlowerColor c : EnumFlowerColor.VALUES) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
list.add(new ItemStack(this, 1, c.ordinal())); list.add(new ItemStack(this, 1, c.ordinal()));
} }
} }
@@ -1,7 +1,5 @@
package binnie.botany.items; package binnie.botany.items;
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
import java.util.List; import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,8 +22,6 @@ public class ItemPigment extends Item {
setUnlocalizedName("pigment"); setUnlocalizedName("pigment");
setHasSubtypes(true); setHasSubtypes(true);
setCreativeTab(CreativeTabBotany.instance); setCreativeTab(CreativeTabBotany.instance);
registerItem(this, getUnlocalizedName().substring(5));
} }
@Override @Override
@@ -49,7 +45,7 @@ public class ItemPigment extends Item {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
for (EnumFlowerColor c : EnumFlowerColor.VALUES) { for (EnumFlowerColor c : EnumFlowerColor.values()) {
list.add(new ItemStack(this, 1, c.ordinal())); list.add(new ItemStack(this, 1, c.ordinal()));
} }
} }
@@ -39,10 +39,10 @@ public class MessageFlowerUpdate extends MessageCoordinates {
public void readData(ByteBuf data) throws IOException { public void readData(ByteBuf data) throws IOException {
super.readData(data); super.readData(data);
render = new TileEntityFlower.RenderInfo(); render = new TileEntityFlower.RenderInfo();
render.primary = EnumFlowerColor.get(data.readByte()); render.primary = EnumFlowerColor.values()[data.readByte()];
render.secondary = EnumFlowerColor.get(data.readByte()); render.secondary = EnumFlowerColor.values()[data.readByte()];
render.stem = EnumFlowerColor.get(data.readByte()); render.stem = EnumFlowerColor.values()[data.readByte()];
render.type = EnumFlowerType.VALUES[data.readByte()]; render.type = EnumFlowerType.values()[data.readByte()];
render.age = data.readByte(); render.age = data.readByte();
render.section = data.readByte(); render.section = data.readByte();
render.wilted = data.readBoolean(); render.wilted = data.readBoolean();
+54 -4
View File
@@ -1,9 +1,16 @@
package binnie.core; package binnie.core;
import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import net.minecraftforge.common.MinecraftForge;
import binnie.Binnie;
import binnie.core.gui.IBinnieGUID; import binnie.core.gui.IBinnieGUID;
import binnie.core.mod.parser.FieldParser;
import binnie.core.network.BinniePacketHandler; import binnie.core.network.BinniePacketHandler;
import binnie.core.network.IPacketID; import binnie.core.network.IPacketID;
import binnie.core.network.IPacketProvider; import binnie.core.network.IPacketProvider;
@@ -16,16 +23,17 @@ import cpw.mods.fml.relauncher.Side;
public abstract class AbstractMod implements IPacketProvider, IInitializable { public abstract class AbstractMod implements IPacketProvider, IInitializable {
private SimpleNetworkWrapper wrapper; private SimpleNetworkWrapper wrapper;
private final LinkedHashSet<Field> fields;
protected final List<IInitializable> modules; protected final List<IInitializable> modules;
public AbstractMod() { public AbstractMod() {
fields = new LinkedHashSet<>();
modules = new ArrayList<>(); modules = new ArrayList<>();
BinnieCore.registerMod(this); BinnieCore.registerMod(this);
MinecraftForge.EVENT_BUS.register(this);
} }
public boolean isActive() { public abstract boolean isActive();
return true;
}
@Override @Override
public abstract String getChannel(); public abstract String getChannel();
@@ -39,6 +47,10 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
return new IBinnieGUID[0]; return new IBinnieGUID[0];
} }
public Class<?>[] getConfigs() {
return new Class[0];
}
public abstract IProxyCore getProxy(); public abstract IProxyCore getProxy();
public abstract String getModID(); public abstract String getModID();
@@ -55,10 +67,32 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
return; return;
} }
if (getConfigs() != null) {
for (Class<?> cls : getConfigs()) {
Binnie.Configuration.registerConfiguration(cls, this);
}
}
getProxy().preInit(); getProxy().preInit();
for (IInitializable module : modules) { for (IInitializable module : modules) {
module.preInit(); module.preInit();
} }
// TODO what does it mean?
Collections.addAll(fields, getClass().getFields());
for (Class<?> cls : getClass().getClasses()) {
Collections.addAll(fields, getClass().getFields());
}
for (IInitializable module : modules) {
Collections.addAll(fields, module.getClass().getFields());
}
for (Field field4 : fields) {
try {
FieldParser.preInitParse(field4, this);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
} }
@Override @Override
@@ -74,6 +108,14 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
for (IInitializable module : modules) { for (IInitializable module : modules) {
module.init(); module.init();
} }
for (Field field : fields) {
try {
FieldParser.initParse(field, this);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
} }
@Override @Override
@@ -86,10 +128,18 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
for (IInitializable module : modules) { for (IInitializable module : modules) {
module.postInit(); module.postInit();
} }
for (Field field : fields) {
try {
FieldParser.postInitParse(field, this);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
} }
protected void addModule(IInitializable init) { protected void addModule(IInitializable init) {
modules.add(init); modules.add(init);
init.registerEventHandler(); MinecraftForge.EVENT_BUS.register(init);
} }
} }
+51 -43
View File
@@ -5,14 +5,13 @@ import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import binnie.Binnie; import binnie.Binnie;
import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.MultipassBlockRenderer;
import binnie.core.block.TileEntityMetadata; import binnie.core.block.TileEntityMetadata;
import binnie.core.config.BCConfig;
import binnie.core.craftgui.minecraft.ModuleCraftGUI; import binnie.core.craftgui.minecraft.ModuleCraftGUI;
import binnie.core.gui.BinnieCoreGUI; import binnie.core.gui.BinnieCoreGUI;
import binnie.core.gui.BinnieGUIHandler; import binnie.core.gui.BinnieGUIHandler;
@@ -23,6 +22,10 @@ import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.ItemFluidContainer; import binnie.core.liquid.ItemFluidContainer;
import binnie.core.machines.MachineGroup; import binnie.core.machines.MachineGroup;
import binnie.core.machines.storage.ModuleStorage; import binnie.core.machines.storage.ModuleStorage;
import binnie.core.mod.config.ConfigurationMain;
import binnie.core.mod.config.ConfigurationMods;
import binnie.core.mod.parser.FieldParser;
import binnie.core.mod.parser.ItemParser;
import binnie.core.network.BinnieCorePacketID; import binnie.core.network.BinnieCorePacketID;
import binnie.core.network.BinniePacketHandler; import binnie.core.network.BinniePacketHandler;
import binnie.core.network.IPacketID; import binnie.core.network.IPacketID;
@@ -46,16 +49,13 @@ import forestry.api.core.ForestryEvent;
import forestry.plugins.PluginManager; import forestry.plugins.PluginManager;
@Mod( @Mod(
modid = BinnieCore.CORE_MODID, modid = "BinnieCore",
name = BinnieCore.CORE_MOD_NAME, name = "Binnie Core",
version = Tags.VERSION, version = Tags.VERSION,
useMetadata = true, useMetadata = true,
dependencies = "after:Forestry@[4.2,),required-after:gtnhlib@[0.0.10,)") dependencies = "after:Forestry@[4.2,),required-after:gtnhlib@[0.0.10,)")
public class BinnieCore extends AbstractMod { public class BinnieCore extends AbstractMod {
public static final String CORE_MODID = "BinnieCore";
public static final String CORE_MOD_NAME = "Binnie Core";
@Mod.Instance("BinnieCore") @Mod.Instance("BinnieCore")
public static BinnieCore instance; public static BinnieCore instance;
@@ -68,20 +68,15 @@ public class BinnieCore extends AbstractMod {
public static ItemGenesis genesis; public static ItemGenesis genesis;
public static ItemFieldKit fieldKit; public static ItemFieldKit fieldKit;
public BinnieCore() {
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
@Mod.EventHandler @Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) { public void preInit(FMLPreInitializationEvent event) {
Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
for (ManagerBase baseManager : Binnie.Managers) { for (ManagerBase baseManager : Binnie.Managers) {
addModule(baseManager); addModule(baseManager);
} }
addModule(new ModuleCraftGUI()); addModule(new ModuleCraftGUI());
if (!BCConfig.disableCompartments) { addModule(new ModuleStorage());
addModule(new ModuleStorage());
}
addModule(new ModuleItems()); addModule(new ModuleItems());
if (Loader.isModLoaded("BuildCraft|Silicon")) { if (Loader.isModLoaded("BuildCraft|Silicon")) {
addModule(new ModuleTrigger()); addModule(new ModuleTrigger());
@@ -111,6 +106,7 @@ public class BinnieCore extends AbstractMod {
Item item = new ItemFluidContainer(container); Item item = new ItemFluidContainer(container);
GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5)); GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
} }
FieldParser.parsers.add(new ItemParser());
super.preInit(); super.preInit();
} }
@@ -138,12 +134,20 @@ public class BinnieCore extends AbstractMod {
return PluginManager.Module.ARBORICULTURE.isEnabled(); return PluginManager.Module.ARBORICULTURE.isEnabled();
} }
public static boolean isBotanyActive() {
return ConfigurationMods.botany;
}
public static boolean isGeneticsActive() {
return ConfigurationMods.genetics;
}
public static boolean isExtraBeesActive() { public static boolean isExtraBeesActive() {
return isApicultureActive(); return ConfigurationMods.extraBees && isApicultureActive();
} }
public static boolean isExtraTreesActive() { public static boolean isExtraTreesActive() {
return isArboricultureActive(); return ConfigurationMods.extraTrees && isArboricultureActive();
} }
@Override @Override
@@ -165,6 +169,23 @@ public class BinnieCore extends AbstractMod {
return list; return list;
} }
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
try {
EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager()
.func_152612_a(event.username.getName());
if (player == null) {
return;
}
event.tracker.synchToPlayer(player);
NBTTagCompound nbt = new NBTTagCompound();
nbt.setString("species", event.species.getUID());
} catch (Exception ex) {
// ignored
}
}
@Override @Override
public String getChannel() { public String getChannel() {
return "BIN"; return "BIN";
@@ -185,6 +206,20 @@ public class BinnieCore extends AbstractMod {
return BinnieCorePacketID.values(); return BinnieCorePacketID.values();
} }
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleTextureRemap(TextureStitchEvent.Pre event) {
if (event.map.getTextureType() == 0) {
Binnie.Liquid.reloadIcons(event.map);
}
Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
}
@Override
public Class<?>[] getConfigs() {
return new Class[] { ConfigurationMain.class };
}
@Override @Override
protected Class<? extends BinniePacketHandler> getPacketHandler() { protected Class<? extends BinniePacketHandler> getPacketHandler() {
return PacketHandler.class; return PacketHandler.class;
@@ -201,31 +236,4 @@ public class BinnieCore extends AbstractMod {
super(instance); super(instance);
} }
} }
public static class EventHandler {
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
try {
EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager()
.func_152612_a(event.username.getName());
if (player == null) {
return;
}
event.tracker.synchToPlayer(player);
} catch (Exception ex) {
// ignored
}
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleTextureRemap(TextureStitchEvent.Pre event) {
if (event.map.getTextureType() == 0) {
Binnie.Liquid.reloadIcons(event.map);
}
Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
}
}
} }
@@ -7,6 +7,4 @@ public interface IInitializable {
void init(); void init();
void postInit(); void postInit();
default void registerEventHandler() {}
} }
-1
View File
@@ -14,7 +14,6 @@ public class Mods {
public static final Mod botania = new Mod("Botania"); public static final Mod botania = new Mod("Botania");
public static final Mod extraBiomes = new Mod("ExtrabiomesXL"); public static final Mod extraBiomes = new Mod("ExtrabiomesXL");
public static final Mod dreamcraft = new Mod("dreamcraft"); public static final Mod dreamcraft = new Mod("dreamcraft");
public static final Mod buildcraftCore = new Mod("BuildCraft|Core");
private static Item findItem(String modId, String name) { private static Item findItem(String modId, String name) {
Item stack = GameRegistry.findItem(modId, name); Item stack = GameRegistry.findItem(modId, name);
@@ -17,8 +17,6 @@ public class ItemMetadata extends ItemBlock {
public ItemMetadata(Block block) { public ItemMetadata(Block block) {
super(block); super(block);
setMaxDamage(0);
setHasSubtypes(true);
} }
@Override @Override
@@ -14,7 +14,6 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
public static MultipassBlockRenderer instance; public static MultipassBlockRenderer instance;
private static int layer = 0; private static int layer = 0;
private static boolean rendering = false;
public MultipassBlockRenderer() { public MultipassBlockRenderer() {
MultipassBlockRenderer.instance = this; MultipassBlockRenderer.instance = this;
@@ -24,49 +23,31 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
return MultipassBlockRenderer.layer; return MultipassBlockRenderer.layer;
} }
public static boolean isRendering() {
return MultipassBlockRenderer.rendering;
}
@Override @Override
public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) { public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) {
IMultipassBlock multipassBlock = (IMultipassBlock) block;
int passes = multipassBlock.getNumberOfPasses();
block.setBlockBoundsForItemRender(); block.setBlockBoundsForItemRender();
renderer.setRenderBoundsFromBlock(block); renderer.setRenderBoundsFromBlock(block);
GL11.glTranslatef(-0.5f, -0.5f, -0.5f); GL11.glTranslatef(-0.5f, -0.5f, -0.5f);
MultipassBlockRenderer.rendering = true; MultipassBlockRenderer.layer = 0;
try { while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
for (int pass = 0; pass < passes; ++pass) { renderItem(block, renderer, meta);
MultipassBlockRenderer.layer = pass; MultipassBlockRenderer.layer++;
renderItem(block, multipassBlock, renderer, meta);
}
} finally {
MultipassBlockRenderer.layer = 0;
MultipassBlockRenderer.rendering = false;
} }
MultipassBlockRenderer.layer = 0;
} }
@Override @Override
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
RenderBlocks renderer) { RenderBlocks renderer) {
IMultipassBlock multipassBlock = (IMultipassBlock) block; boolean r = true;
int passes = multipassBlock.getNumberOfPasses(); MultipassBlockRenderer.layer = 0;
boolean rendered = true; while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
r = renderer.renderStandardBlock(block, x, y, z);
MultipassBlockRenderer.rendering = true; MultipassBlockRenderer.layer++;
try {
for (int pass = 0; pass < passes; ++pass) {
MultipassBlockRenderer.layer = pass;
rendered = renderer.renderStandardBlock(block, x, y, z);
}
return rendered;
} finally {
MultipassBlockRenderer.layer = 0;
MultipassBlockRenderer.rendering = false;
} }
MultipassBlockRenderer.layer = 0;
return r;
} }
@Override @Override
@@ -79,8 +60,8 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
return BinnieCore.multipassRenderID; return BinnieCore.multipassRenderID;
} }
private void renderItem(Block block, IMultipassBlock multipassBlock, RenderBlocks renderer, int meta) { public void renderItem(Block block, RenderBlocks renderer, int meta) {
setColor(multipassBlock.colorMultiplier(meta)); setColor(((IMultipassBlock) block).colorMultiplier(meta));
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
tessellator.setNormal(0.0f, -1.0f, 0.0f); tessellator.setNormal(0.0f, -1.0f, 0.0f);
@@ -76,14 +76,12 @@ public class TileEntityMetadata extends TileEntity {
} }
public static ItemStack getItemStack(Block block, int damage) { public static ItemStack getItemStack(Block block, int damage) {
NBTTagCompound tag = new NBTTagCompound();
tag.setInteger("meta", damage);
ItemStack item = new ItemStack(block, 1, 0); ItemStack item = new ItemStack(block, 1, 0);
if (0 <= damage && damage < Short.MAX_VALUE) { item.setItemDamage(Math.min(damage, 16387));
item.setItemDamage(damage); item.setTagCompound(tag);
} else {
NBTTagCompound tag = new NBTTagCompound();
tag.setInteger("meta", damage);
item.setTagCompound(tag);
}
return item; return item;
} }
@@ -1,14 +0,0 @@
package binnie.core.config;
import com.gtnewhorizon.gtnhlib.config.Config;
import binnie.core.BinnieCore;
@Config(modid = BinnieCore.CORE_MODID)
public class BCConfig {
@Config.Comment("If true, disables all compartment storage machines (no blocks/recipes will be registered).")
@Config.DefaultBoolean(false)
@Config.RequiresMcRestart
public static boolean disableCompartments;
}
@@ -91,7 +91,7 @@ public interface IWidget {
void callEvent(Event event); void callEvent(Event event);
void receiveEvent(Event event); void recieveEvent(Event event);
void onUpdateClient(); void onUpdateClient();
@@ -1,7 +1,10 @@
package binnie.core.craftgui; package binnie.core.craftgui;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Deque; import java.util.Deque;
import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
@@ -165,14 +168,17 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget {
} }
public Deque<IWidget> calculateMousedOverWidgets() { public Deque<IWidget> calculateMousedOverWidgets() {
Deque<IWidget> widgets = new ArrayDeque<>(); Deque<IWidget> list = new ArrayDeque<>();
addMousedOverWidgets(this, widgets); for (IWidget widget : getQueuedWidgets(this)) {
return widgets; if (widget.calculateIsMouseOver()) {
list.addLast(widget);
}
}
return list;
} }
private void addMousedOverWidgets(IWidget widget, Deque<IWidget> widgets) { private Collection<IWidget> getQueuedWidgets(IWidget widget) {
if (!widget.isVisible()) return; List<IWidget> widgets = new ArrayList<>();
boolean addChildren = true; boolean addChildren = true;
if (widget.isCroppedWidget()) { if (widget.isCroppedWidget()) {
addChildren = widget.getCroppedZone().contains(widget.getCropWidget().getRelativeMousePosition()); addChildren = widget.getCroppedZone().contains(widget.getCropWidget().getRelativeMousePosition());
@@ -182,12 +188,11 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget {
ListIterator<IWidget> li = widget.getWidgets().listIterator(widget.getWidgets().size()); ListIterator<IWidget> li = widget.getWidgets().listIterator(widget.getWidgets().size());
while (li.hasPrevious()) { while (li.hasPrevious()) {
IWidget child = li.previous(); IWidget child = li.previous();
addMousedOverWidgets(child, widgets); widgets.addAll(getQueuedWidgets(child));
} }
} }
if (widget.calculateIsMouseOver()) { widgets.add(widget);
widgets.addLast(widget); return widgets;
}
} }
@Override @Override
+9 -19
View File
@@ -194,7 +194,7 @@ public class Widget implements IWidget {
@Override @Override
public void setOffset(IPoint offset) { public void setOffset(IPoint offset) {
if (!offset.equals(this.offset)) { if (offset != this.offset) {
this.offset = new IPoint(offset); this.offset = new IPoint(offset);
callEvent(new EventWidget.ChangeOffset(this)); callEvent(new EventWidget.ChangeOffset(this));
} }
@@ -235,11 +235,11 @@ public class Widget implements IWidget {
@Override @Override
public void callEvent(Event event) { public void callEvent(Event event) {
getSuperParent().receiveEvent(event); getSuperParent().recieveEvent(event);
} }
@Override @Override
public void receiveEvent(Event event) { public void recieveEvent(Event event) {
for (EventHandler handler : globalEventHandlers) { for (EventHandler handler : globalEventHandlers) {
if (handler.handles(event)) { if (handler.handles(event)) {
handler.onEvent(event); handler.onEvent(event);
@@ -248,7 +248,7 @@ public class Widget implements IWidget {
try { try {
for (IWidget child : getWidgets()) { for (IWidget child : getWidgets()) {
child.receiveEvent(event); child.recieveEvent(event);
} }
} catch (ConcurrentModificationException e) { } catch (ConcurrentModificationException e) {
// ignored // ignored
@@ -285,10 +285,6 @@ public class Widget implements IWidget {
onRender(RenderStage.PreChildren); onRender(RenderStage.PreChildren);
for (IWidget widget : getWidgets()) { for (IWidget widget : getWidgets()) {
if (!widget.isVisible()) {
continue;
}
widget.render(); widget.render();
CraftGUI.render.preRender(widget); CraftGUI.render.preRender(widget);
widget.onRender(RenderStage.PostSiblings); widget.onRender(RenderStage.PostSiblings);
@@ -310,22 +306,17 @@ public class Widget implements IWidget {
} }
onUpdateClient(); onUpdateClient();
List<IWidget> deletedWidgets = null; List<IWidget> deletedWidgets = new ArrayList<>();
for (IWidget widget : getWidgets()) { for (IWidget widget : getWidgets()) {
if (widget.hasAttribute(WidgetAttribute.NEEDS_DELETION)) { if (widget.hasAttribute(WidgetAttribute.NEEDS_DELETION)) {
if (deletedWidgets == null) {
deletedWidgets = new ArrayList<>();
}
deletedWidgets.add(widget); deletedWidgets.add(widget);
} else { } else {
widget.updateClient(); widget.updateClient();
} }
} }
if (deletedWidgets != null) { for (IWidget widget : deletedWidgets) {
for (IWidget widget : deletedWidgets) { deleteChild(widget);
deleteChild(widget);
}
} }
} }
@@ -347,7 +338,7 @@ public class Widget implements IWidget {
@Override @Override
public boolean isMouseOverWidget(IPoint relativeMouse) { public boolean isMouseOverWidget(IPoint relativeMouse) {
return contains(relativeMouse); return getArea().contains(relativeMouse);
} }
@Override @Override
@@ -475,8 +466,7 @@ public class Widget implements IWidget {
@Override @Override
public boolean contains(IPoint position) { public boolean contains(IPoint position) {
IPoint size = size(); return getArea().contains(position);
return position.x() >= 0.0f && position.y() >= 0.0f && position.x() <= size.x() && position.y() <= size.y();
} }
@Override @Override
@@ -12,7 +12,6 @@ import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import binnie.Binnie; import binnie.Binnie;
import binnie.core.AbstractMod; import binnie.core.AbstractMod;
@@ -34,7 +33,6 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.craftgui.resource.minecraft.PaddedTexture; import binnie.core.craftgui.resource.minecraft.PaddedTexture;
import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.craftgui.resource.minecraft.StandardTexture;
import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.SlotValidator;
import binnie.core.network.packet.MessageCraftGUI;
import binnie.core.util.I18N; import binnie.core.util.I18N;
import binnie.extrabees.core.ExtraBeeTexture; import binnie.extrabees.core.ExtraBeeTexture;
import binnie.extrabees.gui.ExtraBeeGUITexture; import binnie.extrabees.gui.ExtraBeeGUITexture;
@@ -115,26 +113,20 @@ public class WindowFieldKit extends Window {
@Override @Override
public void initialiseClient() { public void initialiseClient() {
final NBTTagList actions = new NBTTagList();
setTitle(getName()); setTitle(getName());
CraftGUI.render.stylesheet(new StyleSheetPunnett()); CraftGUI.render.stylesheet(new StyleSheetPunnett());
getWindowInventory().createSlot(0); getWindowInventory().createSlot(0);
getWindowInventory().createSlot(1); getWindowInventory().createSlot(1);
setupValidators(); setupValidators();
new ControlPlayerInventory(this).create(actions); new ControlPlayerInventory(this);
IPoint handGlass = new IPoint(16.0f, 32.0f); IPoint handGlass = new IPoint(16.0f, 32.0f);
GlassControl = new ControlImage( GlassControl = new ControlImage(
this, this,
handGlass.x(), handGlass.x(),
handGlass.y(), handGlass.y(),
new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett)); new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett));
new ControlSlot(this, handGlass.x() + 54.0f, handGlass.y() + 26.0f).assign(InventoryType.Window, 0);
new ControlSlot(this, handGlass.x() + 54.0f, handGlass.y() + 26.0f).assign(actions, InventoryType.Window, 0); new ControlSlot(this, 208.0f, 8.0f).assign(InventoryType.Window, 1);
new ControlSlot(this, 208.0f, 8.0f).assign(actions, InventoryType.Window, 1);
MessageCraftGUI.sendToServer(actions);
(text = new ControlText(this, new IPoint(232.0f, 13.0f), I18N.localise("binniecore.gui.tooltip.paper"))) (text = new ControlText(this, new IPoint(232.0f, 13.0f), I18N.localise("binniecore.gui.tooltip.paper")))
.setColor(0x222222); .setColor(0x222222);
(text = new ControlText(this, new IArea(0.0f, 120.0f, w(), 24.0f), "", TextJustification.MIDDLE_CENTER)) (text = new ControlText(this, new IArea(0.0f, 120.0f, w(), 24.0f), "", TextJustification.MIDDLE_CENTER))
@@ -188,9 +180,7 @@ public class WindowFieldKit extends Window {
glassOffsetX *= 1.0f - analyseProgress; glassOffsetX *= 1.0f - analyseProgress;
glassOffsetY += glassVY; glassOffsetY += glassVY;
glassOffsetY *= 1.0f - analyseProgress; glassOffsetY *= 1.0f - analyseProgress;
if (GlassControl != null) { GlassControl.setOffset(new IPoint(glassOffsetX, glassOffsetY));
GlassControl.setOffset(new IPoint(glassOffsetX, glassOffsetY));
}
} }
private void refreshSpecies() { private void refreshSpecies() {
@@ -295,8 +285,8 @@ public class WindowFieldKit extends Window {
} }
@Override @Override
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
super.receiveGuiNBT(side, player, name, nbt); super.recieveGuiNBT(side, player, name, nbt);
if (side != Side.SERVER || !name.equals("analyse")) { if (side != Side.SERVER || !name.equals("analyse")) {
return; return;
} }
@@ -63,7 +63,7 @@ public class WindowGenesis extends Window {
@Override @Override
public void initialiseClient() { public void initialiseClient() {
new ControlPlayerInventory(this).createAndRegister(); new ControlPlayerInventory(this);
setTitle(getName()); setTitle(getName());
ControlTabBar<BreedingSystem> tabSystems = new BreedingSystemControlTabBar(); ControlTabBar<BreedingSystem> tabSystems = new BreedingSystemControlTabBar();
@@ -175,8 +175,8 @@ public class WindowGenesis extends Window {
} }
@Override @Override
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
super.receiveGuiNBT(side, player, name, nbt); super.recieveGuiNBT(side, player, name, nbt);
if (side == Side.SERVER && name.equals("genesis")) { if (side == Side.SERVER && name.equals("genesis")) {
ItemStack stack = ItemStack.loadItemStackFromNBT(nbt); ItemStack stack = ItemStack.loadItemStackFromNBT(nbt);
InventoryPlayer playerInv = player.inventory; InventoryPlayer playerInv = player.inventory;
@@ -1,8 +1,5 @@
package binnie.core.craftgui.controls.tab; package binnie.core.craftgui.controls.tab;
import java.util.IdentityHashMap;
import java.util.Map;
import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.Tooltip;
@@ -24,7 +21,6 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
protected T value; protected T value;
private final ControlTabBar<T> tabBar; private final ControlTabBar<T> tabBar;
private final Map<Texture, Texture> croppedTextures = new IdentityHashMap<>();
public ControlTab(ControlTabBar<T> parent, float x, float y, float w, float h, T value) { public ControlTab(ControlTabBar<T> parent, float x, float y, float w, float h, T value) {
super(parent, x, y, w, h); super(parent, x, y, w, h);
@@ -49,8 +45,9 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
texture = CraftGUITexture.Tab; texture = CraftGUITexture.Tab;
} }
Texture lTexture = CraftGUI.render.getTexture(texture);
Position position = getTabPosition(); Position position = getTabPosition();
Texture iTexture = getCroppedTexture(texture); Texture iTexture = lTexture.crop(position, 8.0f);
IArea area = getArea(); IArea area = getArea();
if (texture == CraftGUITexture.TabDisabled) { if (texture == CraftGUITexture.TabDisabled) {
if (position == Position.TOP || position == Position.LEFT) { if (position == Position.TOP || position == Position.LEFT) {
@@ -71,23 +68,14 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
} }
if (icon.hasOutline()) { if (icon.hasOutline()) {
iTexture = getCroppedTexture(CraftGUITexture.TabOutline); iTexture = CraftGUI.render.getTexture(CraftGUITexture.TabOutline);
iTexture = iTexture.crop(position, 8.0f);
CraftGUI.render.color(icon.getOutlineColor()); CraftGUI.render.color(icon.getOutlineColor());
CraftGUI.render.texture(iTexture, area.inset(2)); CraftGUI.render.texture(iTexture, area.inset(2));
} }
} }
} }
private Texture getCroppedTexture(Object key) {
Texture source = CraftGUI.render.getTexture(key);
Texture cropped = croppedTextures.get(source);
if (cropped == null) {
cropped = source.crop(getTabPosition(), 8.0f);
croppedTextures.put(source, cropped);
}
return cropped;
}
@Override @Override
public void getTooltip(Tooltip tooltip) { public void getTooltip(Tooltip tooltip) {
String name = getName(); String name = getName();
@@ -1,23 +1,18 @@
package binnie.core.craftgui.minecraft; package binnie.core.craftgui.minecraft;
import static net.minecraftforge.common.util.Constants.NBT.TAG_COMPOUND;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
@@ -38,139 +33,107 @@ import binnie.core.machines.power.TankInfo;
import binnie.core.machines.transfer.TransferRequest; import binnie.core.machines.transfer.TransferRequest;
import binnie.core.network.packet.MessageContainerUpdate; import binnie.core.network.packet.MessageContainerUpdate;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
public class ContainerCraftGUI extends Container { public class ContainerCraftGUI extends Container {
// Action type is one of the action constants below
public final static String ACTION_TYPE = "type";
// Action constants
public final static String ACTION_BATCH = "batch";
public final static String SLOT_REG = "slot-reg";
public final static String TANK_CLICK = "tank-click";
public final static String TANK_UPDATE = "tank-update-";
public final static String POWER_UPDATE = "power-update";
public final static String PROCESS_UPDATE = "process-update";
public final static String ERROR_UPDATE = "error-update";
public final static String MOUSE_OVER_SLOT = "mouse-over-slot";
public final static String SHIFT_CLICK_INFO = "shift-click-info";
// Error type is one of the error constants below
public final static String ERROR_TYPE = "type";
// Error constants
public static final byte CANNOT_WORK = (byte) 0;
public static final byte CANNOT_PROGRESS = (byte) 1;
// Slot constants
public static final String SLOT_TYPE = "t";
public static final String SLOT_INDEX = "i";
public static final String SLOT_NUMBER = "n";
// Uncategorized constants
public static final String ACTIONS = "actions";
private static final String USERNAME = "username";
private static final String SLOT_ID = "id";
private static final String SLOT = "slot";
private static final String SLOTS = "slots";
private static final String TANK = "tank";
private static final String ORIGIN = "origin";
private static final String NAME = "name";
private final Window window; private final Window window;
private final Map<String, NBTTagCompound> syncedNBT = new HashMap<>(); private final Map<String, NBTTagCompound> syncedNBT;
private final Map<String, NBTTagCompound> sentNBT = new HashMap<>(); private final Map<String, NBTTagCompound> sentNBT;
private final Map<Integer, TankInfo> syncedTanks = new HashMap<>(); private final Map<Integer, TankInfo> syncedTanks;
private final Map<IInventory, Int2ObjectMap<CustomSlot>> slotsByInventory = new IdentityHashMap<>(); private PowerInfo syncedPower;
private PowerInfo syncedPower = new PowerInfo(); private ProcessInfo syncedProcess;
private ProcessInfo syncedProcess = new ProcessInfo(); private int errorType;
private int errorType = 0; private ErrorState error;
private ErrorState error = null; private int mousedOverSlotNumber;
private int mousedOverSlotNumber = -1;
public ContainerCraftGUI(Window window) { public ContainerCraftGUI(Window window) {
this.window = window; this.window = window;
syncedNBT = new HashMap<>();
sentNBT = new HashMap<>();
syncedTanks = new HashMap<>();
syncedPower = new PowerInfo();
syncedProcess = new ProcessInfo();
errorType = 0;
error = null;
mousedOverSlotNumber = -1;
IMachine machine = Machine.getMachine(window.getInventory());
if (getSide() != Side.SERVER) {
return;
}
if (!window.isServer()) return;
// WARNING: The client side expects `ArrayList` and the server expects `ListMap`
inventoryItemStacks = new ListMap<>(); inventoryItemStacks = new ListMap<>();
inventorySlots = new ListMap<>(); inventorySlots = new ListMap<>();
if (machine == null) {
IInventory entityInventory = window.getInventory(); return;
IMachine machine = Machine.getMachine(entityInventory); }
if (machine == null) return;
GameProfile user = machine.getOwner(); GameProfile user = machine.getOwner();
if (user == null) return; if (user != null) {
NBTTagCompound nbt = new NBTTagCompound();
NBTTagCompound nbt = new NBTTagCompound(); nbt.setString("username", user.getName());
nbt.setString(USERNAME, user.getName()); sendNBTToClient("username", nbt);
sendNBTToClient(USERNAME, nbt); }
} }
@Override @Override
protected Slot addSlotToContainer(Slot slot) { protected Slot addSlotToContainer(Slot slot) {
indexSlot(slot);
return super.addSlotToContainer(slot); return super.addSlotToContainer(slot);
} }
private void indexSlot(Slot slot) {
if (slot instanceof CustomSlot customSlot) {
slotsByInventory.computeIfAbsent(customSlot.inventory, key -> new Int2ObjectOpenHashMap<>())
.putIfAbsent(customSlot.getSlotIndex(), customSlot);
}
}
private Side getSide() { private Side getSide() {
return window.isServer() ? Side.SERVER : Side.CLIENT; return window.isServer() ? Side.SERVER : Side.CLIENT;
} }
@Override @Override
public Slot getSlot(int index) { public Slot getSlot(int index) {
return index < 0 || index >= inventorySlots.size() ? null : inventorySlots.get(index); if (index < 0 || index >= inventorySlots.size()) {
return null;
}
return inventorySlots.get(index);
} }
@Override @Override
public void putStackInSlot(int index, ItemStack stack) { public void putStackInSlot(int index, ItemStack stack) {
final Slot slot = getSlot(index); if (getSlot(index) != null) {
if (slot != null) slot.putStack(stack); getSlot(index).putStack(stack);
}
} }
@Override @Override
public void putStacksInSlots(ItemStack[] par1ArrayOfItemStack) { public void putStacksInSlots(ItemStack[] par1ArrayOfItemStack) {
for (int i = 0; i < par1ArrayOfItemStack.length; ++i) { for (int i = 0; i < par1ArrayOfItemStack.length; ++i) {
final Slot slot = getSlot(i); if (getSlot(i) != null) {
if (slot != null) slot.putStack(par1ArrayOfItemStack[i]); getSlot(i).putStack(par1ArrayOfItemStack[i]);
}
} }
} }
@Override @Override
public void onContainerClosed(EntityPlayer player) { public void onContainerClosed(EntityPlayer player) {
super.onContainerClosed(player); super.onContainerClosed(player);
WindowInventory windowInventory = window.getWindowInventory(); WindowInventory inventory = window.getWindowInventory();
InventoryPlayer playerInventory = player.inventory; for (int i = 0; i < inventory.getSizeInventory(); ++i) {
if (!inventory.dispenseOnClose(i)) {
continue;
}
for (int i = 0; i < windowInventory.getSizeInventory(); ++i) { ItemStack stack = inventory.getStackInSlot(i);
if (!windowInventory.dispenseOnClose(i)) continue; if (stack == null) {
continue;
}
final ItemStack stack = windowInventory.getStackInSlot(i); stack = new TransferRequest(stack, player.inventory).transfer(true);
if (stack == null) continue; if (stack != null) {
player.dropPlayerItemWithRandomChoice(stack, false);
final ItemStack newStack = new TransferRequest(stack, playerInventory).transfer(true); }
if (newStack == null) continue;
player.dropPlayerItemWithRandomChoice(newStack, false);
} }
} }
@Override @Override
public ItemStack slotClick(int slotNum, int mouseButton, int modifier, EntityPlayer player) { public ItemStack slotClick(int slotNum, int mouseButton, int modifier, EntityPlayer player) {
Slot slot = getSlot(slotNum); Slot slot = getSlot(slotNum);
if (slot instanceof CustomSlot customSlot && customSlot.handleClick()) { if (slot instanceof CustomSlot && ((CustomSlot) slot).handleClick()) {
customSlot.onSlotClick(this, mouseButton, modifier, player); ((CustomSlot) slot).onSlotClick(this, mouseButton, modifier, player);
return player.inventory.getItemStack(); return player.inventory.getItemStack();
} }
return super.slotClick(slotNum, mouseButton, modifier, player); return super.slotClick(slotNum, mouseButton, modifier, player);
@@ -188,182 +151,173 @@ public class ContainerCraftGUI extends Container {
} }
sentNBT.clear(); sentNBT.clear();
} }
IInventory entityInventory = window.getInventory(); IInventory inventory = window.getInventory();
return entityInventory == null || entityInventory.isUseableByPlayer(player); return inventory == null || inventory.isUseableByPlayer(player);
} }
@Override @Override
public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { public ItemStack transferStackInSlot(EntityPlayer player, int slotID) {
shiftClick(player, slotID); return shiftClick(player, slotID);
return null;
} }
private void shiftClick(EntityPlayer player, int index) { private ItemStack shiftClick(EntityPlayer player, int index) {
TransferRequest request = getShiftClickRequest(player, index); TransferRequest request = getShiftClickRequest(player, index);
if (request == null) return; if (request == null) {
return null;
}
ItemStack stack = request.transfer(true); ItemStack stack = request.transfer(true);
Slot shiftClickedSlot = inventorySlots.get(index); Slot shiftClickedSlot = inventorySlots.get(index);
shiftClickedSlot.putStack(stack); shiftClickedSlot.putStack(stack);
shiftClickedSlot.onSlotChanged(); shiftClickedSlot.onSlotChanged();
return null;
} }
private TransferRequest getShiftClickRequest(EntityPlayer player, int index) { private TransferRequest getShiftClickRequest(EntityPlayer player, int index) {
if (index < 0) return null; if (index < 0) {
return null;
}
Slot shiftClickedSlot = inventorySlots.get(index); Slot shiftClickedSlot = (Slot) inventorySlots.get(index);
ItemStack itemstack = null; ItemStack itemstack = null;
if (shiftClickedSlot.getHasStack()) { if (shiftClickedSlot.getHasStack()) {
itemstack = shiftClickedSlot.getStack(); itemstack = shiftClickedSlot.getStack().copy();
} }
IInventory playerInventory = player.inventory; IInventory playerInventory = player.inventory;
IInventory entityInventory = window.getInventory(); IInventory containerInventory = window.getInventory();
IInventory windowInventory = window.getWindowInventory(); IInventory windowInventory = window.getWindowInventory();
IInventory fromPlayer = (entityInventory == null) ? windowInventory : entityInventory; IInventory fromPlayer = (containerInventory == null) ? windowInventory : containerInventory;
int[] target = new int[36];
for (int i = 0; i < 36; ++i) {
target[i] = i;
}
TransferRequest request; TransferRequest request;
if (shiftClickedSlot.inventory == playerInventory) { if (shiftClickedSlot.inventory == playerInventory) {
request = new TransferRequest(itemstack, fromPlayer).setOrigin(shiftClickedSlot.inventory); request = new TransferRequest(itemstack, fromPlayer).setOrigin(shiftClickedSlot.inventory);
} else { } else {
int[] target = new int[36];
for (int i = 0; i < target.length; ++i) {
target[i] = i;
}
request = new TransferRequest(itemstack, playerInventory).setOrigin(shiftClickedSlot.inventory) request = new TransferRequest(itemstack, playerInventory).setOrigin(shiftClickedSlot.inventory)
.setTargetSlots(target); .setTargetSlots(target);
} }
if (window instanceof IWindowAffectsShiftClick iWindowAffectsShiftClick) { if (window instanceof IWindowAffectsShiftClick) {
iWindowAffectsShiftClick.alterRequest(request); ((IWindowAffectsShiftClick) window).alterRequest(request);
} }
return request; return request;
} }
@SuppressWarnings("UnusedReturnValue")
public ItemStack tankClick(EntityPlayer player, int slotID) { public ItemStack tankClick(EntityPlayer player, int slotID) {
if (player.inventory.getItemStack() == null) return null; if (player.inventory.getItemStack() == null) {
return null;
ItemStack heldItem = player.inventory.getItemStack().copy();
IInventory entityInventory = window.getInventory();
heldItem = new TransferRequest(heldItem, entityInventory).setOrigin(player.inventory).setTargetSlots(new int[0])
.setTargetTanks(new int[] { slotID }).dropOverflow(player).transfer(true);
player.inventory.setItemStack(heldItem);
if (player instanceof EntityPlayerMP entityPlayerMP) {
entityPlayerMP.updateHeldItem();
} }
ItemStack heldItem = player.inventory.getItemStack().copy();
heldItem = new TransferRequest(heldItem, window.getInventory()).setOrigin(player.inventory)
.setTargetSlots(new int[0]).setTargetTanks(new int[] { slotID }).transfer(true);
player.inventory.setItemStack(heldItem);
if (player instanceof EntityPlayerMP) {
((EntityPlayerMP) player).updateHeldItem();
}
return heldItem; return heldItem;
} }
public void handleNBT(Side side, EntityPlayer player, NBTTagCompound action) { public boolean handleNBT(Side side, EntityPlayer player, String name, NBTTagCompound action) {
if (handleNBTAction(side, player, action)) {
sendContainerContents();
}
}
private boolean handleNBTAction(Side side, EntityPlayer player, NBTTagCompound action) {
final String actionType = action.getString(ACTION_TYPE);
boolean slotRegistered = false;
if (side == Side.SERVER) { if (side == Side.SERVER) {
switch (actionType) { if (name.equals("tank-click")) {
case TANK_CLICK -> tankClick(player, action.getByte(SLOT_ID)); tankClick(player, action.getByte("id"));
case SLOT_REG -> { }
final int slotType = action.getByte(SLOT_TYPE); if (name.equals("slot-reg")) {
final int slotIndex = action.getShort(SLOT_INDEX); int type = action.getByte("t");
final int slotNumber = action.getShort(SLOT_NUMBER); int index = action.getShort("i");
int slotNumber = action.getShort("n");
getOrCreateSlot(InventoryType.values()[type % 4], index, slotNumber);
slotRegistered = createSlot(InventoryType.values()[slotType % 4], slotIndex, slotNumber); for (ICrafting crafterObject : crafters) {
crafterObject.sendContainerAndContentsToPlayer(this, getInventory());
} }
} }
} }
switch (actionType) { if (name.contains("tank-update")) {
case POWER_UPDATE -> onPowerUpdate(action); onTankUpdate(action);
case PROCESS_UPDATE -> onProcessUpdate(action); } else if (name.equals("power-update")) {
case ERROR_UPDATE -> onErrorUpdate(action); onPowerUpdate(action);
case MOUSE_OVER_SLOT -> onMouseOverSlot(player, action); } else if (name.equals("process-update")) {
case SHIFT_CLICK_INFO -> onReceiveShiftClickHighlights(action); onProcessUpdate(action);
default -> { } else if (name.equals("error-update")) {
if (actionType.contains(TANK_UPDATE)) onTankUpdate(action); onErrorUpdate(action);
} } else if (name.equals("mouse-over-slot")) {
onMouseOverSlot(player, action);
} else if (name.equals("shift-click-info")) {
onRecieveShiftClickHighlights(player, action);
} }
return slotRegistered; return false;
} }
@Override @Override
public void detectAndSendChanges() { public void detectAndSendChanges() {
super.detectAndSendChanges(); super.detectAndSendChanges();
ITankMachine tanks = Machine.getInterface(ITankMachine.class, window.getInventory());
IInventory entityInventory = window.getInventory(); IPoweredMachine powered = Machine.getInterface(IPoweredMachine.class, window.getInventory());
ITankMachine tanks = Machine.getInterface(ITankMachine.class, entityInventory); IErrorStateSource error = Machine.getInterface(IErrorStateSource.class, window.getInventory());
IPoweredMachine powered = Machine.getInterface(IPoweredMachine.class, entityInventory); IProcess process = Machine.getInterface(IProcess.class, window.getInventory());
IErrorStateSource error = Machine.getInterface(IErrorStateSource.class, entityInventory); if (tanks != null && window.isServer()) {
IProcess process = Machine.getInterface(IProcess.class, entityInventory); for (int i = 0; i < tanks.getTankInfos().length; ++i) {
TankInfo tank = tanks.getTankInfos()[i];
if (window.isServer() && tanks != null) { if (!getTankInfo(i).equals(tank)) {
final TankInfo[] tankInfos = tanks.getTankInfos(); syncedNBT.put("tank-update-" + i, createTankNBT(i, tank));
for (int i = 0; i < tankInfos.length; ++i) { syncedTanks.put(i, tank);
final TankInfo tank = tankInfos[i]; }
if (this.getTankInfo(i).equals(tank)) continue;
syncedNBT.put(TANK_UPDATE + i, createTankNBT(i, tank));
syncedTanks.put(i, tank);
} }
} }
if (window.isServer()) { if (powered != null && window.isServer()) {
if (powered != null) syncedNBT.put(POWER_UPDATE, createPowerNBT(powered.getPowerInfo())); syncedNBT.put("power-update", createPowerNBT(powered.getPowerInfo()));
if (process != null) syncedNBT.put(PROCESS_UPDATE, createProcessNBT(process.getInfo())); }
if (error != null) syncedNBT.put(ERROR_UPDATE, createErrorNBT(error)); if (process != null && window.isServer()) {
syncedNBT.put("process-update", createProcessNBT(process.getInfo()));
}
if (error != null && window.isServer()) {
syncedNBT.put("error-update", createErrorNBT(error));
} }
INetwork.SendGuiNBT machineSync = Machine.getInterface(INetwork.SendGuiNBT.class, entityInventory); INetwork.SendGuiNBT machineSync = Machine.getInterface(INetwork.SendGuiNBT.class, window.getInventory());
if (machineSync != null) {
machineSync.sendGuiNBT(syncedNBT);
}
if (machineSync != null) machineSync.sendGuiNBT(syncedNBT); Map<String, NBTTagCompound> sentThisTime = new HashMap<>();
for (Map.Entry<String, NBTTagCompound> nbt : syncedNBT.entrySet()) {
NBTTagList actions = null; nbt.getValue().setString("type", nbt.getKey());
boolean shouldSend = true;
for (Map.Entry<String, NBTTagCompound> entry : syncedNBT.entrySet()) { NBTTagCompound lastSent = sentNBT.get(nbt.getKey());
final String actionType = entry.getKey(); if (lastSent != null) {
final NBTTagCompound action = entry.getValue(); shouldSend = !lastSent.equals(nbt.getValue());
final NBTTagCompound actionPrev = sentNBT.get(actionType); }
action.setString(ACTION_TYPE, actionType); if (shouldSend) {
for (Object crafter : crafters) {
if (action == actionPrev || action.equals(actionPrev)) continue; if (crafter instanceof EntityPlayerMP playerMP) {
BinnieCore.proxy.sendToPlayer(new MessageContainerUpdate(nbt.getValue()), playerMP);
if (actions == null) { }
actions = new NBTTagList(); }
sentThisTime.put(nbt.getKey(), nbt.getValue());
} }
actions.appendTag(action);
sentNBT.put(actionType, action);
} }
sentNBT.putAll(sentThisTime);
syncedNBT.clear(); syncedNBT.clear();
if (actions == null) return;
NBTTagCompound actionsBatch = new NBTTagCompound();
actionsBatch.setString(ACTION_TYPE, ACTION_BATCH);
actionsBatch.setTag(ACTIONS, actions);
for (ICrafting crafter : crafters) {
if (crafter instanceof EntityPlayerMP playerMP) {
final MessageContainerUpdate packet = new MessageContainerUpdate(actionsBatch);
BinnieCore.proxy.sendToPlayer(packet, playerMP);
}
}
} }
private NBTTagCompound createErrorNBT(IErrorStateSource error) { private NBTTagCompound createErrorNBT(IErrorStateSource error) {
NBTTagCompound nbt = new NBTTagCompound(); NBTTagCompound nbt = new NBTTagCompound();
ErrorState state = null; ErrorState state = null;
if (error.canWork() != null) { if (error.canWork() != null) {
nbt.setByte(ERROR_TYPE, CANNOT_WORK); nbt.setByte("type", (byte) 0);
state = error.canWork(); state = error.canWork();
} else if (error.canProgress() != null) { } else if (error.canProgress() != null) {
nbt.setByte(ERROR_TYPE, CANNOT_PROGRESS); nbt.setByte("type", (byte) 1);
state = error.canProgress(); state = error.canProgress();
} }
@@ -388,20 +342,19 @@ public class ContainerCraftGUI extends Container {
public NBTTagCompound createTankNBT(int tank, TankInfo tankInfo) { public NBTTagCompound createTankNBT(int tank, TankInfo tankInfo) {
NBTTagCompound nbt = new NBTTagCompound(); NBTTagCompound nbt = new NBTTagCompound();
tankInfo.writeToNBT(nbt); tankInfo.writeToNBT(nbt);
nbt.setByte(TANK, (byte) tank); nbt.setByte("tank", (byte) tank);
return nbt; return nbt;
} }
public void onTankUpdate(NBTTagCompound nbt) { public void onTankUpdate(NBTTagCompound nbt) {
int tankID = nbt.getByte(TANK); int tankID = nbt.getByte("tank");
TankInfo tank = new TankInfo(); TankInfo tank = new TankInfo();
tank.readFromNBT(nbt); tank.readFromNBT(nbt);
syncedTanks.put(tankID, tank); syncedTanks.put(tankID, tank);
} }
public void onProcessUpdate(NBTTagCompound nbt) { public void onProcessUpdate(NBTTagCompound nbt) {
syncedProcess = new ProcessInfo(); (syncedProcess = new ProcessInfo()).readFromNBT(nbt);
syncedProcess.readFromNBT(nbt);
} }
public void onPowerUpdate(NBTTagCompound nbt) { public void onPowerUpdate(NBTTagCompound nbt) {
@@ -422,8 +375,8 @@ public class ContainerCraftGUI extends Container {
} }
public void onErrorUpdate(NBTTagCompound nbt) { public void onErrorUpdate(NBTTagCompound nbt) {
errorType = nbt.getByte(ERROR_TYPE); errorType = nbt.getByte("type");
if (nbt.hasKey(NAME)) { if (nbt.hasKey("name")) {
error = new ErrorState("", ""); error = new ErrorState("", "");
error.readFromNBT(nbt); error.readFromNBT(nbt);
} else { } else {
@@ -450,18 +403,20 @@ public class ContainerCraftGUI extends Container {
} }
public void setMouseOverSlot(Slot slot) { public void setMouseOverSlot(Slot slot) {
if (slot.slotNumber == mousedOverSlotNumber) return; if (slot.slotNumber == mousedOverSlotNumber) {
return;
}
mousedOverSlotNumber = slot.slotNumber; mousedOverSlotNumber = slot.slotNumber;
ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear(); ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear();
NBTTagCompound nbt = new NBTTagCompound(); NBTTagCompound nbt = new NBTTagCompound();
nbt.setShort(SLOT, (short) slot.slotNumber); nbt.setShort("slot", (short) slot.slotNumber);
window.sendClientAction(MOUSE_OVER_SLOT, nbt); window.sendClientAction("mouse-over-slot", nbt);
} }
private void onMouseOverSlot(EntityPlayer player, NBTTagCompound data) { private void onMouseOverSlot(EntityPlayer player, NBTTagCompound data) {
int slotNumber = data.getShort(SLOT); int slotnumber = data.getShort("slot");
TransferRequest request = getShiftClickRequest(player, slotNumber); TransferRequest request = getShiftClickRequest(player, slotnumber);
if (request == null) { if (request == null) {
return; return;
} }
@@ -469,8 +424,8 @@ public class ContainerCraftGUI extends Container {
request.transfer(false); request.transfer(false);
NBTTagCompound nbt = new NBTTagCompound(); NBTTagCompound nbt = new NBTTagCompound();
List<Integer> slots = new ArrayList<>(); List<Integer> slots = new ArrayList<>();
for (TransferRequest.TransferSlot transferSlot : request.getInsertedSlots()) { for (TransferRequest.TransferSlot tslot : request.getInsertedSlots()) {
Slot slot = getSlot(transferSlot.inventory, transferSlot.id); Slot slot = getSlot(tslot.inventory, tslot.id);
if (slot != null) { if (slot != null) {
slots.add(slot.slotNumber); slots.add(slot.slotNumber);
} }
@@ -481,85 +436,80 @@ public class ContainerCraftGUI extends Container {
array[i] = slots.get(i); array[i] = slots.get(i);
} }
nbt.setIntArray(SLOTS, array); nbt.setIntArray("slots", array);
nbt.setShort(ORIGIN, (short) slotNumber); nbt.setShort("origin", (short) slotnumber);
syncedNBT.put(SHIFT_CLICK_INFO, nbt); syncedNBT.put("shift-click-info", nbt);
} }
private void onReceiveShiftClickHighlights(NBTTagCompound data) { private void onRecieveShiftClickHighlights(EntityPlayer player, NBTTagCompound data) {
ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear(); ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear();
for (int slotIndex : data.getIntArray(SLOTS)) { for (int slotnumber : data.getIntArray("slots")) {
ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).add(slotIndex); ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).add(slotnumber);
} }
} }
private CustomSlot getSlot(IInventory inventory, int id) { private CustomSlot getSlot(IInventory inventory, int id) {
Int2ObjectMap<CustomSlot> slots = slotsByInventory.get(inventory); for (Object o : inventorySlots) {
return (slots == null) ? null : slots.get(id); CustomSlot slot = (CustomSlot) o;
} if (slot.inventory == inventory && slot.getSlotIndex() == id) {
return slot;
public void receiveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
if (receiveNBTAction(side, player, action)) {
sendContainerContents();
}
}
private boolean receiveNBTAction(Side side, EntityPlayer player, NBTTagCompound action) {
String actionType = action.getString(ACTION_TYPE);
if (actionType.equals(ACTION_BATCH)) {
boolean slotRegistered = false;
NBTTagList actionsBatch = action.getTagList(ACTIONS, TAG_COMPOUND);
for (int i = 0; i < actionsBatch.tagCount(); i++) {
slotRegistered |= receiveNBTAction(side, player, actionsBatch.getCompoundTagAt(i));
} }
return slotRegistered;
} }
boolean slotRegistered = handleNBTAction(side, player, action); return null;
window.receiveGuiNBT(getSide(), player, actionType, action); }
INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, window.getInventory());
public void recieveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
String name = action.getString("type");
if (handleNBT(side, player, name, action)) {
return;
}
window.recieveGuiNBT(getSide(), player, name, action);
INetwork.RecieveGuiNBT machine = Machine.getInterface(INetwork.RecieveGuiNBT.class, window.getInventory());
if (machine != null) { if (machine != null) {
machine.receiveGuiNBT(getSide(), player, actionType, action); machine.recieveGuiNBT(getSide(), player, name, action);
}
return slotRegistered;
}
private void sendContainerContents() {
for (ICrafting crafter : crafters) {
crafter.sendContainerAndContentsToPlayer(this, getInventory());
} }
} }
public Slot getOrCreateSlot(InventoryType inventoryType, int slotIndex) { public Slot getOrCreateSlot(InventoryType type, int index) {
final IInventory inventory = getInventory(inventoryType); IInventory inventory = getInventory(type);
Slot slot = getSlot(inventory, slotIndex); Slot slot = getSlot(inventory, index);
if (slot == null) { if (slot == null) {
slot = new CustomSlot(inventory, slotIndex); slot = new CustomSlot(inventory, index);
addSlotToContainer(slot); addSlotToContainer(slot);
} }
NBTTagCompound nbt = new NBTTagCompound();
nbt.setByte("t", (byte) type.ordinal());
nbt.setShort("i", (short) index);
nbt.setShort("n", (short) slot.slotNumber);
window.sendClientAction("slot-reg", nbt);
return slot; return slot;
} }
protected IInventory getInventory(InventoryType type) { protected IInventory getInventory(InventoryType type) {
return switch (type) { if (type == InventoryType.Machine) {
case Machine -> window.getInventory(); return window.getInventory();
case Player -> window.getPlayer().inventory; }
case Window -> window.getWindowInventory(); if (type == InventoryType.Player) {
default -> null; return window.getPlayer().inventory;
}; }
if (type == InventoryType.Window) {
return window.getWindowInventory();
}
return null;
} }
private boolean createSlot(InventoryType type, int index, int slotNumber) { private Slot getOrCreateSlot(InventoryType type, int index, int slotNumber) {
if (inventorySlots.get(slotNumber) != null) return false;
IInventory inventory = getInventory(type); IInventory inventory = getInventory(type);
if (inventorySlots.get(slotNumber) != null) {
return null;
}
Slot slot = new CustomSlot(inventory, index); Slot slot = new CustomSlot(inventory, index);
slot.slotNumber = slotNumber; slot.slotNumber = slotNumber;
indexSlot(slot);
inventorySlots.add(slotNumber, slot); inventorySlots.add(slotNumber, slot);
ItemStack stack = slot.getStack(); inventoryItemStacks.add(slotNumber, null);
inventoryItemStacks.add(slotNumber, stack == null ? null : stack.copy()); return slot;
return true;
} }
} }
@@ -11,9 +11,6 @@ import binnie.core.machines.inventory.InventorySlot;
public class CustomSlot extends Slot { public class CustomSlot extends Slot {
private InventorySlot inventorySlot;
private boolean inventorySlotResolved;
public CustomSlot(IInventory inventory, int index) { public CustomSlot(IInventory inventory, int index) {
super(inventory, index, 0, 0); super(inventory, index, 0, 0);
} }
@@ -24,12 +21,11 @@ public class CustomSlot extends Slot {
} }
public InventorySlot getInventorySlot() { public InventorySlot getInventorySlot() {
if (!inventorySlotResolved) { IInventorySlots slots = Machine.getInterface(IInventorySlots.class, inventory);
IInventorySlots slots = Machine.getInterface(IInventorySlots.class, inventory); if (slots != null) {
inventorySlot = (slots == null) ? null : slots.getSlot(getSlotIndex()); return slots.getSlot(getSlotIndex());
inventorySlotResolved = true;
} }
return inventorySlot; return null;
} }
public boolean handleClick() { public boolean handleClick() {
@@ -20,10 +20,6 @@ public enum EnumColor {
Yellow("Yellow", 16777045, 'e'), Yellow("Yellow", 16777045, 'e'),
White("White", 16777215, 'f'); White("White", 16777215, 'f');
/**
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
*/
public static final EnumColor[] VALUES = values();
private final int colour; private final int colour;
private final String name; private final String name;
private final char code; private final char code;
@@ -21,7 +21,6 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import binnie.core.BinnieCore; import binnie.core.BinnieCore;
import binnie.core.craftgui.IWidget; import binnie.core.craftgui.IWidget;
@@ -84,31 +83,29 @@ public class GuiCraftGUI extends GuiContainer {
window.setMousePosition(mouseX - (int) window.getPosition().x(), mouseY - (int) window.getPosition().y()); window.setMousePosition(mouseX - (int) window.getPosition().x(), mouseY - (int) window.getPosition().y());
drawDefaultBackground(); drawDefaultBackground();
GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glDisable(32826); // GL_RESCALE_NORMAL_EXT
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_DEPTH_TEST);
zLevel = 10.0f; zLevel = 10.0f;
GuiScreen.itemRender.zLevel = zLevel; GuiScreen.itemRender.zLevel = zLevel;
GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
window.render(); window.render();
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
NEIHook.renderObjects(window, mouseX, mouseY); NEIHook.renderObjects(window, mouseX, mouseY);
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
InventoryPlayer playerInventory = mc.thePlayer.inventory; InventoryPlayer playerInventory = mc.thePlayer.inventory;
draggedItem = playerInventory.getItemStack(); draggedItem = playerInventory.getItemStack();
if (draggedItem != null) { if (draggedItem != null) {
GL11.glTranslatef(0.0f, 0.0f, 200.0f); renderItem(new IPoint(mouseX - 8, mouseY - 8), draggedItem, false);
renderItem(new IPoint(mouseX - 8, mouseY - 8), draggedItem, false); renderItem(new IPoint(mouseX - 8, mouseY - 8), draggedItem, false);
} }
GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glDisable(32826); // GL_RESCALE_NORMAL_EXT
GL11.glPopMatrix(); GL11.glPopMatrix();
GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_DEPTH_TEST);
@@ -119,6 +116,7 @@ public class GuiCraftGUI extends GuiContainer {
} else { } else {
tooltip.setType(Tooltip.Type.STANDARD); tooltip.setType(Tooltip.Type.STANDARD);
window.getTooltip(tooltip); window.getTooltip(tooltip);
NEIHook.renderToolTips(mouseX, mouseY);
} }
if (tooltip.exists()) { if (tooltip.exists()) {
@@ -135,7 +133,7 @@ public class GuiCraftGUI extends GuiContainer {
int mouseX = (int) mousePosition.x(); int mouseX = (int) mousePosition.x();
int mouseY = (int) mousePosition.y(); int mouseY = (int) mousePosition.y();
FontRenderer font = getFontRenderer(); FontRenderer font = getFontRenderer();
GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glDisable(32826); // GL_RESCALE_NORMAL_EXT
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_DEPTH_TEST);
@@ -226,7 +224,7 @@ public class GuiCraftGUI extends GuiContainer {
GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL11.GL_DEPTH_TEST);
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
} }
@Override @Override
@@ -242,16 +240,12 @@ public class GuiCraftGUI extends GuiContainer {
@Override @Override
protected void keyTyped(char c, int key) { protected void keyTyped(char c, int key) {
boolean noFocusedWidget = window.getFocusedWidget() == null; NEIHook.lastKeyTyped(key, c);
if (noFocusedWidget) { if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && window.getFocusedWidget() == null)) {
NEIHook.lastKeyTyped(key, c);
}
if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && noFocusedWidget)) {
mc.thePlayer.closeScreen(); mc.thePlayer.closeScreen();
} }
IWidget origin = noFocusedWidget ? window : window.getFocusedWidget(); IWidget origin = (window.getFocusedWidget() == null) ? window : window.getFocusedWidget();
window.callEvent(new EventKey.Down(origin, c, key)); window.callEvent(new EventKey.Down(origin, c, key));
} }
@@ -426,9 +420,8 @@ public class GuiCraftGUI extends GuiContainer {
public void renderItem(IPoint pos, ItemStack item, boolean rotating) { public void renderItem(IPoint pos, ItemStack item, boolean rotating) {
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT); GL11.glPushAttrib(8256);
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL11.GL_DEPTH_TEST);
FontRenderer font = item.getItem().getFontRenderer(item); FontRenderer font = item.getItem().getFontRenderer(item);
if (font == null) { if (font == null) {
@@ -451,7 +444,7 @@ public class GuiCraftGUI extends GuiContainer {
} }
GuiScreen.itemRender.renderItemOverlayIntoGUI(font, mc.renderEngine, item, (int) pos.x(), (int) pos.y(), null); GuiScreen.itemRender.renderItemOverlayIntoGUI(font, mc.renderEngine, item, (int) pos.x(), (int) pos.y(), null);
GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); GL11.glClear(256);
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
GL11.glPopAttrib(); GL11.glPopAttrib();
} }
@@ -462,11 +455,11 @@ public class GuiCraftGUI extends GuiContainer {
} }
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
BinnieCore.proxy.bindTexture(map); BinnieCore.proxy.bindTexture(map);
GuiScreen.itemRender.zLevel = zLevel; GuiScreen.itemRender.zLevel = zLevel;
GuiScreen.itemRender.renderIcon((int) pos.x(), (int) pos.y(), icon, 16, 16); GuiScreen.itemRender.renderIcon((int) pos.x(), (int) pos.y(), icon, 16, 16);
GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
@@ -10,7 +10,6 @@ import java.util.Map;
class ListMap<T> implements List<T> { class ListMap<T> implements List<T> {
private final LinkedHashMap<Integer, T> map; private final LinkedHashMap<Integer, T> map;
private int size;
ListMap() { ListMap() {
map = new LinkedHashMap<>(); map = new LinkedHashMap<>();
@@ -18,7 +17,13 @@ class ListMap<T> implements List<T> {
@Override @Override
public int size() { public int size() {
return size; int i = -1;
for (int k : map.keySet()) {
if (k > i) {
i = k;
}
}
return i + 1;
} }
@Override @Override
@@ -88,7 +93,6 @@ class ListMap<T> implements List<T> {
@Override @Override
public void clear() { public void clear() {
map.clear(); map.clear();
size = 0;
} }
@Override @Override
@@ -99,14 +103,12 @@ class ListMap<T> implements List<T> {
@Override @Override
public T set(int index, T element) { public T set(int index, T element) {
map.put(index, element); map.put(index, element);
size = Math.max(size, index + 1);
return element; return element;
} }
@Override @Override
public void add(int index, T element) { public void add(int index, T element) {
map.put(index, element); map.put(index, element);
size = Math.max(size, index + 1);
} }
@Override @Override
@@ -121,7 +123,7 @@ class ListMap<T> implements List<T> {
return entry.getKey(); return entry.getKey();
} }
} }
return -1; return 0;
} }
@Override @Override
@@ -1,5 +1,6 @@
package binnie.core.craftgui.minecraft; package binnie.core.craftgui.minecraft;
import java.util.ArrayList;
import java.util.Deque; import java.util.Deque;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@@ -46,14 +47,12 @@ import binnie.core.resource.BinnieResource;
import binnie.core.resource.ResourceType; import binnie.core.resource.ResourceType;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
public abstract class Window extends TopLevelWidget implements INetwork.ReceiveGuiNBT { public abstract class Window extends TopLevelWidget implements INetwork.RecieveGuiNBT {
protected float titleButtonLeft; protected float titleButtonLeft;
protected float titleButtonRight; protected float titleButtonRight;
private GuiCraftGUI gui; private GuiCraftGUI gui;
private Renderer renderer;
private final ContainerCraftGUI container; private final ContainerCraftGUI container;
private final WindowInventory windowInventory; private final WindowInventory windowInventory;
private ControlText title; private ControlText title;
@@ -81,11 +80,11 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
setSize(new IPoint(width, height)); setSize(new IPoint(width, height));
gui = new GuiCraftGUI(this); gui = new GuiCraftGUI(this);
for (EnumHighlighting h : EnumHighlighting.values()) { for (EnumHighlighting h : EnumHighlighting.values()) {
ControlSlot.highlighting.put(h, new IntOpenHashSet()); ControlSlot.highlighting.put(h, new ArrayList<>());
} }
renderer = new Renderer(gui); CraftGUI.render = new Renderer(gui);
renderer.stylesheet(StyleSheetManager.getDefault()); CraftGUI.render.stylesheet(StyleSheetManager.getDefault());
titleButtonLeft = -14.0f; titleButtonLeft = -14.0f;
if (showHelpButton()) { if (showHelpButton()) {
@@ -196,9 +195,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
} }
public void initGui() { public void initGui() {
CraftGUI.render = renderer;
if (hasBeenInitialised) { if (hasBeenInitialised) {
return; return;
} }
@@ -271,9 +267,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
entityInventory = inventory; entityInventory = inventory;
} }
public void onClose() { public void onClose() {}
CraftGUI.render = null;
}
public boolean isServer() { public boolean isServer() {
return !isClient(); return !isClient();
@@ -297,7 +291,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
} }
@Override @Override
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
if (side == Side.CLIENT && name.equals("username")) { if (side == Side.CLIENT && name.equals("username")) {
float w = w(); float w = w();
float titleButtonRight = this.titleButtonRight + 16.0f; float titleButtonRight = this.titleButtonRight + 16.0f;
@@ -1,5 +1,7 @@
package binnie.core.craftgui.minecraft.control; package binnie.core.craftgui.minecraft.control;
import net.minecraft.inventory.IInventory;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.CraftGUI;
@@ -15,6 +17,8 @@ import binnie.core.craftgui.minecraft.MinecraftTooltip;
import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.Window;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.machines.Machine; import binnie.core.machines.Machine;
import binnie.core.machines.TileEntityMachine;
import binnie.core.machines.power.IPoweredMachine;
import binnie.core.machines.power.IProcess; import binnie.core.machines.power.IProcess;
import binnie.core.util.I18N; import binnie.core.util.I18N;
@@ -30,6 +34,17 @@ public class ControlEnergyBar extends Control implements ITooltip {
addAttribute(WidgetAttribute.MOUSE_OVER); addAttribute(WidgetAttribute.MOUSE_OVER);
} }
// TODO unused method?
public IPoweredMachine getClientPower() {
IInventory inventory = Window.get(this).getInventory();
TileEntityMachine machine = (inventory instanceof TileEntityMachine) ? (TileEntityMachine) inventory : null;
if (machine == null) {
return null;
}
return machine.getMachine().getInterface(IPoweredMachine.class);
}
public float getPercentage() { public float getPercentage() {
float percentage = 100.0f * getStoredEnergy() / getMaxEnergy(); float percentage = 100.0f * getStoredEnergy() / getMaxEnergy();
if (percentage > 100.0f) { if (percentage > 100.0f) {
@@ -57,10 +57,9 @@ public class ControlErrorState extends Control implements ITooltip {
ControlEnergyBar.isError = errorState.isPowerError(); ControlEnergyBar.isError = errorState.isPowerError();
if (errorState.isItemError()) { if (errorState.isItemError()) {
CustomSlot[] customSlots = Window.get(this).getContainer().getCustomSlots();
for (int slot : errorState.getData()) { for (int slot : errorState.getData()) {
int id = -1; int id = -1;
for (CustomSlot cslot : customSlots) { for (CustomSlot cslot : Window.get(this).getContainer().getCustomSlots()) {
if (!(cslot.inventory instanceof InventoryPlayer) && cslot.getSlotIndex() == slot) { if (!(cslot.inventory instanceof InventoryPlayer) && cslot.getSlotIndex() == slot) {
id = cslot.slotNumber; id = cslot.slotNumber;
} }
@@ -47,16 +47,16 @@ public class ControlItemDisplay extends Control implements ITooltip {
@Override @Override
public void onRenderBackground() { public void onRenderBackground() {
if (itemStack == null) {
return;
}
IPoint relativeToWindow = getAbsolutePosition().sub(getSuperParent().getPosition()); IPoint relativeToWindow = getAbsolutePosition().sub(getSuperParent().getPosition());
if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f
|| relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f) { || relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f) {
return; return;
} }
if (itemStack == null) {
return;
}
if (getSize().x() != 16.0f) { if (getSize().x() != 16.0f) {
GL11.glPushMatrix(); GL11.glPushMatrix();
float scale = getSize().x() / 16.0f; float scale = getSize().x() / 16.0f;
@@ -3,13 +3,9 @@ package binnie.core.craftgui.minecraft.control;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.nbt.NBTTagList;
import binnie.core.craftgui.IWidget; import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.minecraft.InventoryType; import binnie.core.craftgui.minecraft.InventoryType;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.network.packet.MessageCraftGUI;
public class ControlPlayerInventory extends Control { public class ControlPlayerInventory extends Control {
@@ -25,24 +21,23 @@ public class ControlPlayerInventory extends Control {
slots = new ArrayList<>(); slots = new ArrayList<>();
for (int row = 0; row < 3; ++row) { for (int row = 0; row < 3; ++row) {
for (int column = 0; column < 9; ++column) { for (int column = 0; column < 9; ++column) {
ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18) ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18);
.setSlotTexture(CraftGUITexture.SlotInventory);
slots.add(slot); slots.add(slot);
} }
} }
if (wide) { if (wide) {
for (int i1 = 0; i1 < 9; ++i1) { for (int i1 = 0; i1 < 9; ++i1) {
ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18) ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18);
.setSlotTexture(CraftGUITexture.SlotInventory);
slots.add(slot2); slots.add(slot2);
} }
} else { } else {
for (int i1 = 0; i1 < 9; ++i1) { for (int i1 = 0; i1 < 9; ++i1) {
ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58.0f).setSlotTexture(CraftGUITexture.SlotInventory); ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58.0f);
slots.add(slot2); slots.add(slot2);
} }
} }
create();
} }
public ControlPlayerInventory(IWidget parent) { public ControlPlayerInventory(IWidget parent) {
@@ -54,33 +49,32 @@ public class ControlPlayerInventory extends Control {
slots = new ArrayList<>(); slots = new ArrayList<>();
for (int row = 0; row < 6; ++row) { for (int row = 0; row < 6; ++row) {
for (int column = 0; column < 6; ++column) { for (int column = 0; column < 6; ++column) {
ControlSlot slot = new ControlSlot(this, column * 18, row * 18) ControlSlot slot = new ControlSlot(this, column * 18, row * 18);
.setSlotTexture(CraftGUITexture.SlotInventory);
slots.add(slot); slots.add(slot);
} }
} }
create();
} }
public ControlPlayerInventory create(NBTTagList actions) { public void create() {
for (int row = 0; row < 3; ++row) { for (int row = 0; row < 3; ++row) {
for (int column = 0; column < 9; ++column) { for (int column = 0; column < 9; ++column) {
ControlSlot slot = slots.get(column + row * 9); ControlSlot slot = slots.get(column + row * 9);
slot.assign(actions, InventoryType.Player, 9 + column + row * 9); slot.assign(InventoryType.Player, 9 + column + row * 9);
} }
} }
for (int i1 = 0; i1 < 9; ++i1) { for (int i1 = 0; i1 < 9; ++i1) {
ControlSlot slot2 = slots.get(27 + i1); ControlSlot slot2 = slots.get(27 + i1);
slot2.assign(actions, InventoryType.Player, i1); slot2.assign(InventoryType.Player, i1);
} }
return this;
} }
public ControlPlayerInventory createAndRegister() { public ControlSlot getSlot(int i) {
final NBTTagList actions = new NBTTagList(); if (i < 0 || i >= slots.size()) {
create(actions); return null;
MessageCraftGUI.sendToServer(actions); }
return this; return slots.get(i);
} }
} }
@@ -1,13 +1,7 @@
package binnie.core.craftgui.minecraft.control; package binnie.core.craftgui.minecraft.control;
import static binnie.core.craftgui.minecraft.ContainerCraftGUI.ACTION_TYPE;
import static binnie.core.craftgui.minecraft.ContainerCraftGUI.SLOT_INDEX;
import static binnie.core.craftgui.minecraft.ContainerCraftGUI.SLOT_NUMBER;
import static binnie.core.craftgui.minecraft.ContainerCraftGUI.SLOT_REG;
import static binnie.core.craftgui.minecraft.ContainerCraftGUI.SLOT_TYPE;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -16,17 +10,12 @@ import net.minecraft.client.multiplayer.PlayerControllerMP;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import org.lwjgl.input.Mouse;
import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.IWidget; import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.events.EventMouse;
import binnie.core.craftgui.events.EventWidget;
import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IArea;
import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.geometry.IPoint;
import binnie.core.craftgui.minecraft.CustomSlot; import binnie.core.craftgui.minecraft.CustomSlot;
@@ -37,44 +26,44 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.InventorySlot;
import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.MachineSide;
import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.SlotValidator;
import binnie.core.network.packet.MessageCraftGUI;
import binnie.core.util.I18N; import binnie.core.util.I18N;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
public class ControlSlot extends ControlSlotBase { public class ControlSlot extends ControlSlotBase {
public static Map<EnumHighlighting, IntSet> highlighting = new EnumMap<>(EnumHighlighting.class); public static Map<EnumHighlighting, List<Integer>> highlighting = new HashMap<>();
public static boolean shiftClickActive = false; public static boolean shiftClickActive = false;
static { static {
for (EnumHighlighting h : EnumHighlighting.values()) { for (EnumHighlighting h : EnumHighlighting.values()) {
ControlSlot.highlighting.put(h, new IntOpenHashSet()); ControlSlot.highlighting.put(h, new ArrayList<>());
} }
} }
public Slot slot; public Slot slot;
private CraftGUITexture slotTexture;
public ControlSlot(IWidget parent, float x, float y) { public ControlSlot(IWidget parent, float x, float y) {
super(parent, x, y); super(parent, x, y);
slot = null; slot = null;
slotTexture = CraftGUITexture.Slot;
addSelfEventHandler(new EventMouse.Down.Handler() { addSelfEventHandler(new EventMouse.Down.Handler() {
@Override @Override
public void onEvent(EventMouse.Down event) { public void onEvent(EventMouse.Down event) {
clickSlot(event.getButton()); if (slot == null) {
} return;
});
addSelfEventHandler(new EventWidget.StartMouseOver.Handler() {
@Override
public void onEvent(EventWidget.StartMouseOver event) {
if (GuiScreen.isShiftKeyDown() && Mouse.isButtonDown(0)
&& Window.get(ControlSlot.this).getDraggedWidget() instanceof ControlSlot) {
clickSlot(0);
} }
PlayerControllerMP playerController = ((Window) getSuperParent()).getGui()
.getMinecraft().playerController;
int windowId = ((Window) getSuperParent()).getContainer().windowId;
int slotNumber = slot.slotNumber;
int button = event.getButton();
Window.get(getWidget()).getGui();
playerController.windowClick(
windowId,
slotNumber,
button,
GuiScreen.isShiftKeyDown() ? 1 : 0,
((Window) getSuperParent()).getGui().getMinecraft().thePlayer);
} }
}); });
} }
@@ -82,30 +71,11 @@ public class ControlSlot extends ControlSlotBase {
public ControlSlot(IWidget parent, int x, int y, Slot slot) { public ControlSlot(IWidget parent, int x, int y, Slot slot) {
super(parent, x, y); super(parent, x, y);
this.slot = slot; this.slot = slot;
slotTexture = CraftGUITexture.Slot;
}
public ControlSlot setSlotTexture(CraftGUITexture texture) {
slotTexture = texture == null ? CraftGUITexture.Slot : texture;
return this;
}
private void clickSlot(int button) {
if (slot == null) return;
Window window = (Window) getSuperParent();
PlayerControllerMP playerController = window.getGui().getMinecraft().playerController;
playerController.windowClick(
window.getContainer().windowId,
slot.slotNumber,
button,
GuiScreen.isShiftKeyDown() ? 1 : 0,
window.getGui().getMinecraft().thePlayer);
} }
@Override @Override
public void onRenderBackground() { public void onRenderBackground() {
CraftGUI.render.texture(slotTexture, IPoint.ZERO); CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO);
if (slot == null) { if (slot == null) {
return; return;
} }
@@ -119,7 +89,7 @@ public class ControlSlot extends ControlSlotBase {
} }
boolean highlighted = false; boolean highlighted = false;
for (Map.Entry<EnumHighlighting, IntSet> highlight : ControlSlot.highlighting.entrySet()) { for (Map.Entry<EnumHighlighting, List<Integer>> highlight : ControlSlot.highlighting.entrySet()) {
if (highlight.getKey() == EnumHighlighting.SHIFT_CLICK && !ControlSlot.shiftClickActive) { if (highlight.getKey() == EnumHighlighting.SHIFT_CLICK && !ControlSlot.shiftClickActive) {
continue; continue;
} }
@@ -148,7 +118,7 @@ public class ControlSlot extends ControlSlotBase {
} }
boolean highlighted = false; boolean highlighted = false;
for (Map.Entry<EnumHighlighting, IntSet> highlight : ControlSlot.highlighting.entrySet()) { for (Map.Entry<EnumHighlighting, List<Integer>> highlight : ControlSlot.highlighting.entrySet()) {
if (highlight.getKey() == EnumHighlighting.SHIFT_CLICK && !ControlSlot.shiftClickActive) { if (highlight.getKey() == EnumHighlighting.SHIFT_CLICK && !ControlSlot.shiftClickActive) {
continue; continue;
} }
@@ -209,28 +179,14 @@ public class ControlSlot extends ControlSlotBase {
return null; return null;
} }
/// Assign a slot and register it immediately. Should be used when no other actions need to be sent. public ControlSlot assign(int index) {
@SuppressWarnings("UnusedReturnValue") return assign(InventoryType.Machine, index);
public ControlSlot assignAndRegister(InventoryType inventoryType, int slotIndex) {
final NBTTagList actions = new NBTTagList();
assign(actions, inventoryType, slotIndex);
MessageCraftGUI.sendToServer(actions);
return this;
} }
/// Assign a slot and defer registration using an `NBTTagList`. public ControlSlot assign(InventoryType inventory, int index) {
/// Use in combination with {@link MessageCraftGUI#sendToServer(NBTTagList)}. if (slot == null) {
public ControlSlot assign(NBTTagList actions, InventoryType inventoryType, int slotIndex) { slot = ((Window) getSuperParent()).getContainer().getOrCreateSlot(inventory, index);
if (slot == null) slot = ((Window) getSuperParent()).getContainer().getOrCreateSlot(inventoryType, slotIndex); }
NBTTagCompound slotReg = new NBTTagCompound();
slotReg.setString(ACTION_TYPE, SLOT_REG);
slotReg.setByte(SLOT_TYPE, (byte) inventoryType.ordinal());
slotReg.setShort(SLOT_INDEX, (short) slotIndex);
slotReg.setShort(SLOT_NUMBER, (short) slot.slotNumber);
actions.appendTag(slotReg);
return this; return this;
} }
@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import net.minecraft.nbt.NBTTagList;
import binnie.core.craftgui.IWidget; import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.Control;
import binnie.core.craftgui.minecraft.InventoryType; import binnie.core.craftgui.minecraft.InventoryType;
@@ -28,14 +26,15 @@ public class ControlSlotArray extends Control implements Iterable<ControlSlot> {
return new ControlSlot(this, x, y); return new ControlSlot(this, x, y);
} }
public ControlSlotArray create(NBTTagList actions, InventoryType inventoryType, int[] index) { public ControlSlotArray create(int[] index) {
int i = 0; return create(InventoryType.Machine, index);
for (ControlSlot controlSlot : slots) { }
final int slotIndex = index[i];
controlSlot.assign(actions, inventoryType, slotIndex);
i++;
}
public ControlSlotArray create(InventoryType type, int[] index) {
int i = 0;
for (ControlSlot slot : slots) {
slot.assign(type, index[i++]);
}
return this; return this;
} }
@@ -52,9 +52,9 @@ public abstract class ControlSlotBase extends Control implements ITooltip {
} }
@Override @Override
public void render() { public void onUpdateClient() {
super.onUpdateClient();
itemDisplay.setItemStack(getItemStack()); itemDisplay.setItemStack(getItemStack());
super.render();
} }
@Override @Override
@@ -10,7 +10,6 @@ public enum CraftGUITexture {
Button("button"), Button("button"),
ButtonHighlighted("button.highlighted"), ButtonHighlighted("button.highlighted"),
Slot("slot"), Slot("slot"),
SlotInventory("slot.inventory"),
SlotBorder("slot.border"), SlotBorder("slot.border"),
SlotOverlay("slot.overlay"), SlotOverlay("slot.overlay"),
SlotCharge("slot.charge"), SlotCharge("slot.charge"),
@@ -9,17 +9,15 @@ class ParsedTextureSheet implements IBinnieTexture {
private final String name; private final String name;
private final String modid; private final String modid;
private final String path; private final String path;
private final BinnieResource texture;
public ParsedTextureSheet(String name, String modid, String path) { public ParsedTextureSheet(String name, String modid, String path) {
this.name = name; this.name = name;
this.modid = modid; this.modid = modid;
this.path = path; this.path = path;
texture = new BinnieResource(modid, ResourceType.GUI, path);
} }
@Override @Override
public BinnieResource getTexture() { public BinnieResource getTexture() {
return texture; return new BinnieResource(modid, ResourceType.GUI, path);
} }
} }
@@ -57,7 +57,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
public BreedingSystem() { public BreedingSystem() {
Binnie.Genetics.registerBreedingSystem(this); Binnie.Genetics.registerBreedingSystem(this);
MinecraftForge.EVENT_BUS.register(new EventHandler()); MinecraftForge.EVENT_BUS.register(this);
} }
public String getChromosomeName(IChromosomeType chromo) { public String getChromosomeName(IChromosomeType chromo) {
@@ -294,16 +294,13 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
public abstract Class<? extends IBreedingTracker> getTrackerClass(); public abstract Class<? extends IBreedingTracker> getTrackerClass();
public class EventHandler { @SubscribeEvent
public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) {
@SubscribeEvent IBreedingTracker tracker = event.tracker;
public void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) { if (!getTrackerClass().isInstance(tracker)) {
IBreedingTracker tracker = event.tracker; return;
if (!getTrackerClass().isInstance(tracker)) {
return;
}
syncTracker(tracker);
} }
syncTracker(tracker);
} }
public void syncTracker(IBreedingTracker tracker) { public void syncTracker(IBreedingTracker tracker) {
@@ -113,7 +113,7 @@ class FlowerBreedingSystem extends BreedingSystem {
case PRIMARY: case PRIMARY:
case SECONDARY: case SECONDARY:
case STEM: case STEM:
for (EnumFlowerColor color : EnumFlowerColor.VALUES) { for (EnumFlowerColor color : EnumFlowerColor.values()) {
alleles.add(color.getAllele()); alleles.add(color.getAllele());
} }
break; break;
@@ -9,7 +9,6 @@ import java.util.Map;
import java.util.TreeSet; import java.util.TreeSet;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.event.world.WorldEvent;
import binnie.Binnie; import binnie.Binnie;
@@ -59,8 +58,9 @@ public class ManagerGenetics extends ManagerBase {
if (BinnieCore.isLepidopteryActive()) { if (BinnieCore.isLepidopteryActive()) {
mothBreedingSystem = new MothBreedingSystem(); mothBreedingSystem = new MothBreedingSystem();
} }
if (BinnieCore.isBotanyActive()) {
flowerBreedingSystem = new FlowerBreedingSystem(); flowerBreedingSystem = new FlowerBreedingSystem();
}
} }
@Override @Override
@@ -68,11 +68,6 @@ public class ManagerGenetics extends ManagerBase {
refreshData(); refreshData();
} }
@Override
public void registerEventHandler() {
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
public ITreeRoot getTreeRoot() { public ITreeRoot getTreeRoot() {
return (ITreeRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees"); return (ITreeRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees");
} }
@@ -146,6 +141,11 @@ public class ManagerGenetics extends ManagerBase {
return (system == null) ? null : system.getConversion(stack); return (system == null) ? null : system.getConversion(stack);
} }
@SubscribeEvent
public void onWorldLoad(WorldEvent.Load event) {
refreshData();
}
private void refreshData() { private void refreshData() {
loadAlleles(); loadAlleles();
for (BreedingSystem system : Binnie.Genetics.getActiveSystems()) { for (BreedingSystem system : Binnie.Genetics.getActiveSystems()) {
@@ -220,12 +220,4 @@ public class ManagerGenetics extends ManagerBase {
return o1.getUID().compareTo(o2.getUID()); return o1.getUID().compareTo(o2.getUID());
} }
} }
public class EventHandler {
@SubscribeEvent
public void onWorldLoad(WorldEvent.Load event) {
refreshData();
}
}
} }
@@ -1,7 +1,5 @@
package binnie.core.item; package binnie.core.item;
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@@ -27,8 +25,6 @@ public class ItemGenesis extends Item {
setCreativeTab(Tabs.tabApiculture); setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("genesis"); setUnlocalizedName("genesis");
setMaxStackSize(1); setMaxStackSize(1);
registerItem(this, getUnlocalizedName().substring(5));
} }
@Override @Override
+2 -6
View File
@@ -1,7 +1,5 @@
package binnie.core.item; package binnie.core.item;
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
import java.util.List; import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
@@ -18,13 +16,11 @@ public class ItemMisc extends Item {
private final IItemMisc[] items; private final IItemMisc[] items;
public ItemMisc(CreativeTabs tab, IItemMisc[] items) { protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) {
setCreativeTab(tab); setCreativeTab(tab);
setHasSubtypes(true); setHasSubtypes(true);
setUnlocalizedName("misc"); setUnlocalizedName("misc");
this.items = items; items = items2;
registerItem(this, getUnlocalizedName().substring(5));
} }
@Override @Override
@@ -0,0 +1,10 @@
package binnie.core.item;
import net.minecraft.creativetab.CreativeTabs;
public class ManagerItem {
public ItemMisc registerMiscItems(IItemMisc[] items, CreativeTabs tab) {
return new ItemMisc(tab, items);
}
}
+25 -34
View File
@@ -6,7 +6,6 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import binnie.botany.Botany; import binnie.botany.Botany;
@@ -50,44 +49,36 @@ public class ModuleItems implements IInitializable {
new ItemStack(Items.dye, 1)); new ItemStack(Items.dye, 1));
} }
@Override @SubscribeEvent
public void registerEventHandler() { public void onUseFieldKit(PlayerInteractEvent event) {
MinecraftForge.EVENT_BUS.register(new EventHandler()); if (!BinnieCore.isBotanyActive() || event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
} return;
}
public static class EventHandler { EntityPlayer player = event.entityPlayer;
if (player != null && player.getHeldItem() != null
@SubscribeEvent && player.getHeldItem().getItem() == BinnieCore.fieldKit
public void onUseFieldKit(PlayerInteractEvent event) { && player.isSneaking()) {
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (!(tile instanceof TileEntityFlower tileFlower)) {
return; return;
} }
EntityPlayer player = event.entityPlayer; IFlower flower = tileFlower.getFlower();
if (player != null && player.getHeldItem() != null if (flower == null) {
&& player.getHeldItem().getItem() == BinnieCore.fieldKit return;
&& player.isSneaking()) {
TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
if (!(tile instanceof TileEntityFlower tileFlower)) {
return;
}
IFlower flower = tileFlower.getFlower();
if (flower == null) {
return;
}
NBTTagCompound info = new NBTTagCompound();
info.setString("Species", flower.getGenome().getPrimary().getUID());
info.setString("Species2", flower.getGenome().getSecondary().getUID());
info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan());
info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID());
info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID());
info.setBoolean("Wilting", flower.isWilted());
info.setBoolean("Flowered", flower.hasFlowered());
Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer);
event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
} }
NBTTagCompound info = new NBTTagCompound();
info.setString("Species", flower.getGenome().getPrimary().getUID());
info.setString("Species2", flower.getGenome().getSecondary().getUID());
info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan());
info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID());
info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID());
info.setBoolean("Wilting", flower.isWilted());
info.setBoolean("Flowered", flower.hasFlowered());
Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer);
event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
} }
} }
} }
@@ -1,9 +1,7 @@
package binnie.core.liquid; package binnie.core.liquid;
import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Set;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
@@ -11,62 +9,32 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import binnie.core.ManagerBase; import binnie.core.ManagerBase;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
public class ManagerLiquid extends ManagerBase { public class ManagerLiquid extends ManagerBase {
private static final Set<String> EXTERNAL_FLUIDS = new HashSet<>();
static {
EXTERNAL_FLUIDS.add("liquidnitrogen");
}
private static boolean isExternalFluid(String identifier) {
return EXTERNAL_FLUIDS.contains(identifier) && Loader.isModLoaded("gregtech_nh");
}
public Map<String, IFluidType> fluids; public Map<String, IFluidType> fluids;
private final Set<String> ownedFluids;
public ManagerLiquid() { public ManagerLiquid() {
fluids = new LinkedHashMap<>(); fluids = new LinkedHashMap<>();
ownedFluids = new HashSet<>();
} }
public void createLiquids(IFluidType[] liquids, int startID) { public void createLiquids(IFluidType[] liquids, int startID) {
for (IFluidType liquid : liquids) { for (IFluidType liquid : liquids) {
String identifier = liquid.getIdentifier().toLowerCase(); BinnieFluid fluid = createLiquid(liquid, startID++);
Fluid fluid = createOrGetLiquid(liquid, startID++); if (fluid == null) {
if (fluid == null && !isExternalFluid(identifier)) {
throw new RuntimeException("Liquid registered incorrectly - " + liquid.getIdentifier()); throw new RuntimeException("Liquid registered incorrectly - " + liquid.getIdentifier());
} }
} }
} }
public BinnieFluid createLiquid(IFluidType fluid, int id) { public BinnieFluid createLiquid(IFluidType fluid, int id) {
Fluid registeredFluid = createOrGetLiquid(fluid, id); fluids.put(fluid.getIdentifier().toLowerCase(), fluid);
return (registeredFluid instanceof BinnieFluid) ? (BinnieFluid) registeredFluid : null; BinnieFluid binnieFluid = new BinnieFluid(fluid);
} FluidRegistry.registerFluid(binnieFluid);
private Fluid createOrGetLiquid(IFluidType fluid, int id) {
String identifier = fluid.getIdentifier().toLowerCase();
fluids.put(identifier, fluid);
Fluid registeredFluid = FluidRegistry.getFluid(identifier);
if (registeredFluid == null && !isExternalFluid(identifier)) {
BinnieFluid binnieFluid = new BinnieFluid(fluid);
FluidRegistry.registerFluid(binnieFluid);
registeredFluid = FluidRegistry.getFluid(identifier);
ownedFluids.add(identifier);
} else if (registeredFluid == null) {
FMLLog.warning(
"[Binnie] External liquid %s is not registered yet. Waiting for the owning mod to register it before postInit.",
identifier);
}
ItemFluidContainer.registerFluid(fluid, id); ItemFluidContainer.registerFluid(fluid, id);
return registeredFluid; return binnieFluid;
} }
public FluidStack getLiquidStack(String name, int amount) { public FluidStack getLiquidStack(String name, int amount) {
@@ -76,26 +44,18 @@ public class ManagerLiquid extends ManagerBase {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void reloadIcons(IIconRegister register) { public void reloadIcons(IIconRegister register) {
for (IFluidType type : fluids.values()) { for (IFluidType type : fluids.values()) {
String identifier = type.getIdentifier().toLowerCase(); Fluid fluid = getLiquidStack(type.getIdentifier(), 1).getFluid();
FluidStack stack = getLiquidStack(identifier, 1);
Fluid fluid = stack == null ? null : stack.getFluid();
type.registerIcon(register); type.registerIcon(register);
if (fluid == null) { if (fluid == null) {
throw new RuntimeException("[Binnie] Liquid not registered properly - " + type.getIdentifier()); throw new RuntimeException("[Binnie] Liquid not registered properly - " + type.getIdentifier());
} }
if (ownedFluids.contains(identifier)) { fluid.setIcons(type.getIcon());
fluid.setIcons(type.getIcon());
}
} }
} }
@Override @Override
public void postInit() { public void postInit() {
for (IFluidType fluid : fluids.values()) { for (IFluidType fluid : fluids.values()) {
String identifier = fluid.getIdentifier().toLowerCase();
if (isExternalFluid(identifier) && FluidRegistry.getFluid(identifier) == null) {
throw new RuntimeException("[Binnie] External liquid not registered - " + identifier);
}
for (FluidContainer container : FluidContainer.values()) { for (FluidContainer container : FluidContainer.values()) {
if (container.isActive() && fluid.canPlaceIn(container)) { if (container.isActive() && fluid.canPlaceIn(container)) {
container.registerContainerData(fluid); container.registerContainerData(fluid);
@@ -5,4 +5,6 @@ import binnie.core.network.IOrdinaled;
public interface IMachineType extends IOrdinaled { public interface IMachineType extends IOrdinaled {
Class<? extends MachinePackage> getPackageClass(); Class<? extends MachinePackage> getPackageClass();
boolean isActive();
} }
+11 -15
View File
@@ -2,7 +2,6 @@ package binnie.core.machines;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -72,9 +71,8 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
@Override @Override
public <T> T getInterface(Class<T> cls) { public <T> T getInterface(Class<T> cls) {
List<MachineComponent> components = componentInterfaceMap.get(cls); if (hasInterface(cls)) {
if (components != null && !components.isEmpty()) { return getInterfaces(cls).get(0);
return cls.cast(components.get(0));
} }
if (cls.isInstance(getPackage())) { if (cls.isInstance(getPackage())) {
return cls.cast(getPackage()); return cls.cast(getPackage());
@@ -90,13 +88,11 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
@Override @Override
public <T> List<T> getInterfaces(Class<T> cls) { public <T> List<T> getInterfaces(Class<T> cls) {
List<MachineComponent> components = componentInterfaceMap.get(cls); ArrayList<T> interfaces = new ArrayList<>();
if (components == null) { if (!hasInterface(cls)) {
return Collections.emptyList(); return interfaces;
} }
for (MachineComponent component : componentInterfaceMap.get(cls)) {
List<T> interfaces = new ArrayList<>(components.size());
for (MachineComponent component : components) {
interfaces.add(cls.cast(component)); interfaces.add(cls.cast(component));
} }
return interfaces; return interfaces;
@@ -281,16 +277,16 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
} }
@Override @Override
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
for (INetwork.ReceiveGuiNBT receive : getInterfaces(INetwork.ReceiveGuiNBT.class)) { for (INetwork.RecieveGuiNBT recieve : getInterfaces(INetwork.RecieveGuiNBT.class)) {
receive.receiveGuiNBT(side, player, name, nbt); recieve.recieveGuiNBT(side, player, name, nbt);
} }
} }
@Override @Override
public void sendGuiNBT(Map<String, NBTTagCompound> nbts) { public void sendGuiNBT(Map<String, NBTTagCompound> nbts) {
for (INetwork.SendGuiNBT receive : getInterfaces(INetwork.SendGuiNBT.class)) { for (INetwork.SendGuiNBT recieve : getInterfaces(INetwork.SendGuiNBT.class)) {
receive.sendGuiNBT(nbts); recieve.sendGuiNBT(nbts);
} }
} }
} }
@@ -50,7 +50,7 @@ public class MachineComponent implements INBTTagable {
return new MachinePayload(Binnie.Machine.getNetworkID(getClass())); return new MachinePayload(Binnie.Machine.getNetworkID(getClass()));
} }
public void receiveData(MachinePayload payload) {} public void recieveData(MachinePayload payload) {}
public MachineUtil getUtil() { public MachineUtil getUtil() {
return getMachine().getMachineUtil(); return getMachine().getMachineUtil();
@@ -31,14 +31,14 @@ public class MachineGroup {
this.blockName = blockName; this.blockName = blockName;
for (IMachineType type : types) { for (IMachineType type : types) {
if (type.getPackageClass() != null) { if (type.getPackageClass() != null && type.isActive()) {
try { try {
MachinePackage pack = type.getPackageClass().newInstance(); MachinePackage pack = type.getPackageClass().newInstance();
pack.assignMetadata(type.ordinal()); pack.assignMetadata(type.ordinal());
pack.setActive(true); pack.setActive(type.isActive());
addPackage(pack); addPackage(pack);
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("Failed to create machine package " + type, e); throw new RuntimeException("Failed to create machine package " + type.toString(), e);
} }
} }
} }
@@ -1,5 +1,6 @@
package binnie.core.machines; package binnie.core.machines;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import binnie.core.util.I18N; import binnie.core.util.I18N;
@@ -27,21 +28,10 @@ public abstract class MachinePackage {
public abstract TileEntity createTileEntity(); public abstract TileEntity createTileEntity();
/// Whether this machine's tile entity needs {@link net.minecraft.tileentity.TileEntity#updateEntity()}.
/// Override to false only when no component implements onUpdate, onInventoryUpdate or a client display tick.
public boolean isTickable() {
return true;
}
public String getDisplayName() { public String getDisplayName() {
return I18N.localise(group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID()); return I18N.localise(group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID());
} }
public String getGuiDisplayName() {
String guiKey = group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID() + ".title";
return I18N.canLocalise(guiKey) ? I18N.localise(guiKey) : getDisplayName();
}
public Integer getMetadata() { public Integer getMetadata() {
return metadata; return metadata;
} }
@@ -58,7 +48,8 @@ public abstract class MachinePackage {
this.group = group; this.group = group;
} }
public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick); public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick,
RenderBlocks renderer);
public boolean isActive() { public boolean isActive() {
return active; return active;
@@ -1,13 +1,11 @@
package binnie.core.machines; package binnie.core.machines;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import binnie.Binnie; import binnie.Binnie;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@@ -15,41 +13,30 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
// Hmm. It's used class // Hmm. It's used class
public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler { public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler {
private final Map<Block, Map<Integer, TileEntityMachine>> inventoryTiles = new HashMap<>(); RenderBlocks blockRenderer;
@Override @Override
public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float partialTick) { public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float partialTick) {
renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick); renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick, blockRenderer);
} }
private void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick) { public void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick,
RenderBlocks renderer) {
if (entity != null && entity.getMachine() != null) { if (entity != null && entity.getMachine() != null) {
MachinePackage machinePackage = entity.getMachine().getPackage(); MachinePackage machinePackage = entity.getMachine().getPackage();
machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick); machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick, renderer);
} }
} }
private void renderInvBlock(Block block, int i, int j) { public void renderInvBlock(RenderBlocks renderblocks, Block block, int i, int j) {
renderTileEntity(getInventoryTile(block, i), 0.0, -0.1, 0.0, 0.0625f); TileEntity entity = block.createTileEntity(null, i);
} renderTileEntity((TileEntityMachine) entity, 0.0, -0.1, 0.0, 0.0625f, renderblocks);
private TileEntityMachine getInventoryTile(Block block, int metadata) {
Map<Integer, TileEntityMachine> tiles = inventoryTiles.computeIfAbsent(block, key -> new HashMap<>());
TileEntityMachine tile = tiles.get(metadata);
if (tile == null) {
if (!(block.createTileEntity(null, metadata) instanceof TileEntityMachine created)) {
return null;
}
tile = created;
tiles.put(metadata, tile);
}
return tile;
} }
@Override @Override
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
if (modelID == Binnie.Machine.getMachineRenderID()) { if (modelID == Binnie.Machine.getMachineRenderID()) {
renderInvBlock(block, metadata, modelID); renderInvBlock(renderer, block, metadata, modelID);
} }
} }
@@ -61,7 +48,7 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl
&& tile.getMachine().getPackage() != null && tile.getMachine().getPackage() != null
&& tile.getMachine().getPackage().getGroup() != null && tile.getMachine().getPackage().getGroup() != null
&& !tile.getMachine().getPackage().getGroup().customRenderer) { && !tile.getMachine().getPackage().getGroup().customRenderer) {
renderTileEntity(tile, x, y, z, 1.0f); renderTileEntity(tile, x, y, z, 1.0f, renderer);
} }
return true; return true;
} }
@@ -75,4 +62,9 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl
public int getRenderId() { public int getRenderId() {
return Binnie.Machine.getMachineRenderID(); return Binnie.Machine.getMachineRenderID();
} }
@Override
public void func_147496_a(World par1World) {
blockRenderer = new RenderBlocks(par1World);
}
} }
@@ -21,11 +21,6 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork
} }
} }
@Override
public boolean canUpdate() {
return machine == null || machine.getPackage() == null || machine.getPackage().isTickable();
}
public TileEntityMachine(MachinePackage pack) { public TileEntityMachine(MachinePackage pack) {
setMachine(pack); setMachine(pack);
} }
@@ -21,23 +21,19 @@ import cpw.mods.fml.common.Optional;
public class TileEntityMachineBase extends TileEntity implements IInventoryMachine, ITankMachine, IPoweredMachine { public class TileEntityMachineBase extends TileEntity implements IInventoryMachine, ITankMachine, IPoweredMachine {
private static final DefaultInventory DEFAULT_INVENTORY = new DefaultInventory();
private static final DefaultTankContainer DEFAULT_TANK_CONTAINER = new DefaultTankContainer();
private static final DefaultPower DEFAULT_POWER = new DefaultPower();
public IInventoryMachine getInventory() { public IInventoryMachine getInventory() {
IInventoryMachine inv = Machine.getInterface(IInventoryMachine.class, this); IInventoryMachine inv = Machine.getInterface(IInventoryMachine.class, this);
return (inv == null || inv == this) ? DEFAULT_INVENTORY : inv; return (inv == null || inv == this) ? new DefaultInventory() : inv;
} }
public ITankMachine getTankContainer() { public ITankMachine getTankContainer() {
ITankMachine inv = Machine.getInterface(ITankMachine.class, this); ITankMachine inv = Machine.getInterface(ITankMachine.class, this);
return (inv == null || inv == this) ? DEFAULT_TANK_CONTAINER : inv; return (inv == null || inv == this) ? new DefaultTankContainer() : inv;
} }
public IPoweredMachine getPower() { public IPoweredMachine getPower() {
IPoweredMachine inv = Machine.getInterface(IPoweredMachine.class, this); IPoweredMachine inv = Machine.getInterface(IPoweredMachine.class, this);
return (inv == null || inv == this) ? DEFAULT_POWER : inv; return (inv == null || inv == this) ? new DefaultPower() : inv;
} }
@Override @Override
@@ -49,7 +49,7 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork.
} }
@Override @Override
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
if (!name.equals("slot-charges")) { if (!name.equals("slot-charges")) {
return; return;
} }
Loaded 100 of 2206 files, more files were not shown because too many files have changed in this diff. Show more