From a4474c9436813e77349227ea969036e4f871eeab Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Thu, 2 Jan 2025 15:16:25 +0100 Subject: [PATCH] backport to 1.7.10 - update build script to GTNH - update depentencies - change code back to work on 1.7.10 - applied fixes from fork of Team Fruit: https://github.com/Team-Fruit/EZStorage - apply spotless --- .editorconfig | 22 + .gitattributes | 44 ++ .github/workflows/build-and-test.yml | 13 + .github/workflows/release-tags.yml | 14 + .gitignore | 71 +-- CODEOWNERS | 3 + LICENSE-template | 21 + build.gradle | 58 +- dependencies.gradle | 39 ++ gradle.properties | 194 +++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 +++++++++ gradlew.bat | 94 ++++ jitpack.yml | 2 + repositories.gradle | 5 + settings.gradle | 21 + .../com/zerofall/ezstorage/EZStorage.java | 63 ++- .../java/com/zerofall/ezstorage/EZTab.java | 26 +- .../com/zerofall/ezstorage/Reference.java | 10 +- .../block/BlockCondensedStorage.java | 20 +- .../ezstorage/block/BlockCraftingBox.java | 6 +- .../ezstorage/block/BlockHyperStorage.java | 22 +- .../ezstorage/block/BlockInputPort.java | 30 +- .../ezstorage/block/BlockOutputPort.java | 28 +- .../ezstorage/block/BlockSearchBox.java | 7 +- .../ezstorage/block/BlockStorage.java | 30 +- .../ezstorage/block/BlockStorageCore.java | 83 ++- .../com/zerofall/ezstorage/block/EZBlock.java | 18 +- .../ezstorage/block/EZBlockContainer.java | 46 +- .../ezstorage/block/StorageMultiblock.java | 241 ++++---- .../configuration/EZConfiguration.java | 40 +- .../container/ContainerStorageCore.java | 196 ++++--- .../ContainerStorageCoreCrafting.java | 285 +++++----- .../ezstorage/events/XEventHandler.java | 31 +- .../ezstorage/gui/GuiCraftingCore.java | 34 +- .../zerofall/ezstorage/gui/GuiHandler.java | 56 +- .../ezstorage/gui/GuiStorageCore.java | 518 +++++++++--------- .../com/zerofall/ezstorage/init/EZBlocks.java | 274 +++++---- .../com/zerofall/ezstorage/item/EZItem.java | 20 +- .../ezstorage/jei/EZStoragePlugin.java | 46 -- .../ezstorage/jei/RecipeTransferHandler.java | 67 --- .../ezstorage/nei/NEIEZStorageConfig.java | 21 + .../ezstorage/nei/NeiCraftingOverlay.java | 63 +++ .../zerofall/ezstorage/network/MyMessage.java | 13 +- .../ezstorage/network/PacketHandler.java | 33 +- .../ezstorage/network/RecipeMessage.java | 47 +- .../network/RecipePacketHandler.java | 104 ++-- .../zerofall/ezstorage/proxy/ClientProxy.java | 10 +- .../zerofall/ezstorage/proxy/CommonProxy.java | 5 +- .../ezstorage/tileentity/EZTileEntity.java | 57 +- .../tileentity/TileEntityInputPort.java | 266 ++++----- .../tileentity/TileEntityOutputPort.java | 85 ++- .../tileentity/TileEntityStorageCore.java | 402 +++++++------- .../com/zerofall/ezstorage/util/BlockRef.java | 101 ++-- .../zerofall/ezstorage/util/EZInventory.java | 242 ++++---- .../ezstorage/util/EZItemRenderer.java | 180 +++--- .../ezstorage/util/EZStorageUtils.java | 25 +- .../zerofall/ezstorage/util/ItemGroup.java | 57 +- .../blockstates/condensed_storage_box.json | 5 - .../ezstorage/blockstates/crafting_box.json | 5 - .../blockstates/hyper_storage_box.json | 5 - .../ezstorage/blockstates/input_port.json | 5 - .../ezstorage/blockstates/output_port.json | 5 - .../ezstorage/blockstates/search_box.json | 5 - .../ezstorage/blockstates/storage_box.json | 5 - .../ezstorage/blockstates/storage_core.json | 5 - .../models/block/condensed_storage_box.json | 12 - .../ezstorage/models/block/crafting_box.json | 7 - .../models/block/hyper_storage_box.json | 12 - .../ezstorage/models/block/input_port.json | 7 - .../ezstorage/models/block/output_port.json | 12 - .../ezstorage/models/block/search_box.json | 7 - .../ezstorage/models/block/storage_box.json | 12 - .../ezstorage/models/block/storage_core.json | 12 - .../models/item/condensed_storage_box.json | 10 - .../ezstorage/models/item/crafting_box.json | 10 - .../models/item/hyper_storage_box.json | 10 - .../ezstorage/models/item/input_port.json | 10 - .../ezstorage/models/item/output_port.json | 10 - .../ezstorage/models/item/search_box.json | 10 - .../ezstorage/models/item/storage_box.json | 10 - .../ezstorage/models/item/storage_core.json | 10 - src/main/resources/mcmod.info | 33 +- 84 files changed, 2713 insertions(+), 2289 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .github/workflows/build-and-test.yml create mode 100644 .github/workflows/release-tags.yml create mode 100644 CODEOWNERS create mode 100644 LICENSE-template create mode 100644 dependencies.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 jitpack.yml create mode 100644 repositories.gradle create mode 100644 settings.gradle delete mode 100644 src/main/java/com/zerofall/ezstorage/jei/EZStoragePlugin.java delete mode 100644 src/main/java/com/zerofall/ezstorage/jei/RecipeTransferHandler.java create mode 100644 src/main/java/com/zerofall/ezstorage/nei/NEIEZStorageConfig.java create mode 100644 src/main/java/com/zerofall/ezstorage/nei/NeiCraftingOverlay.java delete mode 100644 src/main/resources/assets/ezstorage/blockstates/condensed_storage_box.json delete mode 100644 src/main/resources/assets/ezstorage/blockstates/crafting_box.json delete mode 100644 src/main/resources/assets/ezstorage/blockstates/hyper_storage_box.json delete mode 100644 src/main/resources/assets/ezstorage/blockstates/input_port.json delete mode 100644 src/main/resources/assets/ezstorage/blockstates/output_port.json delete mode 100644 src/main/resources/assets/ezstorage/blockstates/search_box.json delete mode 100644 src/main/resources/assets/ezstorage/blockstates/storage_box.json delete mode 100644 src/main/resources/assets/ezstorage/blockstates/storage_core.json delete mode 100644 src/main/resources/assets/ezstorage/models/block/condensed_storage_box.json delete mode 100644 src/main/resources/assets/ezstorage/models/block/crafting_box.json delete mode 100644 src/main/resources/assets/ezstorage/models/block/hyper_storage_box.json delete mode 100644 src/main/resources/assets/ezstorage/models/block/input_port.json delete mode 100644 src/main/resources/assets/ezstorage/models/block/output_port.json delete mode 100644 src/main/resources/assets/ezstorage/models/block/search_box.json delete mode 100644 src/main/resources/assets/ezstorage/models/block/storage_box.json delete mode 100644 src/main/resources/assets/ezstorage/models/block/storage_core.json delete mode 100644 src/main/resources/assets/ezstorage/models/item/condensed_storage_box.json delete mode 100644 src/main/resources/assets/ezstorage/models/item/crafting_box.json delete mode 100644 src/main/resources/assets/ezstorage/models/item/hyper_storage_box.json delete mode 100644 src/main/resources/assets/ezstorage/models/item/input_port.json delete mode 100644 src/main/resources/assets/ezstorage/models/item/output_port.json delete mode 100644 src/main/resources/assets/ezstorage/models/item/search_box.json delete mode 100644 src/main/resources/assets/ezstorage/models/item/storage_box.json delete mode 100644 src/main/resources/assets/ezstorage/models/item/storage_core.json diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..4ffbd90 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,22 @@ +# This is the universal Text Editor Configuration +# for all GTNewHorizons projects +# See: https://editorconfig.org/ + +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{bat,ini}] +end_of_line = crlf + +[*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}] +indent_size = 2 + +[*.lang] +trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..fd2792b --- /dev/null +++ b/.gitattributes @@ -0,0 +1,44 @@ +* text eol=lf + +*.[jJ][aA][rR] binary + +*.[pP][nN][gG] binary +*.[jJ][pP][gG] binary +*.[jJ][pP][eE][gG] binary +*.[gG][iI][fF] binary +*.[tT][iI][fF] binary +*.[tT][iI][fF][fF] binary +*.[iI][cC][oO] binary +*.[sS][vV][gG] text +*.[eE][pP][sS] binary +*.[xX][cC][fF] binary + +*.[kK][aA][rR] binary +*.[mM]4[aA] binary +*.[mM][iI][dD] binary +*.[mM][iI][dD][iI] binary +*.[mM][pP]3 binary +*.[oO][gG][gG] binary +*.[rR][aA] binary + +*.7[zZ] binary +*.[gG][zZ] binary +*.[tT][aA][rR] binary +*.[tT][gG][zZ] binary +*.[zZ][iI][pP] binary + +*.[tT][cC][nN] binary +*.[sS][oO] binary +*.[dD][lL][lL] binary +*.[dD][yY][lL][iI][bB] binary +*.[pP][sS][dD] binary +*.[tT][tT][fF] binary +*.[oO][tT][fF] binary + +*.[pP][aA][tT][cC][hH] -text + +*.[bB][aA][tT] text eol=crlf +*.[cC][mM][dD] text eol=crlf +*.[pP][sS]1 text eol=crlf + +*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml new file mode 100644 index 0000000..3ee2f68 --- /dev/null +++ b/.github/workflows/build-and-test.yml @@ -0,0 +1,13 @@ + +name: Build and test + +on: + pull_request: + branches: [ master, main ] + push: + branches: [ master, main ] + +jobs: + build-and-test: + uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master + secrets: inherit diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml new file mode 100644 index 0000000..e4c0be6 --- /dev/null +++ b/.github/workflows/release-tags.yml @@ -0,0 +1,14 @@ + +name: Release tagged build + +on: + push: + tags: [ '*' ] + +permissions: + contents: write + +jobs: + release-tags: + uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master + secrets: inherit diff --git a/.gitignore b/.gitignore index 07aedd4..5e80e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,38 @@ -#eclipse -/bin -/.settings -/.classpath -.project -.project.swp -.metadata* - -#gradle -/build -/.gradle -/gradle -gradlew -gradlew.bat - -#occupational hazards +.gradle +.settings +/.idea/ +/.vscode/ +/run/ +/build/ /eclipse/ -/repo/ -/buildSrc -/run -/conf -*.launch -*Thumbs.db - -#Patch rejects -*.rej -/patches-/ -# FML changelog -changelog.txt -/patches_old/ -/patches_old_bak/ -*.py -*.7z - -*.class +.classpath +.project +/bin/ +/config/ +/crash-reports/ +/logs/ +options.txt +/saves/ +usernamecache.json +banned-ips.json +banned-players.json +eula.txt +ops.json +server.properties +servers.dat +usercache.json +whitelist.json +/out/ +*.iml +*.ipr +*.iws +src/main/resources/mixins.*([!.]).json +*.bat +*.DS_Store +!gradlew.bat +.factorypath +addon.local.gradle +addon.local.gradle.kts +addon.late.local.gradle +addon.late.local.gradle.kts +layout.json diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..a6b5f68 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,3 @@ +# Any Github changes require admin approval +/.github/** @GTNewHorizons/admin + diff --git a/LICENSE-template b/LICENSE-template new file mode 100644 index 0000000..242da62 --- /dev/null +++ b/LICENSE-template @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/build.gradle b/build.gradle index 1716192..34151b8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,58 +1,4 @@ -// This sets us up for building a forge project - you need all of these -buildscript { - repositories { - jcenter() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' - } -} - -apply plugin: 'net.minecraftforge.gradle.forge' -apply plugin: 'maven' -apply plugin: 'eclipse' - -repositories { - mavenLocal() - maven { - url "http://dvs1.progwml6.com/files/maven" - } -} - -version = "1.8.9-1.2.6" -group= "com.zerofall.ezstorage" -archivesBaseName = "ezstorage" - -minecraft { - version = "1.8.9-11.15.1.1722" - mappings = "snapshot_20151217" - runDir = "run" -} -dependencies { - deobfCompile "mezz.jei:jei_1.8.9:2.25.8.146" -} - -processResources -{ - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } +plugins { + id 'com.gtnewhorizons.gtnhconvention' } diff --git a/dependencies.gradle b/dependencies.gradle new file mode 100644 index 0000000..8347411 --- /dev/null +++ b/dependencies.gradle @@ -0,0 +1,39 @@ +/* + * Add your dependencies here. Supported configurations: + * - api("group:name:version:classifier"): if you use the types from this dependency in the public API of this mod + * Available at runtime and compiletime for mods depending on this mod + * - implementation("g:n:v:c"): if you need this for internal implementation details of the mod, but none of it is visible via the public API + * Available at runtime but not compiletime for mods depending on this mod + * - compileOnly("g:n:v:c"): if the mod you're building doesn't need this dependency during runtime at all, e.g. for optional mods + * Not available at all for mods depending on this mod, only visible at compiletime for this mod + * - compileOnlyApi("g:n:v:c"): like compileOnly, but also visible at compiletime for mods depending on this mod + * Available at compiletime but not runtime for mods depending on this mod + * - runtimeOnlyNonPublishable("g:n:v:c"): if you want to include a mod in this mod's runClient/runServer runs, but not publish it as a dependency + * Not available at all for mods depending on this mod, only visible at runtime for this mod + * - devOnlyNonPublishable("g:n:v:c"): a combination of runtimeOnlyNonPublishable and compileOnly for dependencies present at both compiletime and runtime, + * but not published as Maven dependencies - useful for RFG-deobfuscated dependencies or local testing + * - runtimeOnly("g:n:v:c"): if you don't need this at compile time, but want it to be present at runtime + * Available at runtime for mods depending on this mod + * - annotationProcessor("g:n:v:c"): mostly for java compiler plugins, if you know you need this, use it, otherwise don't worry + * - testCONFIG("g:n:v:c") - replace CONFIG by one of the above (except api), same as above but for the test sources instead of main + * + * - shadowImplementation("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name + * Requires you to enable usesShadowedDependencies in gradle.properties + * + * - compile("g:n:v:c"): deprecated, replace with "api" (works like the old "compile") or "implementation" (can be more efficient) + * + * You can exclude transitive dependencies (dependencies of the chosen dependency) by appending { transitive = false } if needed, + * but use this sparingly as it can break using your mod as another mod's dependency if you're not careful. + * + * To depend on obfuscated jars you can use `devOnlyNonPublishable(rfg.deobf("dep:spec:1.2.3"))` to fetch an obfuscated jar from maven, + * or `devOnlyNonPublishable(rfg.deobf(project.files("libs/my-mod-jar.jar")))` to use a file. + * + * Gradle names for some of the configuration can be misleading, compileOnlyApi and runtimeOnly both get published as dependencies in Maven, but compileOnly does not. + * The buildscript adds runtimeOnlyNonPublishable to also have a runtime dependency that's not published. + * + * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph + */ +dependencies { + implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev") + api("com.github.GTNewHorizons:GTNHLib:0.5.15:dev") +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4a40589 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,194 @@ +# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable. +# LOCAL to test local config updates. +gtnh.settings.blowdryerTag = 0.2.2 + +# Human-readable mod name, available for mcmod.info population. +modName = EZStorage + +# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation. +# Conventionally lowercase. +modId = ezstorage + +# Root package of the mod, used to find various classes in other properties, +# mcmod.info substitution, enabling assertions in run tasks, etc. +modGroup = com.zerofall.ezstorage + +# Whether to use modGroup as the maven publishing group. +# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods. +useModGroupForPublishing = false + +# Updates your build.gradle and settings.gradle automatically whenever an update is available. +autoUpdateBuildScript = false + +# Version of Minecraft to target +minecraftVersion = 1.7.10 + +# Version of Minecraft Forge to target +forgeVersion = 10.13.4.1614 + +# Specify an MCP channel for dependency deobfuscation and the deobfParams task. +channel = stable + +# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task. +mappingsVersion = 12 + +# Defines other MCP mappings for dependency deobfuscation. +remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/ + +# Select a default username for testing your mod. You can always override this per-run by running +# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE. +developmentEnvironmentUserName = Developer + +# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8. +# See https://github.com/bsideup/jabel for details on how this works. +enableModernJavaSyntax = true + +# Enables injecting missing generics into the decompiled source code for a better coding experience. +# Turns most publicly visible List, Map, etc. into proper List, Map types. +enableGenericInjection = true + +# Generate a class with a String field for the mod version named as defined below. +# If generateGradleTokenClass is empty or not missing, no such class will be generated. +# If gradleTokenVersion is empty or missing, the field will not be present in the class. +generateGradleTokenClass = com.zerofall.ezstorage.Tags + +# Name of the token containing the project's current version to generate/replace. +gradleTokenVersion = VERSION + +# [DEPRECATED] +# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java +# public static final String VERSION = "GRADLETOKEN_VERSION"; +# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's +# version in @Mod([...], version = VERSION, [...]). +# Leave these properties empty to skip individual token replacements. +replaceGradleTokenInFile = + +# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can +# leave this property empty. +# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api +apiPackage = + +# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/ +# There can be multiple files in a space-separated list. +# Example value: mymodid_at.cfg nei_at.cfg +accessTransformersFile = + +# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! +usesMixins = false + +# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main. +# This can speed up compile times thanks to not running the mixin annotation processor on all input sources. +# Mixin classes will have access to "main" classes, but not the other way around. +separateMixinSourceSet = + +# Adds some debug arguments like verbose output and class export. +usesMixinDebug = false + +# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. +mixinPlugin = + +# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! +mixinsPackage = + +# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! +# This parameter is for legacy compatibility only +# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin +coreModClass = + +# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class +# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! +containsMixinsAndOrCoreModOnly = false + +# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins. +forceEnableMixins = false + +# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your +# responsibility to check the license and request permission for distribution if required. +usesShadowedDependencies = false + +# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access +# their own classes, making the minimization unreliable. +minimizeShadowedDependencies = true + +# If disabled, won't rename the shadowed classes. +relocateShadowedDependencies = true + +# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. +includeWellKnownRepositories = true + +# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated +# list of strings, with the acceptable keys being(case does not matter): +# cursemaven +# modrinth +excludeWellKnownRepositories = + +# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. +# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables. +# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle. +usesMavenPublishing = true + +# Maven repository to publish the mod to. +# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/ + +# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token. +# +# The project's ID on Modrinth. Can be either the slug or the ID. +# Leave this empty if you don't want to publish to Modrinth. +modrinthProjectId = + +# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth. +# Syntax: scope1-type1:name1;scope2-type2:name2;... +# Where scope can be one of [required, optional, incompatible, embedded], +# type can be one of [project, version], +# and the name is the Modrinth project or version slug/id of the other mod. +# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech +# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +modrinthRelations = + +# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. +# +# The project's numeric ID on CurseForge. You can find this in the About Project box. +# Leave this empty if you don't want to publish on CurseForge. +curseForgeProjectId = + +# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge. +# Syntax: type1:name1;type2:name2;... +# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible], +# and the name is the CurseForge project slug of the other mod. +# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft +# Note: UniMixins is automatically set as a required dependency if usesMixins = true. +curseForgeRelations = + +# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older +# projects. New projects should not use this parameter. +# customArchiveBaseName = + +# Optional parameter to have the build automatically fail if an illegal version is used. +# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. +# The check is ONLY performed if the version is a git tag. +# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+ +# versionPattern = + +# Uncomment to prevent the source code from being published. +# noPublishedSources = true + +# Uncomment this to disable Spotless checks. +# This should only be uncommented to keep it easier to sync with upstream/other forks. +# That is, if there is no other active fork/upstream, NEVER change this. +# disableSpotless = true + +# Uncomment this to disable Checkstyle checks (currently wildcard import check). +# disableCheckstyle = true + +# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle" +# (force use delegated build). +# This is meant to be set in $HOME/.gradle/gradle.properties. +# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build. +# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want! +# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you. +# ideaOverrideBuildType = idea + +# Whether IDEA should run spotless checks when pressing the Build button. +# This is meant to be set in $HOME/.gradle/gradle.properties. +# ideaCheckSpotlessOnBuild = true + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e2847c8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# 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. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 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 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 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 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +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 diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..09bbb51 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +before_install: + - ./gradlew setupCIWorkspace \ No newline at end of file diff --git a/repositories.gradle b/repositories.gradle new file mode 100644 index 0000000..7e002f2 --- /dev/null +++ b/repositories.gradle @@ -0,0 +1,5 @@ +// Add any additional repositories for your dependencies here. + +repositories { + +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..16e84e7 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,21 @@ + +pluginManagement { + repositories { + maven { + // RetroFuturaGradle + name "GTNH Maven" + url "https://nexus.gtnewhorizons.com/repository/public/" + mavenContent { + includeGroup("com.gtnewhorizons") + includeGroupByRegex("com\\.gtnewhorizons\\..+") + } + } + gradlePluginPortal() + mavenCentral() + mavenLocal() + } +} + +plugins { + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30' +} diff --git a/src/main/java/com/zerofall/ezstorage/EZStorage.java b/src/main/java/com/zerofall/ezstorage/EZStorage.java index 7c00f6b..862165c 100644 --- a/src/main/java/com/zerofall/ezstorage/EZStorage.java +++ b/src/main/java/com/zerofall/ezstorage/EZStorage.java @@ -1,5 +1,8 @@ package com.zerofall.ezstorage; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Configuration; + import com.zerofall.ezstorage.configuration.EZConfiguration; import com.zerofall.ezstorage.events.XEventHandler; import com.zerofall.ezstorage.gui.GuiHandler; @@ -10,46 +13,48 @@ import com.zerofall.ezstorage.network.RecipePacketHandler; import com.zerofall.ezstorage.proxy.CommonProxy; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.relauncher.Side; - -@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, version = Reference.VERSION, acceptedMinecraftVersions="[1.8.8]") -public class EZStorage -{ +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.relauncher.Side; + +@Mod( + modid = Reference.MOD_ID, + name = Reference.MOD_NAME, + version = Tags.VERSION, + acceptedMinecraftVersions = "[1.7.10]") +public class EZStorage { + @Mod.Instance(Reference.MOD_ID) public static EZStorage instance; @SidedProxy(clientSide = Reference.CLIENT_PROXY_CLASS, serverSide = Reference.SERVER_PROXY_CLASS) public static CommonProxy proxy; public static SimpleNetworkWrapper networkWrapper; public static Configuration config; - + public EZTab creativeTab; - + @EventHandler public void preInit(FMLPreInitializationEvent event) { - config = new Configuration(event.getSuggestedConfigurationFile()); - EZConfiguration.syncConfig(); - this.creativeTab = new EZTab(); - EZBlocks.init(); - EZBlocks.register(); - NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); - networkWrapper = NetworkRegistry.INSTANCE.newSimpleChannel("ezChannel"); - networkWrapper.registerMessage(PacketHandler.class, MyMessage.class, 0, Side.SERVER); - networkWrapper.registerMessage(RecipePacketHandler.class, RecipeMessage.class, 1, Side.SERVER); - MinecraftForge.EVENT_BUS.register(new XEventHandler()); + config = new Configuration(event.getSuggestedConfigurationFile()); + EZConfiguration.syncConfig(); + this.creativeTab = new EZTab(); + EZBlocks.init(); + EZBlocks.register(); + NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); + networkWrapper = NetworkRegistry.INSTANCE.newSimpleChannel("ezChannel"); + networkWrapper.registerMessage(PacketHandler.class, MyMessage.class, 0, Side.SERVER); + networkWrapper.registerMessage(RecipePacketHandler.class, RecipeMessage.class, 1, Side.SERVER); + MinecraftForge.EVENT_BUS.register(new XEventHandler()); } - + @EventHandler public void init(FMLInitializationEvent event) { - proxy.registerRenders(); + proxy.registerRenders(); } - + } diff --git a/src/main/java/com/zerofall/ezstorage/EZTab.java b/src/main/java/com/zerofall/ezstorage/EZTab.java index e9007f5..b7908b8 100644 --- a/src/main/java/com/zerofall/ezstorage/EZTab.java +++ b/src/main/java/com/zerofall/ezstorage/EZTab.java @@ -1,22 +1,22 @@ package com.zerofall.ezstorage; -import com.zerofall.ezstorage.init.EZBlocks; - import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import com.zerofall.ezstorage.init.EZBlocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class EZTab extends CreativeTabs { - public EZTab() { - super("EZStorage"); - } + public EZTab() { + super("EZStorage"); + } - @Override - @SideOnly(Side.CLIENT) - public Item getTabIconItem() { - return Item.getItemFromBlock(EZBlocks.condensed_storage_box); - } + @Override + @SideOnly(Side.CLIENT) + public Item getTabIconItem() { + return Item.getItemFromBlock(EZBlocks.condensed_storage_box); + } } diff --git a/src/main/java/com/zerofall/ezstorage/Reference.java b/src/main/java/com/zerofall/ezstorage/Reference.java index a55c392..43bcec8 100644 --- a/src/main/java/com/zerofall/ezstorage/Reference.java +++ b/src/main/java/com/zerofall/ezstorage/Reference.java @@ -1,9 +1,9 @@ package com.zerofall.ezstorage; public class Reference { - public static final String MOD_ID = "ezstorage"; - public static final String MOD_NAME = "EZ Storage"; - public static final String VERSION = "1.0"; - public static final String CLIENT_PROXY_CLASS = "com.zerofall.ezstorage.proxy.ClientProxy"; - public static final String SERVER_PROXY_CLASS = "com.zerofall.ezstorage.proxy.CommonProxy"; + + public static final String MOD_ID = "ezstorage"; + public static final String MOD_NAME = "EZ Storage"; + public static final String CLIENT_PROXY_CLASS = "com.zerofall.ezstorage.proxy.ClientProxy"; + public static final String SERVER_PROXY_CLASS = "com.zerofall.ezstorage.proxy.CommonProxy"; } diff --git a/src/main/java/com/zerofall/ezstorage/block/BlockCondensedStorage.java b/src/main/java/com/zerofall/ezstorage/block/BlockCondensedStorage.java index b927c18..fa39df7 100644 --- a/src/main/java/com/zerofall/ezstorage/block/BlockCondensedStorage.java +++ b/src/main/java/com/zerofall/ezstorage/block/BlockCondensedStorage.java @@ -1,17 +1,17 @@ package com.zerofall.ezstorage.block; -import com.zerofall.ezstorage.configuration.EZConfiguration; - import net.minecraft.block.material.Material; +import com.zerofall.ezstorage.configuration.EZConfiguration; + public class BlockCondensedStorage extends BlockStorage { - public BlockCondensedStorage() { - super("condensed_storage_box", Material.iron); - } - - @Override - public int getCapacity() { - return EZConfiguration.condensedCapacity; - } + public BlockCondensedStorage() { + super("condensed_storage_box", Material.iron); + } + + @Override + public int getCapacity() { + return EZConfiguration.condensedCapacity; + } } diff --git a/src/main/java/com/zerofall/ezstorage/block/BlockCraftingBox.java b/src/main/java/com/zerofall/ezstorage/block/BlockCraftingBox.java index e658d17..e5cd9ab 100644 --- a/src/main/java/com/zerofall/ezstorage/block/BlockCraftingBox.java +++ b/src/main/java/com/zerofall/ezstorage/block/BlockCraftingBox.java @@ -4,8 +4,8 @@ public class BlockCraftingBox extends StorageMultiblock { - public BlockCraftingBox() { - super("crafting_box", Material.iron); - } + public BlockCraftingBox() { + super("crafting_box", Material.iron); + } } diff --git a/src/main/java/com/zerofall/ezstorage/block/BlockHyperStorage.java b/src/main/java/com/zerofall/ezstorage/block/BlockHyperStorage.java index 0e1ff45..0bdb020 100644 --- a/src/main/java/com/zerofall/ezstorage/block/BlockHyperStorage.java +++ b/src/main/java/com/zerofall/ezstorage/block/BlockHyperStorage.java @@ -1,17 +1,17 @@ package com.zerofall.ezstorage.block; -import com.zerofall.ezstorage.configuration.EZConfiguration; - import net.minecraft.block.material.Material; +import com.zerofall.ezstorage.configuration.EZConfiguration; + public class BlockHyperStorage extends BlockStorage { - public BlockHyperStorage() { - super("hyper_storage_box", Material.iron); - } - - @Override - public int getCapacity() { - return EZConfiguration.hyperCapacity; - } -} \ No newline at end of file + public BlockHyperStorage() { + super("hyper_storage_box", Material.iron); + } + + @Override + public int getCapacity() { + return EZConfiguration.hyperCapacity; + } +} diff --git a/src/main/java/com/zerofall/ezstorage/block/BlockInputPort.java b/src/main/java/com/zerofall/ezstorage/block/BlockInputPort.java index d859f8c..9b9232a 100644 --- a/src/main/java/com/zerofall/ezstorage/block/BlockInputPort.java +++ b/src/main/java/com/zerofall/ezstorage/block/BlockInputPort.java @@ -1,29 +1,19 @@ package com.zerofall.ezstorage.block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import com.zerofall.ezstorage.EZStorage; import com.zerofall.ezstorage.tileentity.TileEntityInputPort; public class BlockInputPort extends EZBlockContainer { - - public BlockInputPort() { - super("input_port", Material.iron); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) { - return new TileEntityInputPort(); - } - - @Override - public int getRenderType() { - return 3; - } -} \ No newline at end of file + + public BlockInputPort() { + super("input_port", Material.iron); + } + + @Override + public TileEntity createTileEntity(World world, int meta) { + return new TileEntityInputPort(); + } +} diff --git a/src/main/java/com/zerofall/ezstorage/block/BlockOutputPort.java b/src/main/java/com/zerofall/ezstorage/block/BlockOutputPort.java index 7af5418..0fd1340 100644 --- a/src/main/java/com/zerofall/ezstorage/block/BlockOutputPort.java +++ b/src/main/java/com/zerofall/ezstorage/block/BlockOutputPort.java @@ -1,25 +1,19 @@ package com.zerofall.ezstorage.block; -import com.zerofall.ezstorage.tileentity.TileEntityOutputPort; - import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import com.zerofall.ezstorage.tileentity.TileEntityOutputPort; + public class BlockOutputPort extends EZBlockContainer { - - public BlockOutputPort() { - super("output_port", Material.iron); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) { - return new TileEntityOutputPort(); - } - - @Override - public int getRenderType() { - return 3; - } + + public BlockOutputPort() { + super("output_port", Material.iron); + } + + @Override + public TileEntity createTileEntity(World world, int meta) { + return new TileEntityOutputPort(); + } } diff --git a/src/main/java/com/zerofall/ezstorage/block/BlockSearchBox.java b/src/main/java/com/zerofall/ezstorage/block/BlockSearchBox.java index 1cf9871..bb263a4 100644 --- a/src/main/java/com/zerofall/ezstorage/block/BlockSearchBox.java +++ b/src/main/java/com/zerofall/ezstorage/block/BlockSearchBox.java @@ -4,8 +4,7 @@ public class BlockSearchBox extends StorageMultiblock { - public BlockSearchBox() { - super("search_box", Material.iron); - } - + public BlockSearchBox() { + super("search_box", Material.iron); + } } diff --git a/src/main/java/com/zerofall/ezstorage/block/BlockStorage.java b/src/main/java/com/zerofall/ezstorage/block/BlockStorage.java index 86f5d7e..2532158 100644 --- a/src/main/java/com/zerofall/ezstorage/block/BlockStorage.java +++ b/src/main/java/com/zerofall/ezstorage/block/BlockStorage.java @@ -1,20 +1,20 @@ package com.zerofall.ezstorage.block; -import com.zerofall.ezstorage.configuration.EZConfiguration; - import net.minecraft.block.material.Material; +import com.zerofall.ezstorage.configuration.EZConfiguration; + public class BlockStorage extends StorageMultiblock { - - public BlockStorage() { - super("storage_box", Material.wood); - } - - public BlockStorage(String name, Material material) { - super(name, material); - } - - public int getCapacity() { - return EZConfiguration.basicCapacity; - } -} \ No newline at end of file + + public BlockStorage() { + super("storage_box", Material.wood); + } + + public BlockStorage(String name, Material material) { + super(name, material); + } + + public int getCapacity() { + return EZConfiguration.basicCapacity; + } +} diff --git a/src/main/java/com/zerofall/ezstorage/block/BlockStorageCore.java b/src/main/java/com/zerofall/ezstorage/block/BlockStorageCore.java index c86aa41..bcc07bc 100644 --- a/src/main/java/com/zerofall/ezstorage/block/BlockStorageCore.java +++ b/src/main/java/com/zerofall/ezstorage/block/BlockStorageCore.java @@ -1,55 +1,48 @@ package com.zerofall.ezstorage.block; -import com.zerofall.ezstorage.EZStorage; -import com.zerofall.ezstorage.tileentity.TileEntityStorageCore; - +import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import com.zerofall.ezstorage.EZStorage; +import com.zerofall.ezstorage.configuration.EZConfiguration; +import com.zerofall.ezstorage.tileentity.TileEntityStorageCore; + public class BlockStorageCore extends EZBlockContainer { - public BlockStorageCore() { - super("storage_core", Material.wood); - this.setResistance(6000.0f); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) { - return new TileEntityStorageCore(); - } - - @Override - public int getRenderType() { - return 3; - } - - @Override - public void breakBlock(World worldIn, BlockPos pos, IBlockState state) { - TileEntityStorageCore tileEntity = (TileEntityStorageCore)worldIn.getTileEntity(pos); - if (tileEntity.inventory.getTotalCount() > 0) { - super.breakBlock(worldIn, pos, state); - } - } - - @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, - IBlockState state, EntityPlayer playerIn, EnumFacing side, - float hitX, float hitY, float hitZ) { - if (!worldIn.isRemote) { - TileEntityStorageCore tileEntity = (TileEntityStorageCore)worldIn.getTileEntity(pos); - if (tileEntity.hasCraftBox) { - playerIn.openGui(EZStorage.instance, 2, worldIn, pos.getX(), pos.getY(), pos.getZ()); - } else { - playerIn.openGui(EZStorage.instance, 1, worldIn, pos.getX(), pos.getY(), pos.getZ()); - } - - } - return true; - } - + public BlockStorageCore() { + super("storage_core", Material.wood); + this.setResistance(6000.0f); + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileEntityStorageCore(); + } + + @Override + public void breakBlock(World worldIn, int x, int y, int z, Block blockBroken, int meta) { + TileEntity te = worldIn.getTileEntity(x, y, z); + if (te instanceof TileEntityStorageCore && ((TileEntityStorageCore) te).inventory.getTotalCount() > 0) { + super.breakBlock(worldIn, x, y, z, blockBroken, meta); + } + } + + @Override + public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer player, int side, float subX, + float subY, float subZ) { + if (!worldIn.isRemote) { + TileEntityStorageCore tileEntity = (TileEntityStorageCore) worldIn.getTileEntity(x, y, z); + if (tileEntity.hasCraftBox || !EZConfiguration.enableSearchBlock) { + player.openGui(EZStorage.instance, 2, worldIn, x, y, z); + } else { + player.openGui(EZStorage.instance, 1, worldIn, x, y, z); + } + + } + return true; + } + } diff --git a/src/main/java/com/zerofall/ezstorage/block/EZBlock.java b/src/main/java/com/zerofall/ezstorage/block/EZBlock.java index 9830194..ba3ce62 100644 --- a/src/main/java/com/zerofall/ezstorage/block/EZBlock.java +++ b/src/main/java/com/zerofall/ezstorage/block/EZBlock.java @@ -1,17 +1,19 @@ package com.zerofall.ezstorage.block; -import com.zerofall.ezstorage.EZStorage; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import com.zerofall.ezstorage.EZStorage; +import com.zerofall.ezstorage.Reference; + public class EZBlock extends Block { - protected EZBlock(String name, Material materialIn) { - super(materialIn); - this.setUnlocalizedName(name); - this.setCreativeTab(EZStorage.instance.creativeTab); - this.setHardness(2.0f); - } + protected EZBlock(String name, Material materialIn) { + super(materialIn); + this.setBlockName(name); + this.setBlockTextureName(Reference.MOD_ID + ":" + name); + this.setCreativeTab(EZStorage.instance.creativeTab); + this.setHardness(2.0f); + } } diff --git a/src/main/java/com/zerofall/ezstorage/block/EZBlockContainer.java b/src/main/java/com/zerofall/ezstorage/block/EZBlockContainer.java index 84d6f88..c18a87e 100644 --- a/src/main/java/com/zerofall/ezstorage/block/EZBlockContainer.java +++ b/src/main/java/com/zerofall/ezstorage/block/EZBlockContainer.java @@ -1,47 +1,41 @@ package com.zerofall.ezstorage.block; +import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; import com.zerofall.ezstorage.EZStorage; public class EZBlockContainer extends StorageMultiblock implements ITileEntityProvider { - protected EZBlockContainer(String name, Material materialIn) { - super(name, materialIn); - this.setUnlocalizedName(name); - this.setCreativeTab(EZStorage.instance.creativeTab); - this.isBlockContainer = true; - } - - public int getRenderType() - { - return -1; + protected EZBlockContainer(String name, Material materialIn) { + super(name, materialIn); + this.setBlockName(name); + this.setCreativeTab(EZStorage.instance.creativeTab); + this.isBlockContainer = true; } - public void breakBlock(World worldIn, BlockPos pos, IBlockState state) - { - super.breakBlock(worldIn, pos, state); - worldIn.removeTileEntity(pos); + @Override + public void breakBlock(World worldIn, int x, int y, int z, Block blockBroken, int meta) { + super.breakBlock(worldIn, x, y, z, blockBroken, meta); + worldIn.removeTileEntity(x, y, z); } /** * Called on both Client and Server when World#addBlockEvent is called */ - public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam) - { - super.onBlockEventReceived(worldIn, pos, state, eventID, eventParam); - TileEntity tileentity = worldIn.getTileEntity(pos); - return tileentity == null ? false : tileentity.receiveClientEvent(eventID, eventParam); + @Override + public boolean onBlockEventReceived(World worldIn, int x, int y, int z, int eventId, int eventData) { + super.onBlockEventReceived(worldIn, x, y, z, eventId, eventData); + TileEntity tileentity = worldIn.getTileEntity(x, y, z); + return tileentity == null ? false : tileentity.receiveClientEvent(eventId, eventData); } - @Override - public TileEntity createNewTileEntity(World worldIn, int meta) { - return null; - } + @Override + public TileEntity createNewTileEntity(World worldIn, int meta) { + return null; + } -} \ No newline at end of file +} diff --git a/src/main/java/com/zerofall/ezstorage/block/StorageMultiblock.java b/src/main/java/com/zerofall/ezstorage/block/StorageMultiblock.java index 6218087..677bdb0 100644 --- a/src/main/java/com/zerofall/ezstorage/block/StorageMultiblock.java +++ b/src/main/java/com/zerofall/ezstorage/block/StorageMultiblock.java @@ -4,126 +4,133 @@ import java.util.List; import java.util.Set; -import com.zerofall.ezstorage.tileentity.TileEntityStorageCore; -import com.zerofall.ezstorage.util.BlockRef; -import com.zerofall.ezstorage.util.EZStorageUtils; - import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.Explosion; import net.minecraft.world.World; +import com.zerofall.ezstorage.tileentity.TileEntityStorageCore; +import com.zerofall.ezstorage.util.BlockRef; +import com.zerofall.ezstorage.util.EZStorageUtils; + public class StorageMultiblock extends EZBlock { - - protected StorageMultiblock(String name, Material material) { - super(name, material); - } - - @Override - public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, - IBlockState state) { - super.onBlockDestroyedByPlayer(worldIn, pos, state); - attemptMultiblock(worldIn, pos); - } - - @Override - public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, - Explosion explosionIn) { - super.onBlockDestroyedByExplosion(worldIn, pos, explosionIn); - attemptMultiblock(worldIn, pos); - } - - @Override - public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) { - super.onBlockAdded(worldIn, pos, state); - attemptMultiblock(worldIn, pos); - } - - @Override - public boolean canPlaceBlockAt(World worldIn, BlockPos pos) { - if (!worldIn.isRemote) { - Set coreSet = new HashSet(); - BlockRef br = new BlockRef(this, pos.getX(), pos.getY(), pos.getZ()); - findMultipleCores(br, worldIn, null, coreSet); - if (coreSet.size() > 1) { - return false; - } - } - return super.canPlaceBlockAt(worldIn, pos); - } - - /** - * Attempt to form the multiblock structure by searching for the core, then telling the core to scan the multiblock - * @param world - * @param x - * @param y - * @param z - */ - public void attemptMultiblock(World world, BlockPos position) { - if (!world.isRemote) { - if (!(this instanceof BlockStorageCore)) { - BlockRef br = new BlockRef(this, position.getX(), position.getY(), position.getZ()); - TileEntityStorageCore core = findCore(br, world, null); - if (core != null) { - core.scanMultiblock(); - } - } - } - } - - - /** - * Recursive function that searches for a StorageCore in a multiblock structure - * @param br - * @param world - * @param scanned - * @return - */ - public TileEntityStorageCore findCore(BlockRef br, World world, Set scanned) { - if (scanned == null) { - scanned = new HashSet(); - } - List neighbors = EZStorageUtils.getNeighbors(br.pos.getX(), br.pos.getY(), br.pos.getZ(), world); - for (BlockRef blockRef : neighbors) { - if (blockRef.block instanceof StorageMultiblock) { - if (blockRef.block instanceof BlockStorageCore) { - return (TileEntityStorageCore)world.getTileEntity(blockRef.pos); - } else { - if (scanned.add(blockRef) == true) { - TileEntityStorageCore entity = findCore(blockRef, world, scanned); - if (entity != null) { - return entity; - } - } - } - } - } - return null; - } - - /** - * Recursive function that searches for a StorageCore in a multiblock structure - * @param br - * @param world - * @param scanned - * @return - */ - public void findMultipleCores(BlockRef br, World world, Set scanned, Set cores) { - if (scanned == null) { - scanned = new HashSet(); - } - List neighbors = EZStorageUtils.getNeighbors(br.pos.getX(), br.pos.getY(), br.pos.getZ(), world); - for (BlockRef blockRef : neighbors) { - if (blockRef.block instanceof StorageMultiblock) { - if (blockRef.block instanceof BlockStorageCore) { - cores.add((TileEntityStorageCore)world.getTileEntity(blockRef.pos)); - } else { - if (scanned.add(blockRef) == true) { - findMultipleCores(blockRef, world, scanned, cores); - } - } - } - } - } + + protected StorageMultiblock(String name, Material material) { + super(name, material); + } + + @Override + public void onBlockDestroyedByPlayer(World worldIn, int x, int y, int z, int meta) { + super.onBlockDestroyedByPlayer(worldIn, x, y, z, meta); + attemptMultiblock(worldIn, x, y, z, null); + } + + @Override + public void onBlockDestroyedByExplosion(World worldIn, int x, int y, int z, Explosion explosionIn) { + super.onBlockDestroyedByExplosion(worldIn, x, y, z, explosionIn); + attemptMultiblock(worldIn, x, y, z, null); + } + + @Override + public void onBlockPlacedBy(World worldIn, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) { + super.onBlockPlacedBy(worldIn, x, y, z, entity, itemStack); + attemptMultiblock(worldIn, x, y, z, entity); + } + + @Override + public boolean canPlaceBlockAt(World worldIn, int x, int y, int z) { + if (!worldIn.isRemote) { + Set coreSet = new HashSet(); + BlockRef br = new BlockRef(this, x, y, z); + findMultipleCores(br, worldIn, null, coreSet); + if (coreSet.size() > 1) { + return false; + } + } + return super.canPlaceBlockAt(worldIn, x, y, z); + } + + /** + * Attempt to form the multiblock structure by searching for the core, then telling the core to scan the multiblock + * + * @param world + * @param x + * @param y + * @param z + */ + public void attemptMultiblock(World world, int x, int y, int z, EntityLivingBase entity) { + if (!world.isRemote) { + if (!(this instanceof BlockStorageCore)) { + BlockRef br = new BlockRef(this, x, y, z); + TileEntityStorageCore core = findCore(br, world, null); + if (core != null) { + core.scanMultiblock(entity); + } + } + } + } + + /** + * Recursive function that searches for a StorageCore in a multiblock structure + * + * @param br + * @param world + * @param scanned + * @return + */ + public TileEntityStorageCore findCore(BlockRef br, World world, Set scanned) { + if (scanned == null) { + scanned = new HashSet(); + } + List neighbors = EZStorageUtils.getNeighbors(br.posX, br.posY, br.posZ, world); + for (BlockRef blockRef : neighbors) { + if (blockRef.block instanceof StorageMultiblock) { + if (blockRef.block instanceof BlockStorageCore) { + TileEntity te = world.getTileEntity(blockRef.posX, blockRef.posY, blockRef.posZ); + if (te instanceof TileEntityStorageCore) { + return (TileEntityStorageCore) te; + } + } else { + if (scanned.add(blockRef) == true) { + TileEntityStorageCore entity = findCore(blockRef, world, scanned); + if (entity != null) { + return entity; + } + } + } + } + } + return null; + } + + /** + * Recursive function that searches for a StorageCore in a multiblock structure + * + * @param br + * @param world + * @param scanned + * @return + */ + public void findMultipleCores(BlockRef br, World world, Set scanned, Set cores) { + if (scanned == null) { + scanned = new HashSet(); + } + List neighbors = EZStorageUtils.getNeighbors(br.posX, br.posY, br.posZ, world); + for (BlockRef blockRef : neighbors) { + if (blockRef.block instanceof StorageMultiblock) { + if (blockRef.block instanceof BlockStorageCore) { + TileEntity te = world.getTileEntity(blockRef.posX, blockRef.posY, blockRef.posZ); + if (te instanceof TileEntityStorageCore) { + cores.add((TileEntityStorageCore) te); + } + } else { + if (scanned.add(blockRef) == true) { + findMultipleCores(blockRef, world, scanned, cores); + } + } + } + } + } } diff --git a/src/main/java/com/zerofall/ezstorage/configuration/EZConfiguration.java b/src/main/java/com/zerofall/ezstorage/configuration/EZConfiguration.java index bfb26e5..74ff1c9 100644 --- a/src/main/java/com/zerofall/ezstorage/configuration/EZConfiguration.java +++ b/src/main/java/com/zerofall/ezstorage/configuration/EZConfiguration.java @@ -1,26 +1,28 @@ package com.zerofall.ezstorage.configuration; -import com.zerofall.ezstorage.EZStorage; - import net.minecraftforge.common.config.Configuration; +import com.zerofall.ezstorage.EZStorage; + public class EZConfiguration { - public static int basicCapacity; - public static int condensedCapacity; - public static int hyperCapacity; - - public static void syncConfig() { - final Configuration config = EZStorage.config; - config.load(); - - final String OPTIONS = config.CATEGORY_GENERAL + config.CATEGORY_SPLITTER + "options"; - - basicCapacity = config.getInt("Basic Storage Capacity", OPTIONS, 400, 100, 4000, "Basic"); - condensedCapacity = config.getInt("Condensed Storage Capacity", OPTIONS, 4000, 100, 40000, "Condensed"); - hyperCapacity = config.getInt("Hyper Storage Capacity", OPTIONS, 400000, 100, 4000000, "Hyper"); - if (config.hasChanged()) { - config.save(); - } - } + public static int basicCapacity; + public static int condensedCapacity; + public static int hyperCapacity; + public static boolean enableCraftingBlock; + public static boolean enableSearchBlock; + + public static void syncConfig() { + final Configuration config = EZStorage.config; + config.load(); + + final String OPTIONS = Configuration.CATEGORY_GENERAL + Configuration.CATEGORY_SPLITTER + "options"; + + basicCapacity = config.getInt("Basic Storage Capacity", OPTIONS, 400, 100, 4000, "Basic"); + condensedCapacity = config.getInt("Condensed Storage Capacity", OPTIONS, 4000, 100, 40000, "Condensed"); + hyperCapacity = config.getInt("Hyper Storage Capacity", OPTIONS, 400000, 100, 4000000, "Hyper"); + if (config.hasChanged()) { + config.save(); + } + } } diff --git a/src/main/java/com/zerofall/ezstorage/container/ContainerStorageCore.java b/src/main/java/com/zerofall/ezstorage/container/ContainerStorageCore.java index 170779c..4c83a43 100644 --- a/src/main/java/com/zerofall/ezstorage/container/ContainerStorageCore.java +++ b/src/main/java/com/zerofall/ezstorage/container/ContainerStorageCore.java @@ -7,115 +7,113 @@ import net.minecraft.inventory.InventoryBasic; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; import com.zerofall.ezstorage.tileentity.TileEntityStorageCore; public class ContainerStorageCore extends Container { - public TileEntityStorageCore tileEntity; - - public ContainerStorageCore(EntityPlayer player, World world, int x, int y, int z) { - this.tileEntity = ((TileEntityStorageCore)world.getTileEntity(new BlockPos(x, y, z))); - int startingY = 18; - int startingX = 8; - IInventory inventory = new InventoryBasic("title", false, this.rowCount()*9); - for (int i = 0; i < this.rowCount(); i++) { + public TileEntityStorageCore tileEntity; + + public ContainerStorageCore(EntityPlayer player, World world, int x, int y, int z) { + this.tileEntity = ((TileEntityStorageCore) world.getTileEntity(x, y, z)); + int startingY = 18; + int startingX = 8; + IInventory inventory = new InventoryBasic("title", false, this.rowCount() * 9); + for (int i = 0; i < this.rowCount(); i++) { + for (int j = 0; j < 9; j++) { + addSlotToContainer(new Slot(inventory, j + i * 9, startingX + j * 18, startingY + i * 18)); + } + } + + bindPlayerInventory(player.inventory); + } + + protected void bindPlayerInventory(InventoryPlayer inventoryPlayer) { + for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - int test1 = j + i * 9; - addSlotToContainer(new Slot(inventory, j + i * 9, startingX + j * 18, startingY + i * 18)); + addSlotToContainer( + new Slot( + inventoryPlayer, + (j + i * 9) + 9, + playerInventoryX() + j * 18, + playerInventoryY() + i * 18)); } - } - - bindPlayerInventory(player.inventory); - } - - protected void bindPlayerInventory(InventoryPlayer inventoryPlayer) { - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - int test2 = (j + i * 9) + this.rowCount() * 9; - addSlotToContainer(new Slot(inventoryPlayer, (j + i * 9) + 9, - playerInventoryX() + j * 18, playerInventoryY() + i * 18)); - } - } - - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(inventoryPlayer, i, playerInventoryX() + i * 18, playerInventoryY() + 58)); - } - } - - @Override - public boolean canInteractWith(EntityPlayer playerIn) { - return true; - } - - //Shift clicking - @Override - public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) { - ItemStack stack = null; + } + + for (int i = 0; i < 9; i++) { + addSlotToContainer(new Slot(inventoryPlayer, i, playerInventoryX() + i * 18, playerInventoryY() + 58)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer playerIn) { + return true; + } + + // Shift clicking + @Override + public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) { Slot slotObject = (Slot) inventorySlots.get(index); if (slotObject != null && slotObject.getHasStack()) { - ItemStack stackInSlot = slotObject.getStack(); - slotObject.putStack(this.tileEntity.inventory.input(stackInSlot)); + ItemStack stackInSlot = slotObject.getStack(); + slotObject.putStack(this.tileEntity.inventory.input(stackInSlot)); + } + return null; + } + + @Override + public ItemStack slotClick(int slotId, int clickedButton, int mode, EntityPlayer playerIn) { + if (slotId < this.rowCount() * 9 && slotId >= 0) { + return null; + } + return super.slotClick(slotId, clickedButton, mode, playerIn); + } + + public ItemStack customSlotClick(int slotId, int clickedButton, int mode, EntityPlayer playerIn) { + int itemIndex = slotId; + ItemStack heldStack = playerIn.inventory.getItemStack(); + if (heldStack == null) { + int type = 0; + if (clickedButton == 1) { + type = 1; + } + ItemStack stack = this.tileEntity.inventory.getItemsAt(itemIndex, type); + if (stack == null) { + return null; + } + // Shift click + if (clickedButton == 0 && mode == 1) { + if (!this.mergeItemStack(stack, this.rowCount() * 9, this.rowCount() * 9 + 36, true)) { + this.tileEntity.inventory.input(stack); + } + } else { + playerIn.inventory.setItemStack(stack); + } + return stack; + } else { + playerIn.inventory.setItemStack(this.tileEntity.inventory.input(heldStack)); } return null; - } - - @Override - public ItemStack slotClick(int slotId, int clickedButton, int mode, - EntityPlayer playerIn) { - if (slotId < this.rowCount()*9 && slotId >= 0) { - return null; - } - return super.slotClick(slotId, clickedButton, mode, playerIn); - } - - public ItemStack customSlotClick(int slotId, int clickedButton, int mode, - EntityPlayer playerIn) { - int itemIndex = slotId; - ItemStack heldStack = playerIn.inventory.getItemStack(); - if (heldStack == null) { - int type = 0; - if (clickedButton == 1) { - type = 1; - } - ItemStack stack = this.tileEntity.inventory.getItemsAt(itemIndex, type); - if (stack == null) { - return null; - } - //Shift click - if (clickedButton == 0 && mode == 1) { - if (!this.mergeItemStack(stack, this.rowCount()*9, this.rowCount()*9+36, true)) { - this.tileEntity.inventory.input(stack); - } - } else { - playerIn.inventory.setItemStack(stack); - } - return stack; - } else { - playerIn.inventory.setItemStack(this.tileEntity.inventory.input(heldStack)); - } - return null; - } - - protected int playerInventoryX() { - return 8; - } - - protected int playerInventoryY() { - return 140; - } - - protected int rowCount() { - return 6; - } - - @Override - public void onContainerClosed(EntityPlayer playerIn) { - super.onContainerClosed(playerIn); - if (!playerIn.worldObj.isRemote) { - this.tileEntity.sortInventory(); - } - } + } + + protected int playerInventoryX() { + return 8; + } + + protected int playerInventoryY() { + return 140; + } + + protected int rowCount() { + return 6; + } + + @Override + public void onContainerClosed(EntityPlayer playerIn) { + super.onContainerClosed(playerIn); + if (!playerIn.worldObj.isRemote) { + this.tileEntity.sortInventory(); + } + } } diff --git a/src/main/java/com/zerofall/ezstorage/container/ContainerStorageCoreCrafting.java b/src/main/java/com/zerofall/ezstorage/container/ContainerStorageCoreCrafting.java index e41cdc9..6f4bfcd 100644 --- a/src/main/java/com/zerofall/ezstorage/container/ContainerStorageCoreCrafting.java +++ b/src/main/java/com/zerofall/ezstorage/container/ContainerStorageCoreCrafting.java @@ -11,166 +11,167 @@ import net.minecraft.world.World; public class ContainerStorageCoreCrafting extends ContainerStorageCore { - - public InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3); + + public InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3); public IInventory craftResult = new InventoryCraftResult(); private World worldObj; - public ContainerStorageCoreCrafting(EntityPlayer player, World world, - int x, int y, int z) { - super(player, world, x, y, z); - this.worldObj = world; - this.addSlotToContainer(new SlotCrafting(player, this.craftMatrix, this.craftResult, 0, 116, 117)); + public ContainerStorageCoreCrafting(EntityPlayer player, World world, int x, int y, int z) { + super(player, world, x, y, z); + this.worldObj = world; + this.addSlotToContainer(new SlotCrafting(player, this.craftMatrix, this.craftResult, 0, 116, 117)); int i; int j; - for (i = 0; i < 3; ++i) - { - for (j = 0; j < 3; ++j) - { + for (i = 0; i < 3; ++i) { + for (j = 0; j < 3; ++j) { this.addSlotToContainer(new Slot(this.craftMatrix, j + i * 3, 44 + j * 18, 99 + i * 18)); } } this.onCraftMatrixChanged(this.craftMatrix); - } - - public void onCraftMatrixChanged(IInventory inventoryIn) { - this.craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj)); } - - //Shift clicking - @Override - public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) { + + public void onCraftMatrixChanged(IInventory inventoryIn) { + this.craftResult.setInventorySlotContents( + 0, + CraftingManager.getInstance() + .findMatchingRecipe(this.craftMatrix, this.worldObj)); + } + + // Shift clicking + @Override + public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) { Slot slotObject = (Slot) inventorySlots.get(index); if (slotObject != null && slotObject.getHasStack()) { - if (slotObject instanceof SlotCrafting) { - ItemStack[] recipe = new ItemStack[9]; - for (int i=0; i<9; i++) { - recipe[i] = this.craftMatrix.getStackInSlot(i); - } - - ItemStack itemstack1 = slotObject.getStack(); - ItemStack itemstack = null; - ItemStack original = itemstack1.copy(); - int crafted = 0; - int maxStackSize = itemstack1.getMaxStackSize(); - int crafting = itemstack1.stackSize; - for (int i=0; i < itemstack1.getMaxStackSize(); i++) { - if (slotObject.getHasStack() && slotObject.getStack().isItemEqual(itemstack1)) { - if (crafting >= maxStackSize) { - return null; - } - itemstack1 = slotObject.getStack(); - itemstack = itemstack1.copy(); - if (crafted + itemstack1.stackSize > itemstack1.getMaxStackSize()) { - return null; - } - boolean merged = this.mergeItemStack(itemstack1, this.rowCount()*9, this.rowCount()*9+36, true); - if (!merged) { - return null; - } else { - - //It merged! grab another - crafted += itemstack.stackSize; - slotObject.onSlotChange(itemstack1, itemstack); - slotObject.onPickupFromSlot(playerIn, itemstack1); - - if (original.isItemEqual(slotObject.getStack())) { - continue; - } - - tryToPopulateCraftingGrid(recipe, playerIn); - } - } else { - break; - } + if (slotObject instanceof SlotCrafting) { + ItemStack[] recipe = new ItemStack[9]; + for (int i = 0; i < 9; i++) { + recipe[i] = this.craftMatrix.getStackInSlot(i); + } + + ItemStack itemstack1 = slotObject.getStack(); + ItemStack itemstack = null; + ItemStack original = itemstack1.copy(); + int crafted = 0; + int maxStackSize = itemstack1.getMaxStackSize(); + int crafting = itemstack1.stackSize; + + for (int i = 0; i < itemstack1.getMaxStackSize(); i++) { + if (!slotObject.getHasStack() || !slotObject.getStack() + .isItemEqual(itemstack1)) { + break; + } + if (crafting >= maxStackSize) { + break; + } + + itemstack1 = slotObject.getStack(); + if (crafted + itemstack1.stackSize > itemstack1.getMaxStackSize()) { + break; + } + + itemstack = itemstack1.copy(); + boolean merged = this + .mergeItemStack(itemstack1, this.rowCount() * 9, this.rowCount() * 9 + 36, true); + if (!merged) { + return null; + } + + // It merged! grab another + crafted += itemstack.stackSize; + slotObject.onSlotChange(itemstack1, itemstack); + slotObject.onPickupFromSlot(playerIn, itemstack1); + + if (slotObject.getStack() != null && original.isItemEqual(slotObject.getStack())) { + continue; + } + + tryToPopulateCraftingGrid(recipe, playerIn); } - - if (itemstack1.stackSize == itemstack.stackSize) { + + if (itemstack == null || itemstack1.stackSize == itemstack.stackSize) { return null; } - return itemstack; - } else { - ItemStack stackInSlot = slotObject.getStack(); - slotObject.putStack(this.tileEntity.inventory.input(stackInSlot)); - } + } + + ItemStack stackInSlot = slotObject.getStack(); + slotObject.putStack(this.tileEntity.inventory.input(stackInSlot)); } return null; - } - - @Override - public ItemStack slotClick(int slotId, int clickedButton, int mode, EntityPlayer playerIn) { - - if (mode == 0 && clickedButton == 0) { - if (slotId >= 0 && inventorySlots.size() > slotId) { - Slot slotObject = inventorySlots.get(slotId); - if (slotObject != null) { - if (slotObject instanceof SlotCrafting) { - ItemStack[] recipe = new ItemStack[9]; - for (int i=0; i<9; i++) { - recipe[i] = this.craftMatrix.getStackInSlot(i); - } - ItemStack result = super.slotClick(slotId, clickedButton, mode, playerIn); - if (result != null) { - tryToPopulateCraftingGrid(recipe, playerIn); - } - return result; - } - } - } - - } - return super.slotClick(slotId, clickedButton, mode, playerIn); - } - - private void tryToPopulateCraftingGrid(ItemStack[] recipe, EntityPlayer playerIn) { - clearGrid(playerIn); - for (int j = 0; j < recipe.length; j++) { - if (recipe[j] != null) { - if (recipe[j].stackSize > 1) { - continue; - } else { - recipe[j].stackSize = 1; - } - Slot slot = getSlotFromInventory(this.craftMatrix, j); - if (slot != null) { - ItemStack retreived = tileEntity.inventory.getItems(new ItemStack[]{recipe[j]}); - if (retreived != null) { - slot.putStack(retreived); - } - } - } - } - } - - @Override - protected int playerInventoryY() { - return 162; - } - - @Override - protected int rowCount() { - return 4; - } - - @Override - public void onContainerClosed(EntityPlayer playerIn) { - clearGrid(playerIn); - super.onContainerClosed(playerIn); - } - - public void clearGrid(EntityPlayer playerIn){ - for (int i=0; i<9; i++) { - ItemStack stack = this.craftMatrix.getStackInSlot(i); - if (stack != null) { - ItemStack result = this.tileEntity.input(stack); - this.craftMatrix.setInventorySlotContents(i, null); - if (result != null) { - playerIn.dropPlayerItemWithRandomChoice(result, false); - } - } - } - } + } + + @Override + public ItemStack slotClick(int slotId, int clickedButton, int mode, EntityPlayer playerIn) { + if (slotId > 0 && mode == 0 && clickedButton == 0) { + if (slotId >= 0 && inventorySlots.size() > slotId) { + Slot slotObject = inventorySlots.get(slotId); + if (slotObject != null) { + if (slotObject instanceof SlotCrafting) { + ItemStack[] recipe = new ItemStack[9]; + for (int i = 0; i < 9; i++) { + recipe[i] = this.craftMatrix.getStackInSlot(i); + } + ItemStack result = super.slotClick(slotId, clickedButton, mode, playerIn); + if (result != null) { + tryToPopulateCraftingGrid(recipe, playerIn); + } + return result; + } + } + } + + } + return super.slotClick(slotId, clickedButton, mode, playerIn); + } + + private void tryToPopulateCraftingGrid(ItemStack[] recipe, EntityPlayer playerIn) { + clearGrid(playerIn); + for (int j = 0; j < recipe.length; j++) { + if (recipe[j] != null) { + if (recipe[j].stackSize > 1) { + continue; + } else { + recipe[j].stackSize = 1; + } + Slot slot = getSlotFromInventory(this.craftMatrix, j); + if (slot != null) { + ItemStack retreived = tileEntity.inventory.getItems(new ItemStack[] { recipe[j] }); + if (retreived != null) { + slot.putStack(retreived); + } + } + } + } + } + + @Override + protected int playerInventoryY() { + return 162; + } + + @Override + protected int rowCount() { + return 4; + } + + @Override + public void onContainerClosed(EntityPlayer playerIn) { + clearGrid(playerIn); + super.onContainerClosed(playerIn); + } + + public void clearGrid(EntityPlayer playerIn) { + for (int i = 0; i < 9; i++) { + ItemStack stack = this.craftMatrix.getStackInSlot(i); + if (stack != null) { + ItemStack result = this.tileEntity.input(stack); + this.craftMatrix.setInventorySlotContents(i, null); + if (result != null) { + playerIn.dropPlayerItemWithRandomChoice(result, false); + } + } + } + } } diff --git a/src/main/java/com/zerofall/ezstorage/events/XEventHandler.java b/src/main/java/com/zerofall/ezstorage/events/XEventHandler.java index 5e102c4..3defa5b 100644 --- a/src/main/java/com/zerofall/ezstorage/events/XEventHandler.java +++ b/src/main/java/com/zerofall/ezstorage/events/XEventHandler.java @@ -1,23 +1,24 @@ package com.zerofall.ezstorage.events; -import com.zerofall.ezstorage.tileentity.TileEntityStorageCore; - import net.minecraft.tileentity.TileEntity; import net.minecraftforge.event.world.BlockEvent.BreakEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import com.zerofall.ezstorage.tileentity.TileEntityStorageCore; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class XEventHandler { - @SubscribeEvent - public void onBlockBreak(BreakEvent e) { - if (!e.world.isRemote) { - TileEntity tileentity = e.world.getTileEntity(e.pos); - if (tileentity instanceof TileEntityStorageCore) { - TileEntityStorageCore core = (TileEntityStorageCore)tileentity; - if (core.inventory.getTotalCount() > 0) { - e.setCanceled(true); - } - } - } - } + @SubscribeEvent + public void onBlockBreak(BreakEvent e) { + if (!e.world.isRemote) { + TileEntity tileentity = e.world.getTileEntity(e.x, e.y, e.z); + if (tileentity instanceof TileEntityStorageCore) { + TileEntityStorageCore core = (TileEntityStorageCore) tileentity; + if (core.inventory.getTotalCount() > 0) { + e.setCanceled(true); + } + } + } + } } diff --git a/src/main/java/com/zerofall/ezstorage/gui/GuiCraftingCore.java b/src/main/java/com/zerofall/ezstorage/gui/GuiCraftingCore.java index f803895..af95cc9 100644 --- a/src/main/java/com/zerofall/ezstorage/gui/GuiCraftingCore.java +++ b/src/main/java/com/zerofall/ezstorage/gui/GuiCraftingCore.java @@ -1,27 +1,27 @@ package com.zerofall.ezstorage.gui; -import com.zerofall.ezstorage.Reference; -import com.zerofall.ezstorage.container.ContainerStorageCoreCrafting; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import com.zerofall.ezstorage.Reference; +import com.zerofall.ezstorage.container.ContainerStorageCoreCrafting; + public class GuiCraftingCore extends GuiStorageCore { - public GuiCraftingCore(EntityPlayer player, World world, int x, int y, int z) { - super(new ContainerStorageCoreCrafting(player, world, x, y, z), world, x, y, z); - this.xSize = 195; - this.ySize = 244; - } + public GuiCraftingCore(EntityPlayer player, World world, int x, int y, int z) { + super(new ContainerStorageCoreCrafting(player, world, x, y, z), world, x, y, z); + this.xSize = 195; + this.ySize = 244; + } + + @Override + public int rowsVisible() { + return 4; + } - @Override - public int rowsVisible() { - return 4; - } - - @Override - protected ResourceLocation getBackground() { - return new ResourceLocation(Reference.MOD_ID + ":textures/gui/storageCraftingGui.png"); - } + @Override + protected ResourceLocation getBackground() { + return new ResourceLocation(Reference.MOD_ID, "textures/gui/storageCraftingGui.png"); + } } diff --git a/src/main/java/com/zerofall/ezstorage/gui/GuiHandler.java b/src/main/java/com/zerofall/ezstorage/gui/GuiHandler.java index 5bb49da..1b91868 100644 --- a/src/main/java/com/zerofall/ezstorage/gui/GuiHandler.java +++ b/src/main/java/com/zerofall/ezstorage/gui/GuiHandler.java @@ -1,42 +1,40 @@ package com.zerofall.ezstorage.gui; -import com.zerofall.ezstorage.container.ContainerStorageCore; -import com.zerofall.ezstorage.container.ContainerStorageCoreCrafting; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.network.IGuiHandler; + +import com.zerofall.ezstorage.container.ContainerStorageCore; +import com.zerofall.ezstorage.container.ContainerStorageCoreCrafting; + +import cpw.mods.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, - int x, int y, int z) { - TileEntity tileEntity = world.getTileEntity(new BlockPos(x, y, z)); - if(tileEntity != null) { - if (ID == 1) { - return new ContainerStorageCore(player, world, x, y, z); - } else if (ID == 2) { - return new ContainerStorageCoreCrafting(player, world, x, y, z); - } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (tileEntity != null) { + if (ID == 1) { + return new ContainerStorageCore(player, world, x, y, z); + } else if (ID == 2) { + return new ContainerStorageCoreCrafting(player, world, x, y, z); + } } - return null; - } + return null; + } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, - int x, int y, int z) { - TileEntity tileEntity = world.getTileEntity(new BlockPos(x, y, z)); - if(tileEntity != null) { - if (ID == 1) { - return new GuiStorageCore(player, world, x, y, z); - } else if (ID == 2) { - return new GuiCraftingCore(player, world, x, y, z); - } + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (tileEntity != null) { + if (ID == 1) { + return new GuiStorageCore(player, world, x, y, z); + } else if (ID == 2) { + return new GuiCraftingCore(player, world, x, y, z); + } } - return null; - } + return null; + } } diff --git a/src/main/java/com/zerofall/ezstorage/gui/GuiStorageCore.java b/src/main/java/com/zerofall/ezstorage/gui/GuiStorageCore.java index 3b16cd2..092498b 100644 --- a/src/main/java/com/zerofall/ezstorage/gui/GuiStorageCore.java +++ b/src/main/java/com/zerofall/ezstorage/gui/GuiStorageCore.java @@ -1,6 +1,5 @@ package com.zerofall.ezstorage.gui; -import java.io.IOException; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Iterator; @@ -10,11 +9,10 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; @@ -33,21 +31,28 @@ public class GuiStorageCore extends GuiContainer { - TileEntityStorageCore tileEntity; - EZItemRenderer ezRenderer; - int scrollRow = 0; - private boolean isScrolling = false; - private boolean wasClicking = false; - private static final ResourceLocation creativeInventoryTabs = new ResourceLocation("textures/gui/container/creative_inventory/tabs.png"); - private static final ResourceLocation searchBar = new ResourceLocation("textures/gui/container/creative_inventory/tab_item_search.png"); + TileEntityStorageCore tileEntity; + EZItemRenderer ezRenderer; + int scrollRow = 0; + private boolean isScrolling = false; + private boolean wasClicking = false; + private static final ResourceLocation creativeInventoryTabs = new ResourceLocation( + "textures/gui/container/creative_inventory/tabs.png"); + private static final ResourceLocation searchBar = new ResourceLocation( + "textures/gui/container/creative_inventory/tab_item_search.png"); private float currentScroll; private GuiTextField searchField; private List filteredList; - + @Override public void initGui() { - super.initGui(); - this.searchField = new GuiTextField(0, this.fontRendererObj, this.guiLeft+10, this.guiTop+6, 80, this.fontRendererObj.FONT_HEIGHT); + super.initGui(); + this.searchField = new GuiTextField( + this.fontRendererObj, + this.guiLeft + 10, + this.guiTop + 6, + 80, + this.fontRendererObj.FONT_HEIGHT); this.searchField.setMaxStringLength(20); this.searchField.setEnableBackgroundDrawing(false); this.searchField.setTextColor(0xFFFFFF); @@ -56,188 +61,179 @@ public void initGui() { this.searchField.setText(""); filteredList = new ArrayList(this.tileEntity.inventory.inventory); } - - public GuiStorageCore(EntityPlayer player, World world, int x, int y, int z) { - super(new ContainerStorageCore(player, world, x, y, z)); - this.tileEntity = ((TileEntityStorageCore)world.getTileEntity(new BlockPos(x, y, z))); - this.xSize = 195; - this.ySize = 222; - } - - public GuiStorageCore(ContainerStorageCore containerStorageCore, World world, int x, int y, int z) { - super(containerStorageCore); - this.tileEntity = ((TileEntityStorageCore)world.getTileEntity(new BlockPos(x, y, z))); - this.xSize = 195; - this.ySize = 222; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTicks, - int mouseX, int mouseY) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(getBackground()); - int x = (this.width - this.xSize) / 2; - int y = (this.height - this.ySize) / 2; - drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); - this.searchField.setVisible(this.tileEntity.hasSearchBox); - if (this.tileEntity.hasSearchBox) { - this.mc.renderEngine.bindTexture(searchBar); - drawTexturedModalRect(this.guiLeft+8, this.guiTop+4, 80, 4, 90, 12); - this.searchField.drawTextBox(); - } - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - handleScrolling(mouseX, mouseY); - updateFilteredItems(); - DecimalFormat formatter = new DecimalFormat("#,###"); - String totalCount = formatter.format(this.tileEntity.inventory.getTotalCount()); - String max = formatter.format(this.tileEntity.inventory.maxItems); - String amount = totalCount + "/" + max; - //Right-align text - int stringWidth = fontRendererObj.getStringWidth(amount); - - //Scale down text if its too large - if (stringWidth > 88) { - float ScaleFactor = 0.7f; - float RScaleFactor = 1.0f / ScaleFactor; - GL11.glPushMatrix(); - GL11.glScaled( ScaleFactor, ScaleFactor, ScaleFactor ); - int X = (int) (((float) 187 - stringWidth * ScaleFactor) * RScaleFactor); - fontRendererObj.drawString(amount, X, 10, 4210752); - GL11.glPopMatrix(); - } else { - fontRendererObj.drawString(amount, 187 - stringWidth, 6, 4210752); - } - - int x = 8; - int y = 18; - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + + public GuiStorageCore(EntityPlayer player, World world, int x, int y, int z) { + super(new ContainerStorageCore(player, world, x, y, z)); + this.tileEntity = (TileEntityStorageCore) world.getTileEntity(x, y, z); + this.xSize = 195; + this.ySize = 222; + } + + public GuiStorageCore(ContainerStorageCore containerStorageCore, World world, int x, int y, int z) { + super(containerStorageCore); + this.tileEntity = (TileEntityStorageCore) world.getTileEntity(x, y, z); + this.xSize = 195; + this.ySize = 222; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { + this.mc.renderEngine.bindTexture(getBackground()); + int x = (this.width - this.xSize) / 2; + int y = (this.height - this.ySize) / 2; + drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); + this.searchField.setVisible(this.tileEntity.hasSearchBox); + if (this.tileEntity.hasSearchBox) { + this.mc.renderEngine.bindTexture(searchBar); + drawTexturedModalRect(this.guiLeft + 8, this.guiTop + 4, 80, 4, 90, 12); + this.searchField.drawTextBox(); + } + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + handleScrolling(mouseX, mouseY); + // updateFilteredItems(); + DecimalFormat formatter = new DecimalFormat("#,###"); + String totalCount = formatter.format(this.tileEntity.inventory.getTotalCount()); + String max = formatter.format(this.tileEntity.inventory.maxItems); + String amount = totalCount + "/" + max; + // Right-align text + int stringWidth = fontRendererObj.getStringWidth(amount); + + // Scale down text if its too large + if (stringWidth > 88) { + float ScaleFactor = 0.7f; + float RScaleFactor = 1.0f / ScaleFactor; + GL11.glPushMatrix(); + GL11.glScaled(ScaleFactor, ScaleFactor, ScaleFactor); + int X = (int) (((float) 187 - stringWidth * ScaleFactor) * RScaleFactor); + fontRendererObj.drawString(amount, X, 10, 4210752); + GL11.glPopMatrix(); + } else { + fontRendererObj.drawString(amount, 187 - stringWidth, 6, 4210752); + } + + int x = 8; + int y = 18; this.zLevel = 200.0F; - this.itemRender.zLevel = 200.0F; + itemRender.zLevel = 200.0F; if (this.ezRenderer == null) { - this.ezRenderer = new EZItemRenderer(this.mc.getTextureManager(), this.itemRender.getItemModelMesher().getModelManager()); + this.ezRenderer = new EZItemRenderer(); } this.ezRenderer.zLevel = 200.0F; - + boolean finished = false; for (int i = 0; i < this.rowsVisible(); i++) { - x = 8; - for (int j = 0; j < 9; j++) { - int index = (i * 9) + j; - index = scrollRow * 9 + index; - if (index >= this.filteredList.size()) { - finished = true; - break; - } - - ItemGroup group = this.filteredList.get(index); - ItemStack stack = group.itemStack; - FontRenderer font = null; - if (stack != null) font = stack.getItem().getFontRenderer(stack); - if (font == null) font = fontRendererObj; - RenderHelper.enableGUIStandardItemLighting(); - this.itemRender.renderItemAndEffectIntoGUI(stack, x, y); - ezRenderer.renderItemOverlayIntoGUI(font, stack, x, y, "" + group.count); - x += 18; - } - if (finished) { - break; - } - y += 18; + x = 8; + for (int j = 0; j < 9; j++) { + int index = (i * 9) + j; + index = scrollRow * 9 + index; + if (index >= this.filteredList.size()) { + finished = true; + break; + } + + ItemGroup group = this.filteredList.get(index); + ItemStack stack = group.itemStack; + FontRenderer font = null; + if (stack != null) font = stack.getItem() + .getFontRenderer(stack); + if (font == null) font = fontRendererObj; + RenderHelper.enableGUIStandardItemLighting(); + itemRender.renderItemAndEffectIntoGUI(font, this.mc.getTextureManager(), stack, x, y); + ezRenderer.renderItemOverlayIntoGUI(font, stack, x, y, "" + group.count); + x += 18; + } + if (finished) { + break; + } + y += 18; } - + int i1 = 175; int k = 18; int l = k + 108; - this.mc.getTextureManager().bindTexture(creativeInventoryTabs); - this.drawTexturedModalRect(i1, k + (int)((float)(l - k - 17) * this.currentScroll), 232, 0, 12, 15); - this.zLevel = 0.0F; - this.itemRender.zLevel = 0.0F; - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - super.drawScreen(mouseX, mouseY, partialTicks); - Integer slot = getSlotAt(mouseX, mouseY); - if (slot != null) { - int mode = 0; - if (GuiScreen.isShiftKeyDown()) { - mode = 1; - } - int index = this.tileEntity.inventory.slotCount(); - if (slot < this.filteredList.size()) { - ItemGroup group = this.filteredList.get(slot); - if (group != null) { - index = this.tileEntity.inventory.inventory.indexOf(group); - if (index < 0) { - return; - } - this.renderToolTip(group.itemStack, mouseX, mouseY); - } - } - } - } - - @Override - protected void keyTyped(char typedChar, int keyCode) throws IOException { - if (!this.checkHotbarKeys(keyCode)) - { - if (this.tileEntity.hasSearchBox && this.searchField.isFocused() && this.searchField.textboxKeyTyped(typedChar, keyCode)) - { - updateFilteredItems(); + this.mc.getTextureManager() + .bindTexture(creativeInventoryTabs); + this.drawTexturedModalRect(i1, k + (int) ((float) (l - k - 17) * this.currentScroll), 232, 0, 12, 15); + this.zLevel = 0.0F; + itemRender.zLevel = 0.0F; + } + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + super.drawScreen(mouseX, mouseY, partialTicks); + Integer slot = getSlotAt(mouseX, mouseY); + if (slot != null) { + int index = this.tileEntity.inventory.slotCount(); + if (slot < this.filteredList.size()) { + ItemGroup group = this.filteredList.get(slot); + if (group != null) { + index = this.tileEntity.inventory.inventory.indexOf(group); + if (index < 0) { + return; + } + this.renderToolTip(group.itemStack, mouseX, mouseY); + } } - else - { + } + } + + @Override + protected void keyTyped(char typedChar, int keyCode) { + if (!this.checkHotbarKeys(keyCode)) { + if (this.tileEntity.hasSearchBox && this.searchField.isFocused() + && this.searchField.textboxKeyTyped(typedChar, keyCode)) { + updateFilteredItems(); + } else { super.keyTyped(typedChar, keyCode); } } - if(keyCode==63){ - this.tileEntity.sortInventory(); - } - } - - private void updateFilteredItems() { - filteredList = new ArrayList(this.tileEntity.inventory.inventory); - Iterator iterator = this.filteredList.iterator(); - String s1 = this.searchField.getText().toLowerCase(); - - while (iterator.hasNext()) - { - ItemGroup group = (ItemGroup)iterator.next(); + if (keyCode == 63) { + this.tileEntity.sortInventory(); + } + } + + private void updateFilteredItems() { + filteredList = new ArrayList(this.tileEntity.inventory.inventory); + Iterator iterator = this.filteredList.iterator(); + String s1 = this.searchField.getText() + .toLowerCase(); + + while (iterator.hasNext()) { + ItemGroup group = (ItemGroup) iterator.next(); ItemStack itemstack = group.itemStack; boolean flag = false; - Iterator iterator1 = itemstack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips).iterator(); + Iterator iterator1 = itemstack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips) + .iterator(); - while (true) - { - if (iterator1.hasNext()) - { - String s = (String)iterator1.next(); + while (true) { + if (iterator1.hasNext()) { + String s = (String) iterator1.next(); - if (!EnumChatFormatting.getTextWithoutFormattingCodes(s).toLowerCase().contains(s1)) - { + if (!EnumChatFormatting.getTextWithoutFormattingCodes(s) + .toLowerCase() + .contains(s1)) { continue; } flag = true; } - if (!flag) - { + if (!flag) { iterator.remove(); } break; } } - } - - private void handleScrolling(int mouseX, int mouseY) { - boolean flag = Mouse.isButtonDown(0); - + } + + private void handleScrolling(int mouseX, int mouseY) { + boolean flag = Mouse.isButtonDown(0); + int k = this.guiLeft; int l = this.guiTop; int i1 = k + 175; @@ -245,128 +241,126 @@ private void handleScrolling(int mouseX, int mouseY) { int k1 = i1 + 14; int l1 = j1 + 108; - if (!this.wasClicking && flag && mouseX >= i1 && mouseY >= j1 && mouseX < k1 && mouseY < l1) - { + if (!this.wasClicking && flag && mouseX >= i1 && mouseY >= j1 && mouseX < k1 && mouseY < l1) { this.isScrolling = true; } - if (!flag) - { + if (!flag) { this.isScrolling = false; } this.wasClicking = flag; - if (this.isScrolling) - { - this.currentScroll = ((float)(mouseY - j1) - 7.5F) / ((float)(l1 - j1) - 15.0F); + if (this.isScrolling) { + this.currentScroll = ((float) (mouseY - j1) - 7.5F) / ((float) (l1 - j1) - 15.0F); this.currentScroll = MathHelper.clamp_float(this.currentScroll, 0.0F, 1.0F); scrollTo(this.currentScroll); } - } - - @Override - protected void mouseClicked(int mouseX, int mouseY, int mouseButton) - throws IOException { - - Integer slot = getSlotAt(mouseX, mouseY); - if (slot != null) { - int mode = 0; - if (GuiScreen.isShiftKeyDown()) { - mode = 1; - } - int index = this.tileEntity.inventory.slotCount(); - if (slot < this.filteredList.size()) { - ItemGroup group = this.filteredList.get(slot); - if (group != null) { - index = this.tileEntity.inventory.inventory.indexOf(group); - if (index < 0) { - return; - } - } - } - EZStorage.networkWrapper.sendToServer(new MyMessage(index, mouseButton, mode)); - ContainerStorageCore container = (ContainerStorageCore)this.inventorySlots; - container.customSlotClick(index, mouseButton, mode, this.mc.thePlayer); - } else { - int elementX = this.searchField.xPosition; - int elementY = this.searchField.yPosition; - if (mouseX >= elementX && mouseX <= elementX + this.searchField.width && mouseY >= elementY && mouseY <= elementY + this.searchField.height) { - if(mouseButton==1||GuiScreen.isShiftKeyDown()){ - this.searchField.setText(""); - } - this.searchField.setFocused(true); - } else { - this.searchField.setFocused(false); - } - } - super.mouseClicked(mouseX, mouseY, mouseButton); - } - - private Integer getSlotAt(int x, int y) { - int startX = this.guiLeft + 8; - int startY = this.guiTop + 18; - - int clickedX = x - startX; - int clickedY = y - startY; - - if (clickedX > 0 && clickedY > 0) { - int column = clickedX / 18; - if (column < 9) { - int row = clickedY / 18; - if (row < this.rowsVisible()) { - int slot = (row * 9) + column + (scrollRow * 9); - return slot; - } - } - } - return null; - } - - - - @Override - public void handleMouseInput() throws IOException { - - super.handleMouseInput(); + } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int mouseButton) { + + Integer slot = getSlotAt(mouseX, mouseY); + if (slot != null) { + int mode = 0; + if (GuiScreen.isShiftKeyDown()) { + mode = 1; + } + int index = this.tileEntity.inventory.slotCount(); + if (slot < this.filteredList.size()) { + ItemGroup group = this.filteredList.get(slot); + if (group != null) { + index = this.tileEntity.inventory.inventory.indexOf(group); + if (index < 0) { + return; + } + } + } + EZStorage.networkWrapper.sendToServer(new MyMessage(index, mouseButton, mode)); + ContainerStorageCore container = (ContainerStorageCore) this.inventorySlots; + container.customSlotClick(index, mouseButton, mode, this.mc.thePlayer); + } else { + int elementX = this.searchField.xPosition; + int elementY = this.searchField.yPosition; + if (mouseX >= elementX && mouseX <= elementX + this.searchField.width + && mouseY >= elementY + && mouseY <= elementY + this.searchField.height) { + if (mouseButton == 1 || GuiScreen.isShiftKeyDown()) { + this.searchField.setText(""); + } + this.searchField.setFocused(true); + } else { + this.searchField.setFocused(false); + } + } + super.mouseClicked(mouseX, mouseY, mouseButton); + } + + private Integer getSlotAt(int x, int y) { + int startX = this.guiLeft + 8; + int startY = this.guiTop + 18; + + int clickedX = x - startX; + int clickedY = y - startY; + + if (clickedX > 0 && clickedY > 0) { + int column = clickedX / 18; + if (column < 9) { + int row = clickedY / 18; + if (row < this.rowsVisible()) { + int slot = (row * 9) + column + (scrollRow * 9); + return slot; + } + } + } + return null; + } + + @Override + public void handleMouseInput() { + super.handleMouseInput(); int i = Mouse.getEventDWheel(); - if (i != 0) - { + if (i != 0) { int j = this.tileEntity.inventory.slotCount() / 9 - this.rowsVisible() + 1; - if (i > 0) - { + if (i > 0) { i = 1; } - if (i < 0) - { + if (i < 0) { i = -1; } - this.currentScroll = (float)((double)this.currentScroll - (double)i / (double)j); + this.currentScroll = (float) ((double) this.currentScroll - (double) i / (double) j); this.currentScroll = MathHelper.clamp_float(this.currentScroll, 0.0F, 1.0F); scrollTo(this.currentScroll); } - - } - - private void scrollTo(float scroll) { - int i = (this.tileEntity.inventory.slotCount() + 8) / 9 - this.rowsVisible(); - int j = (int)((double)(scroll * (float)i) + 0.5D); - if (j < 0) - { + + } + + @Override + protected void handleMouseClick(Slot p_146984_1_, final int p_146984_2_, final int p_146984_3_, + final int p_146984_4_) { + super.handleMouseClick(p_146984_1_, p_146984_2_, p_146984_3_, p_146984_4_); + updateFilteredItems(); + } + + private void scrollTo(float scroll) { + int i = (this.tileEntity.inventory.slotCount() + 8) / 9 - this.rowsVisible(); + int j = (int) ((double) (scroll * (float) i) + 0.5D); + if (j < 0) { j = 0; } this.scrollRow = j; - } - - protected ResourceLocation getBackground() { - return new ResourceLocation(Reference.MOD_ID + ":textures/gui/storageScrollGui.png"); - } - - public int rowsVisible() { - return 6; - } + } + + protected ResourceLocation getBackground() { + return new ResourceLocation(Reference.MOD_ID, "textures/gui/storageScrollGui.png"); + } + + public int rowsVisible() { + return 6; + } } diff --git a/src/main/java/com/zerofall/ezstorage/init/EZBlocks.java b/src/main/java/com/zerofall/ezstorage/init/EZBlocks.java index ea55719..87a0b79 100644 --- a/src/main/java/com/zerofall/ezstorage/init/EZBlocks.java +++ b/src/main/java/com/zerofall/ezstorage/init/EZBlocks.java @@ -1,5 +1,14 @@ package com.zerofall.ezstorage.init; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import com.zerofall.ezstorage.Reference; import com.zerofall.ezstorage.block.BlockCondensedStorage; import com.zerofall.ezstorage.block.BlockCraftingBox; @@ -13,113 +22,164 @@ import com.zerofall.ezstorage.tileentity.TileEntityOutputPort; import com.zerofall.ezstorage.tileentity.TileEntityStorageCore; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.ShapedOreRecipe; +import cpw.mods.fml.common.registry.GameRegistry; public class EZBlocks { - - public static Block storage_core; - public static Block storage_box; - public static Block condensed_storage_box; - public static Block hyper_storage_box; - public static Block input_port; - public static Block output_port; - public static Block crafting_box; - public static Block search_box; - - public static void init() - { - storage_core = new BlockStorageCore(); - storage_box = new BlockStorage(); - condensed_storage_box = new BlockCondensedStorage(); - hyper_storage_box = new BlockHyperStorage(); - input_port = new BlockInputPort(); - output_port = new BlockOutputPort(); - crafting_box = new BlockCraftingBox(); - search_box = new BlockSearchBox(); - } - - public static void register() - { - GameRegistry.registerBlock(storage_core, storage_core.getUnlocalizedName().substring(5)); - GameRegistry.registerTileEntity(TileEntityStorageCore.class, "TileEntityStorageCore"); - GameRegistry.registerBlock(storage_box, storage_box.getUnlocalizedName().substring(5)); - GameRegistry.registerBlock(condensed_storage_box, condensed_storage_box.getUnlocalizedName().substring(5)); - GameRegistry.registerBlock(hyper_storage_box, hyper_storage_box.getUnlocalizedName().substring(5)); - GameRegistry.registerBlock(input_port, input_port.getUnlocalizedName().substring(5)); - GameRegistry.registerTileEntity(TileEntityInputPort.class, "TileEntityInputPort"); - GameRegistry.registerBlock(output_port, output_port.getUnlocalizedName().substring(5)); - GameRegistry.registerTileEntity(TileEntityOutputPort.class, "TileEntityOutputPort"); - GameRegistry.registerBlock(crafting_box, crafting_box.getUnlocalizedName().substring(5)); - GameRegistry.registerBlock(search_box, search_box.getUnlocalizedName().substring(5)); - registerRecipes(); - } - - public static void registerRenders() - { - registerRender(storage_core); - registerRender(storage_box); - registerRender(condensed_storage_box); - registerRender(hyper_storage_box); - registerRender(input_port); - registerRender(output_port); - registerRender(crafting_box); - registerRender(search_box); - } - - public static void registerRender(Block block) - { - Item item = Item.getItemFromBlock(block); - Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(Reference.MOD_ID + ":" + item.getUnlocalizedName().substring(5), "inventory")); - } - - public static void registerRecipes() { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(storage_core), - "ABA", - "BCB", - "ABA", - 'A', "logWood", 'B', "stickWood", 'C', Blocks.chest)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(storage_box), - "ABA", - "B B", - "ABA", - 'A', "logWood", 'B', Blocks.chest)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(condensed_storage_box), - "ACA", - "CBC", - "ACA", - 'A', "blockIron", 'B', storage_box, 'C', Blocks.iron_bars)); - GameRegistry.addRecipe(new ItemStack(hyper_storage_box), - "ABA", - "ACA", - "AAA", - 'A', Blocks.obsidian, 'B', Items.nether_star, 'C', condensed_storage_box); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(input_port), - "ABA", - "BCB", - "ABA", - 'A', Blocks.hopper, 'B', Blocks.piston, 'C', "blockQuartz")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(output_port), - "A", - "B", - "A", - 'A', Blocks.piston, 'B', input_port)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(crafting_box), - "ABA", - "BCB", - "ABA", - 'A', Items.ender_eye, 'B', Blocks.crafting_table, 'C', "gemDiamond")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(search_box), - "ABA", - "BCB", - "ABA", - 'A', "blockIron", 'B', Items.enchanted_book, 'C', Items.compass)); - } + + public static Block storage_core; + public static Block storage_box; + public static Block condensed_storage_box; + public static Block hyper_storage_box; + public static Block input_port; + public static Block output_port; + public static Block crafting_box; + public static Block search_box; + + public static final Logger LOG = LogManager.getLogger(Reference.MOD_ID); + + public static void init() { + storage_core = new BlockStorageCore(); + storage_box = new BlockStorage(); + condensed_storage_box = new BlockCondensedStorage(); + hyper_storage_box = new BlockHyperStorage(); + input_port = new BlockInputPort(); + output_port = new BlockOutputPort(); + crafting_box = new BlockCraftingBox(); + search_box = new BlockSearchBox(); + } + + public static void register() { + GameRegistry.registerBlock( + storage_core, + storage_core.getUnlocalizedName() + .substring(5)); + GameRegistry.registerTileEntity(TileEntityStorageCore.class, "TileEntityStorageCore"); + GameRegistry.registerBlock( + storage_box, + storage_box.getUnlocalizedName() + .substring(5)); + GameRegistry.registerBlock( + condensed_storage_box, + condensed_storage_box.getUnlocalizedName() + .substring(5)); + GameRegistry.registerBlock( + hyper_storage_box, + hyper_storage_box.getUnlocalizedName() + .substring(5)); + GameRegistry.registerBlock( + input_port, + input_port.getUnlocalizedName() + .substring(5)); + GameRegistry.registerTileEntity(TileEntityInputPort.class, "TileEntityInputPort"); + GameRegistry.registerBlock( + output_port, + output_port.getUnlocalizedName() + .substring(5)); + GameRegistry.registerTileEntity(TileEntityOutputPort.class, "TileEntityOutputPort"); + GameRegistry.registerBlock( + crafting_box, + crafting_box.getUnlocalizedName() + .substring(5)); + GameRegistry.registerBlock( + search_box, + search_box.getUnlocalizedName() + .substring(5)); + registerRecipes(); + } + + public static void registerRenders() { + registerRender(storage_core); + registerRender(storage_box); + registerRender(condensed_storage_box); + registerRender(hyper_storage_box); + registerRender(input_port); + registerRender(output_port); + registerRender(crafting_box); + registerRender(search_box); + } + + public static void registerRender(Block block) { + // Nothing todo here for 1.7.10 probably! + // Item item = Item.getItemFromBlock(block); + // Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new + // ModelResourceLocation(Reference.MOD_ID, item.getUnlocalizedName().substring(5), "inventory")); + } + + public static void registerRecipes() { + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(storage_core), + "ABA", + "BCB", + "ABA", + 'A', + "logWood", + 'B', + "stickWood", + 'C', + Blocks.chest)); + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(storage_box), "ABA", "B B", "ABA", 'A', "logWood", 'B', Blocks.chest)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(condensed_storage_box), + "ACA", + "CBC", + "ACA", + 'A', + "blockIron", + 'B', + storage_box, + 'C', + Blocks.iron_bars)); + GameRegistry.addRecipe( + new ItemStack(hyper_storage_box), + "ABA", + "ACA", + "AAA", + 'A', + Blocks.obsidian, + 'B', + Items.nether_star, + 'C', + condensed_storage_box); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(input_port), + "ABA", + "BCB", + "ABA", + 'A', + Blocks.hopper, + 'B', + Blocks.piston, + 'C', + "blockQuartz")); + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(output_port), "A", "B", "A", 'A', Blocks.piston, 'B', input_port)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(crafting_box), + "ABA", + "BCB", + "ABA", + 'A', + Items.ender_eye, + 'B', + Blocks.crafting_table, + 'C', + "gemDiamond")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(search_box), + "ABA", + "BCB", + "ABA", + 'A', + "blockIron", + 'B', + Items.enchanted_book, + 'C', + Items.compass)); + } } diff --git a/src/main/java/com/zerofall/ezstorage/item/EZItem.java b/src/main/java/com/zerofall/ezstorage/item/EZItem.java index 8a58537..2d0312f 100644 --- a/src/main/java/com/zerofall/ezstorage/item/EZItem.java +++ b/src/main/java/com/zerofall/ezstorage/item/EZItem.java @@ -1,18 +1,20 @@ package com.zerofall.ezstorage.item; import net.minecraft.item.Item; -import net.minecraftforge.fml.common.registry.GameRegistry; import com.zerofall.ezstorage.EZStorage; +import cpw.mods.fml.common.registry.GameRegistry; + public class EZItem extends Item { - public EZItem(String name) { - registerItem(name, this); - } - public static void registerItem(String name, Item item) { - item.setCreativeTab(EZStorage.instance.creativeTab); - item.setUnlocalizedName(name); - GameRegistry.registerItem(item, name); - } + public EZItem(String name) { + registerItem(name, this); + } + + public static void registerItem(String name, Item item) { + item.setCreativeTab(EZStorage.instance.creativeTab); + item.setUnlocalizedName(name); + GameRegistry.registerItem(item, name); + } } diff --git a/src/main/java/com/zerofall/ezstorage/jei/EZStoragePlugin.java b/src/main/java/com/zerofall/ezstorage/jei/EZStoragePlugin.java deleted file mode 100644 index d593834..0000000 --- a/src/main/java/com/zerofall/ezstorage/jei/EZStoragePlugin.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.zerofall.ezstorage.jei; - -import com.zerofall.ezstorage.container.ContainerStorageCoreCrafting; - -import mezz.jei.api.IItemRegistry; -import mezz.jei.api.IJeiHelpers; -import mezz.jei.api.IJeiRuntime; -import mezz.jei.api.IModPlugin; -import mezz.jei.api.IModRegistry; -import mezz.jei.api.IRecipeRegistry; -import mezz.jei.api.JEIPlugin; -import mezz.jei.api.recipe.VanillaRecipeCategoryUid; -import net.minecraft.inventory.ContainerWorkbench; - -@JEIPlugin -public class EZStoragePlugin implements IModPlugin { - - @Override - public void register(IModRegistry registry) { - RecipeTransferHandler helper = new RecipeTransferHandler(); - registry.getRecipeTransferRegistry().addRecipeTransferHandler(helper); - } - - @Override - public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { - - } - - @Override - public void onItemRegistryAvailable(IItemRegistry itemRegistry) { - - } - - @Override - public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { - - } - - @Override - public void onRuntimeAvailable(IJeiRuntime jeiRuntime) { - // TODO Auto-generated method stub - - } - - -} diff --git a/src/main/java/com/zerofall/ezstorage/jei/RecipeTransferHandler.java b/src/main/java/com/zerofall/ezstorage/jei/RecipeTransferHandler.java deleted file mode 100644 index d717f6c..0000000 --- a/src/main/java/com/zerofall/ezstorage/jei/RecipeTransferHandler.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.zerofall.ezstorage.jei; - -import java.util.List; -import java.util.Map; - -import com.zerofall.ezstorage.EZStorage; -import com.zerofall.ezstorage.container.ContainerStorageCoreCrafting; -import com.zerofall.ezstorage.network.RecipeMessage; - -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.transfer.IRecipeTransferError; -import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; -import mezz.jei.gui.RecipeLayout; -import mezz.jei.gui.ingredients.IGuiIngredient; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -public class RecipeTransferHandler implements IRecipeTransferHandler { - - @Override - public Class getContainerClass() { - return ContainerStorageCoreCrafting.class; - } - - @Override - public String getRecipeCategoryUid() { - return "minecraft.crafting"; - } - - @Override - public IRecipeTransferError transferRecipe(Container container, IRecipeLayout recipeLayout, EntityPlayer player, boolean maxTransfer, - boolean doTransfer) { - if (doTransfer) { - Map> inputs = recipeLayout.getItemStacks().getGuiIngredients(); - NBTTagCompound recipe = new NBTTagCompound(); - for (Slot slot : (List) container.inventorySlots) { - if (slot.inventory instanceof InventoryCrafting) { - IGuiIngredient ingredient = inputs.get(slot.getSlotIndex()+1); - if (ingredient != null) { - List possibleItems = ingredient.getAllIngredients(); - NBTTagList tags = new NBTTagList(); - for (ItemStack is : possibleItems) { - NBTTagCompound tag = new NBTTagCompound(); - is.writeToNBT(tag); - tags.appendTag(tag); - } - recipe.setTag("#" + slot.getSlotIndex(), tags); - } - } - } - EZStorage.instance.networkWrapper.sendToServer(new RecipeMessage(recipe)); - } - return null; - } - - @Override - public IRecipeTransferError transferRecipe(Container container, RecipeLayout recipeLayout, EntityPlayer player, - boolean doTransfer) { - return transferRecipe(container, recipeLayout, player, true, doTransfer); - } - -} diff --git a/src/main/java/com/zerofall/ezstorage/nei/NEIEZStorageConfig.java b/src/main/java/com/zerofall/ezstorage/nei/NEIEZStorageConfig.java new file mode 100644 index 0000000..2a130ac --- /dev/null +++ b/src/main/java/com/zerofall/ezstorage/nei/NEIEZStorageConfig.java @@ -0,0 +1,21 @@ +package com.zerofall.ezstorage.nei; + +import com.zerofall.ezstorage.gui.GuiCraftingCore; + +import codechicken.nei.api.API; +import codechicken.nei.api.IConfigureNEI; + +public class NEIEZStorageConfig implements IConfigureNEI { + + public void loadConfig() { + API.registerGuiOverlayHandler(GuiCraftingCore.class, new NeiCraftingOverlay(), "crafting"); + } + + public String getName() { + return "EZStorage"; + } + + public String getVersion() { + return "${version}"; + } +} diff --git a/src/main/java/com/zerofall/ezstorage/nei/NeiCraftingOverlay.java b/src/main/java/com/zerofall/ezstorage/nei/NeiCraftingOverlay.java new file mode 100644 index 0000000..5bfd84b --- /dev/null +++ b/src/main/java/com/zerofall/ezstorage/nei/NeiCraftingOverlay.java @@ -0,0 +1,63 @@ +package com.zerofall.ezstorage.nei; + +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import com.zerofall.ezstorage.EZStorage; +import com.zerofall.ezstorage.network.RecipeMessage; + +import codechicken.nei.PositionedStack; +import codechicken.nei.api.IOverlayHandler; +import codechicken.nei.recipe.IRecipeHandler; + +public class NeiCraftingOverlay implements IOverlayHandler { + + @Override + public void overlayRecipe(final GuiContainer gui, final IRecipeHandler recipe, final int recipeIndex, + final boolean shift) { + try { + final List ingredients = recipe.getIngredientStacks(recipeIndex); + overlayRecipe(gui, ingredients, shift); + } catch (final Exception localException) {} catch (final Error localError) {} + } + + public void overlayRecipe(final GuiContainer gui, final List ingredients, final boolean shift) { + try { + final NBTTagCompound recipe = new NBTTagCompound(); + if (gui instanceof com.zerofall.ezstorage.gui.GuiCraftingCore) { + for (final Iterator localIterator1 = ingredients.iterator(); localIterator1 + .hasNext();) { + final PositionedStack positionedStack = localIterator1.next(); + final int col = (positionedStack.relx - 25) / 18; + final int row = (positionedStack.rely - 6) / 18; + if (positionedStack.items != null && positionedStack.items.length > 0) + for (final Object obj : gui.inventorySlots.inventorySlots) { + final Slot slot = (Slot) obj; + if (slot.inventory instanceof InventoryCrafting && slot.getSlotIndex() == col + row * 3) { + final NBTTagList tags = new NBTTagList(); + final List list = new LinkedList(); + for (int x = 0; x < positionedStack.items.length; x++) + list.add(positionedStack.items[x]); + for (final ItemStack is : list) { + final NBTTagCompound tag = new NBTTagCompound(); + is.writeToNBT(tag); + tags.appendTag(tag); + } + recipe.setTag("#" + slot.getSlotIndex(), tags); + break; + } + } + } + EZStorage.networkWrapper.sendToServer(new RecipeMessage(recipe)); + } + } catch (final Exception localException) {} catch (final Error localError) {} + } +} diff --git a/src/main/java/com/zerofall/ezstorage/network/MyMessage.java b/src/main/java/com/zerofall/ezstorage/network/MyMessage.java index 5c01d45..c3bfec2 100644 --- a/src/main/java/com/zerofall/ezstorage/network/MyMessage.java +++ b/src/main/java/com/zerofall/ezstorage/network/MyMessage.java @@ -1,19 +1,16 @@ package com.zerofall.ezstorage.network; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import io.netty.buffer.ByteBuf; -import net.minecraft.util.BlockPos; -import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class MyMessage implements IMessage { - + public int index; public int button; public int mode; - public MyMessage() { } + public MyMessage() {} public MyMessage(int index, int button, int mode) { this.index = index; @@ -30,7 +27,7 @@ public void fromBytes(ByteBuf buf) { @Override public void toBytes(ByteBuf buf) { - ByteBufUtils.writeVarInt(buf, index, 5); + ByteBufUtils.writeVarInt(buf, index, 5); ByteBufUtils.writeVarInt(buf, button, 5); ByteBufUtils.writeVarInt(buf, mode, 5); } diff --git a/src/main/java/com/zerofall/ezstorage/network/PacketHandler.java b/src/main/java/com/zerofall/ezstorage/network/PacketHandler.java index f10aa34..46f2a50 100644 --- a/src/main/java/com/zerofall/ezstorage/network/PacketHandler.java +++ b/src/main/java/com/zerofall/ezstorage/network/PacketHandler.java @@ -1,26 +1,25 @@ package com.zerofall.ezstorage.network; -import com.zerofall.ezstorage.container.ContainerStorageCore; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.util.BlockPos; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; + +import com.zerofall.ezstorage.container.ContainerStorageCore; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; public class PacketHandler implements IMessageHandler { - + @Override public IMessage onMessage(MyMessage message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - Container container = player.openContainer; - if (container != null && container instanceof ContainerStorageCore) { - ContainerStorageCore storageContainer = (ContainerStorageCore)container; - storageContainer.customSlotClick(message.index, message.button, message.mode, player); - } - return null; // no response in this case + EntityPlayer player = ctx.getServerHandler().playerEntity; + Container container = player.openContainer; + if (container != null && container instanceof ContainerStorageCore) { + ContainerStorageCore storageContainer = (ContainerStorageCore) container; + storageContainer.customSlotClick(message.index, message.button, message.mode, player); + } + return null; // no response in this case } - - -} \ No newline at end of file + +} diff --git a/src/main/java/com/zerofall/ezstorage/network/RecipeMessage.java b/src/main/java/com/zerofall/ezstorage/network/RecipeMessage.java index 7ca0d25..ea3678a 100644 --- a/src/main/java/com/zerofall/ezstorage/network/RecipeMessage.java +++ b/src/main/java/com/zerofall/ezstorage/network/RecipeMessage.java @@ -1,30 +1,31 @@ package com.zerofall.ezstorage.network; -import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; + +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import io.netty.buffer.ByteBuf; public class RecipeMessage implements IMessage { - - NBTTagCompound recipe; - - public RecipeMessage() { - - } - - public RecipeMessage(NBTTagCompound recipe) { - this.recipe = recipe; - } - - @Override - public void fromBytes(ByteBuf buf) { - recipe = ByteBufUtils.readTag(buf); - } - - @Override - public void toBytes(ByteBuf buf) { - ByteBufUtils.writeTag(buf, this.recipe); - } + + NBTTagCompound recipe; + + public RecipeMessage() { + + } + + public RecipeMessage(NBTTagCompound recipe) { + this.recipe = recipe; + } + + @Override + public void fromBytes(ByteBuf buf) { + recipe = ByteBufUtils.readTag(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + ByteBufUtils.writeTag(buf, this.recipe); + } } diff --git a/src/main/java/com/zerofall/ezstorage/network/RecipePacketHandler.java b/src/main/java/com/zerofall/ezstorage/network/RecipePacketHandler.java index 9926dab..2d54951 100644 --- a/src/main/java/com/zerofall/ezstorage/network/RecipePacketHandler.java +++ b/src/main/java/com/zerofall/ezstorage/network/RecipePacketHandler.java @@ -5,63 +5,63 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import com.zerofall.ezstorage.container.ContainerStorageCoreCrafting; import com.zerofall.ezstorage.tileentity.TileEntityStorageCore; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + public class RecipePacketHandler implements IMessageHandler { - - ItemStack[][] recipe; - @Override - public IMessage onMessage(RecipeMessage message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - Container container = player.openContainer; - if (container instanceof ContainerStorageCoreCrafting) { - ContainerStorageCoreCrafting con = (ContainerStorageCoreCrafting)container; - TileEntityStorageCore tileEntity = con.tileEntity; - - //Empty grid into inventory - for (int i = 0; i < 9; i++) { - ItemStack stack = con.craftMatrix.getStackInSlot(i); - if (stack != null) { - ItemStack results = tileEntity.input(stack); - if (results != null) { - return null; - } - con.craftMatrix.setInventorySlotContents(i, null); - } - } - - this.recipe = new ItemStack[9][]; - for( int x = 0; x < this.recipe.length; x++ ) { - NBTTagList list = message.recipe.getTagList( "#" + x, 10 ); - if( list.tagCount() > 0 ) { - this.recipe[x] = new ItemStack[list.tagCount()]; - for( int y = 0; y < list.tagCount(); y++ ) { - this.recipe[x][y] = ItemStack.loadItemStackFromNBT( list.getCompoundTagAt( y ) ); - } - } - } - for (int i = 0; i < this.recipe.length; i++) { - if (this.recipe[i] != null && this.recipe[i].length > 0) { - Slot slot = con.getSlotFromInventory(con.craftMatrix, i); - if (slot != null) { - ItemStack retreived = tileEntity.inventory.getItems(this.recipe[i]); - if (retreived != null) { - slot.putStack(retreived); - } - } - } - } - tileEntity.updateTileEntity(); - } - - - return null; - } + ItemStack[][] recipe; + + @Override + public IMessage onMessage(RecipeMessage message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + Container container = player.openContainer; + if (container instanceof ContainerStorageCoreCrafting) { + ContainerStorageCoreCrafting con = (ContainerStorageCoreCrafting) container; + TileEntityStorageCore tileEntity = con.tileEntity; + + // Empty grid into inventory + for (int i = 0; i < 9; i++) { + ItemStack stack = con.craftMatrix.getStackInSlot(i); + if (stack != null) { + ItemStack results = tileEntity.input(stack); + if (results != null) { + return null; + } + con.craftMatrix.setInventorySlotContents(i, null); + } + } + + this.recipe = new ItemStack[9][]; + for (int x = 0; x < this.recipe.length; x++) { + NBTTagList list = message.recipe.getTagList("#" + x, 10); + if (list.tagCount() > 0) { + this.recipe[x] = new ItemStack[list.tagCount()]; + for (int y = 0; y < list.tagCount(); y++) { + this.recipe[x][y] = ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(y)); + } + } + } + for (int i = 0; i < this.recipe.length; i++) { + if (this.recipe[i] != null && this.recipe[i].length > 0) { + Slot slot = con.getSlotFromInventory(con.craftMatrix, i); + if (slot != null) { + ItemStack retreived = tileEntity.inventory.getItems(this.recipe[i]); + if (retreived != null) { + slot.putStack(retreived); + } + } + } + } + tileEntity.updateTileEntity(); + } + + return null; + } } diff --git a/src/main/java/com/zerofall/ezstorage/proxy/ClientProxy.java b/src/main/java/com/zerofall/ezstorage/proxy/ClientProxy.java index 1794e43..20a7f3f 100644 --- a/src/main/java/com/zerofall/ezstorage/proxy/ClientProxy.java +++ b/src/main/java/com/zerofall/ezstorage/proxy/ClientProxy.java @@ -2,10 +2,10 @@ import com.zerofall.ezstorage.init.EZBlocks; -public class ClientProxy extends CommonProxy{ - @Override - public void registerRenders() { - EZBlocks.registerRenders(); +public class ClientProxy extends CommonProxy { - } + @Override + public void registerRenders() { + EZBlocks.registerRenders(); + } } diff --git a/src/main/java/com/zerofall/ezstorage/proxy/CommonProxy.java b/src/main/java/com/zerofall/ezstorage/proxy/CommonProxy.java index ca460a1..14d18a7 100644 --- a/src/main/java/com/zerofall/ezstorage/proxy/CommonProxy.java +++ b/src/main/java/com/zerofall/ezstorage/proxy/CommonProxy.java @@ -1,7 +1,8 @@ package com.zerofall.ezstorage.proxy; public class CommonProxy { - public void registerRenders() { - } + public void registerRenders() { + + } } diff --git a/src/main/java/com/zerofall/ezstorage/tileentity/EZTileEntity.java b/src/main/java/com/zerofall/ezstorage/tileentity/EZTileEntity.java index ffd1275..d9d391b 100644 --- a/src/main/java/com/zerofall/ezstorage/tileentity/EZTileEntity.java +++ b/src/main/java/com/zerofall/ezstorage/tileentity/EZTileEntity.java @@ -5,35 +5,34 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; public abstract class EZTileEntity extends TileEntity { - - @Override - public void writeToNBT(NBTTagCompound compound) { - super.writeToNBT(compound); - writeDataToNBT(compound); - } - - @Override - public void readFromNBT(NBTTagCompound compound) { - super.readFromNBT(compound); - readDataFromNBT(compound); - } - - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - readFromNBT(pkt.getNbtCompound()); - } - - @Override - public Packet getDescriptionPacket() { - NBTTagCompound nbtTag = new NBTTagCompound(); - writeDataToNBT(nbtTag); - return new S35PacketUpdateTileEntity(this.pos, 1, nbtTag); - } - - public abstract void writeDataToNBT(NBTTagCompound paramNBTTagCompound); - - public abstract void readDataFromNBT(NBTTagCompound paramNBTTagCompound); + + @Override + public void writeToNBT(NBTTagCompound compound) { + super.writeToNBT(compound); + writeDataToNBT(compound); + } + + @Override + public void readFromNBT(NBTTagCompound compound) { + super.readFromNBT(compound); + readDataFromNBT(compound); + } + + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + readFromNBT(pkt.func_148857_g()); + } + + @Override + public Packet getDescriptionPacket() { + NBTTagCompound nbtTag = new NBTTagCompound(); + writeDataToNBT(nbtTag); + return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 1, nbtTag); + } + + public abstract void writeDataToNBT(NBTTagCompound paramNBTTagCompound); + + public abstract void readDataFromNBT(NBTTagCompound paramNBTTagCompound); } diff --git a/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityInputPort.java b/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityInputPort.java index fcf4108..3231818 100644 --- a/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityInputPort.java +++ b/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityInputPort.java @@ -1,160 +1,122 @@ package com.zerofall.ezstorage.tileentity; -import com.zerofall.ezstorage.util.BlockRef; - import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.ITickable; - -public class TileEntityInputPort extends TileEntity implements IInventory, ITickable, ISidedInventory { - - private ItemStack[] inv = new ItemStack[1]; - public TileEntityStorageCore core; - -// @Override -// public String getName() { -// return "input_port"; -// } - - @Override - public boolean hasCustomName() { - return false; - } - - @Override - public IChatComponent getDisplayName() { - return new ChatComponentText("input_port"); - } - - @Override - public int getSizeInventory() { - return 1; - } - - @Override - public ItemStack getStackInSlot(int index) { - return inv[index]; - } - - @Override - public ItemStack decrStackSize(int index, int count) { - ItemStack stack = getStackInSlot(index); - if(stack != null) { - if(stack.stackSize <= count) { - setInventorySlotContents(index, null); - } else { - stack = stack.splitStack(count); - if(stack.stackSize == 0) { - setInventorySlotContents(index, null); - } - } - } - return stack; - } - - @Override - public void setInventorySlotContents(int index, ItemStack stack) { - inv[index] = stack; + +import com.zerofall.ezstorage.util.BlockRef; + +public class TileEntityInputPort extends TileEntity implements IUpdatePlayerListBox, ISidedInventory { + + private ItemStack[] inv = new ItemStack[1]; + public TileEntityStorageCore core; + + @Override + public int getSizeInventory() { + return 1; + } + + @Override + public ItemStack getStackInSlot(int index) { + return inv[index]; + } + + @Override + public ItemStack decrStackSize(int index, int count) { + ItemStack stack = getStackInSlot(index); + if (stack != null) { + if (stack.stackSize <= count) { + setInventorySlotContents(index, null); + } else { + stack = stack.splitStack(count); + if (stack.stackSize == 0) { + setInventorySlotContents(index, null); + } + } + } + return stack; + } + + @Override + public void setInventorySlotContents(int index, ItemStack stack) { + inv[index] = stack; if (stack != null && stack.stackSize > getInventoryStackLimit()) { - stack.stackSize = getInventoryStackLimit(); - } - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return true; - } - - @Override - public void openInventory(EntityPlayer player) { - - } - - @Override - public void closeInventory(EntityPlayer player) { - - } - - @Override - public boolean isItemValidForSlot(int index, ItemStack stack) { - return true; - } - - @Override - public int getField(int id) { - return 0; - } - - @Override - public void setField(int id, int value) { - - } - - @Override - public int getFieldCount() { - return 0; - } - - @Override - public void clear() { - for (int i = 0; i < inv.length; ++i) { - inv[i] = null; - } - } - - @Override - public int[] getSlotsForFace(EnumFacing side) { - int[] slots = new int[1]; - slots[0] = 0; - return slots; - } - - @Override - public boolean canInsertItem(int index, ItemStack itemStackIn, - EnumFacing direction) { - return true; - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, - EnumFacing direction) { - return false; - } - - - @Override - public void update() { - - if (this.core != null) { - ItemStack stack = this.inv[0]; - if (stack != null && stack.stackSize > 0) { - if (this.core.isPartOfMultiblock(new BlockRef(this))) { - this.inv[0] = this.core.input(stack); - } else { - this.core = null; - } - } - } - } - - @Override - public String getName() { - return "input_port"; - } - - @Override - public ItemStack removeStackFromSlot(int index) { - return null; - } + stack.stackSize = getInventoryStackLimit(); + } + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return true; + } + + @Override + public void openInventory() { + // Nothing todo here + } + + @Override + public void closeInventory() { + // Nothing todo here + } + + @Override + public boolean isItemValidForSlot(int index, ItemStack stack) { + return true; + } + + @Override + public boolean canInsertItem(int index, ItemStack itemStackIn, int direction) { + return true; + } + + @Override + public boolean canExtractItem(int index, ItemStack stack, int direction) { + return false; + } + + @Override + public void update() { + if (this.core != null) { + ItemStack stack = this.inv[0]; + if (stack != null && stack.stackSize > 0) { + if (this.core.isPartOfMultiblock(new BlockRef(this))) { + this.inv[0] = this.core.input(stack); + } else { + this.core = null; + } + } + } + } + + @Override + public String getInventoryName() { + return "input_port"; + } + + @Override + public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + return new int[] { 0 }; + } + + @Override + public ItemStack getStackInSlotOnClosing(int index) { + ItemStack stack = getStackInSlot(index); + if (stack != null) { + setInventorySlotContents(index, null); + } + return stack; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } } diff --git a/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityOutputPort.java b/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityOutputPort.java index dedbaff..a661631 100644 --- a/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityOutputPort.java +++ b/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityOutputPort.java @@ -2,59 +2,56 @@ import java.util.List; -import com.zerofall.ezstorage.util.ItemGroup; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityHopper; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; -public class TileEntityOutputPort extends TileEntity implements ITickable { +import com.zerofall.ezstorage.util.ItemGroup; - public TileEntityStorageCore core; +public class TileEntityOutputPort extends TileEntity implements IUpdatePlayerListBox { - @Override - public void update() { - if (core != null && !worldObj.isRemote) { - boolean updateCore = false; - BlockPos location = getPos().offset(EnumFacing.UP); - TileEntity tileentity = worldObj.getTileEntity(location); + public TileEntityStorageCore core; + + @Override + public void update() { + if (core != null && !worldObj.isRemote) { + boolean updateCore = false; + TileEntity tileentity = worldObj.getTileEntity(xCoord, yCoord + 1, zCoord); if (tileentity instanceof IInventory) { - IInventory inventory = (IInventory)tileentity; - - if (inventory != null) { - List inventoryList = core.inventory.inventory; - if (inventoryList != null && inventoryList.size() > 0) { - ItemGroup group = inventoryList.get(0); - if (group != null) { - ItemStack stack = group.itemStack; - stack.stackSize = (int) Math.min((long)stack.getMaxStackSize(), group.count); - int stackSize = stack.stackSize; - ItemStack leftOver = TileEntityHopper.putStackInInventoryAllSlots(inventory, stack, EnumFacing.DOWN); - if (leftOver != null) { - int remaining = stackSize - leftOver.stackSize; - if (remaining > 0) { - group.count -= remaining; - updateCore = true; - } - } else { - group.count -= stackSize; - updateCore = true; - } - if (group.count <= 0) { - core.inventory.inventory.remove(0); - } - } - } - } + IInventory inventory = (IInventory) tileentity; + + if (inventory != null) { + List inventoryList = core.inventory.inventory; + if (inventoryList != null && inventoryList.size() > 0) { + ItemGroup group = inventoryList.get(0); + if (group != null) { + ItemStack stack = group.itemStack; + stack.stackSize = (int) Math.min((long) stack.getMaxStackSize(), group.count); + int stackSize = stack.stackSize; + ItemStack leftOver = TileEntityHopper.func_145889_a(inventory, stack, 0); + if (leftOver != null) { + int remaining = stackSize - leftOver.stackSize; + if (remaining > 0) { + group.count -= remaining; + updateCore = true; + } + } else { + group.count -= stackSize; + updateCore = true; + } + if (group.count <= 0) { + core.inventory.inventory.remove(0); + } + } + } + } } if (updateCore) { - this.worldObj.markBlockForUpdate(core.getPos()); - core.markDirty(); + this.worldObj.markBlockForUpdate(core.xCoord, core.yCoord, core.zCoord); + core.markDirty(); } - } - } + } + } } diff --git a/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityStorageCore.java b/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityStorageCore.java index f15d872..a96ba72 100644 --- a/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityStorageCore.java +++ b/src/main/java/com/zerofall/ezstorage/tileentity/TileEntityStorageCore.java @@ -5,7 +5,18 @@ import java.util.List; import java.util.Set; -import org.apache.logging.log4j.Logger; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.server.gui.IUpdatePlayerListBox; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; import com.zerofall.ezstorage.block.BlockCraftingBox; import com.zerofall.ezstorage.block.BlockInputPort; @@ -20,202 +31,195 @@ import com.zerofall.ezstorage.util.EZStorageUtils; import com.zerofall.ezstorage.util.ItemGroup; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ITickable; -import net.minecraftforge.fml.common.FMLLog; - -public class TileEntityStorageCore extends TileEntity implements ITickable { - - public static Logger log = FMLLog.getLogger(); - - public EZInventory inventory; - - Set multiblock = new HashSet(); - private boolean firstTick = false; - public boolean hasCraftBox = false; - public boolean hasSearchBox = false; - public boolean disabled = false; - - public TileEntityStorageCore() { - inventory = new EZInventory(); - } - - public ItemStack input(ItemStack stack) { - ItemStack result = this.inventory.input(stack); - this.worldObj.markBlockForUpdate(pos); - this.markDirty(); - return result; - } - - public ItemStack getRandomStack() { - ItemStack result = this.inventory.getItemsAt(0, 0); - this.worldObj.markBlockForUpdate(pos); - this.markDirty(); - return result; - } - - public void sortInventory() { - this.inventory.sort(); - updateTileEntity(); - } - - public void updateTileEntity() { - this.worldObj.markBlockForUpdate(pos); - this.markDirty(); - } - - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - readFromNBT(pkt.getNbtCompound()); - } - - @Override - public Packet getDescriptionPacket() { - NBTTagCompound nbtTag = new NBTTagCompound(); - writeToNBT(nbtTag); - return new S35PacketUpdateTileEntity(this.pos, getBlockMetadata(), nbtTag); - } - - @Override - public void writeToNBT(NBTTagCompound paramNBTTagCompound) { - super.writeToNBT(paramNBTTagCompound); - NBTTagList nbttaglist = new NBTTagList(); - for (int i = 0; i < this.inventory.slotCount(); ++i) { - ItemGroup group = this.inventory.inventory.get(i); - if (group != null && group.itemStack != null && group.count > 0) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Index", (byte) i); - group.itemStack.writeToNBT(nbttagcompound1); - nbttagcompound1.setLong("InternalCount", group.count); - nbttaglist.appendTag(nbttagcompound1); - } - } - paramNBTTagCompound.setTag("Internal", nbttaglist); - paramNBTTagCompound.setLong("InternalMax", this.inventory.maxItems); - paramNBTTagCompound.setBoolean("hasSearchBox", this.hasSearchBox); - paramNBTTagCompound.setBoolean("isDisabled", this.disabled); - } - - @Override - public void readFromNBT(NBTTagCompound paramNBTTagCompound) { - super.readFromNBT(paramNBTTagCompound); - NBTTagList nbttaglist = paramNBTTagCompound.getTagList("Internal", 10); - - if (nbttaglist != null) { - inventory.inventory = new ArrayList(); - for (int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); - int j = nbttagcompound1.getByte("Index") & 255; - ItemStack stack = ItemStack.loadItemStackFromNBT(nbttagcompound1); - long count = nbttagcompound1.getLong("InternalCount"); - ItemGroup group = new ItemGroup(stack, count); - this.inventory.inventory.add(group); - } - } - long maxItems = paramNBTTagCompound.getLong("InternalMax"); - this.inventory.maxItems = maxItems; - this.hasSearchBox = paramNBTTagCompound.getBoolean("hasSearchBox"); - this.disabled = paramNBTTagCompound.getBoolean("isDisabled"); - } - - /** - * Scans the multiblock structure for valid blocks - */ - public void scanMultiblock() { - inventory.maxItems = 0; - this.hasCraftBox = false; - this.hasSearchBox = false; - multiblock = new HashSet(); - BlockRef ref = new BlockRef(this); - multiblock.add(ref); - getValidNeighbors(ref); - for (BlockRef blockRef : multiblock) { - if (blockRef.block instanceof BlockStorage) { - BlockStorage sb = (BlockStorage)blockRef.block; - inventory.maxItems += sb.getCapacity(); - } - } - this.worldObj.markBlockForUpdate(pos); - } - - - /** - * Recursive function that scans a block's neighbors, and adds valid blocks to the multiblock list - * @param br - */ - private void getValidNeighbors(BlockRef br) { - List neighbors = EZStorageUtils.getNeighbors(br.pos.getX(), br.pos.getY(), br.pos.getZ(), worldObj); - for (BlockRef blockRef : neighbors) { - if (blockRef.block instanceof StorageMultiblock) { - if (multiblock.add(blockRef) == true && validateSystem() == true) { - if (blockRef.block instanceof BlockInputPort) { - TileEntityInputPort entity = (TileEntityInputPort)this.worldObj.getTileEntity(blockRef.pos); - entity.core = this; - } - if (blockRef.block instanceof BlockOutputPort) { - TileEntityOutputPort entity = (TileEntityOutputPort)this.worldObj.getTileEntity(blockRef.pos); - entity.core = this; - } - if (blockRef.block instanceof BlockCraftingBox) { - this.hasCraftBox = true; - } - if (blockRef.block instanceof BlockSearchBox) { - this.hasSearchBox = true; - } - getValidNeighbors(blockRef); - } - } - } - } - - public boolean validateSystem() { - int count = 0; - for (BlockRef ref : multiblock) { - if (ref.block instanceof BlockStorageCore) { - count ++; - } - if (count > 1) { - if (worldObj.isRemote) { - if (Minecraft.getMinecraft() != null && Minecraft.getMinecraft().thePlayer != null) { - Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("You can only have 1 Storage Core per system!")); - } - } else if (worldObj.getBlockState(pos).getBlock() == EZBlocks.storage_core){ - worldObj.setBlockToAir(getPos()); - worldObj.spawnEntityInWorld(new EntityItem(worldObj, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(EZBlocks.storage_core))); - } - return false; - } - } - return true; - } - - public boolean isPartOfMultiblock(BlockRef blockRef) { - if (multiblock != null) { - if (multiblock.contains(blockRef)) { - return true; - } - } - return false; - } - - @Override - public void update() { - if (!firstTick) { - if (worldObj != null) { - firstTick = true; - scanMultiblock(); - } - } - - } - +public class TileEntityStorageCore extends TileEntity implements IUpdatePlayerListBox { + + public EZInventory inventory; + + Set multiblock = new HashSet(); + private boolean firstTick = false; + public boolean hasCraftBox = false; + public boolean hasSearchBox = false; + public boolean disabled = false; + + public TileEntityStorageCore() { + inventory = new EZInventory(); + } + + public ItemStack input(ItemStack stack) { + ItemStack result = this.inventory.input(stack); + this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + this.markDirty(); + return result; + } + + public ItemStack getRandomStack() { + ItemStack result = this.inventory.getItemsAt(0, 0); + this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + this.markDirty(); + return result; + } + + public void sortInventory() { + this.inventory.sort(); + updateTileEntity(); + } + + public void updateTileEntity() { + this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + this.markDirty(); + } + + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + readFromNBT(pkt.func_148857_g()); + } + + @Override + public Packet getDescriptionPacket() { + NBTTagCompound nbtTag = new NBTTagCompound(); + writeToNBT(nbtTag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, getBlockMetadata(), nbtTag); + } + + @Override + public void writeToNBT(NBTTagCompound paramNBTTagCompound) { + super.writeToNBT(paramNBTTagCompound); + NBTTagList nbttaglist = new NBTTagList(); + for (int i = 0; i < this.inventory.slotCount(); ++i) { + ItemGroup group = this.inventory.inventory.get(i); + if (group != null && group.itemStack != null && group.count > 0) { + NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + nbttagcompound1.setByte("Index", (byte) i); + group.itemStack.writeToNBT(nbttagcompound1); + nbttagcompound1.setLong("InternalCount", group.count); + nbttaglist.appendTag(nbttagcompound1); + } + } + paramNBTTagCompound.setTag("Internal", nbttaglist); + paramNBTTagCompound.setLong("InternalMax", this.inventory.maxItems); + paramNBTTagCompound.setBoolean("hasSearchBox", this.hasSearchBox); + paramNBTTagCompound.setBoolean("isDisabled", this.disabled); + } + + @Override + public void readFromNBT(NBTTagCompound paramNBTTagCompound) { + super.readFromNBT(paramNBTTagCompound); + NBTTagList nbttaglist = paramNBTTagCompound.getTagList("Internal", 10); + + if (nbttaglist != null) { + inventory.inventory = new ArrayList(); + for (int i = 0; i < nbttaglist.tagCount(); ++i) { + NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); + ItemStack stack = ItemStack.loadItemStackFromNBT(nbttagcompound1); + long count = nbttagcompound1.getLong("InternalCount"); + ItemGroup group = new ItemGroup(stack, count); + this.inventory.inventory.add(group); + } + } + long maxItems = paramNBTTagCompound.getLong("InternalMax"); + this.inventory.maxItems = maxItems; + this.hasSearchBox = paramNBTTagCompound.getBoolean("hasSearchBox"); + this.disabled = paramNBTTagCompound.getBoolean("isDisabled"); + } + + /** + * Scans the multiblock structure for valid blocks + */ + public void scanMultiblock(EntityLivingBase entity) { + inventory.maxItems = 0; + this.hasCraftBox = false; + this.hasSearchBox = false; + multiblock = new HashSet(); + BlockRef ref = new BlockRef(this); + multiblock.add(ref); + getValidNeighbors(ref, entity); + for (BlockRef blockRef : multiblock) { + if (blockRef.block instanceof BlockStorage) { + BlockStorage sb = (BlockStorage) blockRef.block; + inventory.maxItems += sb.getCapacity(); + } + } + this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + + /** + * Recursive function that scans a block's neighbors, and adds valid blocks to the multiblock list + * + * @param br + */ + private void getValidNeighbors(BlockRef br, EntityLivingBase entity) { + List neighbors = EZStorageUtils.getNeighbors(br.posX, br.posY, br.posZ, worldObj); + for (BlockRef blockRef : neighbors) { + if (blockRef.block instanceof StorageMultiblock) { + if (multiblock.add(blockRef) && validateSystem(entity)) { + if (blockRef.block instanceof BlockInputPort) { + TileEntity te = this.worldObj.getTileEntity(blockRef.posX, blockRef.posY, blockRef.posZ);; + if (te instanceof TileEntityInputPort) { + ((TileEntityInputPort) te).core = this; + } + } + if (blockRef.block instanceof BlockOutputPort) { + TileEntity te = this.worldObj.getTileEntity(blockRef.posX, blockRef.posY, blockRef.posZ);; + if (te instanceof TileEntityOutputPort) { + ((TileEntityOutputPort) te).core = this; + } + } + if (blockRef.block instanceof BlockCraftingBox) { + this.hasCraftBox = true; + } + if (blockRef.block instanceof BlockSearchBox) { + this.hasSearchBox = true; + } + getValidNeighbors(blockRef, entity); + } + } + } + } + + public boolean validateSystem(EntityLivingBase entity) { + int count = 0; + for (BlockRef ref : multiblock) { + if (ref.block instanceof BlockStorageCore) { + count++; + } + if (count > 1) { + if (worldObj.isRemote) { + if (entity instanceof EntityPlayer) { + ((EntityPlayer) entity).addChatComponentMessage( + new ChatComponentText("You can only have 1 Storage Core per system!")); + } + } else if (worldObj.getTileEntity(xCoord, yCoord, zCoord) + .getBlockType() == EZBlocks.storage_core) { + worldObj.setBlockToAir(xCoord, yCoord, zCoord); + worldObj.spawnEntityInWorld( + new EntityItem(worldObj, xCoord, yCoord, zCoord, new ItemStack(EZBlocks.storage_core))); + } + return false; + } + } + return true; + } + + public boolean isPartOfMultiblock(BlockRef blockRef) { + if (multiblock != null) { + if (multiblock.contains(blockRef)) { + return true; + } + } + return false; + } + + @Override + public void updateEntity() { + if (!firstTick && worldObj != null) { + firstTick = true; + scanMultiblock(null); + } + } + + @Override + public void update() { + // Nothing todo here + } + } diff --git a/src/main/java/com/zerofall/ezstorage/util/BlockRef.java b/src/main/java/com/zerofall/ezstorage/util/BlockRef.java index 1a8adb8..39c1607 100644 --- a/src/main/java/com/zerofall/ezstorage/util/BlockRef.java +++ b/src/main/java/com/zerofall/ezstorage/util/BlockRef.java @@ -2,57 +2,54 @@ import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; public class BlockRef { - - public BlockPos pos; - public Block block; - - public BlockRef(Block block, int x, int y, int z) { - this.block = block; - this.pos = new BlockPos(x, y, z); - } - - public BlockRef(TileEntity entity) { - this.block = entity.getBlockType(); - this.pos = entity.getPos(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((block == null) ? 0 : block.hashCode()); - result = prime * result - + ((pos == null) ? 0 : pos.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - BlockRef other = (BlockRef) obj; - if (block == null) { - if (other.block != null) - return false; - } else if (!Block.isEqualTo(block, other.block)) - return false; - if (pos == null) { - if (other.pos != null) - return false; - } else if (!pos.equals(other.pos)) - return false; - return true; - } - - @Override - public String toString() { - return "BlockRef [pos=" + pos + ", block=" + block + "]"; - } -} \ No newline at end of file + + public int posX; + public int posY; + public int posZ; + public Block block; + + public BlockRef(Block block, int x, int y, int z) { + this.block = block; + this.posX = x; + this.posY = y; + this.posZ = z; + } + + public BlockRef(TileEntity entity) { + this.block = entity.getBlockType(); + this.posX = entity.xCoord; + this.posY = entity.yCoord; + this.posZ = entity.zCoord; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((block == null) ? 0 : block.hashCode()); + result = prime * result + posX + posY + posZ; + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + BlockRef other = (BlockRef) obj; + if (block == null) { + if (other.block != null) return false; + } else if (!Block.isEqualTo(block, other.block)) return false; + if (posX != other.posX || posY != other.posY || posZ != other.posZ) { + return false; + } + return true; + } + + @Override + public String toString() { + return "BlockRef [pos=" + posX + ";" + posY + ";" + posZ + ", block=" + block + "]"; + } +} diff --git a/src/main/java/com/zerofall/ezstorage/util/EZInventory.java b/src/main/java/com/zerofall/ezstorage/util/EZInventory.java index d430f9e..8250e70 100644 --- a/src/main/java/com/zerofall/ezstorage/util/EZInventory.java +++ b/src/main/java/com/zerofall/ezstorage/util/EZInventory.java @@ -4,128 +4,128 @@ import java.util.Collections; import java.util.List; -import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; public class EZInventory { - public List inventory; - public long maxItems = 0; - - public EZInventory() { - inventory = new ArrayList(); - } - - public ItemStack input(ItemStack itemStack) { - //Inventory is full - if (getTotalCount() >= maxItems) { - return itemStack; - } - long space = maxItems - getTotalCount(); - //Only part of the stack can fit - int amount = (int)Math.min(space, (long)itemStack.stackSize); - return mergeStack(itemStack, amount); - } - - public void sort() { - Collections.sort(this.inventory, new ItemGroup.CountComparator()); - } - - private ItemStack mergeStack(ItemStack itemStack, int amount) { - for (ItemGroup group : inventory) { - if (stacksEqual(group.itemStack, itemStack)) { - group.count += amount; - itemStack.stackSize -= amount; - if (itemStack.stackSize <= 0) { - return null; - } else { - return itemStack; - } - } - } - //Needs to add a space - inventory.add(new ItemGroup(itemStack, amount)); - itemStack.stackSize -= amount; - if (itemStack.stackSize <= 0) { - return null; - } else { - return itemStack; - } - } - - //Type: 0= full stack, 1= half stack, 2= single - public ItemStack getItemsAt(int index, int type) { - if (index >= inventory.size()) { - return null; - } - ItemGroup group = inventory.get(index); - ItemStack stack = group.itemStack.copy(); - int size = (int)Math.min((long)stack.getMaxStackSize(), group.count); - if (size > 1) { - if (type == 1) { - size = size/2; - } else if (type == 2) { - size = 1; - } - } - stack.stackSize = size; - group.count -= size; - if (group.count <= 0) { - inventory.remove(index); - } - return stack; - } - - public ItemStack getItems(ItemStack[] itemStacks) { - for (ItemGroup group : inventory) { - for (ItemStack itemStack : itemStacks) { - if (stacksEqual(group.itemStack, itemStack)) { - if (group.count >= itemStack.stackSize) { - ItemStack stack = group.itemStack.copy(); - stack.stackSize = itemStack.stackSize; - group.count -= itemStack.stackSize; - if (group.count <= 0) { - inventory.remove(group); - } - return stack; - } - return null; - } - } - } - return null; - } - - public int slotCount() { - return inventory.size(); - } - - public static boolean stacksEqual(ItemStack stack1, ItemStack stack2) { - if (stack1 == null && stack2 == null) { - return true; - } - if (stack1 == null || stack2 == null) { - return false; - } - if (stack1.getItem() == stack2.getItem()) { - if (stack1.getItemDamage() == stack2.getItemDamage()) { - if (stack1.getTagCompound() == stack2.getTagCompound()) { - return true; - } - } - } - return false; - } - - public long getTotalCount() { - long count = 0; - for (ItemGroup group : inventory) { - count += group.count; - } - return count; - } - - @Override - public String toString() { - return inventory.toString(); - } + + public List inventory; + public long maxItems = 0; + + public EZInventory() { + inventory = new ArrayList(); + } + + public ItemStack input(ItemStack itemStack) { + // Inventory is full + if (getTotalCount() >= maxItems) { + return itemStack; + } + long space = maxItems - getTotalCount(); + // Only part of the stack can fit + int amount = (int) Math.min(space, (long) itemStack.stackSize); + return mergeStack(itemStack, amount); + } + + public void sort() { + Collections.sort(this.inventory, new ItemGroup.CountComparator()); + } + + private ItemStack mergeStack(ItemStack itemStack, int amount) { + for (ItemGroup group : inventory) { + if (stacksEqual(group.itemStack, itemStack)) { + group.count += amount; + itemStack.stackSize -= amount; + if (itemStack.stackSize <= 0) { + return null; + } else { + return itemStack; + } + } + } + // Needs to add a space + inventory.add(new ItemGroup(itemStack, amount)); + itemStack.stackSize -= amount; + if (itemStack.stackSize <= 0) { + return null; + } else { + return itemStack; + } + } + + // Type: 0= full stack, 1= half stack, 2= single + public ItemStack getItemsAt(int index, int type) { + if (index >= inventory.size()) { + return null; + } + ItemGroup group = inventory.get(index); + ItemStack stack = group.itemStack.copy(); + int size = (int) Math.min((long) stack.getMaxStackSize(), group.count); + if (size > 1) { + if (type == 1) { + size = size / 2; + } else if (type == 2) { + size = 1; + } + } + stack.stackSize = size; + group.count -= size; + if (group.count <= 0) { + inventory.remove(index); + } + return stack; + } + + public ItemStack getItems(ItemStack[] itemStacks) { + for (ItemGroup group : inventory) { + for (ItemStack itemStack : itemStacks) { + if (stacksEqual(group.itemStack, itemStack)) { + if (group.count >= itemStack.stackSize) { + ItemStack stack = group.itemStack.copy(); + stack.stackSize = itemStack.stackSize; + group.count -= itemStack.stackSize; + if (group.count <= 0) { + inventory.remove(group); + } + return stack; + } + return null; + } + } + } + return null; + } + + public int slotCount() { + return inventory.size(); + } + + public static boolean stacksEqual(ItemStack stack1, ItemStack stack2) { + if (stack1 == null && stack2 == null) { + return true; + } + if (stack1 == null || stack2 == null) { + return false; + } + if (stack1.getItem() == stack2.getItem()) { + if (stack1.getItemDamage() == stack2.getItemDamage()) { + if (stack1.getTagCompound() == stack2.getTagCompound()) { + return true; + } + } + } + return false; + } + + public long getTotalCount() { + long count = 0; + for (ItemGroup group : inventory) { + count += group.count; + } + return count; + } + + @Override + public String toString() { + return inventory.toString(); + } } diff --git a/src/main/java/com/zerofall/ezstorage/util/EZItemRenderer.java b/src/main/java/com/zerofall/ezstorage/util/EZItemRenderer.java index 676cc68..6ab42d3 100644 --- a/src/main/java/com/zerofall/ezstorage/util/EZItemRenderer.java +++ b/src/main/java/com/zerofall/ezstorage/util/EZItemRenderer.java @@ -2,121 +2,93 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.model.ModelManager; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; public class EZItemRenderer extends RenderItem { - - public EZItemRenderer(TextureManager textureManager, - ModelManager modelManager) { - super(textureManager, modelManager); - } - public void renderItemOverlayIntoGUI(FontRenderer fr, ItemStack stack, int xPosition, int yPosition, String text) { - if (stack != null) - { - float ScaleFactor = 0.5f; - float RScaleFactor = 1.0f / ScaleFactor; - int offset = 0; + public void renderItemOverlayIntoGUI(FontRenderer fr, ItemStack stack, int xPosition, int yPosition, String text) { + if (stack != null) { + float ScaleFactor = 0.5f; + float RScaleFactor = 1.0f / ScaleFactor; + int offset = 0; - boolean unicodeFlag = fr.getUnicodeFlag(); - fr.setUnicodeFlag( false ); + boolean unicodeFlag = fr.getUnicodeFlag(); + fr.setUnicodeFlag(false); - long amount = Long.parseLong(text); - - if ( amount > 999999999999L ) - amount = 999999999999L; + long amount = Long.parseLong(text); - if ( amount != 0 ) - { - if (stack.getItem().showDurabilityBar(stack)) - { - double health = stack.getItem().getDurabilityForDisplay(stack); - int j = (int)Math.round(13.0D - health * 13.0D); - int i = (int)Math.round(255.0D - health * 255.0D); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glDisable(GL11.GL_BLEND); - Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer worldrenderer = tessellator.getWorldRenderer(); - this.renderQuad(worldrenderer, xPosition + 2, yPosition + 13, 13, 2, 0, 0, 0, 255); - this.renderQuad(worldrenderer, xPosition + 2, yPosition + 13, 12, 1, (255 - i) / 4, 64, 0, 255); - this.renderQuad(worldrenderer, xPosition + 2, yPosition + 13, j, 1, 255 - i, i, 0, 255); - //GL11.glEnable(GL11.GL_BLEND); // Forge: Disable Bled because it screws with a lot of things down the line. - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - - String var6 = String.valueOf( Math.abs( amount ) ); + if (amount > 999999999999L) amount = 999999999999L; - if ( amount > 999999999 ) - { - var6 = String.valueOf( ( int ) Math.floor( amount / 1000000000.0 ) ) + 'B'; - } - else if ( amount > 99999999 ) - { - var6 = "." + (int) Math.floor( amount / 100000000.0 ) + 'B'; - } - else if ( amount > 999999 ) - { - var6 = String.valueOf( ( int ) Math.floor( amount / 1000000.0 ) ) + 'M'; - } - else if ( amount > 99999 ) - { - var6 = "." + (int) Math.floor( amount / 100000.0 ) + 'M'; - } - else if ( amount > 9999 ) - { - var6 = String.valueOf( ( int ) Math.floor( amount / 1000.0 ) ) + 'K'; - } + if (amount != 0) { + if (stack.getItem() + .showDurabilityBar(stack)) { + double health = stack.getItem() + .getDurabilityForDisplay(stack); + int j1 = (int) Math.round(13.0D - health * 13.0D); + int k = (int) Math.round(255.0D - health * 255.0D); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glDisable(GL11.GL_BLEND); + Tessellator tessellator = Tessellator.instance; + int l = 255 - k << 16 | k << 8; + int i1 = (255 - k) / 4 << 16 | 0x3F00; + renderQuad(tessellator, xPosition + 2, yPosition + 13, 13, 2, 0); + renderQuad(tessellator, xPosition + 2, yPosition + 13, 12, 1, i1); + renderQuad(tessellator, xPosition + 2, yPosition + 13, j1, 1, l); + // GL11.glEnable(GL11.GL_BLEND); // Forge: Disable Bled because it screws with a lot of things down + // the line. + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + } - GL11.glDisable( GL11.GL_LIGHTING ); - GL11.glDisable( GL11.GL_DEPTH_TEST ); - GL11.glPushMatrix(); - GL11.glScaled( ScaleFactor, ScaleFactor, ScaleFactor ); - int X = (int) (((float) xPosition + offset + 16.0f - fr.getStringWidth( var6 ) * ScaleFactor) * RScaleFactor); - int Y = (int) (((float) yPosition + offset + 16.0f - 7.0f * ScaleFactor) * RScaleFactor); - fr.drawStringWithShadow( var6, X, Y, 16777215 ); - GL11.glPopMatrix(); - GL11.glEnable( GL11.GL_LIGHTING ); - GL11.glEnable( GL11.GL_DEPTH_TEST ); - } + String var6 = String.valueOf(Math.abs(amount)); - fr.setUnicodeFlag( unicodeFlag ); - } - - - } - - private void renderQuad(WorldRenderer p_181565_1_, int p_181565_2_, int p_181565_3_, int p_181565_4_, int p_181565_5_, int p_181565_6_, int p_181565_7_, int p_181565_8_, int p_181565_9_) - { - p_181565_1_.begin(7, DefaultVertexFormats.POSITION_COLOR); - p_181565_1_.pos((double)(p_181565_2_ + 0), (double)(p_181565_3_ + 0), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex(); - p_181565_1_.pos((double)(p_181565_2_ + 0), (double)(p_181565_3_ + p_181565_5_), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex(); - p_181565_1_.pos((double)(p_181565_2_ + p_181565_4_), (double)(p_181565_3_ + p_181565_5_), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex(); - p_181565_1_.pos((double)(p_181565_2_ + p_181565_4_), (double)(p_181565_3_ + 0), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex(); - Tessellator.getInstance().draw(); + if (amount > 999999999) { + var6 = String.valueOf((int) Math.floor(amount / 1000000000.0)) + 'B'; + } else if (amount > 99999999) { + var6 = "." + (int) Math.floor(amount / 100000000.0) + 'B'; + } else if (amount > 999999) { + var6 = String.valueOf((int) Math.floor(amount / 1000000.0)) + 'M'; + } else if (amount > 99999) { + var6 = "." + (int) Math.floor(amount / 100000.0) + 'M'; + } else if (amount > 9999) { + var6 = String.valueOf((int) Math.floor(amount / 1000.0)) + 'K'; + } + + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glPushMatrix(); + GL11.glScaled(ScaleFactor, ScaleFactor, ScaleFactor); + int X = (int) (((float) xPosition + offset + 16.0f - fr.getStringWidth(var6) * ScaleFactor) + * RScaleFactor); + int Y = (int) (((float) yPosition + offset + 16.0f - 7.0f * ScaleFactor) * RScaleFactor); + fr.drawStringWithShadow(var6, X, Y, 16777215); + GL11.glPopMatrix(); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + } + + fr.setUnicodeFlag(unicodeFlag); + } + + } + + private void renderQuad(Tessellator p_77017_1_, int p_77017_2_, int p_77017_3_, int p_77017_4_, int p_77017_5_, + int p_77017_6_) { + p_77017_1_.startDrawingQuads(); + p_77017_1_.setColorOpaque_I(p_77017_6_); + p_77017_1_.addVertex((double) (p_77017_2_ + 0), (double) (p_77017_3_ + 0), 0.0D); + p_77017_1_.addVertex((double) (p_77017_2_ + 0), (double) (p_77017_3_ + p_77017_5_), 0.0D); + p_77017_1_.addVertex((double) (p_77017_2_ + p_77017_4_), (double) (p_77017_3_ + p_77017_5_), 0.0D); + p_77017_1_.addVertex((double) (p_77017_2_ + p_77017_4_), (double) (p_77017_3_ + 0), 0.0D); + p_77017_1_.draw(); } - -// private void renderQuad(Tessellator p_77017_1_, int p_77017_2_, int p_77017_3_, int p_77017_4_, int p_77017_5_, int p_77017_6_) -// { -// p_77017_1_.startDrawingQuads(); -// p_77017_1_.setColorOpaque_I(p_77017_6_); -// p_77017_1_.addVertex((double)(p_77017_2_ + 0), (double)(p_77017_3_ + 0), 0.0D); -// p_77017_1_.addVertex((double)(p_77017_2_ + 0), (double)(p_77017_3_ + p_77017_5_), 0.0D); -// p_77017_1_.addVertex((double)(p_77017_2_ + p_77017_4_), (double)(p_77017_3_ + p_77017_5_), 0.0D); -// p_77017_1_.addVertex((double)(p_77017_2_ + p_77017_4_), (double)(p_77017_3_ + 0), 0.0D); -// p_77017_1_.draw(); -// } -} \ No newline at end of file +} diff --git a/src/main/java/com/zerofall/ezstorage/util/EZStorageUtils.java b/src/main/java/com/zerofall/ezstorage/util/EZStorageUtils.java index f5e4d63..e716011 100644 --- a/src/main/java/com/zerofall/ezstorage/util/EZStorageUtils.java +++ b/src/main/java/com/zerofall/ezstorage/util/EZStorageUtils.java @@ -3,21 +3,20 @@ import java.util.ArrayList; import java.util.List; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; public class EZStorageUtils { - - public static List getNeighbors(int xCoord, int yCoord, int zCoord, World world) { - List blockList = new ArrayList(); - blockList.add(new BlockRef(world.getBlockState(new BlockPos(xCoord - 1, yCoord, zCoord)).getBlock(), xCoord - 1, yCoord, zCoord)); - blockList.add(new BlockRef(world.getBlockState(new BlockPos(xCoord + 1, yCoord, zCoord)).getBlock(), xCoord + 1, yCoord, zCoord)); - blockList.add(new BlockRef(world.getBlockState(new BlockPos(xCoord, yCoord - 1, zCoord)).getBlock(), xCoord, yCoord - 1, zCoord)); - blockList.add(new BlockRef(world.getBlockState(new BlockPos(xCoord, yCoord + 1, zCoord)).getBlock(), xCoord, yCoord + 1, zCoord)); - blockList.add(new BlockRef(world.getBlockState(new BlockPos(xCoord, yCoord, zCoord - 1)).getBlock(), xCoord, yCoord, zCoord - 1)); - blockList.add(new BlockRef(world.getBlockState(new BlockPos(xCoord - 1, yCoord, zCoord)).getBlock(), xCoord - 1, yCoord, zCoord)); - blockList.add(new BlockRef(world.getBlockState(new BlockPos(xCoord, yCoord, zCoord + 1)).getBlock(), xCoord, yCoord, zCoord + 1)); - return blockList; - } + + public static List getNeighbors(int xCoord, int yCoord, int zCoord, World world) { + List blockList = new ArrayList(); + blockList.add(new BlockRef(world.getBlock(xCoord - 1, yCoord, zCoord), xCoord - 1, yCoord, zCoord)); + blockList.add(new BlockRef(world.getBlock(xCoord + 1, yCoord, zCoord), xCoord + 1, yCoord, zCoord)); + blockList.add(new BlockRef(world.getBlock(xCoord, yCoord - 1, zCoord), xCoord, yCoord - 1, zCoord)); + blockList.add(new BlockRef(world.getBlock(xCoord, yCoord + 1, zCoord), xCoord, yCoord + 1, zCoord)); + blockList.add(new BlockRef(world.getBlock(xCoord, yCoord, zCoord - 1), xCoord, yCoord, zCoord - 1)); + blockList.add(new BlockRef(world.getBlock(xCoord - 1, yCoord, zCoord), xCoord - 1, yCoord, zCoord)); + blockList.add(new BlockRef(world.getBlock(xCoord, yCoord, zCoord + 1), xCoord, yCoord, zCoord + 1)); + return blockList; + } } diff --git a/src/main/java/com/zerofall/ezstorage/util/ItemGroup.java b/src/main/java/com/zerofall/ezstorage/util/ItemGroup.java index 105d428..3826201 100644 --- a/src/main/java/com/zerofall/ezstorage/util/ItemGroup.java +++ b/src/main/java/com/zerofall/ezstorage/util/ItemGroup.java @@ -5,32 +5,33 @@ import net.minecraft.item.ItemStack; public class ItemGroup { - public ItemStack itemStack; - public long count; - - public ItemGroup(ItemStack itemStack) { - this.itemStack = itemStack; - this.count = itemStack.stackSize; - } - - public ItemGroup(ItemStack itemStack, long count) { - this.itemStack = itemStack; - this.count = count; - } - - @Override - public String toString() { - return itemStack.getDisplayName() + ":" + count; - } - - public static class CountComparator implements Comparator { - - @Override - public int compare(ItemGroup o1, ItemGroup o2) { - Long l1 = (Long)o1.count; - Long l2 = (Long)o2.count; - return l2.compareTo(l1); - } - - } + + public ItemStack itemStack; + public long count; + + public ItemGroup(ItemStack itemStack) { + this.itemStack = itemStack; + this.count = itemStack.stackSize; + } + + public ItemGroup(ItemStack itemStack, long count) { + this.itemStack = itemStack; + this.count = count; + } + + @Override + public String toString() { + return itemStack.getDisplayName() + ":" + count; + } + + public static class CountComparator implements Comparator { + + @Override + public int compare(ItemGroup o1, ItemGroup o2) { + Long l1 = (Long) o1.count; + Long l2 = (Long) o2.count; + return l2.compareTo(l1); + } + + } } diff --git a/src/main/resources/assets/ezstorage/blockstates/condensed_storage_box.json b/src/main/resources/assets/ezstorage/blockstates/condensed_storage_box.json deleted file mode 100644 index b083854..0000000 --- a/src/main/resources/assets/ezstorage/blockstates/condensed_storage_box.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "ezstorage:condensed_storage_box"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/blockstates/crafting_box.json b/src/main/resources/assets/ezstorage/blockstates/crafting_box.json deleted file mode 100644 index 63a2b7a..0000000 --- a/src/main/resources/assets/ezstorage/blockstates/crafting_box.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "ezstorage:crafting_box"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/blockstates/hyper_storage_box.json b/src/main/resources/assets/ezstorage/blockstates/hyper_storage_box.json deleted file mode 100644 index 5435df3..0000000 --- a/src/main/resources/assets/ezstorage/blockstates/hyper_storage_box.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "ezstorage:hyper_storage_box"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/blockstates/input_port.json b/src/main/resources/assets/ezstorage/blockstates/input_port.json deleted file mode 100644 index 4d76d50..0000000 --- a/src/main/resources/assets/ezstorage/blockstates/input_port.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "ezstorage:input_port"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/blockstates/output_port.json b/src/main/resources/assets/ezstorage/blockstates/output_port.json deleted file mode 100644 index db827da..0000000 --- a/src/main/resources/assets/ezstorage/blockstates/output_port.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "ezstorage:output_port"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/blockstates/search_box.json b/src/main/resources/assets/ezstorage/blockstates/search_box.json deleted file mode 100644 index 484b9b0..0000000 --- a/src/main/resources/assets/ezstorage/blockstates/search_box.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "ezstorage:search_box"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/blockstates/storage_box.json b/src/main/resources/assets/ezstorage/blockstates/storage_box.json deleted file mode 100644 index 87d368f..0000000 --- a/src/main/resources/assets/ezstorage/blockstates/storage_box.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "ezstorage:storage_box"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/blockstates/storage_core.json b/src/main/resources/assets/ezstorage/blockstates/storage_core.json deleted file mode 100644 index d53fe7d..0000000 --- a/src/main/resources/assets/ezstorage/blockstates/storage_core.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "ezstorage:storage_core"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/models/block/condensed_storage_box.json b/src/main/resources/assets/ezstorage/models/block/condensed_storage_box.json deleted file mode 100644 index 2080f9c..0000000 --- a/src/main/resources/assets/ezstorage/models/block/condensed_storage_box.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "ezstorage:blocks/box_side", - "up": "ezstorage:blocks/box_side", - "north": "ezstorage:blocks/condensed_storage_box", - "south": "ezstorage:blocks/condensed_storage_box", - "east": "ezstorage:blocks/condensed_storage_box", - "west": "ezstorage:blocks/condensed_storage_box", - "particle": "ezstorage:blocks/condensed_storage_box" - } -} diff --git a/src/main/resources/assets/ezstorage/models/block/crafting_box.json b/src/main/resources/assets/ezstorage/models/block/crafting_box.json deleted file mode 100644 index 97eea12..0000000 --- a/src/main/resources/assets/ezstorage/models/block/crafting_box.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "ezstorage:blocks/crafting_box", - "particle": "ezstorage:blocks/crafting_box" - } -} diff --git a/src/main/resources/assets/ezstorage/models/block/hyper_storage_box.json b/src/main/resources/assets/ezstorage/models/block/hyper_storage_box.json deleted file mode 100644 index 75597dd..0000000 --- a/src/main/resources/assets/ezstorage/models/block/hyper_storage_box.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "ezstorage:blocks/box_side_hyper", - "up": "ezstorage:blocks/box_side_hyper", - "north": "ezstorage:blocks/hyper_storage_box", - "south": "ezstorage:blocks/hyper_storage_box", - "east": "ezstorage:blocks/hyper_storage_box", - "west": "ezstorage:blocks/hyper_storage_box", - "particle": "ezstorage:blocks/hyper_storage_box" - } -} diff --git a/src/main/resources/assets/ezstorage/models/block/input_port.json b/src/main/resources/assets/ezstorage/models/block/input_port.json deleted file mode 100644 index 9b89150..0000000 --- a/src/main/resources/assets/ezstorage/models/block/input_port.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "ezstorage:blocks/input_port", - "particle": "ezstorage:blocks/input_port" - } -} diff --git a/src/main/resources/assets/ezstorage/models/block/output_port.json b/src/main/resources/assets/ezstorage/models/block/output_port.json deleted file mode 100644 index 48dff59..0000000 --- a/src/main/resources/assets/ezstorage/models/block/output_port.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "ezstorage:blocks/box_side", - "up": "ezstorage:blocks/output_port", - "north": "ezstorage:blocks/box_side", - "south": "ezstorage:blocks/box_side", - "east": "ezstorage:blocks/box_side", - "west": "ezstorage:blocks/box_side", - "particle": "ezstorage:blocks/box_side" - } -} diff --git a/src/main/resources/assets/ezstorage/models/block/search_box.json b/src/main/resources/assets/ezstorage/models/block/search_box.json deleted file mode 100644 index f4639d6..0000000 --- a/src/main/resources/assets/ezstorage/models/block/search_box.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "ezstorage:blocks/search_box", - "particle": "ezstorage:blocks/search_box" - } -} diff --git a/src/main/resources/assets/ezstorage/models/block/storage_box.json b/src/main/resources/assets/ezstorage/models/block/storage_box.json deleted file mode 100644 index 8f35de4..0000000 --- a/src/main/resources/assets/ezstorage/models/block/storage_box.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "ezstorage:blocks/box_side_wood", - "up": "ezstorage:blocks/box_side_wood", - "north": "ezstorage:blocks/storage_box", - "south": "ezstorage:blocks/storage_box", - "east": "ezstorage:blocks/storage_box", - "west": "ezstorage:blocks/storage_box", - "particle": "ezstorage:blocks/storage_box" - } -} diff --git a/src/main/resources/assets/ezstorage/models/block/storage_core.json b/src/main/resources/assets/ezstorage/models/block/storage_core.json deleted file mode 100644 index ed42182..0000000 --- a/src/main/resources/assets/ezstorage/models/block/storage_core.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "ezstorage:blocks/box_side_wood", - "up": "ezstorage:blocks/box_side_wood", - "north": "ezstorage:blocks/storage_core", - "south": "ezstorage:blocks/storage_core", - "east": "ezstorage:blocks/storage_core", - "west": "ezstorage:blocks/storage_core", - "particle": "ezstorage:blocks/storage_core" - } -} diff --git a/src/main/resources/assets/ezstorage/models/item/condensed_storage_box.json b/src/main/resources/assets/ezstorage/models/item/condensed_storage_box.json deleted file mode 100644 index 5b70dc6..0000000 --- a/src/main/resources/assets/ezstorage/models/item/condensed_storage_box.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "ezstorage:block/condensed_storage_box", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/models/item/crafting_box.json b/src/main/resources/assets/ezstorage/models/item/crafting_box.json deleted file mode 100644 index 9508a2a..0000000 --- a/src/main/resources/assets/ezstorage/models/item/crafting_box.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "ezstorage:block/crafting_box", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/models/item/hyper_storage_box.json b/src/main/resources/assets/ezstorage/models/item/hyper_storage_box.json deleted file mode 100644 index a89139b..0000000 --- a/src/main/resources/assets/ezstorage/models/item/hyper_storage_box.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "ezstorage:block/hyper_storage_box", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/models/item/input_port.json b/src/main/resources/assets/ezstorage/models/item/input_port.json deleted file mode 100644 index 66044d5..0000000 --- a/src/main/resources/assets/ezstorage/models/item/input_port.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "ezstorage:block/input_port", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/models/item/output_port.json b/src/main/resources/assets/ezstorage/models/item/output_port.json deleted file mode 100644 index b7795e1..0000000 --- a/src/main/resources/assets/ezstorage/models/item/output_port.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "ezstorage:block/output_port", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/models/item/search_box.json b/src/main/resources/assets/ezstorage/models/item/search_box.json deleted file mode 100644 index 6fea980..0000000 --- a/src/main/resources/assets/ezstorage/models/item/search_box.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "ezstorage:block/search_box", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/models/item/storage_box.json b/src/main/resources/assets/ezstorage/models/item/storage_box.json deleted file mode 100644 index 4e6ec16..0000000 --- a/src/main/resources/assets/ezstorage/models/item/storage_box.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "ezstorage:block/storage_box", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ezstorage/models/item/storage_core.json b/src/main/resources/assets/ezstorage/models/item/storage_core.json deleted file mode 100644 index 6c00742..0000000 --- a/src/main/resources/assets/ezstorage/models/item/storage_core.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "ezstorage:block/storage_core", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index aff01ae..b4a85b7 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,16 +1,21 @@ -[ { - "modid": "ezstorage", - "name": "EZ Storage", - "description": "Storage: Simplified.", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "", - "updateUrl": "", - "authorList": ["zerofall"], - "credits": "", - "logoFile": "", - "screenshots": [], - "dependencies": [] + "modListVersion": 2, + "modList": [{ + "modid": "${modId}", + "name": "${modName}", + "description": "A very simple storage system without energy or complex structures.", + "version": "${modVersion}", + "mcversion": "${minecraftVersion}", + "url": "https://github.com/LITW-Refined/EZStorage", + "updateUrl": "", + "authorList": ["zerofall", "Pilzinsel64"], + "credits": "", + "logoFile": "", + "screenshots": [], + "parent": "", + "requiredMods": [], + "dependencies": [], + "dependants": [], + "useDependencyInformation": false + }] } -]