mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-19 11:59:17 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7209cf38b6 | ||
|
|
7fa43fdfaa | ||
|
|
fcfbf6cc17 | ||
|
|
2c01119ade | ||
|
|
ee8f651d72 | ||
|
|
f35627a48b | ||
|
|
0a67922061 | ||
|
|
d3dbdbe09c |
No files matched your search
@@ -1,2 +0,0 @@
|
|||||||
# Ignore spotlessApply reformat
|
|
||||||
f106b5e7665df6341ae8539f74dc391a7efc98b1
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
* 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
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
name: Report Bug
|
|
||||||
description: "Report a bug."
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: "A bug/crash report with sufficient information and logs to reproduce and track down."
|
|
||||||
- type: input
|
|
||||||
id: discord
|
|
||||||
attributes:
|
|
||||||
label: Your GTNH Discord Username
|
|
||||||
description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
|
|
||||||
placeholder: "Example: Fake#1234"
|
|
||||||
- type: input
|
|
||||||
id: version
|
|
||||||
attributes:
|
|
||||||
label: Mod Version
|
|
||||||
description: "What version of the Mod are you using?"
|
|
||||||
placeholder: "Example: 1.0.0"
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: report
|
|
||||||
attributes:
|
|
||||||
label: Bug Report
|
|
||||||
description: "Relevant information, as well as relevant logs attached such as `logs/fml-client-latest.log."
|
|
||||||
placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: dropdown
|
|
||||||
id: java
|
|
||||||
attributes:
|
|
||||||
label: Java Version
|
|
||||||
description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version.
|
|
||||||
options:
|
|
||||||
- Java 8
|
|
||||||
- Java 17
|
|
||||||
- Java 21
|
|
||||||
- java 25
|
|
||||||
- java 26
|
|
||||||
- Other (Please Specify)
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: modlist
|
|
||||||
attributes:
|
|
||||||
label: Mod List or GTNH Pack Version
|
|
||||||
description: "List of mods, ideally a minimal reproducible set (can be retrieved from latest.log). If using GTNH please indicate pack version and any changed mods, not the entire modlist."
|
|
||||||
placeholder: "List of mods or GTNH Pack version goes here"
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: checkboxes
|
|
||||||
id: final
|
|
||||||
attributes:
|
|
||||||
label: Final Checklist
|
|
||||||
description: Certify that you read things
|
|
||||||
options:
|
|
||||||
- label: "I have searched the issues and haven't found a similar issue."
|
|
||||||
required: true
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
name: Feature Request
|
|
||||||
description: "Request a feature."
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: "Please use this form to request features. We ask you check if it was already requested though"
|
|
||||||
- type: input
|
|
||||||
id: discord
|
|
||||||
attributes:
|
|
||||||
label: Your GTNH Discord Username
|
|
||||||
description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
|
|
||||||
placeholder: "Example: Wumpus#1234"
|
|
||||||
- type: textarea
|
|
||||||
id: request
|
|
||||||
attributes:
|
|
||||||
label: Feature Request
|
|
||||||
description: "Relevant information, as well as relevant images"
|
|
||||||
placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: checkboxes
|
|
||||||
id: final
|
|
||||||
attributes:
|
|
||||||
label: Final Checklist
|
|
||||||
description: Certify that you read things
|
|
||||||
options:
|
|
||||||
- label: "I have searched the issues and haven't found a similar issue."
|
|
||||||
required: true
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
|
|
||||||
name: Build and test
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
branches: [ master, main, release/** ]
|
|
||||||
push:
|
|
||||||
branches: [ master, main, release/** ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-and-test:
|
|
||||||
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
|
|
||||||
secrets: inherit
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
name: Optimize images
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
branches: [ master, main, release/** ]
|
|
||||||
paths:
|
|
||||||
- "**/*.png"
|
|
||||||
|
|
||||||
push:
|
|
||||||
branches: [ master, main, release/** ]
|
|
||||||
paths:
|
|
||||||
- "**/*.png"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
optimize-images:
|
|
||||||
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
|
|
||||||
secrets: inherit
|
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
|
||||||
|
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
|
||||||
|
|
||||||
|
name: Build pull request
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches: [ master, main ]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Set up JDK 8
|
||||||
|
uses: actions/setup-java@v2
|
||||||
|
with:
|
||||||
|
java-version: '8'
|
||||||
|
distribution: 'adopt'
|
||||||
|
cache: gradle
|
||||||
|
|
||||||
|
- name: Grant execute permission for gradlew
|
||||||
|
run: chmod +x gradlew
|
||||||
|
|
||||||
|
- name: Setup the workspace
|
||||||
|
run: ./gradlew setupCIWorkspace
|
||||||
|
|
||||||
|
- name: Build the mod
|
||||||
|
run: ./gradlew build
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
|
|
||||||
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
|
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
|
||||||
|
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
|
||||||
|
|
||||||
|
name: Build and release main branch
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ master, main ]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Set up JDK 8
|
||||||
|
uses: actions/setup-java@v2
|
||||||
|
with:
|
||||||
|
java-version: '8'
|
||||||
|
distribution: 'adopt'
|
||||||
|
cache: gradle
|
||||||
|
|
||||||
|
- name: Grant execute permission for gradlew
|
||||||
|
run: chmod +x gradlew
|
||||||
|
|
||||||
|
- name: Setup the workspace
|
||||||
|
run: ./gradlew setupCIWorkspace
|
||||||
|
|
||||||
|
- name: Build the mod
|
||||||
|
run: ./gradlew build
|
||||||
|
|
||||||
|
- uses: "marvinpinto/action-automatic-releases@latest"
|
||||||
|
with:
|
||||||
|
repo_token: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
automatic_release_tag: "latest"
|
||||||
|
prerelease: true
|
||||||
|
title: "Latest Development Build"
|
||||||
|
files: build/libs/*.jar
|
||||||
|
|
||||||
+1
-13
@@ -1,7 +1,6 @@
|
|||||||
.gradle
|
.gradle
|
||||||
.settings
|
.settings
|
||||||
/.idea/
|
/.idea/
|
||||||
/.vscode/
|
|
||||||
/run/
|
/run/
|
||||||
/build/
|
/build/
|
||||||
/eclipse/
|
/eclipse/
|
||||||
@@ -26,15 +25,4 @@ whitelist.json
|
|||||||
*.iml
|
*.iml
|
||||||
*.ipr
|
*.ipr
|
||||||
*.iws
|
*.iws
|
||||||
src/main/resources/mixins.*([!.]).json
|
src/main/resources/mixins.*.json
|
||||||
*.bat
|
|
||||||
*.sh
|
|
||||||
*.DS_Store
|
|
||||||
!gradlew.bat
|
|
||||||
.factorypath
|
|
||||||
addon.local.gradle
|
|
||||||
addon.local.gradle.kts
|
|
||||||
addon.late.local.gradle
|
|
||||||
addon.late.local.gradle.kts
|
|
||||||
layout.json
|
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
# Any Github changes require admin approval
|
|
||||||
/.github/** @GTNewHorizons/admin
|
|
||||||
|
|
||||||
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.1996
|
||||||
+165
@@ -0,0 +1,165 @@
|
|||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
|
||||||
|
This version of the GNU Lesser General Public License incorporates
|
||||||
|
the terms and conditions of version 3 of the GNU General Public
|
||||||
|
License, supplemented by the additional permissions listed below.
|
||||||
|
|
||||||
|
0. Additional Definitions.
|
||||||
|
|
||||||
|
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||||
|
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||||
|
General Public License.
|
||||||
|
|
||||||
|
"The Library" refers to a covered work governed by this License,
|
||||||
|
other than an Application or a Combined Work as defined below.
|
||||||
|
|
||||||
|
An "Application" is any work that makes use of an interface provided
|
||||||
|
by the Library, but which is not otherwise based on the Library.
|
||||||
|
Defining a subclass of a class defined by the Library is deemed a mode
|
||||||
|
of using an interface provided by the Library.
|
||||||
|
|
||||||
|
A "Combined Work" is a work produced by combining or linking an
|
||||||
|
Application with the Library. The particular version of the Library
|
||||||
|
with which the Combined Work was made is also called the "Linked
|
||||||
|
Version".
|
||||||
|
|
||||||
|
The "Minimal Corresponding Source" for a Combined Work means the
|
||||||
|
Corresponding Source for the Combined Work, excluding any source code
|
||||||
|
for portions of the Combined Work that, considered in isolation, are
|
||||||
|
based on the Application, and not on the Linked Version.
|
||||||
|
|
||||||
|
The "Corresponding Application Code" for a Combined Work means the
|
||||||
|
object code and/or source code for the Application, including any data
|
||||||
|
and utility programs needed for reproducing the Combined Work from the
|
||||||
|
Application, but excluding the System Libraries of the Combined Work.
|
||||||
|
|
||||||
|
1. Exception to Section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
You may convey a covered work under sections 3 and 4 of this License
|
||||||
|
without being bound by section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
2. Conveying Modified Versions.
|
||||||
|
|
||||||
|
If you modify a copy of the Library, and, in your modifications, a
|
||||||
|
facility refers to a function or data to be supplied by an Application
|
||||||
|
that uses the facility (other than as an argument passed when the
|
||||||
|
facility is invoked), then you may convey a copy of the modified
|
||||||
|
version:
|
||||||
|
|
||||||
|
a) under this License, provided that you make a good faith effort to
|
||||||
|
ensure that, in the event an Application does not supply the
|
||||||
|
function or data, the facility still operates, and performs
|
||||||
|
whatever part of its purpose remains meaningful, or
|
||||||
|
|
||||||
|
b) under the GNU GPL, with none of the additional permissions of
|
||||||
|
this License applicable to that copy.
|
||||||
|
|
||||||
|
3. Object Code Incorporating Material from Library Header Files.
|
||||||
|
|
||||||
|
The object code form of an Application may incorporate material from
|
||||||
|
a header file that is part of the Library. You may convey such object
|
||||||
|
code under terms of your choice, provided that, if the incorporated
|
||||||
|
material is not limited to numerical parameters, data structure
|
||||||
|
layouts and accessors, or small macros, inline functions and templates
|
||||||
|
(ten or fewer lines in length), you do both of the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the object code that the
|
||||||
|
Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
4. Combined Works.
|
||||||
|
|
||||||
|
You may convey a Combined Work under terms of your choice that,
|
||||||
|
taken together, effectively do not restrict modification of the
|
||||||
|
portions of the Library contained in the Combined Work and reverse
|
||||||
|
engineering for debugging such modifications, if you also do each of
|
||||||
|
the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the Combined Work that
|
||||||
|
the Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
c) For a Combined Work that displays copyright notices during
|
||||||
|
execution, include the copyright notice for the Library among
|
||||||
|
these notices, as well as a reference directing the user to the
|
||||||
|
copies of the GNU GPL and this license document.
|
||||||
|
|
||||||
|
d) Do one of the following:
|
||||||
|
|
||||||
|
0) Convey the Minimal Corresponding Source under the terms of this
|
||||||
|
License, and the Corresponding Application Code in a form
|
||||||
|
suitable for, and under terms that permit, the user to
|
||||||
|
recombine or relink the Application with a modified version of
|
||||||
|
the Linked Version to produce a modified Combined Work, in the
|
||||||
|
manner specified by section 6 of the GNU GPL for conveying
|
||||||
|
Corresponding Source.
|
||||||
|
|
||||||
|
1) Use a suitable shared library mechanism for linking with the
|
||||||
|
Library. A suitable mechanism is one that (a) uses at run time
|
||||||
|
a copy of the Library already present on the user's computer
|
||||||
|
system, and (b) will operate properly with a modified version
|
||||||
|
of the Library that is interface-compatible with the Linked
|
||||||
|
Version.
|
||||||
|
|
||||||
|
e) Provide Installation Information, but only if you would otherwise
|
||||||
|
be required to provide such information under section 6 of the
|
||||||
|
GNU GPL, and only to the extent that such information is
|
||||||
|
necessary to install and execute a modified version of the
|
||||||
|
Combined Work produced by recombining or relinking the
|
||||||
|
Application with a modified version of the Linked Version. (If
|
||||||
|
you use option 4d0, the Installation Information must accompany
|
||||||
|
the Minimal Corresponding Source and Corresponding Application
|
||||||
|
Code. If you use option 4d1, you must provide the Installation
|
||||||
|
Information in the manner specified by section 6 of the GNU GPL
|
||||||
|
for conveying Corresponding Source.)
|
||||||
|
|
||||||
|
5. Combined Libraries.
|
||||||
|
|
||||||
|
You may place library facilities that are a work based on the
|
||||||
|
Library side by side in a single library together with other library
|
||||||
|
facilities that are not Applications and are not covered by this
|
||||||
|
License, and convey such a combined library under terms of your
|
||||||
|
choice, if you do both of the following:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work based
|
||||||
|
on the Library, uncombined with any other library facilities,
|
||||||
|
conveyed under the terms of this License.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library that part of it
|
||||||
|
is a work based on the Library, and explaining where to find the
|
||||||
|
accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
6. Revised Versions of the GNU Lesser General Public License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the GNU Lesser General Public License from time to time. Such new
|
||||||
|
versions will be similar in spirit to the present version, but may
|
||||||
|
differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Library as you received it specifies that a certain numbered version
|
||||||
|
of the GNU Lesser General Public License "or any later version"
|
||||||
|
applies to it, you have the option of following the terms and
|
||||||
|
conditions either of that published version or of any later version
|
||||||
|
published by the Free Software Foundation. If the Library as you
|
||||||
|
received it does not specify a version number of the GNU Lesser
|
||||||
|
General Public License, you may choose any version of the GNU Lesser
|
||||||
|
General Public License ever published by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Library as you received it specifies that a proxy can decide
|
||||||
|
whether future versions of the GNU Lesser General Public License shall
|
||||||
|
apply, that proxy's public statement of acceptance of any version is
|
||||||
|
permanent authorization for you to choose that version for the
|
||||||
|
Library.
|
||||||
+44
-149
@@ -1,165 +1,60 @@
|
|||||||
GNU LESSER GENERAL PUBLIC LICENSE
|
GTNH Modifications:
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
Copyright (c) 2019 mitchej123
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
GNU LESSER GENERAL PUBLIC LICENSE - See COPYING & COPYING.LESSER
|
||||||
|
|
||||||
|
|
||||||
This version of the GNU Lesser General Public License incorporates
|
-----------------------------------------------------------------------------
|
||||||
the terms and conditions of version 3 of the GNU General Public
|
|
||||||
License, supplemented by the additional permissions listed below.
|
|
||||||
|
|
||||||
0. Additional Definitions.
|
Parts inspired/borrowed/backported from JEI under the MIT License:
|
||||||
|
|
||||||
As used herein, "this License" refers to version 3 of the GNU Lesser
|
https://github.com/mezz/JustEnoughItems/tree/1.12
|
||||||
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
|
||||||
General Public License.
|
The MIT License (MIT)
|
||||||
|
|
||||||
"The Library" refers to a covered work governed by this License,
|
Copyright (c) 2014-2015 mezz
|
||||||
other than an Application or a Combined Work as defined below.
|
|
||||||
|
|
||||||
An "Application" is any work that makes use of an interface provided
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
by the Library, but which is not otherwise based on the Library.
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
Defining a subclass of a class defined by the Library is deemed a mode
|
in the Software without restriction, including without limitation the rights
|
||||||
of using an interface provided by the Library.
|
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:
|
||||||
|
|
||||||
A "Combined Work" is a work produced by combining or linking an
|
The above copyright notice and this permission notice shall be included in
|
||||||
Application with the Library. The particular version of the Library
|
all copies or substantial portions of the Software.
|
||||||
with which the Combined Work was made is also called the "Linked
|
|
||||||
Version".
|
|
||||||
|
|
||||||
The "Minimal Corresponding Source" for a Combined Work means the
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
Corresponding Source for the Combined Work, excluding any source code
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
for portions of the Combined Work that, considered in isolation, are
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
based on the Application, and not on the Linked Version.
|
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.
|
||||||
|
|
||||||
The "Corresponding Application Code" for a Combined Work means the
|
-----------------------------------------------------------------------------
|
||||||
object code and/or source code for the Application, including any data
|
|
||||||
and utility programs needed for reproducing the Combined Work from the
|
|
||||||
Application, but excluding the System Libraries of the Combined Work.
|
|
||||||
|
|
||||||
1. Exception to Section 3 of the GNU GPL.
|
Base NEI License:
|
||||||
|
|
||||||
You may convey a covered work under sections 3 and 4 of this License
|
The MIT License (MIT)
|
||||||
without being bound by section 3 of the GNU GPL.
|
|
||||||
|
|
||||||
2. Conveying Modified Versions.
|
Copyright (c) 2014 ChickenBones
|
||||||
|
|
||||||
If you modify a copy of the Library, and, in your modifications, a
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
facility refers to a function or data to be supplied by an Application
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
that uses the facility (other than as an argument passed when the
|
in the Software without restriction, including without limitation the rights
|
||||||
facility is invoked), then you may convey a copy of the modified
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
version:
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
a) under this License, provided that you make a good faith effort to
|
The above copyright notice and this permission notice shall be included in all
|
||||||
ensure that, in the event an Application does not supply the
|
copies or substantial portions of the Software.
|
||||||
function or data, the facility still operates, and performs
|
|
||||||
whatever part of its purpose remains meaningful, or
|
|
||||||
|
|
||||||
b) under the GNU GPL, with none of the additional permissions of
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
this License applicable to that copy.
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
3. Object Code Incorporating Material from Library Header Files.
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
The object code form of an Application may incorporate material from
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
a header file that is part of the Library. You may convey such object
|
SOFTWARE.
|
||||||
code under terms of your choice, provided that, if the incorporated
|
|
||||||
material is not limited to numerical parameters, data structure
|
|
||||||
layouts and accessors, or small macros, inline functions and templates
|
|
||||||
(ten or fewer lines in length), you do both of the following:
|
|
||||||
|
|
||||||
a) Give prominent notice with each copy of the object code that the
|
|
||||||
Library is used in it and that the Library and its use are
|
|
||||||
covered by this License.
|
|
||||||
|
|
||||||
b) Accompany the object code with a copy of the GNU GPL and this license
|
|
||||||
document.
|
|
||||||
|
|
||||||
4. Combined Works.
|
|
||||||
|
|
||||||
You may convey a Combined Work under terms of your choice that,
|
|
||||||
taken together, effectively do not restrict modification of the
|
|
||||||
portions of the Library contained in the Combined Work and reverse
|
|
||||||
engineering for debugging such modifications, if you also do each of
|
|
||||||
the following:
|
|
||||||
|
|
||||||
a) Give prominent notice with each copy of the Combined Work that
|
|
||||||
the Library is used in it and that the Library and its use are
|
|
||||||
covered by this License.
|
|
||||||
|
|
||||||
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
|
||||||
document.
|
|
||||||
|
|
||||||
c) For a Combined Work that displays copyright notices during
|
|
||||||
execution, include the copyright notice for the Library among
|
|
||||||
these notices, as well as a reference directing the user to the
|
|
||||||
copies of the GNU GPL and this license document.
|
|
||||||
|
|
||||||
d) Do one of the following:
|
|
||||||
|
|
||||||
0) Convey the Minimal Corresponding Source under the terms of this
|
|
||||||
License, and the Corresponding Application Code in a form
|
|
||||||
suitable for, and under terms that permit, the user to
|
|
||||||
recombine or relink the Application with a modified version of
|
|
||||||
the Linked Version to produce a modified Combined Work, in the
|
|
||||||
manner specified by section 6 of the GNU GPL for conveying
|
|
||||||
Corresponding Source.
|
|
||||||
|
|
||||||
1) Use a suitable shared library mechanism for linking with the
|
|
||||||
Library. A suitable mechanism is one that (a) uses at run time
|
|
||||||
a copy of the Library already present on the user's computer
|
|
||||||
system, and (b) will operate properly with a modified version
|
|
||||||
of the Library that is interface-compatible with the Linked
|
|
||||||
Version.
|
|
||||||
|
|
||||||
e) Provide Installation Information, but only if you would otherwise
|
|
||||||
be required to provide such information under section 6 of the
|
|
||||||
GNU GPL, and only to the extent that such information is
|
|
||||||
necessary to install and execute a modified version of the
|
|
||||||
Combined Work produced by recombining or relinking the
|
|
||||||
Application with a modified version of the Linked Version. (If
|
|
||||||
you use option 4d0, the Installation Information must accompany
|
|
||||||
the Minimal Corresponding Source and Corresponding Application
|
|
||||||
Code. If you use option 4d1, you must provide the Installation
|
|
||||||
Information in the manner specified by section 6 of the GNU GPL
|
|
||||||
for conveying Corresponding Source.)
|
|
||||||
|
|
||||||
5. Combined Libraries.
|
|
||||||
|
|
||||||
You may place library facilities that are a work based on the
|
|
||||||
Library side by side in a single library together with other library
|
|
||||||
facilities that are not Applications and are not covered by this
|
|
||||||
License, and convey such a combined library under terms of your
|
|
||||||
choice, if you do both of the following:
|
|
||||||
|
|
||||||
a) Accompany the combined library with a copy of the same work based
|
|
||||||
on the Library, uncombined with any other library facilities,
|
|
||||||
conveyed under the terms of this License.
|
|
||||||
|
|
||||||
b) Give prominent notice with the combined library that part of it
|
|
||||||
is a work based on the Library, and explaining where to find the
|
|
||||||
accompanying uncombined form of the same work.
|
|
||||||
|
|
||||||
6. Revised Versions of the GNU Lesser General Public License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the GNU Lesser General Public License from time to time. Such new
|
|
||||||
versions will be similar in spirit to the present version, but may
|
|
||||||
differ in detail to address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Library as you received it specifies that a certain numbered version
|
|
||||||
of the GNU Lesser General Public License "or any later version"
|
|
||||||
applies to it, you have the option of following the terms and
|
|
||||||
conditions either of that published version or of any later version
|
|
||||||
published by the Free Software Foundation. If the Library as you
|
|
||||||
received it does not specify a version number of the GNU Lesser
|
|
||||||
General Public License, you may choose any version of the GNU Lesser
|
|
||||||
General Public License ever published by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Library as you received it specifies that a proxy can decide
|
|
||||||
whether future versions of the GNU Lesser General Public License shall
|
|
||||||
apply, that proxy's public statement of acceptance of any version is
|
|
||||||
permanent authorization for you to choose that version for the
|
|
||||||
Library.
|
|
||||||
@@ -1,93 +1,31 @@
|
|||||||
# NotEnoughItems Unofficial - By the GTNH Team
|
# NotEnoughItems Unofficial - By the GTNH Team
|
||||||
|
|
||||||
🌐 **Languages:** [English](README.md) | [Українська](README_uk.md)
|
|
||||||
|
|
||||||
A continuation of NotEnoughItems for 1.7.10 by the developers of Gregtech: New Horizons modpack, with features either inspired and/or backported from JustEnoughItems
|
A continuation of NotEnoughItems for 1.7.10 by the developers of Gregtech: New Horizons modpack, with features either inspired and/or backported from JustEnoughItems
|
||||||
|
|
||||||
We've tested this against all of the mods included in GTNH, as well as a limited set of other mods (like Reika's mods). Every effort has been made to maintain backwards compatibility, however the focus is on the mods contained in the GTNH modpack.
|
|
||||||
|
|
||||||
If you have issues with NEI outside of the GTNH modpack you may report them in the [GTNH NEI GitHub](https://github.com/GTNewHorizons/NotEnoughItems).
|
We've tested this against all of the mods included in GTNH, as well as a limited set of other mods (like Reika's mods). Every effort has been made to maintain backwards compatibility, however the focus is on the mods contained in the GTNH modpack.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## New Features:
|
## New Features:
|
||||||
|
|
||||||
* Speed
|
* Speed
|
||||||
- Uses a parallel stream to search the item list over multiple cores, resulting in 2-6x faster searches on average
|
- Uses a parallel stream to search the item list over multiple cores, resulting in 2-6x faster searches on average
|
||||||
- Loads the recipe handlers in parallel
|
- Loads the recipe handlers in parallel
|
||||||
* A textbox for search with most of the features you'd expect - moving forward, backwards, selection, etc
|
* A textbox for search with most of the features you'd expect - moving forward, backwards, selection, etc
|
||||||
* Bookmarks! Are you in the process of crafting? Bookmark it using either 'A' or configure your own key.
|
* Bookmarks! What are you in the process of crafting? Bookmark it using either 'A' or configure your own key.
|
||||||
* Toggle bookmark pane. Default shortcut key `B`. Item Subsets menu is only available if bookmarks are not visible.
|
* Toggle bookmark pane. Default shortcut key `B`. Item Subsets menu is only available if bookmarks are not visible.
|
||||||
* Utility/Cheat buttons line up and wrap based on GUI size
|
* Utility/Cheat buttons line up and wrap based on GUI size
|
||||||
* ItemList is no longer regenerated from the ItemRegistry on every inventory load
|
* ItemList is no longer regenerated from the ItemRegistry on every inventory load
|
||||||
* JEI (Or Creative) Style tabs [Optional] Note: Requires explicit support to be added for an ItemStack to render, otherwise falls back to the first two letters of the handler name.
|
* JEI (Or Creative) Style tabs [Optional] Note: Requires explicit support to be added for an ItemStack to render, otherwise falls back to the first two letters of the handler name.
|
||||||
* Tabs/Handlers are loaded from a CSV config in the JAR (or optionally from the config folder). NBT IMCEvents `registerHandlerInfo` and `removeHandlerInfo` are available for mod authors to add handler information, using the same fields as the CSV file
|
* Tabs/Handlers are loaded from a CSV config in the JAR (or optionally from the config folder). NBT IMCEvents `registerHandlerInfo` and `removeHandlerInfo` are available for mod authors to add handler information, using the same fields as the CSV file
|
||||||
* `@[Mod]->[item]` searching. ex: `@Mod.gregtech->iron ingot`
|
* `@[Mod]->[item]` searching. ex: `@Mod.gregtech->iron ingot`
|
||||||
* Cycle between Recipe, Utility, and Cheat mode by ctrl clicking on the Wrench Icon
|
* Cycle between Recipe, Utility, and Cheat mode by ctrl clicking on the Wrench Icon
|
||||||
* GT5u Tools/Items and GT6 tools should now properly work with the Overlay Recipe Transfer
|
* GT5u Tools/Items and GT6 tools should now properly work with the Overlay Recipe Transfer
|
||||||
|
|
||||||
### Information Page Handler
|
|
||||||
Want to add some information about a block or item without making a massive tooltip for it? You can add information about any block or item by registering it in the Information Handler.
|
|
||||||
|
|
||||||
Information page(s) are displayed when either the uses or recipes of a matching item are searched. All matching items will cycle at the top of the information page.
|
|
||||||
|
|
||||||
Your mod can call:
|
|
||||||
```java
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", nbt);
|
|
||||||
```
|
|
||||||
Where nbt is an NBTTagCompound formatted as described below.
|
|
||||||
|
|
||||||
| Tag | Type | Description |
|
|
||||||
|------------------|----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| `filter` | String | A string filter to match what items should return this information page.<br/>modname:itemname, metadata, Ore Dictionary tags, and regex can all be used. The full format may be seen in `config/NEI/collapsibleitems.cfg`. |
|
|
||||||
| `page` / `pages` | String / String NBTTagList | The actual text to display. See below for differences between single and multi-page messages.<br/>Both formats will automatically translate provided strings. |
|
|
||||||
|
|
||||||
#### Single Page Format
|
|
||||||
|
|
||||||
Use the `"page"` string tag when you only want to add one page of information:
|
|
||||||
```java
|
|
||||||
NBTTagCompound tag = new NBTTagCompound();
|
|
||||||
tag.setString("filter", "minecraft:log 3");
|
|
||||||
tag.setString("page", "Exotic wood found in tropical climates.");
|
|
||||||
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Multiple Page Format
|
|
||||||
|
|
||||||
Use the `"pages"` tag as an `NBTTagList` of strings when you want more than one page:
|
|
||||||
```java
|
|
||||||
NBTTagCompound tag = new NBTTagCompound();
|
|
||||||
tag.setString("filter", "minecraft:diamond_sword");
|
|
||||||
|
|
||||||
NBTTagList pages = new NBTTagList();
|
|
||||||
pages.appendTag(new NBTTagString("A powerful melee weapon."));
|
|
||||||
pages.appendTag(new NBTTagString("Can be enchanted for extra effects."));
|
|
||||||
|
|
||||||
tag.setTag("pages", pages);
|
|
||||||
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
|
|
||||||
```
|
|
||||||
* Each list entry is one page.
|
|
||||||
* Pages will appear in NEI with buttons to scroll through them.
|
|
||||||
|
|
||||||
#### Item Matching
|
|
||||||
|
|
||||||
All items that match `filter` will show your information page. See `config/NEI/collapsibleitems.cfg` for the full filter format.
|
|
||||||
|
|
||||||
#### Item Information Config File
|
|
||||||
|
|
||||||
If you're a modpack creator and want to make custom item information pages, they can easily be added in `config/NEI/informationpages.cfg`, which has a few more examples. The file is not created automatically: use the Export button in the NEI options under Tools > Default Config Files to copy the defaults to `config/NEI`.
|
|
||||||
|
|
||||||
## Other items of note:
|
## Other items of note:
|
||||||
|
|
||||||
|
* Licensed under LGPL - Use this however you want, but please give back any modifications
|
||||||
* Remove TMI style
|
* Remove TMI style
|
||||||
* Removed inventory Load/Save state
|
* Removed inventory Load/Save state
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
GTNH Modifications Copyright (c) 2019-2024 mitchej123 and the GTNH Team
|
|
||||||
|
|
||||||
Licensed under LGPL-3.0 or later - use this however you want, but please give back any modifications
|
|
||||||
|
|
||||||
Parts inspired/borrowed/backported from [JEI](https://github.com/mezz/JustEnoughItems/tree/1.12) under the MIT License.
|
|
||||||
|
|
||||||
Originial code Copyright (c) 2014-2015 mezz and was licensed under the MIT License.
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
# NotEnoughItems Unofficial — від команди GTNH
|
|
||||||
|
|
||||||
🌐 **Мови:** [English](README.md) | [Українська](README_uk.md)
|
|
||||||
|
|
||||||
Продовження модифікації NotEnoughItems для 1.7.10 від розробників збірки GregTech: New Horizons із функціями, натхненними та/або бекпортованими з JustEnoughItems.
|
|
||||||
|
|
||||||
Ми протестували цю версію з усіма модами, що входять до GTNH, а також із обмеженим набором інших модів (як-от моди від Reika). Було докладено всіх зусиль для збереження зворотної сумісності, однак основну увагу приділено модам зі збірки GTNH.
|
|
||||||
|
|
||||||
Якщо у вас виникли проблеми з NEI за межами збірки GTNH, ви можете повідомити про них у [GitHub-репозиторії GTNH NEI](https://github.com/GTNewHorizons/NotEnoughItems).
|
|
||||||
|
|
||||||
## Нові можливості:
|
|
||||||
|
|
||||||
* Швидкодія
|
|
||||||
- Використовує паралельний потік для пошуку у списку предметів на кількох ядрах процесора, що в середньому пришвидшує пошук у 2–6 разів.
|
|
||||||
- Завантажує обробники рецептів паралельно.
|
|
||||||
* Текстове поле пошуку з більшістю очікуваних функцій — переміщення курсора вперед/назад, виділення тексту тощо.
|
|
||||||
* Закладки! Перебуваєте у процесі крафту? Додайте потрібний рецепт до закладок за допомогою клавіші «A» або налаштуйте власну клавішу.
|
|
||||||
* Перемикання видимості панелі закладок. Гаряча клавіша за замовчуванням — `B`. Меню «Підгрупи предметів» доступне лише тоді, коли панель закладок прихована.
|
|
||||||
* Кнопки утиліт та читів вирівнюються в ряд та переносяться на новий рядок залежно від розміру графічного інтерфейсу.
|
|
||||||
* Список предметів (`ItemList`) більше не генерується повторно з `ItemRegistry` під час кожного відкриття інвентарю.
|
|
||||||
* Вкладки у стилі JEI (або творчого режиму) [За бажанням]. Примітка: вимагає явної підтримки для рендерингу `ItemStack`, інакше використовуються перші дві літери назви обробника.
|
|
||||||
* Вкладки/обробники завантажуються з конфігураційного CSV-файлу в JAR-архіві (або за бажанням з папки `config`). Для авторів модів доступні IMC-повідомлення з NBT-даними `registerHandlerInfo` та `removeHandlerInfo` для додавання інформації про обробники з використанням тих самих полів, що й у CSV-файлі.
|
|
||||||
* Пошук за допомогою синтаксису `@[Мод]->[предмет]`. Наприклад: `@Mod.gregtech->iron ingot`.
|
|
||||||
* Перемикання між режимами рецептів, утиліт та читів за допомогою CTRL + ЛКМ по іконці гайкового ключа.
|
|
||||||
* Інструменти/предмети з GT5u та інструменти з GT6 тепер мають коректно працювати з функцією накладення та перенесення рецепта.
|
|
||||||
|
|
||||||
### Обробник інформаційних сторінок
|
|
||||||
Хочете додати інформацію про блок чи предмет, не створюючи для нього величезну підказку? Ви можете додати інформацію про будь-який блок чи предмет, зареєструвавши його в обробнику інформації.
|
|
||||||
|
|
||||||
Інформаційні сторінки відображаються під час пошуку рецептів або способів використання відповідного предмета. Усі відповідні предмети будуть циклічно змінюватися у верхній частині інформаційної сторінки.
|
|
||||||
|
|
||||||
Ваш мод може викликати:
|
|
||||||
```java
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", nbt);
|
|
||||||
```
|
|
||||||
Де `nbt` — це `NBTTagCompound`, відформатований, як описано нижче.
|
|
||||||
|
|
||||||
| Тег | Тип | Опис |
|
|
||||||
|------------------|--------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| `filter` | `String` | Текстовий фільтр для визначення предметів, для яких має відображатися ця інформаційна сторінка.<br/>Можна використовувати `modname:itemname`, метадані, теги OreDictionary та регулярні вирази. Повний формат можна переглянути у `config/NEI/collapsibleitems.cfg`. |
|
|
||||||
| `page` / `pages` | `String` / `String NBTTagList` | Безпосередньо текст для відображення. Різницю між одно- та багатосторінковими повідомленнями див. нижче.<br/>Обидва формати підтримують автоматичний переклад наданих рядків. |
|
|
||||||
|
|
||||||
#### Односторінковий формат
|
|
||||||
|
|
||||||
Використовуйте текстовий тег `"page"`, якщо хочете додати лише одну сторінку інформації:
|
|
||||||
```java
|
|
||||||
NBTTagCompound tag = new NBTTagCompound();
|
|
||||||
tag.setString("filter", "minecraft:log 3");
|
|
||||||
tag.setString("page", "Exotic wood found in tropical climates.");
|
|
||||||
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Багатосторінковий формат
|
|
||||||
|
|
||||||
Використовуйте тег `"pages"` як `NBTTagList` із рядків, якщо потрібно додати понад одну сторінку:
|
|
||||||
```java
|
|
||||||
NBTTagCompound tag = new NBTTagCompound();
|
|
||||||
tag.setString("filter", "minecraft:diamond_sword");
|
|
||||||
|
|
||||||
NBTTagList pages = new NBTTagList();
|
|
||||||
pages.appendTag(new NBTTagString("A powerful melee weapon."));
|
|
||||||
pages.appendTag(new NBTTagString("Can be enchanted for extra effects."));
|
|
||||||
|
|
||||||
tag.setTag("pages", pages);
|
|
||||||
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
|
|
||||||
```
|
|
||||||
* Кожен елемент списку — це одна сторінка.
|
|
||||||
* Сторінки з’являтимуться в NEI з кнопками для їх гортання.
|
|
||||||
|
|
||||||
#### Відповідність предметів
|
|
||||||
|
|
||||||
Усі предмети, що відповідають фільтру `filter`, відображатимуть вашу інформаційну сторінку. Повний формат фільтра див. у `config/NEI/collapsibleitems.cfg`.
|
|
||||||
|
|
||||||
#### Файл конфігурації інформації про предмети
|
|
||||||
|
|
||||||
Якщо ви творець збірки модів і хочете створити власні інформаційні сторінки для предметів, їх можна легко додати у файлі `config/NEI/informationpages.cfg`, де також наведено ще кілька прикладів.
|
|
||||||
|
|
||||||
## Інші примітки:
|
|
||||||
|
|
||||||
* Вилучено стиль TMI
|
|
||||||
* Вилучено збереження/завантаження стану інвентарю
|
|
||||||
|
|
||||||
## Ліцензія
|
|
||||||
|
|
||||||
Авторські права на модифікації від команди GTNH (c) 2019-2024 належать mitchej123 та команді GTNH.
|
|
||||||
|
|
||||||
Поширюється за ліцензією LGPL-3.0 або новішої версії — використовуйте цей код на власний розсуд, але, будь ласка, діліться з розробниками будь-якими внесеними вами змінами.
|
|
||||||
|
|
||||||
Окремі частини коду натхненні, запозичені або бекпортовані з [JEI](https://github.com/mezz/JustEnoughItems/tree/1.12) за ліцензією MIT.
|
|
||||||
|
|
||||||
Авторські права на оригінальний код (c) 2014-2015 належать mezz; код поширювався за ліцензією MIT.
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
compileJava {
|
|
||||||
options.encoding = "UTF-8"
|
|
||||||
}
|
|
||||||
|
|
||||||
generateGrammarSource {
|
|
||||||
maxHeapSize = "128m"
|
|
||||||
arguments += ['-package', 'codechicken.nei.search', '-visitor', '-no-listener']
|
|
||||||
outputDirectory = file("${projectDir}/build/generated/sources/search/antlr/codechicken/nei/search/")
|
|
||||||
}
|
|
||||||
|
|
||||||
compileJava.dependsOn generateGrammarSource
|
|
||||||
sourcesJar.dependsOn generateGrammarSource
|
|
||||||
|
|
||||||
sourcesJar {
|
|
||||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets {
|
|
||||||
main {
|
|
||||||
java.srcDirs += ["build/generated/sources/search/antlr/"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
|
||||||
useJUnitPlatform()
|
|
||||||
testLogging {
|
|
||||||
events "passed", "skipped", "failed"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+502
-3
@@ -1,6 +1,505 @@
|
|||||||
//version: 1707058017
|
//version: eb0b030ab9cb1d0f9a31f11e69e1ceed1dab2c89
|
||||||
|
/*
|
||||||
|
DO NOT CHANGE THIS FILE!
|
||||||
|
|
||||||
|
Also, you may replace this file at any time if there is an update available.
|
||||||
|
Please check https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
|
||||||
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
|
buildscript {
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
name = "forge"
|
||||||
|
url = "https://maven.minecraftforge.net"
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
name = "sonatype"
|
||||||
|
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
name = "Scala CI dependencies"
|
||||||
|
url = "https://repo1.maven.org/maven2/"
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
name = "jitpack"
|
||||||
|
url = "https://jitpack.io"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'antlr'
|
id 'idea'
|
||||||
id 'com.gtnewhorizons.gtnhconvention'
|
id 'scala'
|
||||||
|
id("org.ajoberstar.grgit") version("3.1.1")
|
||||||
|
id("com.github.johnrengelman.shadow") version("4.0.4")
|
||||||
|
id("com.palantir.git-version") version("0.12.3")
|
||||||
|
}
|
||||||
|
|
||||||
|
apply plugin: 'forge'
|
||||||
|
|
||||||
|
def projectJavaVersion = JavaLanguageVersion.of(8)
|
||||||
|
|
||||||
|
java {
|
||||||
|
toolchain {
|
||||||
|
languageVersion.set(projectJavaVersion)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
idea {
|
||||||
|
module {
|
||||||
|
inheritOutputDirs = true
|
||||||
|
downloadJavadoc = true
|
||||||
|
downloadSources = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
checkPropertyExists("modName")
|
||||||
|
checkPropertyExists("modId")
|
||||||
|
checkPropertyExists("modGroup")
|
||||||
|
checkPropertyExists("autoUpdateBuildScript")
|
||||||
|
checkPropertyExists("minecraftVersion")
|
||||||
|
checkPropertyExists("forgeVersion")
|
||||||
|
checkPropertyExists("replaceGradleTokenInFile")
|
||||||
|
checkPropertyExists("gradleTokenModId")
|
||||||
|
checkPropertyExists("gradleTokenModName")
|
||||||
|
checkPropertyExists("gradleTokenVersion")
|
||||||
|
checkPropertyExists("gradleTokenGroupName")
|
||||||
|
checkPropertyExists("apiPackage")
|
||||||
|
checkPropertyExists("accessTransformersFile")
|
||||||
|
checkPropertyExists("usesMixins")
|
||||||
|
checkPropertyExists("mixinPlugin")
|
||||||
|
checkPropertyExists("mixinsPackage")
|
||||||
|
checkPropertyExists("coreModClass")
|
||||||
|
checkPropertyExists("containsMixinsAndOrCoreModOnly")
|
||||||
|
checkPropertyExists("usesShadowedDependencies")
|
||||||
|
checkPropertyExists("developmentEnvironmentUserName")
|
||||||
|
|
||||||
|
def checkPropertyExists(String propertyName) {
|
||||||
|
if (project.hasProperty(propertyName) == false) {
|
||||||
|
throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
String javaSourceDir = "src/main/java/"
|
||||||
|
String scalaSourceDir = "src/main/scala/"
|
||||||
|
|
||||||
|
String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
|
||||||
|
String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
|
||||||
|
if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
|
||||||
|
throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
|
||||||
|
}
|
||||||
|
|
||||||
|
if(apiPackage) {
|
||||||
|
targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
|
||||||
|
targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
|
||||||
|
if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
|
||||||
|
throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(accessTransformersFile) {
|
||||||
|
String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
|
||||||
|
if(new File(targetFile).exists() == false) {
|
||||||
|
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(usesMixins.toBoolean()) {
|
||||||
|
if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
|
||||||
|
throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
|
||||||
|
}
|
||||||
|
|
||||||
|
targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
|
||||||
|
targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
|
||||||
|
if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) {
|
||||||
|
throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
|
||||||
|
}
|
||||||
|
|
||||||
|
String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
|
||||||
|
String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
|
||||||
|
String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
|
||||||
|
if((new File(targetFileJava).exists() || new File(targetFileScala).exists() || new File(targetFileScalaJava).exists()) == false) {
|
||||||
|
throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(coreModClass) {
|
||||||
|
String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
|
||||||
|
String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
|
||||||
|
String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
|
||||||
|
if((new File(targetFileJava).exists() || new File(targetFileScala).exists() || new File(targetFileScalaJava).exists()) == false) {
|
||||||
|
throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations.all {
|
||||||
|
resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
|
||||||
|
|
||||||
|
// Make sure GregTech build won't time out
|
||||||
|
System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
|
||||||
|
System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
|
||||||
|
'git config core.fileMode false'.execute()
|
||||||
|
// Pulls version from git tag
|
||||||
|
version = minecraftVersion + "-" + gitVersion()
|
||||||
|
group = modGroup
|
||||||
|
archivesBaseName = modId
|
||||||
|
|
||||||
|
minecraft {
|
||||||
|
version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
|
||||||
|
runDir = "run"
|
||||||
|
|
||||||
|
if (replaceGradleTokenInFile) {
|
||||||
|
replaceIn replaceGradleTokenInFile
|
||||||
|
if(gradleTokenModId) {
|
||||||
|
replace gradleTokenModId, modId
|
||||||
|
}
|
||||||
|
if(gradleTokenModName) {
|
||||||
|
replace gradleTokenModName, modName
|
||||||
|
}
|
||||||
|
if(gradleTokenVersion) {
|
||||||
|
replace gradleTokenVersion, versionDetails().lastTag
|
||||||
|
}
|
||||||
|
if(gradleTokenGroupName) {
|
||||||
|
replace gradleTokenGroupName, modGroup
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(file("addon.gradle").exists()) {
|
||||||
|
apply from: "addon.gradle"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: 'repositories.gradle'
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
implementation.extendsFrom(shadowImplementation)
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
name = "Overmind forge repo mirror"
|
||||||
|
url = "https://gregtech.overminddl1.com/"
|
||||||
|
}
|
||||||
|
if(usesMixins.toBoolean()) {
|
||||||
|
maven {
|
||||||
|
name = "sponge"
|
||||||
|
url = "https://repo.spongepowered.org/repository/maven-public"
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
url = "https://jitpack.io"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
if(usesMixins.toBoolean()) {
|
||||||
|
annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
|
||||||
|
annotationProcessor("com.google.guava:guava:24.1.1-jre")
|
||||||
|
annotationProcessor("com.google.code.gson:gson:2.8.6")
|
||||||
|
annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
|
||||||
|
// using 0.8 to workaround a issue in 0.7 which fails mixin application
|
||||||
|
compile("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
|
||||||
|
// Mixin includes a lot of dependencies that are too up-to-date
|
||||||
|
exclude module: "launchwrapper"
|
||||||
|
exclude module: "guava"
|
||||||
|
exclude module: "gson"
|
||||||
|
exclude module: "commons-io"
|
||||||
|
exclude module: "log4j-core"
|
||||||
|
}
|
||||||
|
compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: 'dependencies.gradle'
|
||||||
|
|
||||||
|
def mixinConfigJson = "mixins." + modId + ".json"
|
||||||
|
def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
|
||||||
|
def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
|
||||||
|
def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
|
||||||
|
|
||||||
|
task generateAssets {
|
||||||
|
if(usesMixins.toBoolean()) {
|
||||||
|
new File(projectDir.toString() + "/src/main/resources/", mixinConfigJson).text = """{
|
||||||
|
"required": true,
|
||||||
|
"minVersion": "0.7.11",
|
||||||
|
"package": "${modGroup}.${mixinsPackage}",
|
||||||
|
"plugin": "${modGroup}.${mixinPlugin}",
|
||||||
|
"refmap": "${mixingConfigRefMap}",
|
||||||
|
"target": "@env(DEFAULT)",
|
||||||
|
"compatibilityLevel": "JAVA_8"
|
||||||
|
}
|
||||||
|
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task relocateShadowJar(type: ConfigureShadowRelocation) {
|
||||||
|
target = tasks.shadowJar
|
||||||
|
prefix = modGroup + ".shadow"
|
||||||
|
}
|
||||||
|
|
||||||
|
shadowJar {
|
||||||
|
manifest {
|
||||||
|
attributes(getManifestAttributes())
|
||||||
|
}
|
||||||
|
|
||||||
|
minimize() // This will only allow shading for actually used classes
|
||||||
|
configurations = [project.configurations.shadowImplementation]
|
||||||
|
dependsOn(relocateShadowJar)
|
||||||
|
}
|
||||||
|
|
||||||
|
jar {
|
||||||
|
manifest {
|
||||||
|
attributes(getManifestAttributes())
|
||||||
|
}
|
||||||
|
|
||||||
|
if(usesShadowedDependencies.toBoolean()) {
|
||||||
|
dependsOn(shadowJar)
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
reobf {
|
||||||
|
if(usesMixins.toBoolean()) {
|
||||||
|
addExtraSrgFile mixinSrg
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
afterEvaluate {
|
||||||
|
if(usesMixins.toBoolean()) {
|
||||||
|
tasks.compileJava {
|
||||||
|
options.compilerArgs += [
|
||||||
|
"-AreobfSrgFile=${tasks.reobf.srg}",
|
||||||
|
"-AoutSrgFile=${mixinSrg}",
|
||||||
|
"-AoutRefMapFile=${refMap}",
|
||||||
|
// Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
|
||||||
|
"-XDenableSunApiLintControl",
|
||||||
|
"-XDignore.symbol.file"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
runClient {
|
||||||
|
def arguments = []
|
||||||
|
|
||||||
|
if(usesMixins.toBoolean()) {
|
||||||
|
arguments += [
|
||||||
|
"--mods=../build/libs/$modId-${version}.jar",
|
||||||
|
"--tweakClass org.spongepowered.asm.launch.MixinTweaker"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
if(developmentEnvironmentUserName) {
|
||||||
|
arguments += [
|
||||||
|
"--username",
|
||||||
|
developmentEnvironmentUserName
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
args(arguments)
|
||||||
|
}
|
||||||
|
|
||||||
|
runServer {
|
||||||
|
def arguments = []
|
||||||
|
|
||||||
|
if (usesMixins.toBoolean()) {
|
||||||
|
arguments += [
|
||||||
|
"--mods=../build/libs/$modId-${version}.jar",
|
||||||
|
"--tweakClass org.spongepowered.asm.launch.MixinTweaker"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
args(arguments)
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType(JavaExec).configureEach {
|
||||||
|
javaLauncher.set(
|
||||||
|
javaToolchains.launcherFor {
|
||||||
|
languageVersion = projectJavaVersion
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
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 "minecraftVersion": project.minecraft.version,
|
||||||
|
"modVersion": versionDetails().lastTag,
|
||||||
|
"modId": modId,
|
||||||
|
"modName": modName
|
||||||
|
}
|
||||||
|
|
||||||
|
// copy everything else, thats not the mcmod.info
|
||||||
|
from(sourceSets.main.resources.srcDirs) {
|
||||||
|
exclude 'mcmod.info'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def getManifestAttributes() {
|
||||||
|
def manifestAttributes = [:]
|
||||||
|
if(containsMixinsAndOrCoreModOnly.toBoolean() == false) {
|
||||||
|
manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
|
||||||
|
}
|
||||||
|
|
||||||
|
if(accessTransformersFile) {
|
||||||
|
manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
|
||||||
|
}
|
||||||
|
|
||||||
|
if(coreModClass) {
|
||||||
|
manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
|
||||||
|
}
|
||||||
|
|
||||||
|
if(usesMixins.toBoolean()) {
|
||||||
|
manifestAttributes += [
|
||||||
|
"TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
|
||||||
|
"MixinConfigs" : mixinConfigJson,
|
||||||
|
"ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
|
||||||
|
]
|
||||||
|
}
|
||||||
|
return manifestAttributes
|
||||||
|
}
|
||||||
|
|
||||||
|
task sourcesJar(type: Jar) {
|
||||||
|
from (sourceSets.main.allJava)
|
||||||
|
from (file("$projectDir/LICENSE"))
|
||||||
|
getArchiveClassifier().set('sources')
|
||||||
|
}
|
||||||
|
|
||||||
|
task shadowDevJar(type: ShadowJar) {
|
||||||
|
from sourceSets.main.output
|
||||||
|
getArchiveClassifier().set("dev")
|
||||||
|
|
||||||
|
manifest {
|
||||||
|
attributes(getManifestAttributes())
|
||||||
|
}
|
||||||
|
|
||||||
|
minimize() // This will only allow shading for actually used classes
|
||||||
|
configurations = [project.configurations.shadowImplementation]
|
||||||
|
}
|
||||||
|
|
||||||
|
task relocateShadowDevJar(type: ConfigureShadowRelocation) {
|
||||||
|
target = tasks.shadowDevJar
|
||||||
|
prefix = modGroup + ".shadow"
|
||||||
|
}
|
||||||
|
|
||||||
|
task circularResolverJar(type: Jar) {
|
||||||
|
dependsOn(relocateShadowDevJar)
|
||||||
|
dependsOn(shadowDevJar)
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
|
||||||
|
task devJar(type: Jar) {
|
||||||
|
from sourceSets.main.output
|
||||||
|
getArchiveClassifier().set("dev")
|
||||||
|
|
||||||
|
manifest {
|
||||||
|
attributes(getManifestAttributes())
|
||||||
|
}
|
||||||
|
|
||||||
|
if(usesShadowedDependencies.toBoolean()) {
|
||||||
|
dependsOn(circularResolverJar)
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task apiJar(type: Jar) {
|
||||||
|
from (sourceSets.main.allJava) {
|
||||||
|
include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString() + '/**'
|
||||||
|
}
|
||||||
|
|
||||||
|
from (sourceSets.main.output) {
|
||||||
|
include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString() + '/**'
|
||||||
|
}
|
||||||
|
|
||||||
|
from (sourceSets.main.resources.srcDirs) {
|
||||||
|
include("LICENSE")
|
||||||
|
}
|
||||||
|
|
||||||
|
getArchiveClassifier().set('api')
|
||||||
|
}
|
||||||
|
|
||||||
|
artifacts {
|
||||||
|
archives sourcesJar
|
||||||
|
archives devJar
|
||||||
|
if(apiPackage) {
|
||||||
|
archives apiJar
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Updating
|
||||||
|
task updateBuildScript {
|
||||||
|
doLast {
|
||||||
|
if (updateBuildScript()) return
|
||||||
|
|
||||||
|
print("Build script already up-to-date!")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isNewBuildScriptVersionAvailable()) {
|
||||||
|
if (autoUpdateBuildScript.toBoolean()) {
|
||||||
|
updateBuildScript()
|
||||||
|
} else {
|
||||||
|
println("Build script update available! Run 'gradle updateBuildScript'")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static URL availableBuildScriptUrl() {
|
||||||
|
new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle")
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean updateBuildScript() {
|
||||||
|
if (isNewBuildScriptVersionAvailable()) {
|
||||||
|
def buildscriptFile = new File("build.gradle")
|
||||||
|
availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
|
||||||
|
print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean isNewBuildScriptVersionAvailable() {
|
||||||
|
Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
|
||||||
|
|
||||||
|
String currentBuildScript = new File("build.gradle").getText()
|
||||||
|
String currentBuildScriptHash = getVersionHash(currentBuildScript)
|
||||||
|
String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
|
||||||
|
String availableBuildScriptHash = getVersionHash(availableBuildScript)
|
||||||
|
|
||||||
|
boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
|
||||||
|
return !isUpToDate
|
||||||
|
}
|
||||||
|
|
||||||
|
static String getVersionHash(String buildScriptContent) {
|
||||||
|
String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
|
||||||
|
if(versionLine != null) {
|
||||||
|
return versionLine.split(": ").last()
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
configure(updateBuildScript) {
|
||||||
|
group = 'forgegradle'
|
||||||
|
description = 'Updates the build script to the latest version'
|
||||||
}
|
}
|
||||||
+3
-38
@@ -1,42 +1,7 @@
|
|||||||
// Add your dependencies here
|
// Add your dependencies here
|
||||||
configurations.create('gtnhlibEmbed') {
|
|
||||||
canBeConsumed = false
|
|
||||||
canBeResolved = true
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api('com.github.GTNewHorizons:CodeChickenCore:1.4.22:dev')
|
compile("com.github.GTNewHorizons:CodeChickenLib:master-SNAPSHOT:dev")
|
||||||
devOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.11.54:dev')
|
compile("com.github.GTNewHorizons:CodeChickenCore:master-SNAPSHOT:dev")
|
||||||
|
shadowImplementation("org.apache.commons:commons-csv:1.5")
|
||||||
shadowImplementation('org.apache.commons:commons-csv:1.10.0')
|
|
||||||
|
|
||||||
compileOnly('maven.modrinth:forge-essentials:7.5.1')
|
|
||||||
compileOnly('com.cardinalstar.cubicchunks:CubicChunks1710:v0.1.14-alpha:dev')
|
|
||||||
|
|
||||||
antlr('org.antlr:antlr4:4.13.2')
|
|
||||||
shadowImplementation('org.antlr:antlr4-runtime:4.13.2')
|
|
||||||
|
|
||||||
testImplementation(platform('org.junit:junit-bom:5.13.4'))
|
|
||||||
testImplementation('org.junit.jupiter:junit-jupiter')
|
|
||||||
testImplementation("org.mockito:mockito-core:5.+")
|
|
||||||
|
|
||||||
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
|
|
||||||
testRuntimeOnly("org.lwjgl.lwjgl:lwjgl:2.9.3");
|
|
||||||
|
|
||||||
compileOnly("com.github.GTNewHorizons:GTNHLib:0.11.54") { transitive = false }
|
|
||||||
gtnhlibEmbed("com.github.GTNewHorizons:GTNHLib:0.11.54") { transitive = false }
|
|
||||||
}
|
|
||||||
|
|
||||||
def embedArchiveOperations = gtnhGradle.archiveOperations
|
|
||||||
def gtnhlibEmbedContents = configurations.gtnhlibEmbed.elements.map { files ->
|
|
||||||
files.collect { embedArchiveOperations.zipTree(it.asFile) }
|
|
||||||
}
|
|
||||||
|
|
||||||
[tasks.jar, tasks.shadowJar].each {
|
|
||||||
it.configure {
|
|
||||||
from(gtnhlibEmbedContents) {
|
|
||||||
include 'com/gtnewhorizon/gtnhlib/color/ColorResource.class'
|
|
||||||
include 'com/gtnewhorizon/gtnhlib/color/ColorResource$*.class'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+29
-212
@@ -1,243 +1,60 @@
|
|||||||
# 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.0
|
|
||||||
|
|
||||||
# Human-readable mod name, available for mcmod.info population.
|
|
||||||
modName = NotEnoughItems
|
modName = NotEnoughItems
|
||||||
|
|
||||||
# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
|
# This is a case-sensitive string to identify your mod. Convention is to use lower case.
|
||||||
# Conventionally lowercase.
|
|
||||||
modId = NotEnoughItems
|
modId = NotEnoughItems
|
||||||
|
|
||||||
# Root package of the mod, used to find various classes in other properties,
|
|
||||||
# mcmod.info substitution, enabling assertions in run tasks, etc.
|
|
||||||
modGroup = codechicken.nei
|
modGroup = codechicken.nei
|
||||||
|
|
||||||
# Whether to use modGroup as the maven publishing group.
|
# WHY is there no version field?
|
||||||
# When false, com.github.GTNewHorizons is used.
|
# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
|
||||||
useModGroupForPublishing = false
|
# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
|
||||||
|
|
||||||
# Updates your build.gradle and settings.gradle automatically whenever an update is available.
|
# Will update your build.gradle automatically whenever an update is available
|
||||||
autoUpdateBuildScript = false
|
autoUpdateBuildScript = false
|
||||||
|
|
||||||
# Version of Minecraft to target
|
|
||||||
minecraftVersion = 1.7.10
|
minecraftVersion = 1.7.10
|
||||||
|
|
||||||
# Version of Minecraft Forge to target
|
|
||||||
forgeVersion = 10.13.4.1614
|
forgeVersion = 10.13.4.1614
|
||||||
|
|
||||||
# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
|
# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
|
||||||
channel = stable
|
# restart Minecraft in development. Choose this dependent on your mod:
|
||||||
|
# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
|
||||||
|
# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
|
||||||
|
developmentEnvironmentUserName = "Developer"
|
||||||
|
|
||||||
# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
|
# Define a source file of your project with:
|
||||||
mappingsVersion = 12
|
# public static final String VERSION = "GRADLETOKEN_VERSION";
|
||||||
|
# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
|
||||||
# Defines other MCP mappings for dependency deobfuscation.
|
# version in @Mod([...], version = VERSION, [...])
|
||||||
remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
|
# Leave these properties empty to skip individual token replacements
|
||||||
|
replaceGradleTokenInFile = NEIModContainer.java
|
||||||
# Select a default username for testing your mod. You can always override this per-run by running
|
gradleTokenModId = GRADLETOKEN_MODID
|
||||||
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
|
gradleTokenModName = GRADLETOKEN_MODNAME
|
||||||
developmentEnvironmentUserName = Developer
|
gradleTokenVersion = GRADLETOKEN_VERSION
|
||||||
|
|
||||||
# Enables modern Java syntax support. Valid values:
|
|
||||||
# - false: No modern syntax, Java 8 only
|
|
||||||
# - jabel: Jabel syntax-only support, compiles to J8 bytecode
|
|
||||||
# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
|
|
||||||
# - modern: Native modern Java bytecode, no downgrading
|
|
||||||
enableModernJavaSyntax = jabel
|
|
||||||
|
|
||||||
# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
|
|
||||||
# and should *not* be used in most situations. -1 disables this.
|
|
||||||
# forceToolchainVersion = -1
|
|
||||||
|
|
||||||
# Target JVM version for JVM Downgrader bytecode downgrading.
|
|
||||||
# Only used when enableModernJavaSyntax = jvmDowngrader
|
|
||||||
# downgradeTargetVersion = 8
|
|
||||||
|
|
||||||
# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
|
|
||||||
# Classes will be available in META-INF/versions/N/ for each version N in this list.
|
|
||||||
# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
|
|
||||||
# jvmDowngraderMultiReleaseVersions = 21,25
|
|
||||||
|
|
||||||
# Specifies how JVM Downgrader API stubs are provided. Options:
|
|
||||||
# - shade: Shade minimized stubs into the jar
|
|
||||||
# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
|
|
||||||
# - external: Another dependency provides stubs (no constraint, no warning)
|
|
||||||
# - (empty): Warning reminding you to configure stubs
|
|
||||||
# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
|
|
||||||
# jvmDowngraderStubsProvider =
|
|
||||||
|
|
||||||
# Enables injecting missing generics into the decompiled source code for a better coding experience.
|
|
||||||
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
|
|
||||||
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 = codechicken.nei.Tags
|
|
||||||
|
|
||||||
# Name of the token containing the project's current version to generate/replace.
|
|
||||||
gradleTokenVersion = VERSION
|
|
||||||
|
|
||||||
# [DEPRECATED] Mod ID replacement token.
|
|
||||||
gradleTokenModId =
|
|
||||||
|
|
||||||
# [DEPRECATED] Mod name replacement token.
|
|
||||||
gradleTokenModName =
|
|
||||||
|
|
||||||
# [DEPRECATED] Mod Group replacement token.
|
|
||||||
gradleTokenGroupName =
|
gradleTokenGroupName =
|
||||||
|
|
||||||
# [DEPRECATED]
|
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
|
||||||
# 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.
|
# leave this property empty.
|
||||||
# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
|
# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
|
||||||
apiPackage =
|
apiPackage =
|
||||||
|
|
||||||
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
|
# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
|
||||||
# There can be multiple files in a space-separated list.
|
# Example value: mymodid_at.cfg
|
||||||
# Example value: mymodid_at.cfg nei_at.cfg
|
|
||||||
accessTransformersFile = nei_at.cfg
|
accessTransformersFile = nei_at.cfg
|
||||||
|
|
||||||
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
|
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
|
||||||
usesMixins = false
|
usesMixins = false
|
||||||
|
# Specify the location of your implementation of IMixinPlugin. Leave it empty otherwise.
|
||||||
# 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 =
|
mixinPlugin =
|
||||||
|
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
|
||||||
# Specify the package that contains all of your Mixins. The package must exist or
|
|
||||||
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
|
|
||||||
# it must match with this or the build will fail.
|
|
||||||
mixinsPackage =
|
mixinsPackage =
|
||||||
|
|
||||||
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
|
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
|
||||||
# This parameter is for legacy compatibility only
|
# This parameter is for legacy compatability only
|
||||||
# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
|
# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
|
||||||
coreModClass = asm.NEICorePlugin
|
coreModClass = asm.NEICorePlugin
|
||||||
|
|
||||||
# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
|
# 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!
|
# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
|
||||||
containsMixinsAndOrCoreModOnly = true
|
containsMixinsAndOrCoreModOnly = true
|
||||||
|
|
||||||
# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
|
# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
|
||||||
forceEnableMixins = false
|
# responsibility check the licence and request permission for distribution, if required.
|
||||||
|
|
||||||
# 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 = true
|
usesShadowedDependencies = true
|
||||||
|
|
||||||
# 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 = notenoughitems-unofficial
|
|
||||||
|
|
||||||
# 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: UniMixins is automatically set as a required dependency if usesMixins = true.
|
|
||||||
modrinthRelations = required-project\:codechickencore-unofficial
|
|
||||||
|
|
||||||
# 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 = 358228
|
|
||||||
|
|
||||||
# Comma-separated supported CurseForge environments: client, server (case-insensitive).
|
|
||||||
# Use client or server for mods that only support one environment. Defaults to client,server.
|
|
||||||
# These tags describe where the mod can run, not whether installation is required on both sides.
|
|
||||||
curseForgeEnvironments = client,server
|
|
||||||
|
|
||||||
# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
|
|
||||||
# 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 = requiredDependency\:codechickencore-unofficial
|
|
||||||
|
|
||||||
# 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 customize the default working directory used by the runClient* tasks. Relative to the project directory.
|
|
||||||
# runClientWorkingDirectory = run/client
|
|
||||||
|
|
||||||
# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
|
|
||||||
# runServerWorkingDirectory = run/server
|
|
||||||
|
|
||||||
# Optional parameter to have the build automatically fail if an illegal version is used.
|
|
||||||
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
|
|
||||||
# The check is ONLY performed if the version is a git tag.
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# Non-GTNH properties
|
|
||||||
org.gradle.configuration-cache = true
|
|
||||||
org.gradle.parallel = true
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
#This file is generated by updateDaemonJvm
|
|
||||||
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
|
|
||||||
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
|
|
||||||
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
|
|
||||||
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
|
|
||||||
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9064f22734b42ac03e85df04b632e167/redirect
|
|
||||||
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/4d0277c49991306ac78048580fe34bcf/redirect
|
|
||||||
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
|
|
||||||
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
|
|
||||||
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a9fa3b809e484a1e1ac4308a5dda661a/redirect
|
|
||||||
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/aa99913fa6d767d899ffc96082da01ca/redirect
|
|
||||||
toolchainVersion=25
|
|
||||||
Vendored
BIN
Binary file not shown.
+1
-5
@@ -1,9 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
|
||||||
networkTimeout=10000
|
|
||||||
retries=0
|
|
||||||
retryBackOffMs=500
|
|
||||||
validateDistributionUrl=true
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright © 2015 the original authors.
|
# Copyright 2015 the original author or authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -15,114 +15,80 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
##
|
||||||
# gradlew start up script for POSIX generated by Gradle.
|
## Gradle start up script for UN*X
|
||||||
#
|
##
|
||||||
# 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 gradlew
|
|
||||||
#
|
|
||||||
# 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/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
# Resolve links: $0 may be a link
|
||||||
app_path=$0
|
PRG="$0"
|
||||||
|
# Need this for relative symlinks.
|
||||||
# Need this for daisy-chained symlinks.
|
while [ -h "$PRG" ] ; do
|
||||||
while
|
ls=`ls -ld "$PRG"`
|
||||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||||
[ -h "$app_path" ]
|
if expr "$link" : '/.*' > /dev/null; then
|
||||||
do
|
PRG="$link"
|
||||||
ls=$( ls -ld "$app_path" )
|
else
|
||||||
link=${ls#*' -> '}
|
PRG=`dirname "$PRG"`"/$link"
|
||||||
case $link in #(
|
fi
|
||||||
/*) app_path=$link ;; #(
|
|
||||||
*) app_path=$APP_HOME$link ;;
|
|
||||||
esac
|
|
||||||
done
|
done
|
||||||
|
SAVED="`pwd`"
|
||||||
|
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||||
|
APP_HOME="`pwd -P`"
|
||||||
|
cd "$SAVED" >/dev/null
|
||||||
|
|
||||||
# This is normally unused
|
APP_NAME="Gradle"
|
||||||
# shellcheck disable=SC2034
|
APP_BASE_NAME=`basename "$0"`
|
||||||
APP_BASE_NAME=${0##*/}
|
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD="maximum"
|
||||||
|
|
||||||
warn () {
|
warn () {
|
||||||
echo "$*"
|
echo "$*"
|
||||||
} >&2
|
}
|
||||||
|
|
||||||
die () {
|
die () {
|
||||||
echo
|
echo
|
||||||
echo "$*"
|
echo "$*"
|
||||||
echo
|
echo
|
||||||
exit 1
|
exit 1
|
||||||
} >&2
|
}
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
# OS specific support (must be 'true' or 'false').
|
||||||
cygwin=false
|
cygwin=false
|
||||||
msys=false
|
msys=false
|
||||||
darwin=false
|
darwin=false
|
||||||
nonstop=false
|
nonstop=false
|
||||||
case "$( uname )" in #(
|
case "`uname`" in
|
||||||
CYGWIN* ) cygwin=true ;; #(
|
CYGWIN* )
|
||||||
Darwin* ) darwin=true ;; #(
|
cygwin=true
|
||||||
MSYS* | MINGW* ) msys=true ;; #(
|
;;
|
||||||
NONSTOP* ) nonstop=true ;;
|
Darwin* )
|
||||||
|
darwin=true
|
||||||
|
;;
|
||||||
|
MINGW* )
|
||||||
|
msys=true
|
||||||
|
;;
|
||||||
|
NONSTOP* )
|
||||||
|
nonstop=true
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||||
else
|
else
|
||||||
JAVACMD=$JAVA_HOME/bin/java
|
JAVACMD="$JAVA_HOME/bin/java"
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
@@ -131,118 +97,92 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD="java"
|
||||||
if ! command -v java >/dev/null 2>&1
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
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
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||||
case $MAX_FD in #(
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
max*)
|
if [ $? -eq 0 ] ; then
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||||
# shellcheck disable=SC2039,SC3045
|
MAX_FD="$MAX_FD_LIMIT"
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
fi
|
||||||
warn "Could not query maximum file descriptor limit"
|
ulimit -n $MAX_FD
|
||||||
esac
|
if [ $? -ne 0 ] ; then
|
||||||
case $MAX_FD in #(
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||||
'' | soft) :;; #(
|
fi
|
||||||
*)
|
else
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||||
# shellcheck disable=SC2039,SC3045
|
fi
|
||||||
ulimit -n "$MAX_FD" ||
|
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Collect all arguments for the java command, stacking in reverse order:
|
# For Darwin, add options to specify how the application appears in the dock
|
||||||
# * args from the command line
|
if $darwin; then
|
||||||
# * the main class name
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
# * -classpath
|
fi
|
||||||
# * -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
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
if "$cygwin" || "$msys" ; then
|
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
|
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
SEP=""
|
||||||
for arg do
|
for dir in $ROOTDIRSRAW ; do
|
||||||
if
|
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||||
case $arg in #(
|
SEP="|"
|
||||||
-*) 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
|
done
|
||||||
|
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||||
|
# Add a user-defined pattern to the cygpath arguments
|
||||||
|
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||||
|
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||||
|
fi
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
i=0
|
||||||
|
for arg in "$@" ; do
|
||||||
|
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||||
|
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||||
|
|
||||||
|
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||||
|
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||||
|
else
|
||||||
|
eval `echo args$i`="\"$arg\""
|
||||||
|
fi
|
||||||
|
i=$((i+1))
|
||||||
|
done
|
||||||
|
case $i in
|
||||||
|
(0) set -- ;;
|
||||||
|
(1) set -- "$args0" ;;
|
||||||
|
(2) set -- "$args0" "$args1" ;;
|
||||||
|
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||||
|
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||||
|
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||||
|
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||||
|
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||||
|
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||||
|
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Escape application args
|
||||||
|
save () {
|
||||||
|
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||||
|
echo " "
|
||||||
|
}
|
||||||
|
APP_ARGS=$(save "$@")
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||||
# and any embedded shellness will be escaped.
|
cd "$(dirname "$0")"
|
||||||
# * 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" \
|
|
||||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
|
||||||
"$@"
|
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
|
||||||
if ! command -v xargs >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
die "xargs is not available"
|
|
||||||
fi
|
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" "$@"
|
exec "$JAVACMD" "$@"
|
||||||
Vendored
+50
-32
@@ -13,28 +13,22 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
@rem SPDX-License-Identifier: Apache-2.0
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%" == "" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem gradlew startup script for Windows
|
@rem Gradle startup script for Windows
|
||||||
@rem
|
@rem
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|
||||||
@rem Set local scope for the variables, and ensure extensions are enabled
|
@rem Set local scope for the variables with windows NT shell
|
||||||
setlocal EnableExtensions
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
@rem This is normally unused
|
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
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.
|
@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"
|
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||||
|
|
||||||
@@ -43,40 +37,64 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if "%ERRORLEVEL%" == "0" goto init
|
||||||
|
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation.
|
||||||
|
|
||||||
"%COMSPEC%" /c exit 1
|
goto fail
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
:findJavaFromJavaHome
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto init
|
||||||
|
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation.
|
||||||
|
|
||||||
"%COMSPEC%" /c exit 1
|
goto fail
|
||||||
|
|
||||||
|
:init
|
||||||
|
@rem Get command-line arguments, handling Windows variants
|
||||||
|
|
||||||
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||||
|
|
||||||
|
:win9xME_args
|
||||||
|
@rem Slurp the command line arguments.
|
||||||
|
set CMD_LINE_ARGS=
|
||||||
|
set _SKIP=2
|
||||||
|
|
||||||
|
:win9xME_args_slurp
|
||||||
|
if "x%~1" == "x" goto execute
|
||||||
|
|
||||||
|
set CMD_LINE_ARGS=%*
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@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 %CMD_LINE_ARGS%
|
||||||
|
|
||||||
@rem Execute gradlew
|
:end
|
||||||
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
|
@rem End local scope for the variables with windows NT shell
|
||||||
@rem which allows us to clear the local environment before executing the java command
|
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||||
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
|
|
||||||
|
|
||||||
:exitWithErrorLevel
|
:fail
|
||||||
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
"%COMSPEC%" /c exit %ERRORLEVEL%
|
rem the _cmd.exe /c_ return code!
|
||||||
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
+3
-3
@@ -1,8 +1,8 @@
|
|||||||
// Add any additional repositories for your dependencies here
|
// Add any additional repositiroes for your dependencies here
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
maven {
|
maven {
|
||||||
name = "Modrinth"
|
url = "https://jitpack.io"
|
||||||
url = "https://api.modrinth.com/maven"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
|
|
||||||
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 '2.0.34'
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
rootProject.name = "NotEnoughItems"
|
|
||||||
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
lexer grammar SearchExpressionLexer;
|
|
||||||
|
|
||||||
// Antlr4 generates imports with .*
|
|
||||||
@header {
|
|
||||||
// CHECKSTYLE:OFF
|
|
||||||
import codechicken.nei.SearchTokenParser;
|
|
||||||
}
|
|
||||||
|
|
||||||
@members {
|
|
||||||
private SearchTokenParser searchParser;
|
|
||||||
|
|
||||||
public SearchExpressionLexer(CharStream input, SearchTokenParser searchParser) {
|
|
||||||
this(input);
|
|
||||||
this.searchParser = searchParser;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Lexer rules
|
|
||||||
REGEX_LEFT : 'r'? '/' -> pushMode(REGEX) ;
|
|
||||||
QUOTE_LEFT : '"' -> pushMode(QUOTED) ;
|
|
||||||
|
|
||||||
DASH : '-' ;
|
|
||||||
|
|
||||||
RECIPE_INGREDIENTS : '<&' | '<' ;
|
|
||||||
RECIPE_RESULT : '>&' | '>' ;
|
|
||||||
RECIPE_OTHERS : '^&' | '^' ;
|
|
||||||
RECIPE_TEXT : '~' ;
|
|
||||||
|
|
||||||
OR : '|' ;
|
|
||||||
LEFT_BRACKET : '{' ;
|
|
||||||
RIGHT_BRACKET : '}' ;
|
|
||||||
NEWLINE_OR_TAB : [\t\r\n] -> skip ;
|
|
||||||
SPACE : ' ' ;
|
|
||||||
ESCAPED_SYMBOL : '\\' . ;
|
|
||||||
|
|
||||||
PREFIX : CLEAN_SYMBOL {searchParser.hasRedefinedPrefix(getText().charAt(0))}? ;
|
|
||||||
CLEAN_SYMBOL : ~[-<>^~{}|/\\ "] ;
|
|
||||||
|
|
||||||
mode REGEX;
|
|
||||||
|
|
||||||
REGEX_CONTENT : (~[/] | '\\/')+ ;
|
|
||||||
REGEX_RIGHT : '/' -> popMode ;
|
|
||||||
|
|
||||||
mode QUOTED;
|
|
||||||
|
|
||||||
QUOTED_CONTENT : (~["] | '\\"')+ ;
|
|
||||||
QUOTE_RIGHT : '"' -> popMode ;
|
|
||||||
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
parser grammar SearchExpressionParser;
|
|
||||||
|
|
||||||
// Antlr4 generates imports with .*
|
|
||||||
@header {
|
|
||||||
// CHECKSTYLE:OFF
|
|
||||||
}
|
|
||||||
|
|
||||||
options { tokenVocab=SearchExpressionLexer; }
|
|
||||||
|
|
||||||
// Parser rules
|
|
||||||
|
|
||||||
// Should only be used for recipes. Thanks to antlr inability to properly
|
|
||||||
// inherit grammars, this is included where it's not supposed to be
|
|
||||||
recipeSearchExpression
|
|
||||||
: recipeClauseExpression*
|
|
||||||
;
|
|
||||||
|
|
||||||
recipeClauseExpression
|
|
||||||
: ingredientsPrefix=RECIPE_INGREDIENTS searchExpression[0, $ingredientsPrefix.getText().length() > 1]
|
|
||||||
| resultPrefix=RECIPE_RESULT searchExpression[1, $resultPrefix.getText().length() > 1]
|
|
||||||
| othersPrefix=RECIPE_OTHERS searchExpression[2, $othersPrefix.getText().length() > 1]
|
|
||||||
| RECIPE_TEXT searchExpression[4, false]
|
|
||||||
| searchExpression[3, false]
|
|
||||||
;
|
|
||||||
|
|
||||||
// General search expression rules
|
|
||||||
searchExpression[int type, boolean allRecipe]
|
|
||||||
: orExpression
|
|
||||||
;
|
|
||||||
|
|
||||||
orExpression
|
|
||||||
: sequenceExpression (OR sequenceExpression)*
|
|
||||||
;
|
|
||||||
|
|
||||||
sequenceExpression
|
|
||||||
: (SPACE* unaryExpression SPACE*)+
|
|
||||||
;
|
|
||||||
|
|
||||||
unaryExpression
|
|
||||||
: LEFT_BRACKET orExpression RIGHT_BRACKET?
|
|
||||||
| prefixedExpression
|
|
||||||
| negateExpression
|
|
||||||
| token['\0']
|
|
||||||
;
|
|
||||||
|
|
||||||
negateExpression
|
|
||||||
: DASH unaryExpression
|
|
||||||
;
|
|
||||||
|
|
||||||
prefixedExpression
|
|
||||||
locals [
|
|
||||||
Character prefix
|
|
||||||
]
|
|
||||||
: prefixToken=PREFIX { $prefix = $prefixToken.getText().charAt(0); } token[$prefix]
|
|
||||||
;
|
|
||||||
|
|
||||||
token[Character prefix]
|
|
||||||
: regex[prefix]
|
|
||||||
| quoted[prefix]
|
|
||||||
| plainText
|
|
||||||
;
|
|
||||||
|
|
||||||
regex[Character prefix]
|
|
||||||
: REGEX_LEFT REGEX_CONTENT REGEX_RIGHT?
|
|
||||||
;
|
|
||||||
|
|
||||||
quoted[Character prefix]
|
|
||||||
: QUOTE_LEFT QUOTED_CONTENT QUOTE_RIGHT?
|
|
||||||
;
|
|
||||||
|
|
||||||
plainText
|
|
||||||
: (CLEAN_SYMBOL | ESCAPED_SYMBOL)+
|
|
||||||
;
|
|
||||||
|
|
||||||
@@ -1,151 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.ItemsGrid.ItemsGridSlot;
|
|
||||||
import codechicken.nei.api.GuiInfo;
|
|
||||||
import codechicken.nei.api.INEIGuiHandler;
|
|
||||||
import codechicken.nei.api.ShortcutInputHandler;
|
|
||||||
import codechicken.nei.drawable.DrawableBuilder;
|
|
||||||
import codechicken.nei.drawable.DrawableResource;
|
|
||||||
import codechicken.nei.guihook.IContainerTooltipHandler;
|
|
||||||
import codechicken.nei.recipe.GuiRecipe;
|
|
||||||
|
|
||||||
public abstract class AbstractSubpanel<T extends ItemsGrid<? extends ItemsGridSlot, ? extends ItemsGrid.MouseContext>>
|
|
||||||
extends Widget implements IContainerTooltipHandler {
|
|
||||||
|
|
||||||
final DrawableResource DASH = new DrawableBuilder("nei:textures/dash.png", 0, 0, 6, 1).setTextureSize(6, 1).build();
|
|
||||||
|
|
||||||
protected int mouseDownItemIndex = -1;
|
|
||||||
protected int splittingLineColor = 0xffffffff;
|
|
||||||
protected int linePaddingStart = 0;
|
|
||||||
protected T grid;
|
|
||||||
|
|
||||||
public boolean isEmpty() {
|
|
||||||
return this.grid.isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void draw(int mousex, int mousey) {
|
|
||||||
drawSplittingLine();
|
|
||||||
this.grid.draw(mousex, mousey);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void update() {
|
|
||||||
this.grid.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract int setPanelWidth(int width);
|
|
||||||
|
|
||||||
public void resize(GuiContainer gui) {
|
|
||||||
this.grid.setGridSize(x, y + 4, w, h - 8);
|
|
||||||
this.grid.refresh(gui);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack getStackMouseOver(int mousex, int mousey) {
|
|
||||||
final ItemsGridSlot slot = getSlotMouseOver(mousex, mousey);
|
|
||||||
return slot == null ? null : slot.getItemStack();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemsGridSlot getSlotMouseOver(int mousex, int mousey) {
|
|
||||||
return this.grid.getSlotMouseOver(mousex, mousey);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void updateLinePadding() {
|
|
||||||
final GuiContainer guiContainer = NEIClientUtils.getGuiContainer();
|
|
||||||
final INEIGuiHandler[] handlers = GuiInfo.getGuiHandlersSnapshot();
|
|
||||||
final Rectangle4i rect = new Rectangle4i(this.x, this.y - 1, 10, 2);
|
|
||||||
this.linePaddingStart = 0;
|
|
||||||
|
|
||||||
while (this.linePaddingStart < this.w && GuiInfo.hideItemPanelSlot(guiContainer, rect, handlers)) {
|
|
||||||
this.linePaddingStart += 10;
|
|
||||||
rect.x += 10;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void drawSplittingLine() {
|
|
||||||
float alpha = (this.splittingLineColor >> 24 & 255) / 255.0F;
|
|
||||||
float red = (this.splittingLineColor >> 16 & 255) / 255.0F;
|
|
||||||
float green = (this.splittingLineColor >> 8 & 255) / 255.0F;
|
|
||||||
float blue = (this.splittingLineColor & 255) / 255.0F;
|
|
||||||
|
|
||||||
int width = this.grid.columns * ItemsGrid.SLOT_SIZE - this.linePaddingStart;
|
|
||||||
int repeat = width / 6;
|
|
||||||
int shiftX = this.x + this.linePaddingStart + (this.w - width) / 2;
|
|
||||||
|
|
||||||
GL11.glColor4f(red, green, blue, alpha);
|
|
||||||
for (int i = 0; i < repeat; i++) {
|
|
||||||
DASH.draw(shiftX + i * 6, this.y);
|
|
||||||
}
|
|
||||||
GL11.glColor4f(1, 1, 1, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
|
|
||||||
|
|
||||||
if (this.mouseDownItemIndex >= 0 && ItemPanels.itemPanel.draggedStack == null
|
|
||||||
&& NEIClientUtils.getHeldItem() == null
|
|
||||||
&& NEIClientConfig.hasSMPCounterPart()) {
|
|
||||||
|
|
||||||
final ItemsGridSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
|
|
||||||
|
|
||||||
if (mouseOverSlot == null || mouseOverSlot.itemIndex != this.mouseDownItemIndex || heldTime > 500) {
|
|
||||||
ItemPanels.itemPanel.draggedStack = getDraggedStackWithQuantity(
|
|
||||||
this.grid.getItem(this.mouseDownItemIndex));
|
|
||||||
this.mouseDownItemIndex = -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean handleClick(int mousex, int mousey, int button) {
|
|
||||||
if (handleClickExt(mousex, mousey, button)) return true;
|
|
||||||
|
|
||||||
final ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
|
||||||
if (hoverSlot != null) {
|
|
||||||
|
|
||||||
if (button == 2) {
|
|
||||||
ItemPanels.itemPanel.draggedStack = getDraggedStackWithQuantity(hoverSlot.getItemStack());
|
|
||||||
} else {
|
|
||||||
mouseDownItemIndex = hoverSlot.itemIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected abstract ItemStack getDraggedStackWithQuantity(ItemStack itemStack);
|
|
||||||
|
|
||||||
public ItemStack getStackMouseOverWithQuantity(int mousex, int mousey) {
|
|
||||||
final ItemStack hoverSlot = getStackMouseOver(mousex, mousey);
|
|
||||||
return hoverSlot != null ? getDraggedStackWithQuantity(hoverSlot) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseUp(int mousex, int mousey, int button) {
|
|
||||||
final ItemsGridSlot hoverSlot = getSlotMouseOver(mousex, mousey);
|
|
||||||
|
|
||||||
if (hoverSlot != null && hoverSlot.itemIndex == this.mouseDownItemIndex
|
|
||||||
&& ItemPanels.itemPanel.draggedStack == null) {
|
|
||||||
|
|
||||||
if (NEIController.manager.window instanceof GuiRecipe || NEIClientUtils.shiftKey()
|
|
||||||
|| !NEIClientConfig.canCheatItem(hoverSlot.getItemStack())) {
|
|
||||||
ShortcutInputHandler.handleMouseClick(hoverSlot.getItemStack().copy());
|
|
||||||
} else {
|
|
||||||
NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.getItemStack()), button, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
this.mouseDownItemIndex = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,180 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import static codechicken.lib.gui.GuiDraw.getMousePosition;
|
|
||||||
|
|
||||||
import java.awt.Point;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.GuiTextField;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.client.settings.GameSettings;
|
|
||||||
import net.minecraft.util.ChatAllowedCharacters;
|
|
||||||
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.guihook.IContainerInputHandler;
|
|
||||||
|
|
||||||
public class AutoFocusWidget implements IContainerInputHandler {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Implement this interface on a GuiContainer to enable the autofocus search in NEI (if the autofocus option is
|
|
||||||
* enabled) without needing to add the classname to the config file .
|
|
||||||
*/
|
|
||||||
public interface INEIAutoFocusSearchEnable {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static AutoFocusWidget instance = new AutoFocusWidget();
|
|
||||||
|
|
||||||
public static List<String> enableAutoFocusPrefixes = new ArrayList<>();
|
|
||||||
|
|
||||||
protected boolean autofocus = false;
|
|
||||||
protected Point mouse;
|
|
||||||
protected Point pendingMouse;
|
|
||||||
protected GuiTextField textInputHolder;
|
|
||||||
|
|
||||||
public AutoFocusWidget() {
|
|
||||||
GuiContainerManager.addInputHandler(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void load(GuiContainer gui) {
|
|
||||||
this.autofocus = LayoutManager.searchField.isVisible() && NEIClientConfig.searchWidgetAutofocus() != 0
|
|
||||||
&& isAllowedGuiAutoSearchFocus(gui);
|
|
||||||
this.mouse = null;
|
|
||||||
this.pendingMouse = null;
|
|
||||||
|
|
||||||
if (this.autofocus) {
|
|
||||||
beginTextInput();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void beginTextInput() {
|
|
||||||
if (this.textInputHolder == null) {
|
|
||||||
this.textInputHolder = new GuiTextField(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.textInputHolder.setFocused(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void endTextInput() {
|
|
||||||
if (this.textInputHolder != null) {
|
|
||||||
this.textInputHolder.setFocused(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void guiTick() {
|
|
||||||
if (!this.autofocus) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final Point current = getMousePosition();
|
|
||||||
|
|
||||||
if (this.mouse == null) {
|
|
||||||
if (current.equals(this.pendingMouse)) {
|
|
||||||
this.mouse = current;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.pendingMouse = current;
|
|
||||||
} else if (!this.mouse.equals(current)) {
|
|
||||||
cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void cancel() {
|
|
||||||
if (this.autofocus) {
|
|
||||||
this.autofocus = false;
|
|
||||||
endTextInput();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
|
||||||
|
|
||||||
if (this.autofocus) {
|
|
||||||
|
|
||||||
if (NEIClientConfig.searchWidgetAutofocus() == 2
|
|
||||||
&& GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindInventory)) {
|
|
||||||
cancel();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (keyCode == Keyboard.KEY_RETURN || keyCode == Keyboard.KEY_NUMPADENTER
|
|
||||||
|| keyCode == Keyboard.KEY_ESCAPE) {
|
|
||||||
cancel();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ChatAllowedCharacters.isAllowedCharacter(keyChar)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.autofocus = false;
|
|
||||||
|
|
||||||
LayoutManager.searchField.setFocus(true);
|
|
||||||
endTextInput();
|
|
||||||
|
|
||||||
final String oldText = LayoutManager.searchField.text();
|
|
||||||
LayoutManager.searchField.handleKeyPress(keyCode, keyChar);
|
|
||||||
|
|
||||||
return !LayoutManager.searchField.text().equals(oldText);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
|
||||||
cancel();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
|
||||||
cancel();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
|
||||||
cancel();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {
|
|
||||||
cancel();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
|
||||||
cancel();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
|
|
||||||
cancel();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected boolean isAllowedGuiAutoSearchFocus(GuiContainer gui) {
|
|
||||||
if (gui instanceof INEIAutoFocusSearchEnable) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
String guiClassName = gui.getClass().getName();
|
|
||||||
for (String prefix : enableAutoFocusPrefixes) {
|
|
||||||
if (guiClassName.startsWith(prefix)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiChest;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
|
|
||||||
import codechicken.nei.api.API;
|
|
||||||
import codechicken.nei.api.IBookmarkContainerHandler;
|
|
||||||
|
|
||||||
public class BookmarkContainerInfo {
|
|
||||||
|
|
||||||
private static final HashMap<Class<? extends GuiContainer>, IBookmarkContainerHandler> handlerMap = new HashMap<>();
|
|
||||||
|
|
||||||
public static void registerBookmarkContainerHandler(Class<? extends GuiContainer> classz,
|
|
||||||
IBookmarkContainerHandler handler) {
|
|
||||||
handlerMap.put(classz, handler);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasBookmarkContainerHandler(Class<? extends GuiContainer> classz) {
|
|
||||||
return handlerMap.containsKey(classz);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static IBookmarkContainerHandler getBookmarkContainerHandler(GuiContainer gui) {
|
|
||||||
if (gui != null) {
|
|
||||||
return handlerMap.get(gui.getClass());
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void load() {
|
|
||||||
API.registerBookmarkContainerHandler(GuiChest.class, new DefaultBookmarkContainerHandler());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,11 +1,11 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.lib.gui.GuiDraw.getStringWidth;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public abstract class Button extends Widget {
|
import static codechicken.lib.gui.GuiDraw.getStringWidth;
|
||||||
|
|
||||||
|
public abstract class Button extends Widget
|
||||||
|
{
|
||||||
public Button(String s) {
|
public Button(String s) {
|
||||||
label = s;
|
label = s;
|
||||||
}
|
}
|
||||||
@@ -15,7 +15,7 @@ public abstract class Button extends Widget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int contentWidth() {
|
public int contentWidth() {
|
||||||
return getRenderIcon() == null ? getStringWidth(getRenderLabel()) : getRenderIcon().width;
|
return getRenderIcon() == null ? getStringWidth(label) : getRenderIcon().width;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -25,7 +25,9 @@ public abstract class Button extends Widget {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handleClick(int mx, int my, int button) {
|
public boolean handleClick(int mx, int my, int button) {
|
||||||
if (button == 1 || button == 0) if (onButtonPress(button == 1)) NEIClientUtils.playClickSound();
|
if (button == 1 || button == 0)
|
||||||
|
if (onButtonPress(button == 1))
|
||||||
|
NEIClientUtils.playClickSound();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,35 +39,36 @@ public abstract class Button extends Widget {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
|
public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
|
||||||
if (!contains(mx, my)) return tooltip;
|
if (!contains(mx, my))
|
||||||
|
return tooltip;
|
||||||
|
|
||||||
final String tip = getButtonTip();
|
final String tip = getButtonTip();
|
||||||
if (tip != null) tooltip.add(tip);
|
if (tip != null)
|
||||||
|
tooltip.add(tip);
|
||||||
|
|
||||||
addTooltips(tooltip);
|
addTooltips(tooltip);
|
||||||
|
|
||||||
return tooltip;
|
return tooltip;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getButtonTip() {
|
public String getButtonTip() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addTooltips(List<String> tooltip) {}
|
public void addTooltips(List<String> tooltip) {}
|
||||||
|
|
||||||
public String getRenderLabel() {
|
public String getRenderLabel() {
|
||||||
return label;
|
return label;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getRenderLabelColor() {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public final String label;
|
public final String label;
|
||||||
public Image icon;
|
public Image icon;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 0x4 = state flag, as opposed to 1 click 0 = normal 1 = on 2 = disabled
|
* 0x4 = state flag, as opposed to 1 click
|
||||||
|
* 0 = normal
|
||||||
|
* 1 = on
|
||||||
|
* 2 = disabled
|
||||||
*/
|
*/
|
||||||
public int state;
|
public int state;
|
||||||
}
|
}
|
||||||
@@ -1,21 +1,20 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
public abstract class ButtonCycled extends Button {
|
public abstract class ButtonCycled extends Button
|
||||||
|
{
|
||||||
public ButtonCycled() {}
|
public ButtonCycled() {}
|
||||||
|
|
||||||
public ButtonCycled(int num) {
|
public ButtonCycled(int num) {
|
||||||
icons = new Image[num];
|
icons = new Image[num];
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Image getRenderIcon() {
|
public Image getRenderIcon()
|
||||||
|
{
|
||||||
return icons[index];
|
return icons[index];
|
||||||
}
|
}
|
||||||
|
|
||||||
public void init() {}
|
public void init() {}
|
||||||
|
|
||||||
public int index;
|
public int index;
|
||||||
public Image[] icons;
|
public Image[] icons;
|
||||||
}
|
}
|
||||||
@@ -1,95 +1,77 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import codechicken.core.ClientUtils;
|
||||||
import java.io.File;
|
import codechicken.core.GuiModListScroll;
|
||||||
import java.io.IOException;
|
import codechicken.lib.packet.PacketCustom;
|
||||||
import java.io.InputStreamReader;
|
import codechicken.nei.api.API;
|
||||||
import java.net.URL;
|
import codechicken.nei.api.ItemInfo;
|
||||||
import java.nio.charset.StandardCharsets;
|
import codechicken.nei.recipe.GuiRecipeTab;
|
||||||
import java.util.ArrayList;
|
import com.google.common.collect.Lists;
|
||||||
import java.util.HashSet;
|
import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
|
||||||
import java.util.Iterator;
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import java.util.List;
|
import cpw.mods.fml.common.Loader;
|
||||||
import java.util.Map;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
import java.util.TreeMap;
|
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||||
import java.util.function.Consumer;
|
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
||||||
import java.util.regex.Pattern;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.entity.EntityPlayerSP;
|
import net.minecraft.client.entity.EntityPlayerSP;
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.gui.GuiErrorScreen;
|
import net.minecraft.client.gui.GuiErrorScreen;
|
||||||
|
import net.minecraft.client.gui.GuiMainMenu;
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
import net.minecraft.client.gui.GuiScreen;
|
||||||
import net.minecraft.client.gui.GuiSelectWorld;
|
import net.minecraft.client.gui.GuiSelectWorld;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.client.multiplayer.WorldClient;
|
import net.minecraft.client.multiplayer.WorldClient;
|
||||||
import net.minecraft.client.resources.IResource;
|
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.item.EntityItem;
|
import net.minecraft.entity.item.EntityItem;
|
||||||
import net.minecraft.launchwrapper.Launch;
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.client.event.GuiOpenEvent;
|
|
||||||
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import net.minecraftforge.event.world.WorldEvent;
|
import org.apache.commons.csv.CSVFormat;
|
||||||
|
import org.apache.commons.csv.CSVParser;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.csv.CSVRecord;
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
import java.io.BufferedReader;
|
||||||
import com.google.common.collect.Lists;
|
import java.io.File;
|
||||||
|
import java.io.FileReader;
|
||||||
import codechicken.core.ClassDiscoverer;
|
import java.io.FileWriter;
|
||||||
import codechicken.core.ClientUtils;
|
import java.io.IOException;
|
||||||
import codechicken.lib.packet.PacketCustom;
|
import java.io.InputStreamReader;
|
||||||
import codechicken.nei.api.API;
|
import java.net.MalformedURLException;
|
||||||
import codechicken.nei.api.GuiInfo;
|
import java.net.URL;
|
||||||
import codechicken.nei.api.IConfigureNEI;
|
import java.util.ArrayList;
|
||||||
import codechicken.nei.api.ItemInfo;
|
import java.util.Arrays;
|
||||||
import codechicken.nei.bookmark.tree.GuiCraftingTree;
|
import java.util.Collection;
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
import java.util.Collections;
|
||||||
import codechicken.nei.recipe.GuiCraftingRecipe;
|
import java.util.HashSet;
|
||||||
import codechicken.nei.recipe.GuiUsageRecipe;
|
import java.util.Iterator;
|
||||||
import codechicken.nei.recipe.IRecipeHandler;
|
import java.util.List;
|
||||||
import codechicken.nei.recipe.RecipeHandlerRef;
|
|
||||||
import codechicken.nei.recipe.RecipeItemInputHandler;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
import codechicken.nei.recipe.debug.DebugHandlerWidget;
|
|
||||||
import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
|
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
import cpw.mods.fml.common.Loader;
|
|
||||||
import cpw.mods.fml.common.ModClassLoader;
|
|
||||||
import cpw.mods.fml.common.discovery.ASMDataTable;
|
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
|
||||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
|
||||||
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
|
|
||||||
public class ClientHandler {
|
|
||||||
|
|
||||||
|
public class ClientHandler
|
||||||
|
{
|
||||||
|
private static String[] defaultSerialHandlers = {
|
||||||
|
"WayofTime.alchemicalWizardry.client.nei.NEIAlchemyRecipeHandler"
|
||||||
|
};
|
||||||
|
private static String[] defaultHeightHackHandlers = {
|
||||||
|
"ic2.neiIntegration.core.recipehandler.FluidCannerRecipeHandler",
|
||||||
|
"tconstruct.plugins.nei.RecipeHandlerAlloying",
|
||||||
|
"tconstruct.plugins.nei.RecipeHandlerCastingBasin",
|
||||||
|
"tconstruct.plugins.nei.RecipeHandlerCastingTable",
|
||||||
|
"tconstruct.plugins.nei.RecipeHandlerMelting",
|
||||||
|
};
|
||||||
|
private static String[] defaultHandlerOrdering = {
|
||||||
|
"# Each line in this file should either be a comment (starts with '#') or an ordering.",
|
||||||
|
"# Ordering lines are <handler ID>,<ordering number>.",
|
||||||
|
"# Handlers will be sorted in order of number ascending, so smaller numbers first.",
|
||||||
|
"# Any handlers that are missing from this file will be assigned to 0.",
|
||||||
|
"# Negative numbers are fine.",
|
||||||
|
"# If you delete this file, it will be regenerated with all registered handler IDs.",
|
||||||
|
};
|
||||||
private static ClientHandler instance;
|
private static ClientHandler instance;
|
||||||
private final ArrayList<EntityItem> SMPmagneticItems = new ArrayList<>();
|
|
||||||
private static final String HANDLER_ORDERING = "handlerordering.csv";
|
private ArrayList<EntityItem> SMPmagneticItems = new ArrayList<>();
|
||||||
public static final List<String> DEFAULT_CONFIGS = ImmutableList.of(
|
|
||||||
"serialhandlers.cfg",
|
|
||||||
"heighthackhandlers.cfg",
|
|
||||||
"hiddenhandlers.cfg",
|
|
||||||
"enableautofocus.cfg",
|
|
||||||
"guicraftablesblacklist.cfg",
|
|
||||||
"defaultbookmarkcontainers.cfg",
|
|
||||||
"hiddenitems.cfg",
|
|
||||||
"guidfilters.cfg",
|
|
||||||
"informationpages.cfg",
|
|
||||||
"collapsibleitems.cfg",
|
|
||||||
"recipeidblacklist.cfg",
|
|
||||||
"handlers.csv",
|
|
||||||
"catalysts.csv",
|
|
||||||
HANDLER_ORDERING);
|
|
||||||
private World lastworld;
|
private World lastworld;
|
||||||
|
private GuiScreen lastGui;
|
||||||
|
|
||||||
public void addSMPMagneticItem(int i, World world) {
|
public void addSMPMagneticItem(int i, World world) {
|
||||||
WorldClient cworld = (WorldClient) world;
|
WorldClient cworld = (WorldClient) world;
|
||||||
@@ -114,11 +96,9 @@ public class ClientHandler {
|
|||||||
if (world.isRemote) {
|
if (world.isRemote) {
|
||||||
items = SMPmagneticItems;
|
items = SMPmagneticItems;
|
||||||
} else {
|
} else {
|
||||||
items = world.getEntitiesWithinAABB(
|
items = world.getEntitiesWithinAABB(EntityItem.class, player.boundingBox.expand(distancexz, distancey, distancexz));
|
||||||
EntityItem.class,
|
|
||||||
player.boundingBox.expand(distancexz, distancey, distancexz));
|
|
||||||
}
|
}
|
||||||
for (Iterator<EntityItem> iterator = items.iterator(); iterator.hasNext();) {
|
for (Iterator<EntityItem> iterator = items.iterator(); iterator.hasNext(); ) {
|
||||||
EntityItem item = iterator.next();
|
EntityItem item = iterator.next();
|
||||||
|
|
||||||
if (item.delayBeforeCanPickup > 0) continue;
|
if (item.delayBeforeCanPickup > 0) continue;
|
||||||
@@ -172,144 +152,56 @@ public class ClientHandler {
|
|||||||
|
|
||||||
public static void preInit() {
|
public static void preInit() {
|
||||||
loadSerialHandlers();
|
loadSerialHandlers();
|
||||||
loadHiddenItems();
|
|
||||||
loadHeightHackHandlers();
|
loadHeightHackHandlers();
|
||||||
loadHiddenHandlers();
|
|
||||||
loadEnableAutoFocus();
|
|
||||||
loadGuiCraftablesBlacklist();
|
|
||||||
loadDefaultBookmarkContainers();
|
|
||||||
ItemInfo.preInit();
|
ItemInfo.preInit();
|
||||||
StackInfo.loadGuidFilters();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static URL getDefaultResource(String resource) {
|
|
||||||
final String folder = resource.substring(resource.lastIndexOf(".") + 1);
|
|
||||||
return ClientHandler.class.getResource("/assets/nei/" + folder + "/" + resource);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean exportDefaultConfig(String resource) {
|
|
||||||
final File file = new File(NEIClientConfig.configDir, resource);
|
|
||||||
if (file.exists() && !NEIClientUtils.backupFile(file)) return false;
|
|
||||||
|
|
||||||
if (HANDLER_ORDERING.equals(resource)) {
|
|
||||||
return writeDefaultHandlerOrdering();
|
|
||||||
}
|
|
||||||
|
|
||||||
final URL url = getDefaultResource(resource);
|
|
||||||
if (url == null) return false;
|
|
||||||
|
|
||||||
try {
|
|
||||||
FileUtils.copyURLToFile(url, file);
|
|
||||||
NEIClientConfig.logger.info("Exported default '{}' to {}", resource, file);
|
|
||||||
return true;
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to export default '{}' to file {}", resource, file, e);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean loadSettingsResource(String resource, Consumer<Stream<String>> callback) {
|
|
||||||
final ResourceLocation location = new ResourceLocation("nei", resource);
|
|
||||||
|
|
||||||
try {
|
|
||||||
final IResource res = Minecraft.getMinecraft().getResourceManager().getResource(location);
|
|
||||||
|
|
||||||
try (BufferedReader reader = new BufferedReader(
|
|
||||||
new InputStreamReader(res.getInputStream(), StandardCharsets.UTF_8))) {
|
|
||||||
NEIClientConfig.logger.info("Loading '{}' from jar {}", resource, location);
|
|
||||||
callback.accept(
|
|
||||||
IOUtils.readLines(reader).stream()
|
|
||||||
.map(line -> line.contains("#") ? line.substring(0, line.indexOf('#')) : line)
|
|
||||||
.map(String::trim).filter(line -> !line.isEmpty()));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (Exception io) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, location);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean loadSettingsFile(String resource, Consumer<Stream<String>> callback) {
|
|
||||||
final File file = new File(NEIClientConfig.configDir, resource);
|
|
||||||
final boolean fromJar = !file.exists();
|
|
||||||
|
|
||||||
try {
|
|
||||||
final URL url = fromJar ? getDefaultResource(resource) : file.toURI().toURL();
|
|
||||||
if (url == null) return false;
|
|
||||||
|
|
||||||
try (InputStreamReader reader = new InputStreamReader(url.openStream(), StandardCharsets.UTF_8)) {
|
|
||||||
NEIClientConfig.logger.info("Loading '{}' from {}", resource, fromJar ? "JAR" : file);
|
|
||||||
callback.accept(
|
|
||||||
IOUtils.readLines(reader).stream()
|
|
||||||
.map(line -> line.contains("#") ? line.substring(0, line.indexOf('#')) : line)
|
|
||||||
.map(String::trim).filter(line -> !line.isEmpty()));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, file, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void loadSerialHandlers() {
|
public static void loadSerialHandlers() {
|
||||||
loadSettingsFile(
|
File file = NEIClientConfig.serialHandlersFile;
|
||||||
"serialhandlers.cfg",
|
if(!file.exists()) {
|
||||||
lines -> NEIClientConfig.serialHandlers = lines.collect(Collectors.toCollection(HashSet::new)));
|
try(FileWriter writer = new FileWriter(file)) {
|
||||||
|
NEIClientConfig.logger.info("Creating default serial handlers list {}", file);
|
||||||
|
Collection<String> toSave = Loader.isModLoaded("dreamcraft") ? Collections.singletonList("") : Arrays.asList(defaultSerialHandlers);
|
||||||
|
IOUtils.writeLines(toSave, "\n", writer);
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to save default serial handlers list to file {}", file, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try (FileReader reader = new FileReader(file)) {
|
||||||
|
NEIClientConfig.logger.info("Loading serial handlers from file {}", file);
|
||||||
|
NEIClientConfig.serialHandlers = new HashSet<>(IOUtils.readLines(reader));
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load serial handlers from file {}", file, e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void loadHeightHackHandlers() {
|
public static void loadHeightHackHandlers() {
|
||||||
loadSettingsFile(
|
File file = NEIClientConfig.heightHackHandlersFile;
|
||||||
"heighthackhandlers.cfg",
|
if (!file.exists()) {
|
||||||
lines -> NEIClientConfig.heightHackHandlerRegex = lines.map(Pattern::compile)
|
try (FileWriter writer = new FileWriter(file)) {
|
||||||
.collect(Collectors.toCollection(HashSet::new)));
|
NEIClientConfig.logger.info("Creating default height hack handlers list {}", file);
|
||||||
}
|
Collection<String> toSave = Loader.isModLoaded("dreamcraft") ? Collections.singletonList("") : Arrays.asList(defaultHeightHackHandlers);
|
||||||
|
IOUtils.writeLines(toSave, "\n", writer);
|
||||||
public static void loadHiddenHandlers() {
|
} catch (IOException e) {
|
||||||
loadSettingsFile(
|
NEIClientConfig.logger.error("Failed to save default height hack handlers list to file {}", file, e);
|
||||||
"hiddenhandlers.cfg",
|
|
||||||
lines -> NEIClientConfig.hiddenHandlers = lines.collect(Collectors.toCollection(HashSet::new)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void loadEnableAutoFocus() {
|
|
||||||
loadSettingsFile(
|
|
||||||
"enableautofocus.cfg",
|
|
||||||
lines -> AutoFocusWidget.enableAutoFocusPrefixes = lines.collect(Collectors.toList()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void loadGuiCraftablesBlacklist() {
|
|
||||||
loadSettingsFile(
|
|
||||||
"guicraftablesblacklist.cfg",
|
|
||||||
lines -> ItemCraftablesPanel.guiBlacklist = lines.collect(Collectors.toList()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void loadDefaultBookmarkContainers() {
|
|
||||||
loadSettingsFile("defaultbookmarkcontainers.cfg", lines -> {
|
|
||||||
for (String clazz : lines.collect(Collectors.toList())) {
|
|
||||||
try {
|
|
||||||
API.registerBookmarkContainerHandler(
|
|
||||||
(Class<? extends GuiContainer>) Class.forName(clazz),
|
|
||||||
new DefaultBookmarkContainerHandler());
|
|
||||||
} catch (Exception e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load class '{}' for defaultbookmarkcontainers.cfg", clazz);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public static void loadHiddenItems() {
|
try (FileReader reader = new FileReader(file)) {
|
||||||
loadSettingsFile("hiddenitems.cfg", lines -> lines.forEach(API::hideItem));
|
NEIClientConfig.logger.info("Loading height hack handlers from file {}", file);
|
||||||
|
NEIClientConfig.heightHackHandlers = new HashSet<>(IOUtils.readLines(reader));
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load height hack handlers from file {}", file, e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void load() {
|
public static void load() {
|
||||||
instance = new ClientHandler();
|
instance = new ClientHandler();
|
||||||
|
|
||||||
|
GuiModListScroll.register("NotEnoughItems");
|
||||||
PacketCustom.assignHandler(NEICPH.channel, new NEICPH());
|
PacketCustom.assignHandler(NEICPH.channel, new NEICPH());
|
||||||
FMLCommonHandler.instance().bus().register(instance);
|
FMLCommonHandler.instance().bus().register(instance);
|
||||||
MinecraftForge.EVENT_BUS.register(instance);
|
MinecraftForge.EVENT_BUS.register(instance);
|
||||||
MinecraftForge.EVENT_BUS.register(new GuiCraftingTree.EventHandler());
|
|
||||||
|
|
||||||
API.registerHighlightHandler(new DefaultHighlightHandler(), ItemInfo.Layout.HEADER);
|
API.registerHighlightHandler(new DefaultHighlightHandler(), ItemInfo.Layout.HEADER);
|
||||||
HUDRenderer.load();
|
HUDRenderer.load();
|
||||||
@@ -317,158 +209,115 @@ public class ClientHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void postInit() {
|
public static void postInit() {
|
||||||
GuiContainerManager.registerReloadResourceListener();
|
loadHandlerOrdering();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void loadHandlerOrdering() {
|
public static void loadHandlerOrdering() {
|
||||||
loadSettingsFile(
|
File file = NEIClientConfig.handlerOrderingFile;
|
||||||
HANDLER_ORDERING,
|
if (!file.exists()) {
|
||||||
lines -> lines.map(line -> line.split(",")).filter(parts -> parts.length == 2).forEach(parts -> {
|
try (FileWriter writer = new FileWriter(file)) {
|
||||||
String handlerId = parts[0];
|
NEIClientConfig.logger.info("Creating default handler ordering CSV {}", file);
|
||||||
int ordering = Integer.parseInt(parts[1]);
|
|
||||||
NEIClientConfig.handlerOrdering.put(handlerId, ordering);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean writeDefaultHandlerOrdering() {
|
List<String> toWrite = Lists.newArrayList(defaultHandlerOrdering);
|
||||||
final File file = new File(NEIClientConfig.configDir, HANDLER_ORDERING);
|
GuiRecipeTab.handlerMap.keySet().stream()
|
||||||
final List<String> lines = Lists.newArrayList(
|
.sorted()
|
||||||
"# Each line in this file should either be a comment (starts with '#') or an ordering.",
|
.forEach(handlerId -> toWrite.add(String.format("%s,0", handlerId)));
|
||||||
"# Ordering lines are <handler ID>,<ordering number>.",
|
|
||||||
"# Handlers will be sorted in order of number ascending, so smaller numbers first.",
|
|
||||||
"# Any handlers that are missing from this file keep their own order, 0 for most of them.",
|
|
||||||
"# Negative numbers are fine.");
|
|
||||||
final Map<String, Integer> orders = new TreeMap<>();
|
|
||||||
final List<IRecipeHandler> handlers = new ArrayList<>();
|
|
||||||
handlers.addAll(GuiCraftingRecipe.craftinghandlers);
|
|
||||||
handlers.addAll(GuiCraftingRecipe.serialCraftingHandlers);
|
|
||||||
handlers.addAll(GuiUsageRecipe.usagehandlers);
|
|
||||||
handlers.addAll(GuiUsageRecipe.serialUsageHandlers);
|
|
||||||
|
|
||||||
for (IRecipeHandler handler : handlers) {
|
IOUtils.writeLines(toWrite, "\n", writer);
|
||||||
orders.putIfAbsent(
|
} catch (IOException e) {
|
||||||
NEIClientConfig.HANDLER_ID_FUNCTION.apply(handler),
|
NEIClientConfig.logger.error("Failed to save default handler ordering to file {}", file, e);
|
||||||
NEIClientConfig.getHandlerOrder(handler));
|
|
||||||
}
|
|
||||||
|
|
||||||
orders.forEach((handlerId, order) -> lines.add(handlerId + "," + order));
|
|
||||||
|
|
||||||
try {
|
|
||||||
NEIClientConfig.logger.info("Creating default '{}' {}", HANDLER_ORDERING, file);
|
|
||||||
FileUtils.writeLines(file, StandardCharsets.UTF_8.name(), lines, "\n");
|
|
||||||
return true;
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to save default '{}' to file {}", HANDLER_ORDERING, file, e);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void loadPluginsList() {
|
|
||||||
final boolean jarjar = Launch.blackboard.getOrDefault("jarjar.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
|
|
||||||
if (!jarjar) {
|
|
||||||
// Do the old style class discovery
|
|
||||||
final ClassDiscoverer classDiscoverer = new ClassDiscoverer(
|
|
||||||
test -> test.startsWith("NEI") && test.endsWith("Config.class"),
|
|
||||||
IConfigureNEI.class);
|
|
||||||
|
|
||||||
NEIClientConfig.pluginsList.addAll(classDiscoverer.findClasses());
|
|
||||||
NEIClientConfig.logger
|
|
||||||
.info("Loading NEI Plugins via ClassDiscoverer: " + NEIClientConfig.pluginsList.size());
|
|
||||||
|
|
||||||
} else {
|
|
||||||
// If JarJar's loaded, the ASMDataTable now includes interfaces in addition to Annotations, so use that
|
|
||||||
// instead Includes a small change in behavior of no longer requiring the class to start with NEI and end
|
|
||||||
// with Config; This could easily be changed if desired, but the previous behavior was likely to speed
|
|
||||||
// things up by limiting the scope when looking at all of the jars and classes in the classpath.
|
|
||||||
final ASMDataTable dataTable = NEIModContainer.getAsmDataTable();
|
|
||||||
final ModClassLoader modClassLoader = (ModClassLoader) Loader.instance().getModClassLoader();
|
|
||||||
for (ASMDataTable.ASMData asmData : dataTable.getAll(IConfigureNEI.class.getName().replace('.', '/'))) {
|
|
||||||
final String className = asmData.getClassName().replace('/', '.');
|
|
||||||
try {
|
|
||||||
NEIClientConfig.pluginsList.add(Class.forName(className, true, modClassLoader));
|
|
||||||
} catch (ClassNotFoundException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load plugin class {}", className, e);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
NEIClientConfig.logger.info("Loading NEI Plugins via JarJar: " + NEIClientConfig.pluginsList.size());
|
}
|
||||||
|
|
||||||
|
URL url;
|
||||||
|
try {
|
||||||
|
url = file.toURI().toURL();
|
||||||
|
} catch (MalformedURLException e) {
|
||||||
|
NEIClientConfig.logger.info("Invalid URL for handler ordering CSV.");
|
||||||
|
e.printStackTrace();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()))) {
|
||||||
|
NEIClientConfig.logger.info("Loading handler ordering from file {}", file);
|
||||||
|
CSVParser csvParser = CSVFormat.EXCEL.withCommentMarker('#').parse(reader);
|
||||||
|
for (CSVRecord record : csvParser) {
|
||||||
|
final String handlerId = record.get(0);
|
||||||
|
|
||||||
|
int ordering;
|
||||||
|
try {
|
||||||
|
ordering = Integer.parseInt(record.get(1));
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
NEIClientConfig.logger.error("Error parsing CSV record {}: {}", record, e);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
NEIClientConfig.handlerOrdering.put(handlerId, ordering);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
NEIClientConfig.logger.info("Error parsing CSV");
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void tickEvent(TickEvent.ClientTickEvent event) {
|
public void tickEvent(TickEvent.ClientTickEvent event) {
|
||||||
if (event.phase == Phase.END) return;
|
if(event.phase == Phase.END)
|
||||||
|
return;
|
||||||
|
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
Minecraft mc = Minecraft.getMinecraft();
|
||||||
if (mc.theWorld != null) {
|
if(mc.theWorld != null) {
|
||||||
loadWorld(mc.theWorld, false);
|
loadWorld(mc.theWorld, false);
|
||||||
|
|
||||||
if (!NEIClientConfig.isEnabled()) return;
|
if (!NEIClientConfig.isEnabled())
|
||||||
|
return;
|
||||||
|
|
||||||
/*
|
KeyManager.tickKeyStates();
|
||||||
* NEI plugins are loaded in a separate thread. Make sure loading them has finished otherwise a CME might
|
|
||||||
* occur in KeyManager if a plugin calls API.addKeyBind() during initialization.
|
|
||||||
*/
|
|
||||||
if (NEIClientConfig.isLoaded()) KeyManager.tickKeyStates();
|
|
||||||
|
|
||||||
NEIController.updateUnlimitedItems(mc.thePlayer.inventory);
|
NEIController.updateUnlimitedItems(mc.thePlayer.inventory);
|
||||||
if (mc.currentScreen == null) NEIController.processCreativeCycling(mc.thePlayer.inventory);
|
if (mc.currentScreen == null)
|
||||||
|
NEIController.processCreativeCycling(mc.thePlayer.inventory);
|
||||||
|
|
||||||
updateMagnetMode(mc.theWorld, mc.thePlayer);
|
updateMagnetMode(mc.theWorld, mc.thePlayer);
|
||||||
} else {
|
|
||||||
lastworld = null;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@SubscribeEvent
|
GuiScreen gui = mc.currentScreen;
|
||||||
public void onGuiScreen(GuiOpenEvent event) {
|
if (gui != lastGui) {
|
||||||
if (event.gui instanceof GuiSelectWorld) {
|
if (gui instanceof GuiMainMenu)
|
||||||
NEIClientConfig.reloadSaves();
|
lastworld = null;
|
||||||
} else if (event.gui == null) {
|
else if (gui instanceof GuiSelectWorld)
|
||||||
/* prevent WorldClient reference being held in the Gui */
|
NEIClientConfig.reloadSaves();
|
||||||
NEIController.manager = null;
|
|
||||||
GuiInfo.clearGuiHandlers();
|
|
||||||
}
|
}
|
||||||
|
lastGui = gui;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void tickEvent(TickEvent.RenderTickEvent event) {
|
public void tickEvent(TickEvent.RenderTickEvent event) {
|
||||||
if (event.phase == Phase.END && NEIClientConfig.isEnabled()) HUDRenderer.renderOverlay();
|
if(event.phase == Phase.END && NEIClientConfig.isEnabled())
|
||||||
|
HUDRenderer.renderOverlay();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void renderLastEvent(RenderWorldLastEvent event) {
|
public void renderLastEvent(RenderWorldLastEvent event) {
|
||||||
if (NEIClientConfig.isEnabled()) WorldOverlayRenderer.render(event.partialTicks);
|
if (NEIClientConfig.isEnabled())
|
||||||
|
WorldOverlayRenderer.render(event.partialTicks);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
@SubscribeEvent
|
|
||||||
public void onWorldUnload(WorldEvent.Unload event) {
|
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
|
||||||
if (event.world == mc.theWorld) {
|
|
||||||
NEIClientConfig.unloadWorld();
|
|
||||||
ItemMobSpawner.clearEntityReferences();
|
|
||||||
WorldOverlayRenderer.onWorldUnload();
|
|
||||||
RecipeItemInputHandler.instance.clearTooltipCache();
|
|
||||||
RecipeHandlerRef.clearCache();
|
|
||||||
ItemPanels.itemPanel.craftablesPanel.clearGuiReferences();
|
|
||||||
DebugHandlerWidget.instance.clearGuiReferences();
|
|
||||||
NEIController.manager = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void loadWorld(World world, boolean fromServer) {
|
public void loadWorld(World world, boolean fromServer) {
|
||||||
if (world != lastworld) {
|
if (world != lastworld) {
|
||||||
SMPmagneticItems.clear();
|
SMPmagneticItems.clear();
|
||||||
if (!NEIClientConfig.getBooleanSetting("world.overlays.lock")) {
|
WorldOverlayRenderer.reset();
|
||||||
WorldOverlayRenderer.reset();
|
|
||||||
}
|
|
||||||
if (!fromServer) {
|
if (!fromServer) {
|
||||||
NEIClientConfig.setHasSMPCounterPart(false);
|
NEIClientConfig.setHasSMPCounterPart(false);
|
||||||
NEIClientConfig.setInternalEnabled(false);
|
NEIClientConfig.setInternalEnabled(false);
|
||||||
|
|
||||||
if (!Minecraft.getMinecraft().isSingleplayer()) // wait for server to initiate in singleplayer
|
if (!Minecraft.getMinecraft().isSingleplayer())//wait for server to initiate in singleplayer
|
||||||
NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
|
NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
|
||||||
}
|
}
|
||||||
|
|
||||||
lastworld = world;
|
lastworld = world;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -478,8 +327,8 @@ public class ClientHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static RuntimeException throwCME(final String message) {
|
public static RuntimeException throwCME(final String message) {
|
||||||
final GuiScreen errorGui = new GuiErrorScreen(null, null) {
|
final GuiScreen errorGui = new GuiErrorScreen(null, null)
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public void handleMouseInput() {}
|
public void handleMouseInput() {}
|
||||||
|
|
||||||
@@ -495,18 +344,16 @@ public class ClientHandler {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
CustomModLoadingErrorDisplayException e = new CustomModLoadingErrorDisplayException() {
|
@SuppressWarnings("serial")
|
||||||
|
CustomModLoadingErrorDisplayException e = new CustomModLoadingErrorDisplayException()
|
||||||
private static final long serialVersionUID = -5593387489666663375L;
|
{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) {
|
public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) {
|
||||||
Minecraft.getMinecraft().displayGuiScreen(errorGui);
|
Minecraft.getMinecraft().displayGuiScreen(errorGui);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY,
|
public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY, float tickTime) {}
|
||||||
float tickTime) {}
|
|
||||||
};
|
};
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,316 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTBase;
|
|
||||||
import net.minecraft.nbt.NBTBase.NBTPrimitive;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.util.StatCollector;
|
|
||||||
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
import com.google.gson.JsonParser;
|
|
||||||
import com.google.gson.JsonSyntaxException;
|
|
||||||
|
|
||||||
import codechicken.nei.ItemList.AnyMultiItemFilter;
|
|
||||||
import codechicken.nei.ItemList.EverythingItemFilter;
|
|
||||||
import codechicken.nei.ItemList.NothingItemFilter;
|
|
||||||
import codechicken.nei.PresetsList.Preset;
|
|
||||||
import codechicken.nei.PresetsList.PresetMode;
|
|
||||||
import codechicken.nei.api.ItemFilter;
|
|
||||||
import codechicken.nei.util.ItemStackFilterParser;
|
|
||||||
|
|
||||||
public class CollapsibleItems {
|
|
||||||
|
|
||||||
protected static class GroupItem {
|
|
||||||
|
|
||||||
public String guid;
|
|
||||||
public ItemFilter filter;
|
|
||||||
public boolean expanded = false;
|
|
||||||
public String displayName = "";
|
|
||||||
public String unlocalizedName;
|
|
||||||
|
|
||||||
public void setFilter(String filter) {
|
|
||||||
this.filter = ItemStackFilterParser.parse(filter.trim());
|
|
||||||
this.guid = this.filter != null ? UUID.nameUUIDFromBytes(filter.getBytes()).toString() : "";
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setFilter(ItemFilter filter, String guid) {
|
|
||||||
this.filter = filter;
|
|
||||||
this.guid = guid;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDisplayName() {
|
|
||||||
if (this.unlocalizedName != null && !this.unlocalizedName.isEmpty()) {
|
|
||||||
final String translated = StatCollector.translateToLocal(this.unlocalizedName);
|
|
||||||
|
|
||||||
if (!translated.equals(this.unlocalizedName)) {
|
|
||||||
return translated;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.displayName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean matches(ItemStack stack) {
|
|
||||||
return this.filter.matches(stack);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ApiGroup {
|
|
||||||
|
|
||||||
private String unlocalizedName;
|
|
||||||
|
|
||||||
public ApiGroup setName(String unlocalizedName) {
|
|
||||||
this.unlocalizedName = unlocalizedName;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final String STATE_KEY = "collapsibleitems";
|
|
||||||
|
|
||||||
protected static File statesFile;
|
|
||||||
protected static final List<GroupItem> groups = new ArrayList<>();
|
|
||||||
protected static final List<Supplier<GroupItem>> apiGroups = new CopyOnWriteArrayList<>();
|
|
||||||
protected static final Map<ItemStack, Integer> cache = new ConcurrentHashMap<>();
|
|
||||||
|
|
||||||
private CollapsibleItems() {}
|
|
||||||
|
|
||||||
public static void load() {
|
|
||||||
CollapsibleItems.groups.clear();
|
|
||||||
CollapsibleItems.cache.clear();
|
|
||||||
|
|
||||||
for (int i = PresetsList.presets.size() - 1; i >= 0; i--) {
|
|
||||||
Preset preset = PresetsList.presets.get(i);
|
|
||||||
if (preset.enabled && preset.mode == PresetMode.GROUP) {
|
|
||||||
GroupItem group = new GroupItem();
|
|
||||||
group.setFilter(preset, UUID.nameUUIDFromBytes(preset.items.toString().getBytes()).toString());
|
|
||||||
group.displayName = preset.name;
|
|
||||||
addGroup(group);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.enableCollapsibleItems()) {
|
|
||||||
ClientHandler.loadSettingsFile(
|
|
||||||
"collapsibleitems.cfg",
|
|
||||||
lines -> parseFile(lines.collect(Collectors.toCollection(ArrayList::new))));
|
|
||||||
|
|
||||||
for (Supplier<GroupItem> apiGroup : CollapsibleItems.apiGroups) {
|
|
||||||
try {
|
|
||||||
addGroup(apiGroup.get());
|
|
||||||
} catch (Exception e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to add API group", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
loadStates();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ApiGroup registerGroup(String filter) {
|
|
||||||
final ApiGroup apiGroup = new ApiGroup();
|
|
||||||
|
|
||||||
CollapsibleItems.apiGroups.add(() -> {
|
|
||||||
GroupItem group = new GroupItem();
|
|
||||||
group.setFilter(filter);
|
|
||||||
group.unlocalizedName = apiGroup.unlocalizedName;
|
|
||||||
return group;
|
|
||||||
});
|
|
||||||
|
|
||||||
return apiGroup;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ApiGroup registerGroup(Iterable<ItemStack> items) {
|
|
||||||
final ApiGroup apiGroup = new ApiGroup();
|
|
||||||
final ItemStackSet filter = new ItemStackSet();
|
|
||||||
|
|
||||||
for (ItemStack stack : items) {
|
|
||||||
if (stack != null) filter.add(stack.copy());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (filter.isEmpty()) return apiGroup;
|
|
||||||
|
|
||||||
final String key = filter.keys().stream()
|
|
||||||
.map(stack -> Item.itemRegistry.getNameForObject(stack.getItem()) + ":" + stack.getItemDamage())
|
|
||||||
.sorted().collect(Collectors.joining(","));
|
|
||||||
final String guid = UUID.nameUUIDFromBytes(key.getBytes()).toString();
|
|
||||||
|
|
||||||
CollapsibleItems.apiGroups.add(() -> {
|
|
||||||
GroupItem group = new GroupItem();
|
|
||||||
group.setFilter(filter, guid);
|
|
||||||
group.unlocalizedName = apiGroup.unlocalizedName;
|
|
||||||
return group;
|
|
||||||
});
|
|
||||||
|
|
||||||
return apiGroup;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void parseFile(List<String> itemStrings) {
|
|
||||||
final JsonParser parser = new JsonParser();
|
|
||||||
GroupItem group = new GroupItem();
|
|
||||||
|
|
||||||
for (String itemStr : itemStrings) {
|
|
||||||
try {
|
|
||||||
|
|
||||||
if (itemStr.startsWith("; ")) {
|
|
||||||
JsonObject settings = parser.parse(itemStr.substring(2)).getAsJsonObject();
|
|
||||||
|
|
||||||
if (settings.get("unlocalizedName") != null) {
|
|
||||||
group.unlocalizedName = settings.get("unlocalizedName").getAsString();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (settings.get("expanded") != null) {
|
|
||||||
group.expanded = settings.get("expanded").getAsBoolean();
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
group.setFilter(itemStr);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (group.filter != null) {
|
|
||||||
addGroup(group);
|
|
||||||
group = new GroupItem();
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (IllegalArgumentException | JsonSyntaxException | IllegalStateException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load collapsible items from json string:\n{}", itemStr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void addGroup(GroupItem group) {
|
|
||||||
if (group == null || group.filter == null
|
|
||||||
|| group.filter instanceof EverythingItemFilter
|
|
||||||
|| group.filter instanceof NothingItemFilter)
|
|
||||||
return;
|
|
||||||
CollapsibleItems.groups.add(group);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isEmpty() {
|
|
||||||
return CollapsibleItems.groups.isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ItemFilter getItemFilter() {
|
|
||||||
AnyMultiItemFilter filter = new AnyMultiItemFilter();
|
|
||||||
|
|
||||||
for (GroupItem group : CollapsibleItems.groups) {
|
|
||||||
filter.filters.add(group.filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
return filter;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void clearCache() {
|
|
||||||
CollapsibleItems.cache.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void putItem(ItemStack stack) {
|
|
||||||
int groupIndex = -1;
|
|
||||||
|
|
||||||
for (int i = 0; i < CollapsibleItems.groups.size() && groupIndex == -1; i++) {
|
|
||||||
if (CollapsibleItems.groups.get(i).matches(stack)) {
|
|
||||||
groupIndex = i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (groupIndex != -1) {
|
|
||||||
CollapsibleItems.cache.put(stack, groupIndex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int getGroupIndex(ItemStack stack) {
|
|
||||||
|
|
||||||
if (stack == null) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return CollapsibleItems.cache.getOrDefault(stack, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getDisplayName(int groupIndex) {
|
|
||||||
|
|
||||||
if (groupIndex < CollapsibleItems.groups.size()) {
|
|
||||||
return CollapsibleItems.groups.get(groupIndex).getDisplayName();
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isExpanded(int groupIndex) {
|
|
||||||
|
|
||||||
if (groupIndex < CollapsibleItems.groups.size()) {
|
|
||||||
return CollapsibleItems.groups.get(groupIndex).expanded;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setExpanded(int groupIndex, boolean expanded) {
|
|
||||||
|
|
||||||
if (groupIndex < CollapsibleItems.groups.size()) {
|
|
||||||
CollapsibleItems.groups.get(groupIndex).expanded = expanded;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void toggleGroups(Boolean expanded) {
|
|
||||||
|
|
||||||
if (expanded == null) {
|
|
||||||
expanded = CollapsibleItems.groups.stream().noneMatch(g -> g.expanded);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (GroupItem group : CollapsibleItems.groups) {
|
|
||||||
group.expanded = expanded;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void saveStates() {
|
|
||||||
NBTTagCompound list = new NBTTagCompound();
|
|
||||||
|
|
||||||
for (GroupItem group : CollapsibleItems.groups) {
|
|
||||||
list.setBoolean(group.guid, group.expanded);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.world != null) {
|
|
||||||
NEIClientConfig.world.nbt.setTag(STATE_KEY, list);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void loadStates() {
|
|
||||||
|
|
||||||
try {
|
|
||||||
|
|
||||||
if (NEIClientConfig.world.nbt.hasKey(STATE_KEY)) {
|
|
||||||
NBTTagCompound states = NEIClientConfig.world.nbt.getCompoundTag(STATE_KEY);
|
|
||||||
final Map<String, NBTBase> list = states.tagMap;
|
|
||||||
final Map<String, GroupItem> mapping = new HashMap<>();
|
|
||||||
|
|
||||||
for (GroupItem group : CollapsibleItems.groups) {
|
|
||||||
mapping.put(group.guid, group);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (Map.Entry<String, NBTBase> nbtEntry : list.entrySet()) {
|
|
||||||
if (mapping.containsKey(nbtEntry.getKey())) {
|
|
||||||
mapping.get(nbtEntry.getKey()).expanded = ((NBTPrimitive) nbtEntry.getValue()).func_150290_f()
|
|
||||||
== 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
NEIClientConfig.logger.error("Error loading collapsible items states", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import com.gtnewhorizon.gtnhlib.color.ColorResource;
|
|
||||||
|
|
||||||
public class ColorUtils {
|
|
||||||
|
|
||||||
private static final ColorResource.Factory color = new ColorResource.Factory("nei");
|
|
||||||
|
|
||||||
public static final ColorResource
|
|
||||||
// spotless:off
|
|
||||||
textGray = color.rgb("textGray", "0x404040"),
|
|
||||||
textLightGray = color.rgb("textLightGray", "0x606060"),
|
|
||||||
recipeTitle = color.rgb("recipeTitle", "0xFFFFFF"),
|
|
||||||
recipeTitleHover = color.rgb("recipeTitleHover", "0xFFFF55"),
|
|
||||||
subsetWidget = color.rgb("subsetWidget", "0xAA00AA"),
|
|
||||||
recipeBadge = color.rgb("recipeBadge", "0xFDD835"),
|
|
||||||
buttonLabelNormal = color.rgb("buttonLabelNormal", "0xE0E0E0"),
|
|
||||||
buttonLabelHover = color.rgb("buttonLabelHover", "0xFFFFA0"),
|
|
||||||
buttonLabelDisabled = color.rgb("buttonLabelDisabled", "0x601010"),
|
|
||||||
buttonLabelInactive = color.rgb("buttonLabelInactive", "0xA0A0A0"),
|
|
||||||
|
|
||||||
craftingTreeLine = color.argb("craftingTreeLine", "0xFF888888");
|
|
||||||
// spotless:on
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.awt.Dimension;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
|
||||||
import codechicken.lib.gui.GuiDraw.ITooltipLineHandler;
|
|
||||||
|
|
||||||
public abstract class CompositeTooltipLineHandler implements ITooltipLineHandler {
|
|
||||||
|
|
||||||
protected static final int SCREEN_MARGIN = 8 * 2 + 10;
|
|
||||||
protected static final int RESERVED_HEIGHT = 40;
|
|
||||||
|
|
||||||
protected final List<ItemsTooltipLineHandler> lines = new ArrayList<>();
|
|
||||||
protected final Dimension size = new Dimension();
|
|
||||||
|
|
||||||
protected boolean created = false;
|
|
||||||
protected int screenHeight = 0;
|
|
||||||
|
|
||||||
protected abstract void createLines();
|
|
||||||
|
|
||||||
protected boolean needsUpdate() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dimension getSize() {
|
|
||||||
ensureCreated();
|
|
||||||
return this.size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int x, int y) {
|
|
||||||
if (this.size.height == 0) return;
|
|
||||||
|
|
||||||
for (ItemsTooltipLineHandler line : this.lines) {
|
|
||||||
line.draw(x, y);
|
|
||||||
y += line.getSize().height;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void ensureCreated() {
|
|
||||||
boolean update = needsUpdate();
|
|
||||||
update = this.screenHeight != (this.screenHeight = GuiDraw.displaySize().height) || update;
|
|
||||||
|
|
||||||
if (this.created && !update) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.created = true;
|
|
||||||
this.lines.clear();
|
|
||||||
this.size.setSize(0, 0);
|
|
||||||
|
|
||||||
createLines();
|
|
||||||
fitToScreen();
|
|
||||||
|
|
||||||
for (ItemsTooltipLineHandler line : this.lines) {
|
|
||||||
this.size.width = Math.max(this.size.width, line.getSize().width);
|
|
||||||
this.size.height += line.getSize().height;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void fitToScreen() {
|
|
||||||
if (this.lines.isEmpty()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final List<ItemsTooltipLineHandler> ordered = new ArrayList<>(this.lines);
|
|
||||||
ordered.sort(Comparator.comparingInt(ItemsTooltipLineHandler::getRows));
|
|
||||||
|
|
||||||
int budget = availableHeight() / ItemsTooltipLineHandler.SLOT_SIZE;
|
|
||||||
int rest = ordered.size();
|
|
||||||
|
|
||||||
for (ItemsTooltipLineHandler line : ordered) {
|
|
||||||
final int fair = Math.max(1, budget / rest);
|
|
||||||
|
|
||||||
if (line.getRows() > fair) {
|
|
||||||
line.setMaxRows(fair);
|
|
||||||
}
|
|
||||||
|
|
||||||
budget -= line.getRows();
|
|
||||||
rest--;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int availableHeight() {
|
|
||||||
return GuiDraw.displaySize().height - SCREEN_MARGIN
|
|
||||||
- RESERVED_HEIGHT
|
|
||||||
- this.lines.size() * ItemsTooltipLineHandler.headerHeight();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static int maxLineRows() {
|
|
||||||
final int height = GuiDraw.displaySize().height - SCREEN_MARGIN
|
|
||||||
- RESERVED_HEIGHT
|
|
||||||
- ItemsTooltipLineHandler.headerHeight();
|
|
||||||
return Math.max(1, height / ItemsTooltipLineHandler.SLOT_SIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
||||||
@@ -9,13 +11,10 @@ import net.minecraft.item.ItemArmor;
|
|||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
public class ContainerCreativeInv extends Container
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
{
|
||||||
|
private class SlotArmor extends Slot
|
||||||
public class ContainerCreativeInv extends Container {
|
{
|
||||||
|
|
||||||
private class SlotArmor extends Slot {
|
|
||||||
|
|
||||||
final int armorType;
|
final int armorType;
|
||||||
|
|
||||||
public SlotArmor(IInventory inv, int x, int y, int slot, int armor) {
|
public SlotArmor(IInventory inv, int x, int y, int slot, int armor) {
|
||||||
@@ -40,16 +39,15 @@ public class ContainerCreativeInv extends Container {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private class SlotBlockArmor extends SlotArmor {
|
private class SlotBlockArmor extends SlotArmor
|
||||||
|
{
|
||||||
public SlotBlockArmor(IInventory inv, int x, int y, int slot, int armor) {
|
public SlotBlockArmor(IInventory inv, int x, int y, int slot, int armor) {
|
||||||
super(inv, x, y, slot, armor);
|
super(inv, x, y, slot, armor);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isItemValid(ItemStack stack) {
|
public boolean isItemValid(ItemStack stack) {
|
||||||
return super.isItemValid(stack) || stack != null; // && Block.getBlockFromItem(stack.getItem()) !=
|
return super.isItemValid(stack) || stack != null;// && Block.getBlockFromItem(stack.getItem()) != Blocks.air;
|
||||||
// Blocks.air;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,34 +56,33 @@ public class ContainerCreativeInv extends Container {
|
|||||||
public ContainerCreativeInv(EntityPlayer player, ExtendedCreativeInv extraInv) {
|
public ContainerCreativeInv(EntityPlayer player, ExtendedCreativeInv extraInv) {
|
||||||
this.player = player;
|
this.player = player;
|
||||||
InventoryPlayer invPlayer = player.inventory;
|
InventoryPlayer invPlayer = player.inventory;
|
||||||
for (int row = 0; row < 6; row++) for (int col = 0; col < 9; col++)
|
for (int row = 0; row < 6; row++)
|
||||||
addSlotToContainer(new Slot(extraInv, col + row * 9, 8 + col * 18, 5 + row * 18));
|
for (int col = 0; col < 9; col++)
|
||||||
|
addSlotToContainer(new Slot(extraInv, col + row * 9, 8 + col * 18, 5 + row * 18));
|
||||||
|
|
||||||
for (int row = 0; row < 3; ++row) for (int col = 0; col < 9; ++col)
|
for (int row = 0; row < 3; ++row)
|
||||||
addSlotToContainer(new Slot(invPlayer, col + row * 9 + 9, 8 + col * 18, 118 + row * 18));
|
for (int col = 0; col < 9; ++col)
|
||||||
|
addSlotToContainer(new Slot(invPlayer, col + row * 9 + 9, 8 + col * 18, 118 + row * 18));
|
||||||
|
|
||||||
for (int col = 0; col < 9; ++col) addSlotToContainer(new Slot(invPlayer, col, 8 + col * 18, 176));
|
for (int col = 0; col < 9; ++col)
|
||||||
|
addSlotToContainer(new Slot(invPlayer, col, 8 + col * 18, 176));
|
||||||
|
|
||||||
addSlotToContainer(new SlotBlockArmor(invPlayer, invPlayer.getSizeInventory() - 1, -15, 23, 0));
|
addSlotToContainer(new SlotBlockArmor(invPlayer, invPlayer.getSizeInventory() - 1, -15, 23, 0));
|
||||||
for (int armorType = 1; armorType < 4; armorType++) addSlotToContainer(
|
for (int armorType = 1; armorType < 4; armorType++)
|
||||||
new SlotArmor(
|
addSlotToContainer(new SlotArmor(invPlayer, invPlayer.getSizeInventory() - 1 - armorType, -15, 23 + armorType * 18, armorType));
|
||||||
invPlayer,
|
|
||||||
invPlayer.getSizeInventory() - 1 - armorType,
|
|
||||||
-15,
|
|
||||||
23 + armorType * 18,
|
|
||||||
armorType));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int slotIndex) {
|
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int slotIndex) {
|
||||||
ItemStack transferredStack = null;
|
ItemStack transferredStack = null;
|
||||||
Slot slot = inventorySlots.get(slotIndex);
|
Slot slot = (Slot) inventorySlots.get(slotIndex);
|
||||||
|
|
||||||
if (slot != null && slot.getHasStack()) {
|
if (slot != null && slot.getHasStack()) {
|
||||||
ItemStack stack = slot.getStack();
|
ItemStack stack = slot.getStack();
|
||||||
transferredStack = stack.copy();
|
transferredStack = stack.copy();
|
||||||
|
|
||||||
if (stack.getItem() instanceof ItemArmor armor) {
|
if (stack.getItem() instanceof ItemArmor) {
|
||||||
|
ItemArmor armor = (ItemArmor) stack.getItem();
|
||||||
if (!getSlot(90 + armor.armorType).getHasStack()) {
|
if (!getSlot(90 + armor.armorType).getHasStack()) {
|
||||||
getSlot(90 + armor.armorType).putStack(transferredStack);
|
getSlot(90 + armor.armorType).putStack(transferredStack);
|
||||||
slot.putStack(null);
|
slot.putStack(null);
|
||||||
@@ -94,13 +91,16 @@ public class ContainerCreativeInv extends Container {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (slotIndex < 54) {
|
if (slotIndex < 54) {
|
||||||
if (!this.mergeItemStack(stack, 54, 90, true)) return null;
|
if (!this.mergeItemStack(stack, 54, 90, true))
|
||||||
|
return null;
|
||||||
} else if (!this.mergeItemStack(stack, 0, 54, false)) {
|
} else if (!this.mergeItemStack(stack, 0, 54, false)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.stackSize == 0) slot.putStack(null);
|
if (stack.stackSize == 0)
|
||||||
else slot.onSlotChanged();
|
slot.putStack(null);
|
||||||
|
else
|
||||||
|
slot.onSlotChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
return transferredStack;
|
return transferredStack;
|
||||||
|
|||||||
@@ -1,29 +1,28 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import codechicken.lib.render.CCRenderState;
|
||||||
|
|
||||||
import net.minecraft.client.gui.Gui;
|
import net.minecraft.client.gui.Gui;
|
||||||
import net.minecraft.enchantment.Enchantment;
|
import net.minecraft.enchantment.Enchantment;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.ContainerEnchantment;
|
import net.minecraft.inventory.ContainerEnchantment;
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagList;
|
import net.minecraft.nbt.NBTTagList;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import codechicken.lib.render.CCRenderState;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is crap code, don't ever do this.
|
* This is crap code, don't ever do this.
|
||||||
*/
|
*/
|
||||||
public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
public class ContainerEnchantmentModifier extends ContainerEnchantment
|
||||||
|
{
|
||||||
public static class EnchantmentHash {
|
public static class EnchantmentHash
|
||||||
|
{
|
||||||
public EnchantmentHash(Enchantment e, int i, int l) {
|
public EnchantmentHash(Enchantment e, int i, int l) {
|
||||||
enchantment = e;
|
enchantment = e;
|
||||||
state = i;
|
state = i;
|
||||||
@@ -105,11 +104,10 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
int barempty = height - getScrollBarHeight();
|
int barempty = height - getScrollBarHeight();
|
||||||
int sbary = rely + (int) (barempty * percentscrolled + 0.5);
|
int sbary = rely + (int) (barempty * percentscrolled + 0.5);
|
||||||
|
|
||||||
if (button == 0 && getScrollBarHeight() < height && // the scroll bar can move (not full length)
|
if (button == 0 &&
|
||||||
mousex >= relx + cwidth
|
getScrollBarHeight() < height && //the scroll bar can move (not full length)
|
||||||
&& mousex < relx + cwidth + getScrollBarWidth()
|
mousex >= relx + cwidth && mousex < relx + cwidth + getScrollBarWidth() &&
|
||||||
&& mousey >= rely
|
mousey >= rely && mousey < rely + height)//in the scroll pane
|
||||||
&& mousey < rely + height) // in the scroll pane
|
|
||||||
{
|
{
|
||||||
if (mousey < sbary) {
|
if (mousey < sbary) {
|
||||||
percentscrolled = (mousey - rely) / (float) barempty;
|
percentscrolled = (mousey - rely) / (float) barempty;
|
||||||
@@ -128,7 +126,7 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void mouseUp(int mousex, int mousey, int button) {
|
public void mouseUp(int mousex, int mousey, int button) {
|
||||||
if (scrollclicky >= 0 && button == 0) // we were scrolling and we released mouse
|
if (scrollclicky >= 0 && button == 0)//we were scrolling and we released mouse
|
||||||
{
|
{
|
||||||
scrollclicky = -1;
|
scrollclicky = -1;
|
||||||
}
|
}
|
||||||
@@ -137,7 +135,8 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
public boolean clickButton(int mousex, int mousey, int button) {
|
public boolean clickButton(int mousex, int mousey, int button) {
|
||||||
mousex -= parentscreen.guiLeft;
|
mousex -= parentscreen.guiLeft;
|
||||||
mousey -= parentscreen.guiTop;
|
mousey -= parentscreen.guiTop;
|
||||||
if (mousex >= relx && mousex < relx + cwidth && mousey >= rely && mousey <= rely + height) // in the box
|
if (mousex >= relx && mousex < relx + cwidth &&
|
||||||
|
mousey >= rely && mousey <= rely + height)//in the box
|
||||||
{
|
{
|
||||||
int slot = getClickedSlot(mousey);
|
int slot = getClickedSlot(mousey);
|
||||||
if (slot >= getNumSlots()) return false;
|
if (slot >= getNumSlots()) return false;
|
||||||
@@ -163,22 +162,24 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
|
|
||||||
public boolean addEnchantment(int e, int level) {
|
public boolean addEnchantment(int e, int level) {
|
||||||
if (e < Enchantment.enchantmentsList.length && Enchantment.enchantmentsList[e] != null) {
|
if (e < Enchantment.enchantmentsList.length && Enchantment.enchantmentsList[e] != null) {
|
||||||
inventorySlots.get(0).getStack().addEnchantment(Enchantment.enchantmentsList[e], level);
|
((Slot) inventorySlots.get(0)).getStack().addEnchantment(Enchantment.enchantmentsList[e], level);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void removeEnchantment(int e) {
|
public void removeEnchantment(int e) {
|
||||||
ItemStack stack = inventorySlots.get(0).getStack();
|
ItemStack stack = ((Slot) inventorySlots.get(0)).getStack();
|
||||||
NBTTagList nbttaglist = stack.getEnchantmentTagList();
|
NBTTagList nbttaglist = stack.getEnchantmentTagList();
|
||||||
if (nbttaglist != null) {
|
if (nbttaglist != null) {
|
||||||
for (int i = 0; i < nbttaglist.tagCount(); i++) {
|
for (int i = 0; i < nbttaglist.tagCount(); i++) {
|
||||||
int ID = nbttaglist.getCompoundTagAt(i).getShort("id");
|
int ID = nbttaglist.getCompoundTagAt(i).getShort("id");
|
||||||
if (ID == e) {
|
if (ID == e) {
|
||||||
nbttaglist.removeTag(i);
|
nbttaglist.removeTag(i);
|
||||||
if (nbttaglist.tagCount() == 0) stack.getTagCompound().removeTag("ench");
|
if (nbttaglist.tagCount() == 0)
|
||||||
if (stack.getTagCompound().hasNoTags()) stack.setTagCompound(null);
|
stack.getTagCompound().removeTag("ench");
|
||||||
|
if (stack.getTagCompound().hasNoTags())
|
||||||
|
stack.setTagCompound(null);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -190,7 +191,8 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void onCraftMatrixChanged(IInventory iinventory) {
|
public void onCraftMatrixChanged(IInventory iinventory) {
|
||||||
if (parentscreen != null) updateEnchantmentOptions(GuiEnchantmentModifier.validateEnchantments());
|
if (parentscreen != null)
|
||||||
|
updateEnchantmentOptions(GuiEnchantmentModifier.validateEnchantments());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateEnchantmentOptions(boolean validate) {
|
public void updateEnchantmentOptions(boolean validate) {
|
||||||
@@ -219,10 +221,9 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
if (NEIServerUtils.stackHasEnchantment(toolstack, e.effectId)) {
|
if (NEIServerUtils.stackHasEnchantment(toolstack, e.effectId)) {
|
||||||
state = 2;
|
state = 2;
|
||||||
level = NEIServerUtils.getEnchantmentLevel(toolstack, e.effectId);
|
level = NEIServerUtils.getEnchantmentLevel(toolstack, e.effectId);
|
||||||
} else
|
} else if (NEIServerUtils.doesEnchantmentConflict(NEIServerUtils.getEnchantments(toolstack), e) && validate) {
|
||||||
if (NEIServerUtils.doesEnchantmentConflict(NEIServerUtils.getEnchantments(toolstack), e) && validate) {
|
state = 1;
|
||||||
state = 1;
|
}
|
||||||
}
|
|
||||||
slotEnchantment.add(new EnchantmentHash(e, state, level));
|
slotEnchantment.add(new EnchantmentHash(e, state, level));
|
||||||
}
|
}
|
||||||
if (numoptions != slotEnchantment.size()) {
|
if (numoptions != slotEnchantment.size()) {
|
||||||
@@ -256,28 +257,10 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
CCRenderState.changeTexture("textures/gui/container/enchanting_table.png");
|
CCRenderState.changeTexture("textures/gui/container/enchanting_table.png");
|
||||||
GL11.glColor3f(1, 1, 1);
|
GL11.glColor3f(1, 1, 1);
|
||||||
if (hasScrollBar()) {
|
if (hasScrollBar()) {
|
||||||
gui.drawTexturedModalRect(
|
gui.drawTexturedModalRect(relx, rely + slot * slotheight, 0, gui.ySize + slotheight * shade, cwidth - 30, slotheight);
|
||||||
relx,
|
gui.drawTexturedModalRect(relx + cwidth - 30, rely + slot * slotheight, cwidth - 23, gui.ySize + slotheight * shade, 30, slotheight);
|
||||||
rely + slot * slotheight,
|
|
||||||
0,
|
|
||||||
gui.ySize + slotheight * shade,
|
|
||||||
cwidth - 30,
|
|
||||||
slotheight);
|
|
||||||
gui.drawTexturedModalRect(
|
|
||||||
relx + cwidth - 30,
|
|
||||||
rely + slot * slotheight,
|
|
||||||
cwidth - 23,
|
|
||||||
gui.ySize + slotheight * shade,
|
|
||||||
30,
|
|
||||||
slotheight);
|
|
||||||
} else {
|
} else {
|
||||||
gui.drawTexturedModalRect(
|
gui.drawTexturedModalRect(relx, rely + slot * slotheight, 0, gui.ySize + slotheight * shade, cwidth + 7, slotheight);
|
||||||
relx,
|
|
||||||
rely + slot * slotheight,
|
|
||||||
0,
|
|
||||||
gui.ySize + slotheight * shade,
|
|
||||||
cwidth + 7,
|
|
||||||
slotheight);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gui.getFontRenderer().drawString(text, relx + 4, rely + slot * slotheight + 5, textColourFromState(shade));
|
gui.getFontRenderer().drawString(text, relx + 4, rely + slot * slotheight + 5, textColourFromState(shade));
|
||||||
@@ -294,32 +277,18 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
int sbary = rely + (int) ((height - getScrollBarHeight()) * percentscrolled + 0.5);
|
int sbary = rely + (int) ((height - getScrollBarHeight()) * percentscrolled + 0.5);
|
||||||
int sbarx = relx + cwidth;
|
int sbarx = relx + cwidth;
|
||||||
|
|
||||||
Gui.drawRect(sbarx, rely, sbarx + getScrollBarWidth(), rely + height, 0xFF202020); // background
|
Gui.drawRect(sbarx, rely, sbarx + getScrollBarWidth(), rely + height, 0xFF202020);//background
|
||||||
Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth(), sbary + getScrollBarHeight(), 0xFF8B8B8B); // corners
|
Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth(), sbary + getScrollBarHeight(), 0xFF8B8B8B);//corners
|
||||||
Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth() - 1, sbary + getScrollBarHeight() - 1, 0xFFF0F0F0); // topleft
|
Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth() - 1, sbary + getScrollBarHeight() - 1, 0xFFF0F0F0);//topleft up
|
||||||
// up
|
Gui.drawRect(sbarx + 1, sbary + 1, sbarx + getScrollBarWidth() - 1, sbary + getScrollBarHeight() - 1, 0xFF555555);//bottom right down
|
||||||
Gui.drawRect(
|
Gui.drawRect(sbarx + 1, sbary + 1, sbarx + getScrollBarWidth() - 2, sbary + getScrollBarHeight() - 2, 0xFFC6C6C6);//scrollbar
|
||||||
sbarx + 1,
|
|
||||||
sbary + 1,
|
|
||||||
sbarx + getScrollBarWidth() - 1,
|
|
||||||
sbary + getScrollBarHeight() - 1,
|
|
||||||
0xFF555555); // bottom right down
|
|
||||||
Gui.drawRect(
|
|
||||||
sbarx + 1,
|
|
||||||
sbary + 1,
|
|
||||||
sbarx + getScrollBarWidth() - 2,
|
|
||||||
sbary + getScrollBarHeight() - 2,
|
|
||||||
0xFFC6C6C6); // scrollbar
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private int textColourFromState(int shade) {
|
private int textColourFromState(int shade) {
|
||||||
switch (shade) {
|
switch(shade) {
|
||||||
case 0:
|
case 0: return 0x685e4a;
|
||||||
return 0x685e4a;
|
case 1: return 0x407f10;
|
||||||
case 1:
|
default: return 0xffff80;
|
||||||
return 0x407f10;
|
|
||||||
default:
|
|
||||||
return 0xffff80;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import codechicken.lib.inventory.ContainerExtended;
|
||||||
|
import codechicken.lib.inventory.InventoryNBT;
|
||||||
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
|
import codechicken.lib.inventory.SlotHandleClicks;
|
||||||
|
import codechicken.lib.packet.PacketCustom;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
@@ -11,16 +16,10 @@ import net.minecraft.nbt.NBTTagCompound;
|
|||||||
import net.minecraft.nbt.NBTTagList;
|
import net.minecraft.nbt.NBTTagList;
|
||||||
import net.minecraft.potion.PotionEffect;
|
import net.minecraft.potion.PotionEffect;
|
||||||
|
|
||||||
import codechicken.lib.inventory.ContainerExtended;
|
public class ContainerPotionCreator extends ContainerExtended
|
||||||
import codechicken.lib.inventory.InventoryNBT;
|
{
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
public class SlotPotion extends Slot
|
||||||
import codechicken.lib.inventory.SlotHandleClicks;
|
{
|
||||||
import codechicken.lib.packet.PacketCustom;
|
|
||||||
|
|
||||||
public class ContainerPotionCreator extends ContainerExtended {
|
|
||||||
|
|
||||||
public class SlotPotion extends Slot {
|
|
||||||
|
|
||||||
public SlotPotion(IInventory inv, int slotIndex, int x, int y) {
|
public SlotPotion(IInventory inv, int slotIndex, int x, int y) {
|
||||||
super(inv, slotIndex, x, y);
|
super(inv, slotIndex, x, y);
|
||||||
}
|
}
|
||||||
@@ -35,15 +34,16 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
super.onSlotChanged();
|
super.onSlotChanged();
|
||||||
if (getHasStack()) {
|
if (getHasStack()) {
|
||||||
ItemStack stack = getStack();
|
ItemStack stack = getStack();
|
||||||
if (!stack.hasTagCompound()) stack.setTagCompound(new NBTTagCompound());
|
if (!stack.hasTagCompound())
|
||||||
|
stack.setTagCompound(new NBTTagCompound());
|
||||||
if (!stack.getTagCompound().hasKey("CustomPotionEffects"))
|
if (!stack.getTagCompound().hasKey("CustomPotionEffects"))
|
||||||
stack.getTagCompound().setTag("CustomPotionEffects", new NBTTagList());
|
stack.getTagCompound().setTag("CustomPotionEffects", new NBTTagList());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SlotPotionStore extends SlotHandleClicks {
|
public class SlotPotionStore extends SlotHandleClicks
|
||||||
|
{
|
||||||
public SlotPotionStore(IInventory inv, int slotIndex, int x, int y) {
|
public SlotPotionStore(IInventory inv, int slotIndex, int x, int y) {
|
||||||
super(inv, slotIndex, x, y);
|
super(inv, slotIndex, x, y);
|
||||||
}
|
}
|
||||||
@@ -60,7 +60,8 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
putStack(InventoryUtils.copyStack(held, 1));
|
putStack(InventoryUtils.copyStack(held, 1));
|
||||||
player.inventory.setItemStack(null);
|
player.inventory.setItemStack(null);
|
||||||
}
|
}
|
||||||
} else if (getHasStack()) player.inventory.setItemStack(getStack());
|
} else if (getHasStack())
|
||||||
|
player.inventory.setItemStack(getStack());
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -71,8 +72,8 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class InventoryPotionStore extends InventoryNBT {
|
public static class InventoryPotionStore extends InventoryNBT
|
||||||
|
{
|
||||||
public InventoryPotionStore() {
|
public InventoryPotionStore() {
|
||||||
super(9, NEIClientConfig.global.nbt.getCompoundTag("potionStore"));
|
super(9, NEIClientConfig.global.nbt.getCompoundTag("potionStore"));
|
||||||
}
|
}
|
||||||
@@ -81,6 +82,7 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
public void markDirty() {
|
public void markDirty() {
|
||||||
super.markDirty();
|
super.markDirty();
|
||||||
NEIClientConfig.global.nbt.setTag("potionStore", tag);
|
NEIClientConfig.global.nbt.setTag("potionStore", tag);
|
||||||
|
NEIClientConfig.global.saveNBT();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,13 +96,15 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
this.potionStoreInv = potionStoreInv;
|
this.potionStoreInv = potionStoreInv;
|
||||||
|
|
||||||
addSlotToContainer(new SlotPotion(potionInv, 0, 25, 102));
|
addSlotToContainer(new SlotPotion(potionInv, 0, 25, 102));
|
||||||
for (int i = 0; i < 9; i++) addSlotToContainer(new SlotPotionStore(potionStoreInv, i, 8 + i * 18, 14));
|
for (int i = 0; i < 9; i++)
|
||||||
|
addSlotToContainer(new SlotPotionStore(potionStoreInv, i, 8 + i * 18, 14));
|
||||||
bindPlayerInventory(inventoryPlayer, 8, 125);
|
bindPlayerInventory(inventoryPlayer, 8, 125);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean doMergeStackAreas(int slotIndex, ItemStack stack) {
|
public boolean doMergeStackAreas(int slotIndex, ItemStack stack) {
|
||||||
if (slotIndex < 10) return mergeItemStack(stack, 10, 46, true);
|
if (slotIndex < 10)
|
||||||
|
return mergeItemStack(stack, 10, 46, true);
|
||||||
return mergeItemStack(stack, 0, 1, false);
|
return mergeItemStack(stack, 0, 1, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,27 +117,30 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
public void onContainerClosed(EntityPlayer player) {
|
public void onContainerClosed(EntityPlayer player) {
|
||||||
super.onContainerClosed(player);
|
super.onContainerClosed(player);
|
||||||
|
|
||||||
if (!player.worldObj.isRemote) InventoryUtils.dropOnClose(player, potionInv);
|
if (!player.worldObj.isRemote)
|
||||||
|
InventoryUtils.dropOnClose(player, potionInv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public void handleServerPacket(PacketCustom packet) {
|
public void handleServerPacket(PacketCustom packet) {
|
||||||
ItemStack potion = potionInv.getStackInSlot(0);
|
ItemStack potion = potionInv.getStackInSlot(0);
|
||||||
if (potion == null) return;
|
if (potion == null)
|
||||||
|
return;
|
||||||
|
|
||||||
boolean add = packet.getType() == 3;
|
boolean add = packet.getType() == 3;
|
||||||
int effectID = packet.readUByte();
|
int effectID = packet.readUByte();
|
||||||
|
|
||||||
NBTTagList effects = potion.getTagCompound().getTagList("CustomPotionEffects", 10);
|
NBTTagList effects = potion.getTagCompound().getTagList("CustomPotionEffects", 10);
|
||||||
NBTTagList newEffects = new NBTTagList();
|
NBTTagList newEffects = new NBTTagList();
|
||||||
for (int i = 0; i < effects.tagCount(); i++) {
|
for(int i = 0; i < effects.tagCount(); i++) {
|
||||||
NBTTagCompound tag = effects.getCompoundTagAt(i);
|
NBTTagCompound tag = effects.getCompoundTagAt(i);
|
||||||
PotionEffect e = PotionEffect.readCustomPotionEffectFromNBT(tag);
|
PotionEffect e = PotionEffect.readCustomPotionEffectFromNBT(tag);
|
||||||
if (e.getPotionID() != effectID) newEffects.appendTag(tag);
|
if(e.getPotionID() != effectID)
|
||||||
|
newEffects.appendTag(tag);
|
||||||
}
|
}
|
||||||
if (add) newEffects.appendTag(
|
if(add)
|
||||||
new PotionEffect(effectID, packet.readInt(), packet.readUByte())
|
newEffects.appendTag(new PotionEffect(effectID, packet.readInt(), packet.readUByte()).writeCustomPotionEffectToNBT(new NBTTagCompound()));
|
||||||
.writeCustomPotionEffectToNBT(new NBTTagCompound()));
|
|
||||||
potion.getTagCompound().setTag("CustomPotionEffects", newEffects);
|
potion.getTagCompound().setTag("CustomPotionEffects", newEffects);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,4 +157,4 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
packet.writeByte(effectID);
|
packet.writeByte(effectID);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import codechicken.nei.api.IBookmarkContainerHandler;
|
|
||||||
|
|
||||||
public class DefaultBookmarkContainerHandler implements IBookmarkContainerHandler {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void pullBookmarkItemsFromContainer(GuiContainer guiContainer, ArrayList<ItemStack> bookmarkItems) {
|
|
||||||
final List<Slot> slots = guiContainer.inventorySlots.inventorySlots;
|
|
||||||
final FastTransferManager manager = new FastTransferManager();
|
|
||||||
|
|
||||||
for (ItemStack bookmarkItem : bookmarkItems) {
|
|
||||||
for (int i = 0; i < slots.size() - 4 * 9; i++) {
|
|
||||||
final Slot slot = slots.get(i);
|
|
||||||
if (slot.getHasStack() && bookmarkItem.isItemEqual(slot.getStack())) {
|
|
||||||
final int transferAmount = Math.min(bookmarkItem.stackSize, slot.getStack().stackSize);
|
|
||||||
manager.transferItems(guiContainer, i, transferAmount);
|
|
||||||
bookmarkItem.stackSize -= transferAmount;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,34 +1,35 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.util.List;
|
import codechicken.nei.api.IHighlightHandler;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.MovingObjectPosition;
|
import net.minecraft.util.MovingObjectPosition;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import codechicken.nei.api.IHighlightHandler;
|
import java.util.List;
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
|
|
||||||
public class DefaultHighlightHandler implements IHighlightHandler {
|
|
||||||
|
|
||||||
|
public class DefaultHighlightHandler implements IHighlightHandler
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public List<String> handleTextData(ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop,
|
public List<String> handleTextData(ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop, List<String> currenttip, ItemInfo.Layout layout) {
|
||||||
List<String> currenttip, ItemInfo.Layout layout) {
|
|
||||||
String name = null;
|
String name = null;
|
||||||
try {
|
try {
|
||||||
String s = GuiContainerManager.itemDisplayNameShort(stack);
|
String s = GuiContainerManager.itemDisplayNameShort(stack);
|
||||||
if (!s.endsWith("Unnamed")) name = s;
|
if (s != null && !s.endsWith("Unnamed"))
|
||||||
|
name = s;
|
||||||
|
|
||||||
if (name != null) currenttip.add(name);
|
if (name != null)
|
||||||
|
currenttip.add(name);
|
||||||
} catch (Exception ignored) {}
|
} catch (Exception ignored) {}
|
||||||
|
|
||||||
if (name != null && stack.getItem() == Items.redstone) {
|
if (name != null && stack.getItem() == Items.redstone) {
|
||||||
int md = world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ);
|
int md = world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ);
|
||||||
String s = "" + md;
|
String s = "" + md;
|
||||||
if (s.length() < 2) s = " " + s;
|
if (s.length() < 2)
|
||||||
|
s = " " + s;
|
||||||
currenttip.set(currenttip.size() - 1, name + " " + s);
|
currenttip.set(currenttip.size() - 1, name + " " + s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import codechicken.nei.api.ItemFilter;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
public class DoubleFilteredFilter implements ItemFilter {
|
||||||
|
private ItemFilter filter;
|
||||||
|
private ItemList.PatternItemFilter patternFilter;
|
||||||
|
|
||||||
|
public DoubleFilteredFilter(ItemFilter filter, String itemFilter) {
|
||||||
|
this.filter = filter;
|
||||||
|
this.patternFilter = new ItemList.PatternItemFilter(SearchField.getPattern(itemFilter));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean matches(ItemStack item) {
|
||||||
|
if(filter.matches(item)) {
|
||||||
|
return patternFilter.matches(item);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,13 +1,12 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
public class ExtendedCreativeInv implements IInventory
|
||||||
|
{
|
||||||
public class ExtendedCreativeInv implements IInventory {
|
|
||||||
|
|
||||||
final PlayerSave playerSave;
|
final PlayerSave playerSave;
|
||||||
final Side side;
|
final Side side;
|
||||||
|
|
||||||
@@ -23,7 +22,8 @@ public class ExtendedCreativeInv implements IInventory {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getStackInSlot(int slot) {
|
public ItemStack getStackInSlot(int slot) {
|
||||||
if (side.isClient()) return NEIClientConfig.creativeInv[slot];
|
if (side.isClient())
|
||||||
|
return NEIClientConfig.creativeInv[slot];
|
||||||
return playerSave.creativeInv[slot];
|
return playerSave.creativeInv[slot];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,8 +58,10 @@ public class ExtendedCreativeInv implements IInventory {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setInventorySlotContents(int slot, ItemStack stack) {
|
public void setInventorySlotContents(int slot, ItemStack stack) {
|
||||||
if (side.isClient()) NEIClientConfig.creativeInv[slot] = stack;
|
if (side.isClient())
|
||||||
else playerSave.creativeInv[slot] = stack;
|
NEIClientConfig.creativeInv[slot] = stack;
|
||||||
|
else
|
||||||
|
playerSave.creativeInv[slot] = stack;
|
||||||
|
|
||||||
markDirty();
|
markDirty();
|
||||||
}
|
}
|
||||||
@@ -76,7 +78,8 @@ public class ExtendedCreativeInv implements IInventory {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void markDirty() {
|
public void markDirty() {
|
||||||
if (side.isServer()) playerSave.setCreativeDirty();
|
if (side.isServer())
|
||||||
|
playerSave.setCreativeDirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -85,10 +88,12 @@ public class ExtendedCreativeInv implements IInventory {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void openInventory() {}
|
public void openInventory() {
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void closeInventory() {}
|
public void closeInventory() {
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isItemValidForSlot(int slot, ItemStack stack) {
|
public boolean isItemValidForSlot(int slot, ItemStack stack) {
|
||||||
@@ -99,4 +104,5 @@ public class ExtendedCreativeInv implements IInventory {
|
|||||||
public boolean hasCustomInventoryName() {
|
public boolean hasCustomInventoryName() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,30 +1,27 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.nei.NEIServerUtils.areStacksIdentical;
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
import static codechicken.nei.NEIServerUtils.areStacksSameType;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import static codechicken.nei.NEIServerUtils.copyStack;
|
import net.minecraft.inventory.Container;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
|
|
||||||
import net.minecraft.client.entity.EntityPlayerSP;
|
import static codechicken.nei.NEIServerUtils.areStacksIdentical;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import static codechicken.nei.NEIServerUtils.areStacksSameType;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import static codechicken.nei.NEIServerUtils.copyStack;
|
||||||
import net.minecraft.inventory.Container;
|
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
|
|
||||||
public class FastTransferManager {
|
|
||||||
|
|
||||||
|
public class FastTransferManager
|
||||||
|
{
|
||||||
/**
|
/**
|
||||||
* Based on the general assumption that we want to fill top to bottom, left to right
|
* Based on the general assumption that we want to fill top to bottom, left to right
|
||||||
*/
|
*/
|
||||||
public static class SlotPositionComparator implements Comparator<Integer> {
|
public static class SlotPositionComparator implements Comparator<Integer>
|
||||||
|
{
|
||||||
final Container container;
|
final Container container;
|
||||||
|
|
||||||
public SlotPositionComparator(Container c) {
|
public SlotPositionComparator(Container c) {
|
||||||
@@ -50,7 +47,8 @@ public class FastTransferManager {
|
|||||||
stack.stackSize = 1;
|
stack.stackSize = 1;
|
||||||
|
|
||||||
for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++) {
|
for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++) {
|
||||||
if (slotZoneMap.containsKey(slotNo) || !container.getSlot(slotNo).isItemValid(stack)) continue;
|
if (slotZoneMap.containsKey(slotNo) || !container.getSlot(slotNo).isItemValid(stack))
|
||||||
|
continue;
|
||||||
|
|
||||||
HashSet<Integer> connectedSlots = new HashSet<>();
|
HashSet<Integer> connectedSlots = new HashSet<>();
|
||||||
findConnectedSlots(container, slotNo, connectedSlots);
|
findConnectedSlots(container, slotNo, connectedSlots);
|
||||||
@@ -71,11 +69,11 @@ public class FastTransferManager {
|
|||||||
final int threshold = 18;
|
final int threshold = 18;
|
||||||
|
|
||||||
for (int i = 0; i < container.inventorySlots.size(); i++) {
|
for (int i = 0; i < container.inventorySlots.size(); i++) {
|
||||||
if (connectedSlots.contains(i)) continue;
|
if (connectedSlots.contains(i))
|
||||||
|
continue;
|
||||||
|
|
||||||
Slot slot1 = container.getSlot(i);
|
Slot slot1 = container.getSlot(i);
|
||||||
if (Math.abs(slot.xDisplayPosition - slot1.xDisplayPosition) <= threshold
|
if (Math.abs(slot.xDisplayPosition - slot1.xDisplayPosition) <= threshold && Math.abs(slot.yDisplayPosition - slot1.yDisplayPosition) <= threshold) {
|
||||||
&& Math.abs(slot.yDisplayPosition - slot1.yDisplayPosition) <= threshold) {
|
|
||||||
findConnectedSlots(container, i, connectedSlots);
|
findConnectedSlots(container, i, connectedSlots);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -84,14 +82,15 @@ public class FastTransferManager {
|
|||||||
public static int findSlotWithItem(Container container, ItemStack teststack) {
|
public static int findSlotWithItem(Container container, ItemStack teststack) {
|
||||||
for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++) {
|
for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++) {
|
||||||
ItemStack stack = container.getSlot(slotNo).getStack();
|
ItemStack stack = container.getSlot(slotNo).getStack();
|
||||||
if (areStacksSameType(stack, teststack)) return slotNo;
|
if (areStacksSameType(stack, teststack))
|
||||||
|
return slotNo;
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void clearSlots(Container container) {
|
public static void clearSlots(Container container) {
|
||||||
for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++)
|
for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++)
|
||||||
container.inventorySlots.get(slotNo).putStack(null);
|
((Slot) container.inventorySlots.get(slotNo)).putStack(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void performMassTransfer(GuiContainer window, int fromSlot, int toSlot, ItemStack heldStack) {
|
public void performMassTransfer(GuiContainer window, int fromSlot, int toSlot, ItemStack heldStack) {
|
||||||
@@ -100,16 +99,20 @@ public class FastTransferManager {
|
|||||||
Integer fromZone = slotZoneMap.get(fromSlot);
|
Integer fromZone = slotZoneMap.get(fromSlot);
|
||||||
Integer toZone = slotZoneMap.get(toSlot);
|
Integer toZone = slotZoneMap.get(toSlot);
|
||||||
|
|
||||||
if (fromZone == null || toZone == null || fromZone.equals(toZone)) return;
|
if (fromZone == null || toZone == null || fromZone.equals(toZone))
|
||||||
|
return;
|
||||||
|
|
||||||
if (NEIClientUtils.getHeldItem() != null && !areStacksSameType(heldStack, NEIClientUtils.getHeldItem())) return;
|
if (NEIClientUtils.getHeldItem() != null && !areStacksSameType(heldStack, NEIClientUtils.getHeldItem()))
|
||||||
|
return;
|
||||||
|
|
||||||
if (!fillZoneWithHeldItem(window, toZone)) return;
|
if (!fillZoneWithHeldItem(window, toZone))
|
||||||
|
return;
|
||||||
|
|
||||||
for (int transferFrom : slotZones.get(fromZone)) {
|
for (int transferFrom : slotZones.get(fromZone)) {
|
||||||
ItemStack transferStack = window.inventorySlots.getSlot(transferFrom).getStack();
|
ItemStack transferStack = window.inventorySlots.getSlot(transferFrom).getStack();
|
||||||
|
|
||||||
if (!areStacksSameType(heldStack, transferStack)) continue;
|
if (!areStacksSameType(heldStack, transferStack))
|
||||||
|
continue;
|
||||||
|
|
||||||
clickSlot(window, transferFrom);
|
clickSlot(window, transferFrom);
|
||||||
if (!fillZoneWithHeldItem(window, toZone)) {
|
if (!fillZoneWithHeldItem(window, toZone)) {
|
||||||
@@ -127,7 +130,8 @@ public class FastTransferManager {
|
|||||||
|
|
||||||
Slot slot = container.getSlot(fromSlot);
|
Slot slot = container.getSlot(fromSlot);
|
||||||
ItemStack stack = slot.getStack();
|
ItemStack stack = slot.getStack();
|
||||||
if (stack == null) return -1;
|
if (stack == null)
|
||||||
|
return -1;
|
||||||
|
|
||||||
stack.stackSize = 1;
|
stack.stackSize = 1;
|
||||||
slot.putStack(stack.copy());
|
slot.putStack(stack.copy());
|
||||||
@@ -137,19 +141,19 @@ public class FastTransferManager {
|
|||||||
LinkedList<ItemStack> compareAfter = saveContainer(container);
|
LinkedList<ItemStack> compareAfter = saveContainer(container);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// if(compareAfter.get(fromSlot) != null)//transfer failed
|
//if(compareAfter.get(fromSlot) != null)//transfer failed
|
||||||
// return -1;
|
//return -1;
|
||||||
|
|
||||||
for (int i = 0; i < compareBefore.size(); i++) {
|
for (int i = 0; i < compareBefore.size(); i++) {
|
||||||
if (i == fromSlot) continue;
|
if (i == fromSlot)
|
||||||
|
continue;
|
||||||
|
|
||||||
ItemStack before = compareBefore.get(i);
|
ItemStack before = compareBefore.get(i);
|
||||||
ItemStack after = compareAfter.get(i);
|
ItemStack after = compareAfter.get(i);
|
||||||
|
|
||||||
if (!areStacksIdentical(before, after) && after != null)
|
if (!areStacksIdentical(before, after) && after != null)
|
||||||
if (before == null ? areStacksSameType(stack, after) : // transfered into this empty slot
|
if (before == null ? areStacksSameType(stack, after) ://transfered into this empty slot
|
||||||
areStacksSameType(stack, after) && after.stackSize - before.stackSize > 0) // it added to
|
areStacksSameType(stack, after) && after.stackSize - before.stackSize > 0)//it added to this stack
|
||||||
// this stack
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -177,48 +181,45 @@ public class FastTransferManager {
|
|||||||
|
|
||||||
public void transferItem(GuiContainer window, int fromSlot) {
|
public void transferItem(GuiContainer window, int fromSlot) {
|
||||||
int toSlot = findShiftClickDestinationSlot(window.inventorySlots, fromSlot);
|
int toSlot = findShiftClickDestinationSlot(window.inventorySlots, fromSlot);
|
||||||
if (toSlot == -1) return;
|
if (toSlot == -1)
|
||||||
|
return;
|
||||||
|
|
||||||
Slot from = window.inventorySlots.getSlot(fromSlot);
|
Slot from = window.inventorySlots.getSlot(fromSlot);
|
||||||
|
|
||||||
if (from.isItemValid(from.getStack())) moveOneItem(window, fromSlot, toSlot);
|
if (from.isItemValid(from.getStack()))
|
||||||
else // slots that you can't put stuff in
|
moveOneItem(window, fromSlot, toSlot);
|
||||||
|
else//slots that you can't put stuff in
|
||||||
moveOutputSet(window, fromSlot, toSlot);
|
moveOutputSet(window, fromSlot, toSlot);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void transferItems(GuiContainer window, int fromSlot, int itemCount) {
|
|
||||||
for (int i = 0; i < itemCount; i++) {
|
|
||||||
transferItem(window, fromSlot);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void moveOutputSet(GuiContainer window, int fromSlot, int toSlot) {
|
public void moveOutputSet(GuiContainer window, int fromSlot, int toSlot) {
|
||||||
if (NEIClientUtils.getHeldItem() != null) return;
|
if (NEIClientUtils.getHeldItem() != null)
|
||||||
|
|
||||||
clickSlot(window, fromSlot); // pickup fromSlot
|
|
||||||
if (NEIClientUtils.getHeldItem() == null) // maybe this container does auto transfers. No need to pick up the
|
|
||||||
// final item
|
|
||||||
return;
|
return;
|
||||||
clickSlot(window, toSlot); // place one in toSlot
|
|
||||||
|
clickSlot(window, fromSlot);//pickup fromSlot
|
||||||
|
if (NEIClientUtils.getHeldItem() == null)//maybe this container does auto transfers. No need to pick up the final item
|
||||||
|
return;
|
||||||
|
clickSlot(window, toSlot);//place one in toSlot
|
||||||
}
|
}
|
||||||
|
|
||||||
public void moveOneItem(GuiContainer window, int fromSlot, int toSlot) {
|
public void moveOneItem(GuiContainer window, int fromSlot, int toSlot) {
|
||||||
clickSlot(window, fromSlot); // pickup fromSlot
|
clickSlot(window, fromSlot);//pickup fromSlot
|
||||||
clickSlot(window, toSlot, 1); // place one in toSlot
|
clickSlot(window, toSlot, 1);//place one in toSlot
|
||||||
clickSlot(window, fromSlot); // place down in fromSlot
|
clickSlot(window, fromSlot);//place down in fromSlot
|
||||||
}
|
}
|
||||||
|
|
||||||
public void retrieveItem(GuiContainer window, int toSlot) {
|
public void retrieveItem(GuiContainer window, int toSlot) {
|
||||||
Slot slot = window.inventorySlots.getSlot(toSlot);
|
Slot slot = window.inventorySlots.getSlot(toSlot);
|
||||||
ItemStack slotStack = slot.getStack();
|
ItemStack slotStack = slot.getStack();
|
||||||
if (slotStack == null || slotStack.stackSize == slot.getSlotStackLimit()
|
if (slotStack == null ||
|
||||||
|| slotStack.stackSize == slotStack.getMaxStackSize())
|
slotStack.stackSize == slot.getSlotStackLimit() ||
|
||||||
|
slotStack.stackSize == slotStack.getMaxStackSize())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
generateSlotMap(window.inventorySlots, slotStack);
|
generateSlotMap(window.inventorySlots, slotStack);
|
||||||
|
|
||||||
Integer destZone = slotZoneMap.get(toSlot);
|
Integer destZone = slotZoneMap.get(toSlot);
|
||||||
if (destZone == null) // slots that don't accept
|
if (destZone == null)//slots that don't accept
|
||||||
return;
|
return;
|
||||||
|
|
||||||
int firstZoneSlot = findShiftClickDestinationSlot(window.inventorySlots, toSlot);
|
int firstZoneSlot = findShiftClickDestinationSlot(window.inventorySlots, toSlot);
|
||||||
@@ -227,14 +228,17 @@ public class FastTransferManager {
|
|||||||
Integer integer = slotZoneMap.get(firstZoneSlot);
|
Integer integer = slotZoneMap.get(firstZoneSlot);
|
||||||
if (integer != null) {
|
if (integer != null) {
|
||||||
firstZone = integer;
|
firstZone = integer;
|
||||||
if (retrieveItemFromZone(window, firstZone, toSlot)) return;
|
if (retrieveItemFromZone(window, firstZone, toSlot))
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int zone = 0; zone < slotZones.size(); zone++) {
|
for (int zone = 0; zone < slotZones.size(); zone++) {
|
||||||
if (zone == destZone || zone == firstZone) continue;
|
if (zone == destZone || zone == firstZone)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (retrieveItemFromZone(window, zone, toSlot)) return;
|
if (retrieveItemFromZone(window, zone, toSlot))
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
retrieveItemFromZone(window, destZone, toSlot);
|
retrieveItemFromZone(window, destZone, toSlot);
|
||||||
@@ -243,14 +247,14 @@ public class FastTransferManager {
|
|||||||
private boolean retrieveItemFromZone(GuiContainer window, int zone, int toSlot) {
|
private boolean retrieveItemFromZone(GuiContainer window, int zone, int toSlot) {
|
||||||
ItemStack stack = window.inventorySlots.getSlot(toSlot).getStack();
|
ItemStack stack = window.inventorySlots.getSlot(toSlot).getStack();
|
||||||
for (int i : slotZones.get(zone)) {
|
for (int i : slotZones.get(zone)) {
|
||||||
if (i == toSlot) continue;
|
if (i == toSlot)
|
||||||
|
continue;
|
||||||
|
|
||||||
Slot slot = window.inventorySlots.getSlot(i);
|
Slot slot = window.inventorySlots.getSlot(i);
|
||||||
ItemStack stack1 = slot.getStack();
|
ItemStack stack1 = slot.getStack();
|
||||||
|
|
||||||
if (areStacksSameType(stack, stack1) && stack1.stackSize != slot.getSlotStackLimit() && // get from full
|
if (areStacksSameType(stack, stack1) &&
|
||||||
// stacks on second
|
stack1.stackSize != slot.getSlotStackLimit() && //get from full stacks on second pass
|
||||||
// pass
|
|
||||||
stack1.stackSize != stack1.getMaxStackSize()) {
|
stack1.stackSize != stack1.getMaxStackSize()) {
|
||||||
moveOneItem(window, i, toSlot);
|
moveOneItem(window, i, toSlot);
|
||||||
return true;
|
return true;
|
||||||
@@ -258,7 +262,8 @@ public class FastTransferManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (int i : slotZones.get(zone)) {
|
for (int i : slotZones.get(zone)) {
|
||||||
if (i == toSlot) continue;
|
if (i == toSlot)
|
||||||
|
continue;
|
||||||
|
|
||||||
Slot slot = window.inventorySlots.getSlot(i);
|
Slot slot = window.inventorySlots.getSlot(i);
|
||||||
ItemStack stack1 = slot.getStack();
|
ItemStack stack1 = slot.getStack();
|
||||||
@@ -283,49 +288,32 @@ public class FastTransferManager {
|
|||||||
GuiContainerManager.getManager(window).handleSlotClick(slotIndex, button, modifier);
|
GuiContainerManager.getManager(window).handleSlotClick(slotIndex, button, modifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int dropHeldItem(GuiContainer window) {
|
|
||||||
final EntityPlayerSP player = window.mc.thePlayer;
|
|
||||||
final ItemStack held = player.inventory.getItemStack();
|
|
||||||
|
|
||||||
if (held == null) return -1;
|
|
||||||
|
|
||||||
for (int i = 0; i < window.inventorySlots.inventorySlots.size(); i++) {
|
|
||||||
final Slot slot = window.inventorySlots.inventorySlots.get(i);
|
|
||||||
|
|
||||||
if (slot.inventory instanceof InventoryPlayer && !slot.getHasStack() && slot.isItemValid(held)) {
|
|
||||||
clickSlot(window, i, 0, 0);
|
|
||||||
|
|
||||||
if (player.inventory.getItemStack() == null) {
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean fillZoneWithHeldItem(GuiContainer window, int zoneIndex) {
|
private boolean fillZoneWithHeldItem(GuiContainer window, int zoneIndex) {
|
||||||
for (int transferTo : slotZones.get(zoneIndex)) {
|
for (int transferTo : slotZones.get(zoneIndex)) {
|
||||||
ItemStack held = NEIClientUtils.getHeldItem();
|
ItemStack held = NEIClientUtils.getHeldItem();
|
||||||
|
|
||||||
if (held == null) break;
|
if (held == null)
|
||||||
|
break;
|
||||||
|
|
||||||
ItemStack inToSlot = window.inventorySlots.getSlot(transferTo).getStack();
|
ItemStack inToSlot = window.inventorySlots.getSlot(transferTo).getStack();
|
||||||
|
|
||||||
if (!areStacksSameType(inToSlot, held)) continue;
|
if (!areStacksSameType(inToSlot, held))
|
||||||
|
continue;
|
||||||
|
|
||||||
clickSlot(window, transferTo);
|
clickSlot(window, transferTo);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int transferTo : slotZones.get(zoneIndex)) // repeat on empty slots
|
for (int transferTo : slotZones.get(zoneIndex))//repeat on empty slots
|
||||||
{
|
{
|
||||||
ItemStack held = NEIClientUtils.getHeldItem();
|
ItemStack held = NEIClientUtils.getHeldItem();
|
||||||
|
|
||||||
if (held == null) break;
|
if (held == null)
|
||||||
|
break;
|
||||||
|
|
||||||
ItemStack inToSlot = window.inventorySlots.getSlot(transferTo).getStack();
|
ItemStack inToSlot = window.inventorySlots.getSlot(transferTo).getStack();
|
||||||
|
|
||||||
if (inToSlot != null) continue;
|
if (inToSlot != null)
|
||||||
|
continue;
|
||||||
|
|
||||||
clickSlot(window, transferTo);
|
clickSlot(window, transferTo);
|
||||||
}
|
}
|
||||||
@@ -335,13 +323,14 @@ public class FastTransferManager {
|
|||||||
|
|
||||||
public void throwAll(GuiContainer window, int pickedUpFromSlot) {
|
public void throwAll(GuiContainer window, int pickedUpFromSlot) {
|
||||||
ItemStack held = NEIClientUtils.getHeldItem();
|
ItemStack held = NEIClientUtils.getHeldItem();
|
||||||
if (held == null) return;
|
if (held == null)
|
||||||
|
return;
|
||||||
|
|
||||||
clickSlot(window, -999);
|
clickSlot(window, -999);
|
||||||
|
|
||||||
generateSlotMap(window.inventorySlots, held);
|
generateSlotMap(window.inventorySlots, held);
|
||||||
Integer zone = slotZoneMap.get(pickedUpFromSlot);
|
Integer zone = slotZoneMap.get(pickedUpFromSlot);
|
||||||
if (zone == null) // something went wrong and we can't work out where the item was picked up from
|
if(zone == null) //something went wrong and we can't work out where the item was picked up from
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (int slotIndex : slotZones.get(zone)) {
|
for (int slotIndex : slotZones.get(zone)) {
|
||||||
|
|||||||
@@ -1,395 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.io.OutputStream;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
|
|
||||||
import org.apache.commons.io.IOUtils;
|
|
||||||
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
import com.google.gson.JsonParser;
|
|
||||||
import com.google.gson.JsonSyntaxException;
|
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
|
||||||
import codechicken.nei.api.API;
|
|
||||||
import codechicken.nei.recipe.GuiCraftingRecipe;
|
|
||||||
import codechicken.nei.recipe.GuiRecipeTab;
|
|
||||||
import codechicken.nei.recipe.ICraftingHandler;
|
|
||||||
import codechicken.nei.recipe.Recipe.RecipeId;
|
|
||||||
import codechicken.nei.recipe.RecipeHandlerRef;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
import codechicken.nei.util.FavoriteStorage;
|
|
||||||
import codechicken.nei.util.NBTJson;
|
|
||||||
|
|
||||||
public class FavoriteRecipes {
|
|
||||||
|
|
||||||
protected static final class FastKey {
|
|
||||||
|
|
||||||
public final ItemStack stack;
|
|
||||||
private int hash;
|
|
||||||
|
|
||||||
public FastKey(ItemStack stack) {
|
|
||||||
this.stack = stack;
|
|
||||||
|
|
||||||
this.hash = 31 + Item.getIdFromItem(stack.getItem());
|
|
||||||
this.hash = 31 * this.hash + stack.getItemDamage();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return this.hash;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object o) {
|
|
||||||
if (this == o) return true;
|
|
||||||
|
|
||||||
if (o instanceof FastKey k && this.stack.getItem() == k.stack.getItem()
|
|
||||||
&& this.stack.getItemDamage() == k.stack.getItemDamage()) {
|
|
||||||
return this.stack == k.stack || Objects.equals(this.stack.stackTagCompound, k.stack.stackTagCompound);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final RestartableTask singleRecipeFavoritesTask = new RestartableTask(
|
|
||||||
"Generate Single-Recipe Favorites") {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() {
|
|
||||||
final List<ICraftingHandler> handlers = GuiCraftingRecipe.getCraftingHandlers("all");
|
|
||||||
final Map<FastKey, RecipeHandlerRef> autogeneratedRecipes = new HashMap<>();
|
|
||||||
final Set<FastKey> whitelistItems = new HashSet<>(ItemList.items.size());
|
|
||||||
final FavoriteStorage storage = new FavoriteStorage();
|
|
||||||
|
|
||||||
for (ItemStack stack : ItemList.items) {
|
|
||||||
whitelistItems.add(new FastKey(stack));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (interrupted()) return;
|
|
||||||
|
|
||||||
for (ICraftingHandler handler : handlers) {
|
|
||||||
if (!GuiRecipeTab.getHandlerInfo(handler).getShowFavoritesButton()) continue;
|
|
||||||
|
|
||||||
for (int i = 0; i < handler.numRecipes(); i++) {
|
|
||||||
RecipeHandlerRef ref = null;
|
|
||||||
|
|
||||||
for (PositionedStack result : handler.getResultStacks(i)) {
|
|
||||||
ItemStack stack = StackInfo.getItemStackWithMinimumDamage(result.items);
|
|
||||||
final FastKey key = new FastKey(stack);
|
|
||||||
|
|
||||||
if (!whitelistItems.contains(key)) continue;
|
|
||||||
|
|
||||||
if (autogeneratedRecipes.get(key) == null) {
|
|
||||||
|
|
||||||
if (ref == null) {
|
|
||||||
ref = RecipeHandlerRef.of(handler, i);
|
|
||||||
}
|
|
||||||
|
|
||||||
autogeneratedRecipes.put(key, ref);
|
|
||||||
} else {
|
|
||||||
autogeneratedRecipes.remove(key);
|
|
||||||
whitelistItems.remove(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (interrupted()) return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final Map<RecipeHandlerRef, RecipeId> recipesCache = new HashMap<>();
|
|
||||||
|
|
||||||
for (Map.Entry<FastKey, RecipeHandlerRef> entry : autogeneratedRecipes.entrySet()) {
|
|
||||||
final RecipeId recipeId = recipesCache
|
|
||||||
.computeIfAbsent(entry.getValue(), r -> RecipeId.of(r.handler, r.recipeIndex));
|
|
||||||
storage.add(entry.getKey().stack, recipeId);
|
|
||||||
}
|
|
||||||
|
|
||||||
FavoriteRecipes.autoFavorites = storage;
|
|
||||||
updateSubsetVisibility();
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
public static final String FAVORITE_ITEM = "FavoriteItem";
|
|
||||||
private static final FavoriteStorage manualFavorites = new FavoriteStorage();
|
|
||||||
private static FavoriteStorage autoFavorites = new FavoriteStorage();
|
|
||||||
private static File favoriteFile;
|
|
||||||
private static int revision = 0;
|
|
||||||
|
|
||||||
static {
|
|
||||||
API.addSubset("Favorites.Manual", manualFavorites::contains);
|
|
||||||
API.addSubset("Favorites.Generated", stack -> FavoriteRecipes.autoFavorites.contains(stack));
|
|
||||||
}
|
|
||||||
|
|
||||||
private FavoriteRecipes() {}
|
|
||||||
|
|
||||||
public static void load() {
|
|
||||||
String worldPath = "global";
|
|
||||||
|
|
||||||
if (NEIClientConfig.getBooleanSetting("inventory.favorites.worldSpecific")) {
|
|
||||||
worldPath = NEIClientConfig.getWorldPath();
|
|
||||||
}
|
|
||||||
|
|
||||||
final File dir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
|
|
||||||
|
|
||||||
if (!dir.exists()) {
|
|
||||||
dir.mkdirs();
|
|
||||||
}
|
|
||||||
|
|
||||||
favoriteFile = new File(dir, "favorites.ini");
|
|
||||||
|
|
||||||
if (!favoriteFile.exists()) {
|
|
||||||
final File globalFavorites = new File(CommonUtils.getMinecraftDir(), "saves/NEI/global/favorites.ini");
|
|
||||||
final File configFavorites = new File(NEIClientConfig.configDir, "favorites.ini");
|
|
||||||
final File defaultFavorites = configFavorites.exists() ? configFavorites : globalFavorites;
|
|
||||||
|
|
||||||
if (defaultFavorites.exists()) {
|
|
||||||
try {
|
|
||||||
if (favoriteFile.createNewFile()) {
|
|
||||||
InputStream src = new FileInputStream(defaultFavorites);
|
|
||||||
OutputStream dst = new FileOutputStream(favoriteFile);
|
|
||||||
|
|
||||||
IOUtils.copy(src, dst);
|
|
||||||
|
|
||||||
src.close();
|
|
||||||
dst.close();
|
|
||||||
}
|
|
||||||
} catch (IOException e) {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
loadData();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void loadData() {
|
|
||||||
|
|
||||||
if (favoriteFile == null || !favoriteFile.exists()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<String> itemStrings;
|
|
||||||
|
|
||||||
try (FileInputStream reader = new FileInputStream(favoriteFile)) {
|
|
||||||
NEIClientConfig.logger.info("Loading favorites from file {}", favoriteFile);
|
|
||||||
itemStrings = IOUtils.readLines(reader, StandardCharsets.UTF_8);
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load favorites from file {}", favoriteFile, e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final JsonParser parser = new JsonParser();
|
|
||||||
boolean hasErrors = false;
|
|
||||||
|
|
||||||
manualFavorites.clear();
|
|
||||||
|
|
||||||
for (String itemStr : itemStrings) {
|
|
||||||
|
|
||||||
if (itemStr.isEmpty() || itemStr.startsWith("#")) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
JsonObject jsonObject = parser.parse(itemStr).getAsJsonObject();
|
|
||||||
|
|
||||||
if (jsonObject.get("item") != null && jsonObject.get("recipeId") != null) {
|
|
||||||
final NBTTagCompound itemStackNBT = (NBTTagCompound) NBTJson.toNbt(jsonObject.get("item"));
|
|
||||||
final RecipeId recipeId = RecipeId.of(jsonObject.getAsJsonObject("recipeId"));
|
|
||||||
final ItemStack stack = StackInfo.loadFromNBT(itemStackNBT);
|
|
||||||
|
|
||||||
if (recipeId == null || stack == null) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FAVORITE_ITEM.equals(recipeId.getHandlerName()) || RecipeHandlerRef.of(recipeId) != null) {
|
|
||||||
manualFavorites.add(stack, recipeId);
|
|
||||||
} else {
|
|
||||||
hasErrors = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load favorite from json string: {}", itemStr);
|
|
||||||
hasErrors = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasErrors) {
|
|
||||||
|
|
||||||
NEIClientUtils.backupFile(favoriteFile);
|
|
||||||
|
|
||||||
save();
|
|
||||||
}
|
|
||||||
|
|
||||||
loadAutoGeneratedRecipes();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static RecipeId getGeneratedFavorite(ItemStack stack) {
|
|
||||||
if (NEIClientConfig.favoritesEnabled() && stack != null) {
|
|
||||||
return autoFavorites.getRecipeId(stack);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ItemStack getGeneratedFavorite(RecipeId recipeId) {
|
|
||||||
if (NEIClientConfig.favoritesEnabled() && recipeId != null) {
|
|
||||||
return autoFavorites.getItemStack(recipeId);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static RecipeId getManualFavorite(ItemStack stack) {
|
|
||||||
if (NEIClientConfig.favoritesEnabled() && stack != null) {
|
|
||||||
return manualFavorites.getRecipeId(stack);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ItemStack getManualFavorite(RecipeId recipeId) {
|
|
||||||
if (NEIClientConfig.favoritesEnabled() && recipeId != null) {
|
|
||||||
return manualFavorites.getItemStack(recipeId);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static RecipeId getFavorite(ItemStack stack) {
|
|
||||||
|
|
||||||
if (NEIClientConfig.favoritesEnabled() && stack != null) {
|
|
||||||
final RecipeId recipeId = manualFavorites.getRecipeId(stack);
|
|
||||||
return recipeId != null ? recipeId : autoFavorites.getRecipeId(stack);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ItemStack getFavorite(RecipeId recipeId) {
|
|
||||||
|
|
||||||
if (NEIClientConfig.favoritesEnabled() && recipeId != null) {
|
|
||||||
final ItemStack stack = manualFavorites.getItemStack(recipeId);
|
|
||||||
return stack != null ? stack : autoFavorites.getItemStack(recipeId);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int size() {
|
|
||||||
return manualFavorites.size() + autoFavorites.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void reload() {
|
|
||||||
save();
|
|
||||||
load();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean hasManual() {
|
|
||||||
return manualFavorites.size() > 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean containsManual(ItemStack stack) {
|
|
||||||
return getManualFavorite(stack) != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean contains(ItemStack stack) {
|
|
||||||
return getFavorite(stack) != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void toggleFavoriteItem(ItemStack stack) {
|
|
||||||
if (stack == null) return;
|
|
||||||
|
|
||||||
if (containsManual(stack)) {
|
|
||||||
setFavorite(stack, null);
|
|
||||||
} else {
|
|
||||||
setFavorite(
|
|
||||||
stack,
|
|
||||||
RecipeId.of(
|
|
||||||
stack,
|
|
||||||
FavoriteRecipes.FAVORITE_ITEM,
|
|
||||||
Arrays.asList(new ItemStack(Blocks.fire, 1), stack)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setFavorite(ItemStack stack, RecipeId recipeId) {
|
|
||||||
if (stack == null) return;
|
|
||||||
|
|
||||||
manualFavorites.removeItemStack(stack);
|
|
||||||
|
|
||||||
if (recipeId != null) {
|
|
||||||
manualFavorites.removeRecipeId(recipeId);
|
|
||||||
manualFavorites.add(stack, recipeId);
|
|
||||||
}
|
|
||||||
|
|
||||||
updateSubsetVisibility();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void loadAutoGeneratedRecipes() {
|
|
||||||
if (ItemList.loadFinished
|
|
||||||
&& NEIClientConfig.getBooleanSetting("inventory.favorites.generateSingleRecipeFavorites")) {
|
|
||||||
singleRecipeFavoritesTask.restart();
|
|
||||||
} else {
|
|
||||||
singleRecipeFavoritesTask.stop();
|
|
||||||
autoFavorites.clear();
|
|
||||||
|
|
||||||
updateSubsetVisibility();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static void updateSubsetVisibility() {
|
|
||||||
SubsetWidget.updateHiddenItems();
|
|
||||||
FavoriteRecipes.revision++;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int getRevision() {
|
|
||||||
return revision;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void save() {
|
|
||||||
|
|
||||||
if (favoriteFile == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final List<String> strings = new ArrayList<>();
|
|
||||||
|
|
||||||
for (Map.Entry<NBTTagCompound, RecipeId> entry : manualFavorites.getAllFavorites()) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
final JsonObject line = new JsonObject();
|
|
||||||
|
|
||||||
line.add("item", NBTJson.toJsonObject(entry.getKey()));
|
|
||||||
line.add("recipeId", entry.getValue().toJsonObject());
|
|
||||||
|
|
||||||
strings.add(NBTJson.toJson(line));
|
|
||||||
} catch (JsonSyntaxException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to stringify favorites ItemStack to json string");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
try (FileOutputStream output = new FileOutputStream(favoriteFile)) {
|
|
||||||
IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to save favorites list to file {}", favoriteFile, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,328 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
|
||||||
import net.minecraft.client.gui.Gui;
|
|
||||||
import net.minecraft.client.gui.GuiTextField;
|
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
|
||||||
import net.minecraft.util.ChatAllowedCharacters;
|
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
public class FormattedTextField extends GuiTextField {
|
|
||||||
|
|
||||||
public static interface TextFormatter {
|
|
||||||
|
|
||||||
TextFormatter DEFAULT = (text) -> text;
|
|
||||||
|
|
||||||
public String format(String text);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected FontRenderer fontRenderer;
|
|
||||||
protected String rawText = "";
|
|
||||||
protected String formattedText = "";
|
|
||||||
protected String placeholder = "";
|
|
||||||
protected boolean editable = true;
|
|
||||||
protected int editableColor = 14737632;
|
|
||||||
protected int notEditableColor = 7368816;
|
|
||||||
protected TextFormatter formatter = TextFormatter.DEFAULT;
|
|
||||||
protected int lineScrollOffset = 0;
|
|
||||||
protected int frame = 0;
|
|
||||||
|
|
||||||
public FormattedTextField(FontRenderer fontRenderer, int xPosition, int yPosition, int width, int height) {
|
|
||||||
super(fontRenderer, xPosition, yPosition, width, height);
|
|
||||||
this.fontRenderer = fontRenderer;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setFormatter(TextFormatter formatter) {
|
|
||||||
this.formatter = formatter;
|
|
||||||
}
|
|
||||||
|
|
||||||
public TextFormatter getFormatter() {
|
|
||||||
return this.formatter;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPlaceholder(String placeholder) {
|
|
||||||
this.placeholder = placeholder;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateCursorCounter() {
|
|
||||||
super.updateCursorCounter();
|
|
||||||
++this.frame;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setFocused(boolean focus) {
|
|
||||||
if (focus && !this.isFocused()) {
|
|
||||||
this.frame = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
super.setFocused(focus);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setText(String rawText) {
|
|
||||||
super.setText(EnumChatFormatting.getTextWithoutFormattingCodes(rawText));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setSelectionPos(int p_146199_1_) {
|
|
||||||
String text = this.getText();
|
|
||||||
int j = text.length();
|
|
||||||
|
|
||||||
super.setSelectionPos(p_146199_1_);
|
|
||||||
|
|
||||||
p_146199_1_ = Math.max(0, Math.min(p_146199_1_, j));
|
|
||||||
|
|
||||||
if (this.fontRenderer != null) {
|
|
||||||
|
|
||||||
if (this.lineScrollOffset > j) {
|
|
||||||
this.lineScrollOffset = j;
|
|
||||||
}
|
|
||||||
|
|
||||||
int k = this.getWidth();
|
|
||||||
String s = this.fontRenderer.trimStringToWidth(text.substring(this.lineScrollOffset), k);
|
|
||||||
int l = s.length() + this.lineScrollOffset;
|
|
||||||
|
|
||||||
if (p_146199_1_ == this.lineScrollOffset) {
|
|
||||||
this.lineScrollOffset -= this.fontRenderer.trimStringToWidth(text, k, true).length();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (p_146199_1_ > l) {
|
|
||||||
this.lineScrollOffset += p_146199_1_ - l;
|
|
||||||
} else if (p_146199_1_ <= this.lineScrollOffset) {
|
|
||||||
this.lineScrollOffset -= this.lineScrollOffset - p_146199_1_;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.lineScrollOffset = Math.max(0, Math.min(this.lineScrollOffset, j));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setTextColor(int p_146193_1_) {
|
|
||||||
super.setTextColor(p_146193_1_);
|
|
||||||
this.editableColor = p_146193_1_;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setDisabledTextColour(int p_146204_1_) {
|
|
||||||
super.setDisabledTextColour(p_146204_1_);
|
|
||||||
this.notEditableColor = p_146204_1_;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setEnabled(boolean p_146184_1_) {
|
|
||||||
super.setEnabled(p_146184_1_);
|
|
||||||
this.editable = p_146184_1_;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected boolean beforeWrite(String text) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void writeText(String textPart) {
|
|
||||||
String newText = "";
|
|
||||||
String substr = ChatAllowedCharacters.filerAllowedCharacters(textPart);
|
|
||||||
int cursorPosition = getCursorPosition();
|
|
||||||
int maxStringLength = getMaxStringLength();
|
|
||||||
String text = getText();
|
|
||||||
|
|
||||||
if (text.isEmpty()) {
|
|
||||||
newText = substr.substring(0, Math.min(maxStringLength, substr.length()));
|
|
||||||
cursorPosition = newText.length();
|
|
||||||
} else {
|
|
||||||
int selectionEnd = getSelectionEnd();
|
|
||||||
String textStart = text.substring(0, Math.min(cursorPosition, selectionEnd));
|
|
||||||
String textEnd = text.substring(Math.max(cursorPosition, selectionEnd));
|
|
||||||
newText = textStart + substr + textEnd;
|
|
||||||
|
|
||||||
if (newText.length() > maxStringLength) {
|
|
||||||
newText = newText.substring(0, maxStringLength);
|
|
||||||
}
|
|
||||||
|
|
||||||
cursorPosition = Math.min(textStart.length() + substr.length(), newText.length());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (beforeWrite(newText)) {
|
|
||||||
setText(newText);
|
|
||||||
setCursorPosition(cursorPosition);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getNthWordFromPos(int p_146183_1_, int p_146183_2_) {
|
|
||||||
return this.func_146197_a(p_146183_1_, p_146183_2_, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawTextBox() {
|
|
||||||
|
|
||||||
if (!this.getVisible()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.getEnableBackgroundDrawing()) {
|
|
||||||
drawRect(
|
|
||||||
this.xPosition - 1,
|
|
||||||
this.yPosition - 1,
|
|
||||||
this.xPosition + this.width + 1,
|
|
||||||
this.yPosition + this.height + 1,
|
|
||||||
-6250336);
|
|
||||||
drawRect(
|
|
||||||
this.xPosition,
|
|
||||||
this.yPosition,
|
|
||||||
this.xPosition + this.width,
|
|
||||||
this.yPosition + this.height,
|
|
||||||
-16777216);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this.rawText.equals(getText())) {
|
|
||||||
this.rawText = getText();
|
|
||||||
this.formattedText = this.formatter.format(this.rawText);
|
|
||||||
if (!EnumChatFormatting.getTextWithoutFormattingCodes(this.formattedText).toLowerCase()
|
|
||||||
.equals(this.rawText.toLowerCase())) {
|
|
||||||
this.formattedText = this.rawText;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isFocused() && this.formattedText.isEmpty()) {
|
|
||||||
int x = getEnableBackgroundDrawing() ? this.xPosition + 4 : this.xPosition;
|
|
||||||
int y = getEnableBackgroundDrawing() ? this.yPosition + (this.height - 8) / 2 : this.yPosition;
|
|
||||||
this.fontRenderer.drawStringWithShadow(
|
|
||||||
this.fontRenderer.trimStringToWidth(this.placeholder, this.getWidth()),
|
|
||||||
x,
|
|
||||||
y,
|
|
||||||
this.notEditableColor);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
int firstCharacterIndex = getFormattedTextShift(this.lineScrollOffset);
|
|
||||||
String rawTextClipped = this.fontRenderer
|
|
||||||
.trimStringToWidth(this.rawText.substring(this.lineScrollOffset), this.getWidth());
|
|
||||||
String textClipped = this.formattedText
|
|
||||||
.substring(firstCharacterIndex, getFormattedTextShift(this.lineScrollOffset + rawTextClipped.length()));
|
|
||||||
int cursorPosition = getFormattedTextShift(getCursorPosition());
|
|
||||||
int selectionEnd = getFormattedTextShift(getSelectionEnd());
|
|
||||||
|
|
||||||
int color = this.editable ? this.editableColor : this.notEditableColor;
|
|
||||||
int cursorA = cursorPosition - firstCharacterIndex;
|
|
||||||
int cursorB = selectionEnd - firstCharacterIndex;
|
|
||||||
boolean flag = cursorA >= 0 && cursorA <= textClipped.length();
|
|
||||||
boolean flag1 = isFocused() && this.frame / 6 % 2 == 0 && flag;
|
|
||||||
boolean flag2 = getCursorPosition() < this.rawText.length() || this.rawText.length() >= getMaxStringLength();
|
|
||||||
int x = getEnableBackgroundDrawing() ? this.xPosition + 4 : this.xPosition;
|
|
||||||
int y = getEnableBackgroundDrawing() ? this.yPosition + (this.height - 8) / 2 : this.yPosition;
|
|
||||||
int x2 = x;
|
|
||||||
|
|
||||||
if (cursorB > textClipped.length()) {
|
|
||||||
cursorB = textClipped.length();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (textClipped.length() > 0) {
|
|
||||||
String s1 = flag ? textClipped.substring(0, cursorA) : textClipped;
|
|
||||||
String colorA = getPreviousColor(firstCharacterIndex);
|
|
||||||
x2 = this.fontRenderer.drawStringWithShadow(colorA + s1, x, y, color);
|
|
||||||
}
|
|
||||||
|
|
||||||
int k1 = x2;
|
|
||||||
|
|
||||||
if (!flag) {
|
|
||||||
k1 = cursorA > 0 ? x + this.width : x;
|
|
||||||
} else if (flag2) {
|
|
||||||
k1 = x2 - 1;
|
|
||||||
--x2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (textClipped.length() > 0 && flag && cursorA < textClipped.length()) {
|
|
||||||
String colorB = getPreviousColor(firstCharacterIndex + cursorA);
|
|
||||||
this.fontRenderer.drawStringWithShadow(colorB + textClipped.substring(cursorA), x2, y, color);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flag1) {
|
|
||||||
if (flag2) {
|
|
||||||
Gui.drawRect(k1, y - 1, k1 + 1, y + 1 + this.fontRenderer.FONT_HEIGHT, -3092272);
|
|
||||||
} else {
|
|
||||||
this.fontRenderer.drawStringWithShadow("_", k1, y, color);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cursorB != cursorA) {
|
|
||||||
int l1 = x + this.fontRenderer.getStringWidth(textClipped.substring(0, cursorB));
|
|
||||||
drawCursorVertical(k1, y - 1, l1 - 1, y + 1 + this.fontRenderer.FONT_HEIGHT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void drawCursorVertical(int x1, int y1, int x2, int y2) {
|
|
||||||
int i1;
|
|
||||||
|
|
||||||
if (x1 < x2) {
|
|
||||||
i1 = x1;
|
|
||||||
x1 = x2;
|
|
||||||
x2 = i1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (y1 < y2) {
|
|
||||||
i1 = y1;
|
|
||||||
y1 = y2;
|
|
||||||
y2 = i1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (x2 > this.xPosition + this.width) {
|
|
||||||
x2 = this.xPosition + this.width;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (x1 > this.xPosition + this.width) {
|
|
||||||
x1 = this.xPosition + this.width;
|
|
||||||
}
|
|
||||||
|
|
||||||
Tessellator tessellator = Tessellator.instance;
|
|
||||||
GL11.glColor4f(0.0F, 0.0F, 1.0F, 1.0F);
|
|
||||||
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
|
||||||
GL11.glEnable(GL11.GL_COLOR_LOGIC_OP);
|
|
||||||
GL11.glLogicOp(GL11.GL_OR_REVERSE);
|
|
||||||
tessellator.startDrawingQuads();
|
|
||||||
tessellator.addVertex((double) x1, (double) y2, 0.0D);
|
|
||||||
tessellator.addVertex((double) x2, (double) y2, 0.0D);
|
|
||||||
tessellator.addVertex((double) x2, (double) y1, 0.0D);
|
|
||||||
tessellator.addVertex((double) x1, (double) y1, 0.0D);
|
|
||||||
tessellator.draw();
|
|
||||||
GL11.glDisable(GL11.GL_COLOR_LOGIC_OP);
|
|
||||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getFormattedTextShift(int position) {
|
|
||||||
int shift = 0;
|
|
||||||
|
|
||||||
for (int i = 0; i < position; i++) {
|
|
||||||
while (this.formattedText.length() > i + shift + 1 && this.formattedText.charAt(i + shift) == '\u00a7'
|
|
||||||
&& isFormattingCode(this.formattedText.charAt(i + shift + 1))) {
|
|
||||||
shift += 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Math.min(position + shift, this.formattedText.length());
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean isFormattingCode(char c) {
|
|
||||||
return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f')
|
|
||||||
|| (c >= 'k' && c <= 'o')
|
|
||||||
|| c == 'r'
|
|
||||||
|| (c >= 'A' && c <= 'F')
|
|
||||||
|| (c >= 'K' && c <= 'O')
|
|
||||||
|| c == 'R';
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getPreviousColor(int position) {
|
|
||||||
position = Math.min(position, this.formattedText.length() - 1);
|
|
||||||
while (position >= 0) {
|
|
||||||
if (this.formattedText.charAt(position) == '\u00a7') {
|
|
||||||
return this.formattedText.substring(position, position + 2);
|
|
||||||
}
|
|
||||||
position--;
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,188 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.lang.ref.WeakReference;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.function.Predicate;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
|
|
||||||
final class GridOverlapScanner {
|
|
||||||
|
|
||||||
private static boolean scanRequested = true;
|
|
||||||
private static boolean scanFrame = true;
|
|
||||||
private static boolean wasShowTooltip = true;
|
|
||||||
private static WeakReference<GuiContainer> lastGui = new WeakReference<>(null);
|
|
||||||
|
|
||||||
private boolean invalidated = true;
|
|
||||||
|
|
||||||
private final Rectangle4i rect = new Rectangle4i();
|
|
||||||
private boolean[] checked = new boolean[0];
|
|
||||||
private int[] queue = new int[0];
|
|
||||||
private int tail;
|
|
||||||
|
|
||||||
private Predicate<Rectangle4i> isHidden;
|
|
||||||
private boolean[] hidden;
|
|
||||||
private int hiddenCount;
|
|
||||||
private int left;
|
|
||||||
private int top;
|
|
||||||
private int slotSize;
|
|
||||||
private int columns;
|
|
||||||
|
|
||||||
public static void requestScan() {
|
|
||||||
scanRequested = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void beginFrame(GuiContainer gui, boolean shouldShowTooltip) {
|
|
||||||
|
|
||||||
if (wasShowTooltip != shouldShowTooltip) {
|
|
||||||
scanRequested = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
wasShowTooltip = shouldShowTooltip;
|
|
||||||
|
|
||||||
if (lastGui.get() != gui) {
|
|
||||||
lastGui = new WeakReference<>(gui);
|
|
||||||
scanRequested = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
scanFrame = scanRequested;
|
|
||||||
scanRequested = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isScanFrame() {
|
|
||||||
return scanFrame;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void invalidate() {
|
|
||||||
this.invalidated = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean shouldRefresh() {
|
|
||||||
final boolean refresh = this.invalidated || scanFrame;
|
|
||||||
this.invalidated = false;
|
|
||||||
return refresh;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int scan(Predicate<Rectangle4i> isHidden, int left, int top, int slotSize, int rows, int columns,
|
|
||||||
boolean seedLeft, boolean seedRight, boolean[] hidden) {
|
|
||||||
final int size = rows * columns;
|
|
||||||
|
|
||||||
if (this.checked.length < size) {
|
|
||||||
this.checked = new boolean[size];
|
|
||||||
this.queue = new int[size];
|
|
||||||
} else {
|
|
||||||
Arrays.fill(this.checked, 0, size, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.isHidden = isHidden;
|
|
||||||
this.hidden = hidden;
|
|
||||||
this.hiddenCount = 0;
|
|
||||||
this.tail = 0;
|
|
||||||
this.left = left;
|
|
||||||
this.top = top;
|
|
||||||
this.slotSize = slotSize;
|
|
||||||
this.columns = columns;
|
|
||||||
|
|
||||||
for (int r = 0; r < rows; r++) {
|
|
||||||
if (seedLeft) {
|
|
||||||
probe(r, 0);
|
|
||||||
}
|
|
||||||
if (seedRight) {
|
|
||||||
probe(r, columns - 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int head = 0; head < this.tail; head++) {
|
|
||||||
final int row = this.queue[head] / columns;
|
|
||||||
final int column = this.queue[head] % columns;
|
|
||||||
|
|
||||||
for (int r = Math.max(0, row - 1); r <= Math.min(rows - 1, row + 1); r++) {
|
|
||||||
for (int c = Math.max(0, column - 1); c <= Math.min(columns - 1, column + 1); c++) {
|
|
||||||
probe(r, c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int r = 0; r < rows; r++) {
|
|
||||||
for (int c = 0; c < columns; c++) {
|
|
||||||
if (this.checked[r * columns + c]) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
int c1 = c;
|
|
||||||
while (c1 + 1 < columns && !this.checked[r * columns + c1 + 1]) {
|
|
||||||
c1++;
|
|
||||||
}
|
|
||||||
|
|
||||||
int r1 = r;
|
|
||||||
while (r1 + 1 < rows && isUnchecked(r1 + 1, c, c1)) {
|
|
||||||
r1++;
|
|
||||||
}
|
|
||||||
|
|
||||||
scanArea(r, r1, c, c1);
|
|
||||||
c = c1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.isHidden = null;
|
|
||||||
this.hidden = null;
|
|
||||||
|
|
||||||
return this.hiddenCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void probe(int row, int column) {
|
|
||||||
final int idx = row * this.columns + column;
|
|
||||||
|
|
||||||
if (!this.checked[idx]) {
|
|
||||||
this.checked[idx] = true;
|
|
||||||
|
|
||||||
if (test(row, row, column, column)) {
|
|
||||||
this.hidden[idx] = true;
|
|
||||||
this.queue[this.tail++] = idx;
|
|
||||||
this.hiddenCount++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void scanArea(int r0, int r1, int c0, int c1) {
|
|
||||||
|
|
||||||
if (!test(r0, r1, c0, c1)) {
|
|
||||||
for (int r = r0; r <= r1; r++) {
|
|
||||||
Arrays.fill(this.checked, r * this.columns + c0, r * this.columns + c1 + 1, true);
|
|
||||||
}
|
|
||||||
} else if (r0 == r1 && c0 == c1) {
|
|
||||||
this.checked[r0 * this.columns + c0] = true;
|
|
||||||
this.hidden[r0 * this.columns + c0] = true;
|
|
||||||
this.hiddenCount++;
|
|
||||||
} else if (r1 - r0 >= c1 - c0) {
|
|
||||||
final int mid = (r0 + r1) / 2;
|
|
||||||
scanArea(r0, mid, c0, c1);
|
|
||||||
scanArea(mid + 1, r1, c0, c1);
|
|
||||||
} else {
|
|
||||||
final int mid = (c0 + c1) / 2;
|
|
||||||
scanArea(r0, r1, c0, mid);
|
|
||||||
scanArea(r0, r1, mid + 1, c1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isUnchecked(int row, int c0, int c1) {
|
|
||||||
for (int c = c0; c <= c1; c++) {
|
|
||||||
if (this.checked[row * this.columns + c]) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean test(int r0, int r1, int c0, int c1) {
|
|
||||||
this.rect.set(
|
|
||||||
this.left + c0 * this.slotSize,
|
|
||||||
this.top + r0 * this.slotSize,
|
|
||||||
(c1 - c0 + 1) * this.slotSize,
|
|
||||||
(r1 - r0 + 1) * this.slotSize);
|
|
||||||
return this.isHidden.test(this.rect);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,19 +1,17 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.nei.NEIClientUtils.translate;
|
import codechicken.lib.render.CCRenderState;
|
||||||
|
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import codechicken.lib.render.CCRenderState;
|
import static codechicken.nei.NEIClientUtils.translate;
|
||||||
|
|
||||||
public class GuiEnchantmentModifier extends GuiContainer {
|
|
||||||
|
|
||||||
|
public class GuiEnchantmentModifier extends GuiContainer
|
||||||
|
{
|
||||||
final ContainerEnchantmentModifier container;
|
final ContainerEnchantmentModifier container;
|
||||||
|
|
||||||
public GuiEnchantmentModifier(InventoryPlayer inventoryplayer, World world, int i, int j, int k) {
|
public GuiEnchantmentModifier(InventoryPlayer inventoryplayer, World world, int i, int j, int k) {
|
||||||
@@ -24,8 +22,8 @@ public class GuiEnchantmentModifier extends GuiContainer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
|
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
|
||||||
fontRendererObj.drawString(translate("enchant"), 12, 6, ColorUtils.textGray.getColor());
|
fontRendererObj.drawString(translate("enchant"), 12, 6, 0x404040);
|
||||||
fontRendererObj.drawString(translate("enchant.level"), 19, 20, ColorUtils.textGray.getColor());
|
fontRendererObj.drawString(translate("enchant.level"), 19, 20, 0x404040);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
|
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
|
||||||
@@ -39,11 +37,7 @@ public class GuiEnchantmentModifier extends GuiContainer {
|
|||||||
container.drawScrollBar(this);
|
container.drawScrollBar(this);
|
||||||
|
|
||||||
String levelstring = "" + container.level;
|
String levelstring = "" + container.level;
|
||||||
fontRendererObj.drawString(
|
fontRendererObj.drawString(levelstring, 33 - fontRendererObj.getStringWidth(levelstring) / 2, 34, 0xFF606060);
|
||||||
levelstring,
|
|
||||||
33 - fontRendererObj.getStringWidth(levelstring) / 2,
|
|
||||||
34,
|
|
||||||
ColorUtils.textLightGray.getColor());
|
|
||||||
|
|
||||||
GL11.glTranslatef(-guiLeft, -guiTop, 0);
|
GL11.glTranslatef(-guiLeft, -guiTop, 0);
|
||||||
}
|
}
|
||||||
@@ -66,6 +60,7 @@ public class GuiEnchantmentModifier extends GuiContainer {
|
|||||||
|
|
||||||
public static void toggleEnchantmentValidation() {
|
public static void toggleEnchantmentValidation() {
|
||||||
NEIClientConfig.world.nbt.setBoolean("validateenchantments", !validateEnchantments());
|
NEIClientConfig.world.nbt.setBoolean("validateenchantments", !validateEnchantments());
|
||||||
|
NEIClientConfig.world.saveNBT();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void actionPerformed(GuiButton guibutton) {
|
protected void actionPerformed(GuiButton guibutton) {
|
||||||
@@ -82,8 +77,8 @@ public class GuiEnchantmentModifier extends GuiContainer {
|
|||||||
|
|
||||||
private void changeLevel(int i) {
|
private void changeLevel(int i) {
|
||||||
container.level += i;
|
container.level += i;
|
||||||
buttonList.get(0).enabled = container.level != 1;
|
((GuiButton) buttonList.get(0)).enabled = container.level != 1;
|
||||||
buttonList.get(1).enabled = container.level != 10;
|
((GuiButton) buttonList.get(1)).enabled = container.level != 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void mouseClicked(int i, int j, int k) {
|
protected void mouseClicked(int i, int j, int k) {
|
||||||
|
|||||||
@@ -1,23 +1,18 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import codechicken.lib.render.CCRenderState;
|
||||||
|
import codechicken.nei.api.INEIGuiHandler;
|
||||||
|
import codechicken.nei.api.TaggedInventoryArea;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.inventory.Container;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler
|
||||||
import net.minecraft.inventory.Container;
|
{
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import codechicken.lib.render.CCRenderState;
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.AutoFocusWidget.INEIAutoFocusSearchEnable;
|
|
||||||
import codechicken.nei.api.INEIGuiHandler;
|
|
||||||
import codechicken.nei.api.TaggedInventoryArea;
|
|
||||||
|
|
||||||
public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler, INEIAutoFocusSearchEnable {
|
|
||||||
|
|
||||||
public GuiExtendedCreativeInv(Container par1Container) {
|
public GuiExtendedCreativeInv(Container par1Container) {
|
||||||
super(par1Container);
|
super(par1Container);
|
||||||
ySize = 198;
|
ySize = 198;
|
||||||
@@ -56,17 +51,6 @@ public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandl
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
|
public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
|
||||||
return (new Rectangle4i(guiLeft - 15, guiTop + 18, 18, 18 * 4 + 4)).intersects(new Rectangle4i(x, y, w, h));
|
return false;
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void handleMouseClick(Slot slotIn, int slotId, int clickedButton, int clickType) {
|
|
||||||
|
|
||||||
// Hack for armor slots, because they are outside the container
|
|
||||||
if (slotIn != null && clickType == 4 && slotIn.xDisplayPosition < 0) {
|
|
||||||
clickType = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
super.handleMouseClick(slotIn, slotId, clickedButton, clickType);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,57 +4,38 @@ import net.minecraft.client.Minecraft;
|
|||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import codechicken.nei.drawable.DrawableBuilder;
|
public class GuiNEIButton extends GuiButton
|
||||||
import codechicken.nei.drawable.DrawableResource;
|
{
|
||||||
|
|
||||||
public class GuiNEIButton extends GuiButton {
|
|
||||||
|
|
||||||
protected static final ResourceLocation guiTex = new ResourceLocation("textures/gui/widgets.png");
|
protected static final ResourceLocation guiTex = new ResourceLocation("textures/gui/widgets.png");
|
||||||
private static final DrawableResource[] BACKGROUNDS = new DrawableResource[3];
|
|
||||||
|
public GuiNEIButton(int i, int j, int k, int l, int i1, String s)
|
||||||
static {
|
{
|
||||||
for (int state = 0; state < BACKGROUNDS.length; state++) {
|
|
||||||
BACKGROUNDS[state] = new DrawableBuilder(guiTex, 0, 46 + state * 20, 200, 20).setSlices(2, 2, 2, 2).build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public GuiNEIButton(int i, int j, int k, int l, int i1, String s) {
|
|
||||||
super(i, j, k, l, i1, s);
|
super(i, j, k, l, i1, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void drawButton(Minecraft minecraft, int i, int j)
|
||||||
|
{
|
||||||
|
if(!visible)
|
||||||
|
return;
|
||||||
|
|
||||||
protected DrawableResource getBackground(int mouseX, int mouseY, boolean mouseOver) {
|
|
||||||
return BACKGROUNDS[getHoverState(mouseOver)];
|
|
||||||
}
|
|
||||||
|
|
||||||
public void drawButton(Minecraft minecraft, int x, int y) {
|
|
||||||
if (!visible) return;
|
|
||||||
|
|
||||||
boolean mouseOver = x >= xPosition && y >= yPosition && x < xPosition + width && y < yPosition + height;
|
|
||||||
|
|
||||||
GL11.glColor4f(1, 1, 1, 1);
|
|
||||||
getBackground(x, y, mouseOver).draw(xPosition, yPosition, width, height);
|
|
||||||
mouseDragged(minecraft, x, y);
|
|
||||||
drawContent(minecraft, x, y, mouseOver);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int getTextColour(boolean mouseOver) {
|
|
||||||
|
|
||||||
if (!enabled) {
|
|
||||||
return ColorUtils.buttonLabelInactive.getColor();
|
|
||||||
} else if (mouseOver) {
|
|
||||||
return ColorUtils.buttonLabelHover.getColor();
|
|
||||||
}
|
|
||||||
|
|
||||||
return ColorUtils.buttonLabelNormal.getColor();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void drawContent(Minecraft minecraft, int x, int y, boolean mouseOver) {
|
|
||||||
FontRenderer fontrenderer = minecraft.fontRenderer;
|
FontRenderer fontrenderer = minecraft.fontRenderer;
|
||||||
int color = getTextColour(mouseOver);
|
minecraft.renderEngine.bindTexture(guiTex);
|
||||||
|
GL11.glColor4f(1, 1, 1, 1);
|
||||||
drawCenteredString(fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, color);
|
boolean flag = i >= xPosition && j >= yPosition && i < xPosition + width && j < yPosition + height;
|
||||||
|
int k = getHoverState(flag);
|
||||||
|
drawTexturedModalRect(xPosition, yPosition, 0, 46 + k * 20, width / 2, height / 2);//top left
|
||||||
|
drawTexturedModalRect(xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height / 2);//top right
|
||||||
|
drawTexturedModalRect(xPosition, yPosition + height / 2, 0, 46 + k * 20 + 20 - height / 2, width / 2, height / 2);//bottom left
|
||||||
|
drawTexturedModalRect(xPosition + width / 2, yPosition + height / 2, 200 - width / 2, 46 + k * 20 + 20 - height / 2, width / 2, height / 2);//bottom right
|
||||||
|
mouseDragged(minecraft, i, j);
|
||||||
|
|
||||||
|
if(!enabled)
|
||||||
|
drawCenteredString(fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xffa0a0a0);
|
||||||
|
else if(flag)
|
||||||
|
drawCenteredString(fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xffffa0);
|
||||||
|
else
|
||||||
|
drawCenteredString(fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xe0e0e0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,37 +1,37 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.nei.NEIClientUtils.translate;
|
|
||||||
|
|
||||||
import java.awt.Dimension;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagList;
|
|
||||||
import net.minecraft.potion.Potion;
|
|
||||||
import net.minecraft.potion.PotionEffect;
|
|
||||||
import net.minecraft.util.StatCollector;
|
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import codechicken.core.gui.GuiCCButton;
|
import codechicken.core.gui.GuiCCButton;
|
||||||
import codechicken.core.gui.GuiCCTextField;
|
import codechicken.core.gui.GuiCCTextField;
|
||||||
import codechicken.core.gui.GuiScrollSlot;
|
import codechicken.core.gui.GuiScrollSlot;
|
||||||
import codechicken.core.inventory.GuiContainerWidget;
|
import codechicken.core.inventory.GuiContainerWidget;
|
||||||
import codechicken.lib.render.CCRenderState;
|
import codechicken.lib.render.CCRenderState;
|
||||||
import codechicken.lib.render.FontUtils;
|
import codechicken.lib.render.FontUtils;
|
||||||
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagList;
|
||||||
|
import net.minecraft.potion.Potion;
|
||||||
|
import net.minecraft.potion.PotionEffect;
|
||||||
|
import net.minecraft.util.StatCollector;
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
public class GuiPotionCreator extends GuiContainerWidget {
|
import java.awt.Dimension;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class GuiSlotPotionEffects extends GuiScrollSlot {
|
import static codechicken.nei.NEIClientUtils.translate;
|
||||||
|
|
||||||
|
public class GuiPotionCreator extends GuiContainerWidget
|
||||||
|
{
|
||||||
|
public class GuiSlotPotionEffects extends GuiScrollSlot
|
||||||
|
{
|
||||||
public int selectedslot = -1;
|
public int selectedslot = -1;
|
||||||
public boolean enabled = true;
|
public boolean enabled = true;
|
||||||
private final ArrayList<Potion> validPotions = new ArrayList<>();
|
private final ArrayList<Potion> validPotions = new ArrayList<>();
|
||||||
|
|
||||||
public GuiSlotPotionEffects(int x, int y) {
|
public GuiSlotPotionEffects(int x, int y) {
|
||||||
super(x, y, 108, 76);
|
super(x, y, 108, 76);
|
||||||
for (Potion p : Potion.potionTypes) if (p != null) validPotions.add(p);
|
for (Potion p : Potion.potionTypes)
|
||||||
|
if (p != null)
|
||||||
|
validPotions.add(p);
|
||||||
setSmoothScroll(false);
|
setSmoothScroll(false);
|
||||||
setMargins(0, 0, 0, 0);
|
setMargins(0, 0, 0, 0);
|
||||||
}
|
}
|
||||||
@@ -48,7 +48,8 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawOverlay(float frame) {}
|
public void drawOverlay(float frame) {
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int scrollbarGuideAlignment() {
|
public int scrollbarGuideAlignment() {
|
||||||
@@ -68,18 +69,13 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
Potion potion = validPotions.get(slot);
|
Potion potion = validPotions.get(slot);
|
||||||
PotionEffect effect = getEffect(potion.id);
|
PotionEffect effect = getEffect(potion.id);
|
||||||
boolean blank = effect == null;
|
boolean blank = effect == null;
|
||||||
if (effect == null) effect = new PotionEffect(potion.id, 1200, 0);
|
if (effect == null)
|
||||||
|
effect = new PotionEffect(potion.id, 1200, 0);
|
||||||
int shade = selectedslot == slot ? 2 : blank ? 1 : 0;
|
int shade = selectedslot == slot ? 2 : blank ? 1 : 0;
|
||||||
|
|
||||||
CCRenderState.changeTexture("textures/gui/container/enchanting_table.png");
|
CCRenderState.changeTexture("textures/gui/container/enchanting_table.png");
|
||||||
drawTexturedModalRect(x, y, 0, 166 + getSlotHeight(slot) * shade, width - 30, getSlotHeight(slot));
|
drawTexturedModalRect(x, y, 0, 166 + getSlotHeight(slot) * shade, width - 30, getSlotHeight(slot));
|
||||||
drawTexturedModalRect(
|
drawTexturedModalRect(x + width - 30, y, width - 23, 166 + getSlotHeight(slot) * shade, 30, getSlotHeight(slot));
|
||||||
x + width - 30,
|
|
||||||
y,
|
|
||||||
width - 23,
|
|
||||||
166 + getSlotHeight(slot) * shade,
|
|
||||||
30,
|
|
||||||
getSlotHeight(slot));
|
|
||||||
|
|
||||||
if (potion.hasStatusIcon()) {
|
if (potion.hasStatusIcon()) {
|
||||||
CCRenderState.changeTexture("textures/gui/container/inventory.png");
|
CCRenderState.changeTexture("textures/gui/container/inventory.png");
|
||||||
@@ -108,7 +104,8 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
NBTTagList potionTagList = potion.getTagCompound().getTagList("CustomPotionEffects", 10);
|
NBTTagList potionTagList = potion.getTagCompound().getTagList("CustomPotionEffects", 10);
|
||||||
for (int i = 0; i < potionTagList.tagCount(); i++) {
|
for (int i = 0; i < potionTagList.tagCount(); i++) {
|
||||||
PotionEffect effect = PotionEffect.readCustomPotionEffectFromNBT(potionTagList.getCompoundTagAt(i));
|
PotionEffect effect = PotionEffect.readCustomPotionEffectFromNBT(potionTagList.getCompoundTagAt(i));
|
||||||
if (effect.getPotionID() == id) return effect;
|
if (effect.getPotionID() == id)
|
||||||
|
return effect;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
@@ -121,7 +118,8 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void slotClicked(int slot, int button, int mx, int my, int count) {
|
protected void slotClicked(int slot, int button, int mx, int my, int count) {
|
||||||
if (!enabled) return;
|
if (!enabled)
|
||||||
|
return;
|
||||||
|
|
||||||
if (button == 0) {
|
if (button == 0) {
|
||||||
select(slot);
|
select(slot);
|
||||||
@@ -147,16 +145,19 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setEnabled(boolean b) {
|
public void setEnabled(boolean b) {
|
||||||
if (b == enabled) return;
|
if (b == enabled)
|
||||||
|
return;
|
||||||
enabled = b;
|
enabled = b;
|
||||||
if (!enabled) deselect();
|
if (!enabled)
|
||||||
|
deselect();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void select(int slot) {
|
private void select(int slot) {
|
||||||
selectedslot = slot;
|
selectedslot = slot;
|
||||||
durationField.setEnabled(true);
|
durationField.setEnabled(true);
|
||||||
PotionEffect effect = getEffect(validPotions.get(slot).id);
|
PotionEffect effect = getEffect(validPotions.get(slot).id);
|
||||||
if (effect == null) effect = new PotionEffect(validPotions.get(slot).id, 1200, 0);
|
if (effect == null)
|
||||||
|
effect = new PotionEffect(validPotions.get(slot).id, 1200, 0);
|
||||||
durationField.setDurationTicks(effect.getDuration());
|
durationField.setDurationTicks(effect.getDuration());
|
||||||
amplifier = effect.getAmplifier();
|
amplifier = effect.getAmplifier();
|
||||||
validateInputButtons();
|
validateInputButtons();
|
||||||
@@ -174,8 +175,8 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class GuiDurationField extends GuiCCTextField {
|
public class GuiDurationField extends GuiCCTextField
|
||||||
|
{
|
||||||
private String baseValue;
|
private String baseValue;
|
||||||
|
|
||||||
public GuiDurationField(int x, int y, int width, int height) {
|
public GuiDurationField(int x, int y, int width, int height) {
|
||||||
@@ -189,22 +190,27 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
i /= 20;
|
i /= 20;
|
||||||
String minutes = Integer.toString(i / 60);
|
String minutes = Integer.toString(i / 60);
|
||||||
String seconds = Integer.toString(i % 60);
|
String seconds = Integer.toString(i % 60);
|
||||||
if (seconds.length() == 1) seconds = '0' + seconds;
|
if (seconds.length() == 1)
|
||||||
|
seconds = '0' + seconds;
|
||||||
setText(minutes + seconds);
|
setText(minutes + seconds);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean b) {
|
public void setEnabled(boolean b) {
|
||||||
super.setEnabled(b);
|
super.setEnabled(b);
|
||||||
if (!isEnabled()) setText("100");
|
if (!isEnabled())
|
||||||
|
setText("100");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFocusChanged() {
|
public void onFocusChanged() {
|
||||||
if (isFocused()) baseValue = getText();
|
if (isFocused())
|
||||||
|
baseValue = getText();
|
||||||
else {
|
else {
|
||||||
if (!validateValue()) setText(baseValue);
|
if (!validateValue())
|
||||||
else applyEffect();
|
setText(baseValue);
|
||||||
|
else
|
||||||
|
applyEffect();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -225,8 +231,7 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
@Override
|
@Override
|
||||||
public void drawText() {
|
public void drawText() {
|
||||||
String s = getText();
|
String s = getText();
|
||||||
String seconds = s
|
String seconds = s.substring(Math.max(0, s.length() - 2), Math.max(0, s.length() - 2) + Math.min(s.length(), 2));
|
||||||
.substring(Math.max(0, s.length() - 2), Math.max(0, s.length() - 2) + Math.min(s.length(), 2));
|
|
||||||
String minutes = s.length() < 3 ? "" : s.substring(0, s.length() - 2);
|
String minutes = s.length() < 3 ? "" : s.substring(0, s.length() - 2);
|
||||||
int ty = y + height / 2 - 4;
|
int ty = y + height / 2 - 4;
|
||||||
int tcolour = getTextColour();
|
int tcolour = getTextColour();
|
||||||
@@ -289,10 +294,10 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
CCRenderState.changeTexture("nei:textures/gui/potion.png");
|
CCRenderState.changeTexture("nei:textures/gui/potion.png");
|
||||||
drawTexturedModalRect(0, 0, 0, 0, xSize, ySize);
|
drawTexturedModalRect(0, 0, 0, 0, xSize, ySize);
|
||||||
|
|
||||||
FontUtils.drawCenteredString(translate("potion.favourite"), xSize / 2, 4, ColorUtils.textGray.getColor());
|
FontUtils.drawCenteredString(translate("potion.favourite"), xSize / 2, 4, 0x404040);
|
||||||
fontRendererObj.drawString(translate("potion.duration"), 12, 40, ColorUtils.textGray.getColor());
|
fontRendererObj.drawString(translate("potion.duration"), 12, 40, 0x404040);
|
||||||
fontRendererObj.drawString(translate("potion.level"), 19, 73, ColorUtils.textGray.getColor());
|
fontRendererObj.drawString(translate("potion.level"), 19, 73, 0x404040);
|
||||||
FontUtils.drawCenteredString(translateAmplifier(amplifier), 33, 86, ColorUtils.textGray.getColor());
|
FontUtils.drawCenteredString(translateAmplifier(amplifier), 33, 86, 0xFF606060);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -311,8 +316,10 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(String ident, Object... params) {
|
public void actionPerformed(String ident, Object... params) {
|
||||||
if (ident.equals("ampDown")) amplifier--;
|
if (ident.equals("ampDown"))
|
||||||
else if (ident.equals("ampUp")) amplifier++;
|
amplifier--;
|
||||||
|
else if (ident.equals("ampUp"))
|
||||||
|
amplifier++;
|
||||||
applyEffect();
|
applyEffect();
|
||||||
validateInputButtons();
|
validateInputButtons();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,34 +1,32 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import codechicken.lib.config.ConfigTag;
|
||||||
|
import codechicken.nei.KeyManager.IKeyStateTracker;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.renderer.RenderHelper;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
import org.lwjgl.opengl.GL12;
|
||||||
|
|
||||||
|
import java.awt.Dimension;
|
||||||
|
import java.awt.Point;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import static codechicken.lib.gui.GuiDraw.displaySize;
|
import static codechicken.lib.gui.GuiDraw.displaySize;
|
||||||
import static codechicken.lib.gui.GuiDraw.drawString;
|
import static codechicken.lib.gui.GuiDraw.drawString;
|
||||||
import static codechicken.lib.gui.GuiDraw.drawTooltipBox;
|
import static codechicken.lib.gui.GuiDraw.drawTooltipBox;
|
||||||
import static codechicken.lib.gui.GuiDraw.getStringWidth;
|
import static codechicken.lib.gui.GuiDraw.getStringWidth;
|
||||||
|
|
||||||
import java.awt.Dimension;
|
public class HUDRenderer implements IKeyStateTracker
|
||||||
import java.awt.Point;
|
{
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.renderer.RenderHelper;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
import org.lwjgl.opengl.GL12;
|
|
||||||
|
|
||||||
import codechicken.lib.config.ConfigTag;
|
|
||||||
import codechicken.nei.KeyManager.IKeyStateTracker;
|
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
|
|
||||||
public class HUDRenderer implements IKeyStateTracker {
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void tickKeyStates() {
|
public void tickKeyStates() {
|
||||||
if (KeyManager.isPressed("world.highlight_tips")) {
|
if (KeyManager.keyStates.get("world.highlight_tips").down) {
|
||||||
ConfigTag tag = NEIClientConfig.getSetting("world.highlight_tips");
|
ConfigTag tag = NEIClientConfig.getSetting("world.highlight_tips");
|
||||||
tag.setBooleanValue(!tag.getBooleanValue());
|
tag.setBooleanValue(!tag.getBooleanValue());
|
||||||
}
|
}
|
||||||
@@ -36,26 +34,37 @@ public class HUDRenderer implements IKeyStateTracker {
|
|||||||
|
|
||||||
public static void renderOverlay() {
|
public static void renderOverlay() {
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
Minecraft mc = Minecraft.getMinecraft();
|
||||||
if (mc.currentScreen == null && mc.theWorld != null
|
if (mc.currentScreen == null &&
|
||||||
&& !mc.gameSettings.keyBindPlayerList.getIsKeyPressed()
|
mc.theWorld != null &&
|
||||||
&& NEIClientConfig.getBooleanSetting("world.highlight_tips")
|
!mc.gameSettings.keyBindPlayerList.getIsKeyPressed() &&
|
||||||
&& mc.objectMouseOver != null
|
NEIClientConfig.getBooleanSetting("world.highlight_tips") &&
|
||||||
&& mc.objectMouseOver.typeOfHit == MovingObjectType.BLOCK) {
|
mc.objectMouseOver != null &&
|
||||||
|
mc.objectMouseOver.typeOfHit == MovingObjectType.BLOCK) {
|
||||||
World world = mc.theWorld;
|
World world = mc.theWorld;
|
||||||
final List<ItemStack> items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver);
|
ArrayList<ItemStack> items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver);
|
||||||
|
if (items.isEmpty())
|
||||||
|
return;
|
||||||
|
|
||||||
if (items.isEmpty()) return;
|
int minDamage = Integer.MAX_VALUE;
|
||||||
|
ItemStack stack = null;
|
||||||
|
for(ItemStack astack : items) {
|
||||||
|
if(astack.getItem() != null && astack.getItemDamage() < minDamage) {
|
||||||
|
stack = astack;
|
||||||
|
minDamage = stack.getItemDamage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final ItemStack stack = StackInfo.getItemStackWithMinimumDamage(items.toArray(new ItemStack[0]));
|
|
||||||
renderOverlay(stack, ItemInfo.getText(stack, world, mc.thePlayer, mc.objectMouseOver), getPositioning());
|
renderOverlay(stack, ItemInfo.getText(stack, world, mc.thePlayer, mc.objectMouseOver), getPositioning());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderOverlay(ItemStack stack, List<String> textData, Point pos) {
|
public static void renderOverlay(ItemStack stack, List<String> textData, Point pos) {
|
||||||
if ((stack == null || stack.getItem() == null) && textData.isEmpty()) return;
|
if((stack == null || stack.getItem() == null) && textData.isEmpty())
|
||||||
|
return;
|
||||||
|
|
||||||
int w = 0;
|
int w = 0;
|
||||||
for (String s : textData) w = Math.max(w, getStringWidth(s) + 29);
|
for (String s : textData)
|
||||||
|
w = Math.max(w, getStringWidth(s) + 29);
|
||||||
int h = Math.max(24, 10 + 10 * textData.size());
|
int h = Math.max(24, 10 + 10 * textData.size());
|
||||||
|
|
||||||
Dimension size = displaySize();
|
Dimension size = displaySize();
|
||||||
@@ -76,7 +85,8 @@ public class HUDRenderer implements IKeyStateTracker {
|
|||||||
RenderHelper.enableGUIStandardItemLighting();
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||||
|
|
||||||
if (stack != null && stack.getItem() != null) GuiContainerManager.drawItem(x + 5, y + h / 2 - 8, stack);
|
if (stack != null && stack.getItem() != null)
|
||||||
|
GuiContainerManager.drawItem(x + 5, y + h / 2 - 8, stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Point getPositioning() {
|
private static Point getPositioning() {
|
||||||
@@ -88,4 +98,4 @@ public class HUDRenderer implements IKeyStateTracker {
|
|||||||
public static void load() {
|
public static void load() {
|
||||||
KeyManager.trackers.add(new HUDRenderer());
|
KeyManager.trackers.add(new HUDRenderer());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import static codechicken.nei.NEIClientUtils.translate;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
|
||||||
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.guihook.IContainerInputHandler;
|
|
||||||
import codechicken.nei.guihook.IContainerTooltipHandler;
|
|
||||||
import codechicken.nei.recipe.AutoCraftingManager;
|
|
||||||
|
|
||||||
public class HeldItemHandler implements IContainerInputHandler, IContainerTooltipHandler {
|
|
||||||
|
|
||||||
protected HeldItemHandler() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void load() {
|
|
||||||
HeldItemHandler instance = new HeldItemHandler();
|
|
||||||
GuiContainerManager.addInputHandler(instance);
|
|
||||||
GuiContainerManager.addTooltipHandler(instance);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected boolean contains(int mousex, int mousey) {
|
|
||||||
return NEIClientUtils.getHeldItem() != null && !ItemPanels.bookmarkPanel.inEditingState()
|
|
||||||
&& !AutoCraftingManager.processing()
|
|
||||||
&& (ItemPanels.bookmarkPanel.contains(mousex, mousey)
|
|
||||||
|| ItemPanels.itemPanel.containsWithSubpanels(mousex, mousey));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
|
||||||
|
|
||||||
if (contains(mousex, mousey)) {
|
|
||||||
|
|
||||||
if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")
|
|
||||||
|| NEIClientUtils.mc().playerController.isInCreativeMode()) {
|
|
||||||
if (button == 1) {
|
|
||||||
NEIClientUtils.decreaseSlotStack(-999);
|
|
||||||
} else {
|
|
||||||
NEIClientUtils.deleteHeldItem();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
NEIClientUtils.dropHeldItem();
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
|
|
||||||
|
|
||||||
if (contains(mousex, mousey)) {
|
|
||||||
currenttip.clear();
|
|
||||||
|
|
||||||
if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")
|
|
||||||
|| NEIClientUtils.mc().playerController.isInCreativeMode()) {
|
|
||||||
currenttip.add(EnumChatFormatting.RED + translate("itempanel.deleteItem"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return currenttip;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,161 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.GuiRepair;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiBrewingStand;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiCrafting;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiFurnace;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiInventory;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
|
|
||||||
import codechicken.nei.api.API;
|
|
||||||
import codechicken.nei.recipe.BrewingOverlayHandler;
|
|
||||||
import codechicken.nei.recipe.BrewingRecipeHandler;
|
|
||||||
import codechicken.nei.recipe.DefaultOverlayHandler;
|
|
||||||
import codechicken.nei.recipe.FireworkRecipeHandler;
|
|
||||||
import codechicken.nei.recipe.FuelRecipeHandler;
|
|
||||||
import codechicken.nei.recipe.FurnaceRecipeHandler;
|
|
||||||
import codechicken.nei.recipe.InformationHandler;
|
|
||||||
import codechicken.nei.recipe.ProfilerRecipeHandler;
|
|
||||||
import codechicken.nei.recipe.RepairOverlayHandler;
|
|
||||||
import codechicken.nei.recipe.RepairRecipeHandler;
|
|
||||||
import codechicken.nei.recipe.ShapedRecipeHandler;
|
|
||||||
import codechicken.nei.recipe.ShapelessRecipeHandler;
|
|
||||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
|
||||||
|
|
||||||
public class IMCForNEI {
|
|
||||||
|
|
||||||
public static void IMCSender() {
|
|
||||||
|
|
||||||
API.registerRecipeHandler(new ShapedRecipeHandler());
|
|
||||||
API.registerUsageHandler(new ShapedRecipeHandler());
|
|
||||||
sendHandler("codechicken.nei.recipe.ShapedRecipeHandler", "minecraft:crafting_table");
|
|
||||||
|
|
||||||
API.registerRecipeHandler(new ShapelessRecipeHandler());
|
|
||||||
API.registerUsageHandler(new ShapelessRecipeHandler());
|
|
||||||
sendHandler("codechicken.nei.recipe.ShapelessRecipeHandler", "minecraft:crafting_table");
|
|
||||||
|
|
||||||
API.registerRecipeHandler(new FireworkRecipeHandler());
|
|
||||||
API.registerUsageHandler(new FireworkRecipeHandler());
|
|
||||||
sendHandler("codechicken.nei.recipe.FireworkRecipeHandler", "minecraft:fireworks");
|
|
||||||
|
|
||||||
API.registerRecipeHandler(new FurnaceRecipeHandler());
|
|
||||||
API.registerUsageHandler(new FurnaceRecipeHandler());
|
|
||||||
sendHandler("codechicken.nei.recipe.FurnaceRecipeHandler", "minecraft:furnace");
|
|
||||||
|
|
||||||
API.registerRecipeHandler(new BrewingRecipeHandler());
|
|
||||||
API.registerUsageHandler(new BrewingRecipeHandler());
|
|
||||||
sendHandler("codechicken.nei.recipe.BrewingRecipeHandler", "minecraft:brewing_stand");
|
|
||||||
|
|
||||||
API.registerRecipeHandler(new FuelRecipeHandler());
|
|
||||||
API.registerUsageHandler(new FuelRecipeHandler());
|
|
||||||
sendFuelRecipeHandler();
|
|
||||||
|
|
||||||
API.registerRecipeHandler(new InformationHandler());
|
|
||||||
API.registerUsageHandler(new InformationHandler());
|
|
||||||
sendInformationHandler();
|
|
||||||
|
|
||||||
API.registerRecipeHandler(new RepairRecipeHandler());
|
|
||||||
API.registerUsageHandler(new RepairRecipeHandler());
|
|
||||||
sendRepairHandler();
|
|
||||||
sendCatalyst("repair", "minecraft:anvil");
|
|
||||||
|
|
||||||
API.registerGuiOverlay(GuiCrafting.class, "crafting");
|
|
||||||
API.registerGuiOverlay(GuiInventory.class, "crafting2x2", 63, 20);
|
|
||||||
API.registerGuiOverlay(GuiFurnace.class, "smelting");
|
|
||||||
API.registerGuiOverlay(GuiFurnace.class, "fuel");
|
|
||||||
API.registerGuiOverlay(GuiBrewingStand.class, "brewing");
|
|
||||||
API.registerGuiOverlay(GuiRepair.class, "repair", 2, 37);
|
|
||||||
|
|
||||||
API.registerGuiOverlayHandler(GuiCrafting.class, new DefaultOverlayHandler(), "crafting");
|
|
||||||
API.registerGuiOverlayHandler(GuiInventory.class, new DefaultOverlayHandler(63, 20), "crafting2x2");
|
|
||||||
API.registerGuiOverlayHandler(GuiBrewingStand.class, new BrewingOverlayHandler(), "brewing");
|
|
||||||
API.registerGuiOverlayHandler(GuiRepair.class, new RepairOverlayHandler(), "repair");
|
|
||||||
|
|
||||||
API.registerRecipeHandler(new ProfilerRecipeHandler(true));
|
|
||||||
API.registerUsageHandler(new ProfilerRecipeHandler(false));
|
|
||||||
sendProfilerRecipeHandler();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void sendHandler(String aName, String aBlock) {
|
|
||||||
NBTTagCompound aNBT = new NBTTagCompound();
|
|
||||||
aNBT.setString("handler", aName);
|
|
||||||
aNBT.setString("modName", "Minecraft");
|
|
||||||
aNBT.setString("modId", "minecraft");
|
|
||||||
aNBT.setString("itemName", aBlock);
|
|
||||||
aNBT.setInteger("handlerWidth", 166);
|
|
||||||
aNBT.setInteger("handlerHeight", 65);
|
|
||||||
aNBT.setBoolean("multipleWidgetsAllowed", true);
|
|
||||||
aNBT.setInteger("yShift", 0);
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void sendRepairHandler() {
|
|
||||||
NBTTagCompound aNBT = new NBTTagCompound();
|
|
||||||
aNBT.setString("handler", "codechicken.nei.recipe.RepairRecipeHandler");
|
|
||||||
aNBT.setString("modName", "Minecraft");
|
|
||||||
aNBT.setString("modId", "minecraft");
|
|
||||||
aNBT.setString("itemName", "minecraft:anvil");
|
|
||||||
aNBT.setInteger("handlerHeight", 39);
|
|
||||||
aNBT.setInteger("handlerWidth", 166);
|
|
||||||
aNBT.setBoolean("multipleWidgetsAllowed", true);
|
|
||||||
aNBT.setBoolean("showFavoritesButton", false);
|
|
||||||
aNBT.setInteger("yShift", 0);
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void sendFuelRecipeHandler() {
|
|
||||||
NBTTagCompound aNBT = new NBTTagCompound();
|
|
||||||
aNBT.setString("handler", "codechicken.nei.recipe.FuelRecipeHandler");
|
|
||||||
aNBT.setString("modName", "Minecraft");
|
|
||||||
aNBT.setString("modId", "minecraft");
|
|
||||||
aNBT.setString("imageResource", "nei:textures/nei_tabbed_sprites.png");
|
|
||||||
aNBT.setInteger("imageX", 80);
|
|
||||||
aNBT.setInteger("imageY", 0);
|
|
||||||
aNBT.setInteger("imageWidth", 14);
|
|
||||||
aNBT.setInteger("imageHeight", 14);
|
|
||||||
aNBT.setInteger("handlerHeight", 65);
|
|
||||||
aNBT.setInteger("handlerWidth", 166);
|
|
||||||
aNBT.setBoolean("multipleWidgetsAllowed", true);
|
|
||||||
aNBT.setInteger("yShift", 0);
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void sendInformationHandler() {
|
|
||||||
NBTTagCompound aNBT = new NBTTagCompound();
|
|
||||||
aNBT.setString("handler", "codechicken.nei.recipe.InformationHandler");
|
|
||||||
aNBT.setString("modName", "Not Enough Items");
|
|
||||||
aNBT.setString("modId", "nei");
|
|
||||||
aNBT.setString("imageResource", "nei:textures/nei_tabbed_sprites.png");
|
|
||||||
aNBT.setInteger("imageX", 96);
|
|
||||||
aNBT.setInteger("imageY", 0);
|
|
||||||
aNBT.setInteger("imageWidth", 16);
|
|
||||||
aNBT.setInteger("imageHeight", 16);
|
|
||||||
aNBT.setInteger("handlerHeight", 65);
|
|
||||||
aNBT.setInteger("handlerWidth", 166);
|
|
||||||
aNBT.setBoolean("multipleWidgetsAllowed", true);
|
|
||||||
aNBT.setInteger("yShift", 0);
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void sendProfilerRecipeHandler() {
|
|
||||||
NBTTagCompound aNBT = new NBTTagCompound();
|
|
||||||
aNBT.setString("handler", "codechicken.nei.recipe.ProfilerRecipeHandler");
|
|
||||||
aNBT.setString("modName", "Not Enough Items");
|
|
||||||
aNBT.setString("modId", "nei");
|
|
||||||
aNBT.setString("itemName", "minecraft:clock");
|
|
||||||
aNBT.setInteger("handlerHeight", 16);
|
|
||||||
aNBT.setInteger("handlerWidth", 166);
|
|
||||||
aNBT.setBoolean("multipleWidgetsAllowed", true);
|
|
||||||
aNBT.setInteger("yShift", 0);
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void sendCatalyst(String aName, String aStack) {
|
|
||||||
NBTTagCompound aNBT = new NBTTagCompound();
|
|
||||||
aNBT.setString("handlerID", aName);
|
|
||||||
aNBT.setString("itemName", aStack);
|
|
||||||
aNBT.setInteger("priority", 0);
|
|
||||||
FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,13 +1,14 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
public class Image {
|
public class Image
|
||||||
|
{
|
||||||
public int x;
|
public int x;
|
||||||
public int y;
|
public int y;
|
||||||
public int width;
|
public int width;
|
||||||
public int height;
|
public int height;
|
||||||
|
|
||||||
public Image(int x, int y, int w, int h) {
|
public Image(int x, int y, int w, int h)
|
||||||
|
{
|
||||||
this.x = x;
|
this.x = x;
|
||||||
this.y = y;
|
this.y = y;
|
||||||
width = w;
|
width = w;
|
||||||
|
|||||||
@@ -1,40 +1,55 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
import codechicken.nei.api.IInfiniteItemHandler;
|
import codechicken.nei.api.IInfiniteItemHandler;
|
||||||
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class InfiniteStackSizeHandler implements IInfiniteItemHandler {
|
public class InfiniteStackSizeHandler implements IInfiniteItemHandler
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public void onPickup(ItemStack heldItem) {
|
public void onPickup(ItemStack heldItem)
|
||||||
|
{
|
||||||
heldItem.stackSize = 1;
|
heldItem.stackSize = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPlaceInfinite(ItemStack heldItem) {
|
public void onPlaceInfinite(ItemStack heldItem)
|
||||||
|
{
|
||||||
heldItem.stackSize = 111;
|
heldItem.stackSize = 111;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canHandleItem(ItemStack stack) {
|
public boolean canHandleItem(ItemStack stack)
|
||||||
|
{
|
||||||
return !stack.isItemStackDamageable();
|
return !stack.isItemStackDamageable();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isItemInfinite(ItemStack stack) {
|
public boolean isItemInfinite(ItemStack stack)
|
||||||
|
{
|
||||||
return stack.stackSize == -1 || stack.stackSize > 100;
|
return stack.stackSize == -1 || stack.stackSize > 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void replenishInfiniteStack(InventoryPlayer inv, int slotNo) {
|
public void replenishInfiniteStack(InventoryPlayer inv, int slotNo)
|
||||||
inv.getStackInSlot(slotNo).stackSize = 111;
|
{
|
||||||
|
ItemStack stack = inv.getStackInSlot(slotNo);
|
||||||
|
stack.stackSize = 111;
|
||||||
|
|
||||||
|
for(int i = 0; i < inv.getSizeInventory(); i++)
|
||||||
|
{
|
||||||
|
if(i == slotNo)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if(NEIServerUtils.areStacksSameType(stack, inv.getStackInSlot(i)))
|
||||||
|
inv.setInventorySlotContents(i, null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getInfiniteItem(ItemStack typeStack) {
|
public ItemStack getInfiniteItem(ItemStack typeStack)
|
||||||
|
{
|
||||||
return InventoryUtils.copyStack(typeStack, -1);
|
return InventoryUtils.copyStack(typeStack, -1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,12 +1,11 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import codechicken.nei.api.IInfiniteItemHandler;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import codechicken.nei.api.IInfiniteItemHandler;
|
public class InfiniteToolHandler implements IInfiniteItemHandler
|
||||||
|
{
|
||||||
public class InfiniteToolHandler implements IInfiniteItemHandler {
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPickup(ItemStack heldItem) {
|
public void onPickup(ItemStack heldItem) {
|
||||||
heldItem.setItemDamage(0);
|
heldItem.setItemDamage(0);
|
||||||
|
|||||||
@@ -4,13 +4,15 @@ import net.minecraft.entity.player.EntityPlayer;
|
|||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
||||||
import net.minecraft.inventory.InventoryCrafting;
|
import net.minecraft.inventory.InventoryCrafting;
|
||||||
|
|
||||||
public class InventoryCraftingDummy extends InventoryCrafting {
|
public class InventoryCraftingDummy extends InventoryCrafting
|
||||||
|
{
|
||||||
public InventoryCraftingDummy() {
|
public InventoryCraftingDummy()
|
||||||
super(new Container() {
|
{
|
||||||
|
super(new Container()
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public boolean canInteractWith(EntityPlayer entityplayer) {
|
public boolean canInteractWith(EntityPlayer entityplayer)
|
||||||
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}, 3, 3);
|
}, 3, 3);
|
||||||
|
|||||||
@@ -1,483 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import java.util.stream.IntStream;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.ItemsGrid.ItemsGridSlot;
|
|
||||||
import codechicken.nei.ItemsGrid.MouseContext;
|
|
||||||
import codechicken.nei.NEIClientUtils.Alignment;
|
|
||||||
import codechicken.nei.recipe.AutoCraftingManager;
|
|
||||||
import codechicken.nei.recipe.GuiCraftingRecipe;
|
|
||||||
import codechicken.nei.recipe.GuiRecipe;
|
|
||||||
import codechicken.nei.recipe.ICraftingHandler;
|
|
||||||
import codechicken.nei.recipe.IRecipeHandler;
|
|
||||||
import codechicken.nei.recipe.Recipe;
|
|
||||||
import codechicken.nei.recipe.Recipe.RecipeId;
|
|
||||||
import codechicken.nei.recipe.RecipeInfo;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
import codechicken.nei.util.ReadableNumberConverter;
|
|
||||||
|
|
||||||
public class ItemCraftablesPanel
|
|
||||||
extends AbstractSubpanel<ItemsGrid<ItemCraftablesPanel.CraftablesGridSlot, MouseContext>> {
|
|
||||||
|
|
||||||
public static class CraftablesGridSlot extends ItemsGridSlot {
|
|
||||||
|
|
||||||
protected final long realAmount;
|
|
||||||
protected final boolean isFluidDisplay;
|
|
||||||
protected final RecipeId recipeId;
|
|
||||||
|
|
||||||
public CraftablesGridSlot(int slotIndex, int itemIndex, ItemStack itemStack, RecipeId recipeId) {
|
|
||||||
super(slotIndex, itemIndex, itemStack);
|
|
||||||
this.realAmount = StackInfo.getAmount(itemStack);
|
|
||||||
this.isFluidDisplay = StackInfo.isFluidDisplayItem(itemStack);
|
|
||||||
this.recipeId = recipeId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public RecipeId getRecipeId() {
|
|
||||||
return this.recipeId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <M extends MouseContext> void afterDraw(Rectangle4i rect, M mouseContext) {
|
|
||||||
drawStackSize(rect);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void drawStackSize(Rectangle4i rect) {
|
|
||||||
long stackSize = this.realAmount;
|
|
||||||
|
|
||||||
if (stackSize > 1) {
|
|
||||||
final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
|
|
||||||
String amountString = "";
|
|
||||||
|
|
||||||
if (stackSize < 10_000) {
|
|
||||||
amountString = String.valueOf(stackSize);
|
|
||||||
} else {
|
|
||||||
amountString = ReadableNumberConverter.INSTANCE.toWideReadableForm(stackSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isFluidDisplay) {
|
|
||||||
amountString += "L";
|
|
||||||
}
|
|
||||||
|
|
||||||
NEIClientUtils.drawNEIOverlayText(
|
|
||||||
amountString,
|
|
||||||
new Rectangle4i(rect.x + 1, rect.y + 1, rect.w - 2, rect.h - 2),
|
|
||||||
panelFactor,
|
|
||||||
0xFFFFFF,
|
|
||||||
true,
|
|
||||||
this.isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class CraftablesSnapshot {
|
|
||||||
|
|
||||||
final GuiContainer guiContainer;
|
|
||||||
final ItemStackAmount inventory;
|
|
||||||
final boolean showOnlyFavorites;
|
|
||||||
final int maxCandidates;
|
|
||||||
|
|
||||||
CraftablesSnapshot(GuiContainer guiContainer, ItemStackAmount inventory, boolean showOnlyFavorites,
|
|
||||||
int maxCandidates) {
|
|
||||||
this.guiContainer = guiContainer;
|
|
||||||
this.inventory = inventory;
|
|
||||||
this.showOnlyFavorites = showOnlyFavorites;
|
|
||||||
this.maxCandidates = maxCandidates;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class RecipeCandidate {
|
|
||||||
|
|
||||||
final IRecipeHandler handler;
|
|
||||||
final int recipeIndex;
|
|
||||||
final List<PositionedStack> ingredientStacks;
|
|
||||||
final ItemStack sortKeyItem;
|
|
||||||
|
|
||||||
RecipeCandidate(IRecipeHandler handler, int recipeIndex, List<PositionedStack> ingredientStacks,
|
|
||||||
ItemStack sortKeyItem) {
|
|
||||||
this.handler = handler;
|
|
||||||
this.recipeIndex = recipeIndex;
|
|
||||||
this.ingredientStacks = ingredientStacks;
|
|
||||||
this.sortKeyItem = sortKeyItem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final Comparator<ItemStack> ITEM_SORT_COMPARATOR = Comparator
|
|
||||||
.comparing(FavoriteRecipes::containsManual).thenComparing(FavoriteRecipes::contains).reversed()
|
|
||||||
.thenComparing(ItemSorter.instance);
|
|
||||||
|
|
||||||
public static List<String> guiBlacklist = new ArrayList<>();
|
|
||||||
private final int MIN_DELAY = 600;
|
|
||||||
|
|
||||||
private Map<String, ArrayList<ICraftingHandler>> identHandlers = new HashMap<>();
|
|
||||||
private Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
|
|
||||||
|
|
||||||
private GuiContainer lastGuiContainer = null;
|
|
||||||
private ItemStackAmount lastPlayerInventory = null;
|
|
||||||
private long lastPlayerInventorySync = 0;
|
|
||||||
private int lastFavoritesCount = 0;
|
|
||||||
|
|
||||||
private volatile CraftablesSnapshot pendingSnapshot;
|
|
||||||
private final AtomicReference<Map<ItemStack, RecipeId>> pendingResult = new AtomicReference<>();
|
|
||||||
private final RestartableTask task = new RestartableTask("NEI Craftables Panel") {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() {
|
|
||||||
final CraftablesSnapshot snapshot = ItemCraftablesPanel.this.pendingSnapshot;
|
|
||||||
|
|
||||||
if (snapshot != null) {
|
|
||||||
pendingResult.set(generateCraftables(snapshot));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
public ItemCraftablesPanel() {
|
|
||||||
this.grid = new ItemsGrid<>() {
|
|
||||||
|
|
||||||
protected List<CraftablesGridSlot> gridMask;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onGridChanged() {
|
|
||||||
this.gridMask = null;
|
|
||||||
super.onGridChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<CraftablesGridSlot> getMask() {
|
|
||||||
|
|
||||||
if (this.gridMask == null) {
|
|
||||||
final int maxSlotIndex = this.rows * this.columns;
|
|
||||||
final List<CraftablesGridSlot> gridMask = new ArrayList<>();
|
|
||||||
this.realItems.clear();
|
|
||||||
|
|
||||||
if (!ItemCraftablesPanel.this.availableRecipes.isEmpty()) {
|
|
||||||
final List<Map.Entry<ItemStack, RecipeId>> entries = ItemCraftablesPanel.this.availableRecipes
|
|
||||||
.entrySet().stream().sorted(Map.Entry.comparingByKey(ITEM_SORT_COMPARATOR))
|
|
||||||
.limit(maxSlotIndex).collect(Collectors.toList());
|
|
||||||
int slotIndex = 0;
|
|
||||||
int itemIndex = 0;
|
|
||||||
|
|
||||||
for (Map.Entry<ItemStack, RecipeId> entry : entries) {
|
|
||||||
if (!isInvalidSlot(slotIndex)) {
|
|
||||||
this.realItems.add(entry.getKey());
|
|
||||||
gridMask.add(
|
|
||||||
new CraftablesGridSlot(
|
|
||||||
slotIndex,
|
|
||||||
itemIndex++,
|
|
||||||
entry.getKey(),
|
|
||||||
entry.getValue()));
|
|
||||||
}
|
|
||||||
if (slotIndex++ >= maxSlotIndex) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.gridMask = gridMask;
|
|
||||||
} else {
|
|
||||||
this.gridMask = Collections.emptyList();
|
|
||||||
}
|
|
||||||
|
|
||||||
ItemCraftablesPanel.this.updateLinePadding();
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.gridMask;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected MouseContext getMouseContext(int mousex, int mousey) {
|
|
||||||
final ItemsGridSlot hovered = getSlotMouseOver(mousex, mousey);
|
|
||||||
|
|
||||||
if (hovered != null) {
|
|
||||||
return new MouseContext(
|
|
||||||
hovered.slotIndex,
|
|
||||||
hovered.slotIndex / this.columns,
|
|
||||||
hovered.slotIndex % this.columns);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
|
|
||||||
return ItemQuantityField.prepareStackWithQuantity(itemStack, StackInfo.getAmount(itemStack));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int mousex, int mousey) {
|
|
||||||
if (!this.availableRecipes.isEmpty()) {
|
|
||||||
super.draw(mousex, mousey);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int setPanelWidth(int width) {
|
|
||||||
if (getGuiContainer() != this.lastGuiContainer) updateCraftables();
|
|
||||||
|
|
||||||
final int columns = width / ItemsGrid.SLOT_SIZE;
|
|
||||||
final int useRows = NEIClientConfig.getIntSetting("inventory.craftables.useRows");
|
|
||||||
final int rows = (int) Math.min(Math.ceil(this.availableRecipes.size() * 1f / columns), useRows);
|
|
||||||
|
|
||||||
this.w = width;
|
|
||||||
this.h = 8 + ItemsGrid.SLOT_SIZE * Math.max(rows, 1);
|
|
||||||
|
|
||||||
return rows;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void update() {
|
|
||||||
this.splittingLineColor = NEIClientConfig.getSetting("inventory.craftables.color").getHexValue();
|
|
||||||
applyPendingResult();
|
|
||||||
updateCraftables();
|
|
||||||
super.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void applyPendingResult() {
|
|
||||||
final Map<ItemStack, RecipeId> result = this.pendingResult.getAndSet(null);
|
|
||||||
|
|
||||||
if (result != null && NEIClientConfig.showCraftablesPanelWidget()) {
|
|
||||||
this.availableRecipes = result;
|
|
||||||
this.grid.onGridChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateCraftables() {
|
|
||||||
|
|
||||||
if (!NEIClientConfig.showCraftablesPanelWidget()) {
|
|
||||||
clearCraftables();
|
|
||||||
} else if (this.lastPlayerInventory == null
|
|
||||||
|| Math.abs(System.currentTimeMillis() - this.lastPlayerInventorySync) >= MIN_DELAY) {
|
|
||||||
final GuiContainer firstGui = getGuiContainer();
|
|
||||||
this.lastPlayerInventorySync = System.currentTimeMillis();
|
|
||||||
|
|
||||||
if (firstGui != null && !ItemCraftablesPanel.guiBlacklist.contains(firstGui.getClass().getName())) {
|
|
||||||
final boolean showOnlyFavorites = NEIClientConfig
|
|
||||||
.getBooleanSetting("inventory.craftables.favoritesOnly");
|
|
||||||
final ItemStackAmount inv = AutoCraftingManager.getInventoryItems(firstGui);
|
|
||||||
|
|
||||||
if (this.lastGuiContainer != firstGui
|
|
||||||
|| showOnlyFavorites && this.lastFavoritesCount != FavoriteRecipes.size()
|
|
||||||
|| !inv.equals(this.lastPlayerInventory)) {
|
|
||||||
this.lastPlayerInventory = inv;
|
|
||||||
this.lastGuiContainer = firstGui;
|
|
||||||
this.lastFavoritesCount = FavoriteRecipes.size();
|
|
||||||
final int maxRows = NEIClientConfig.getIntSetting("inventory.craftables.useRows") + 2;
|
|
||||||
final int maxCandidates = Math.max(this.grid.columns, 1) * maxRows;
|
|
||||||
this.pendingSnapshot = new CraftablesSnapshot(
|
|
||||||
firstGui,
|
|
||||||
inv,
|
|
||||||
showOnlyFavorites,
|
|
||||||
maxCandidates);
|
|
||||||
this.task.restart();
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
clearCraftables();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void clearCraftables() {
|
|
||||||
if (!this.availableRecipes.isEmpty()) {
|
|
||||||
this.availableRecipes = Collections.emptyMap();
|
|
||||||
this.lastPlayerInventory = null;
|
|
||||||
this.grid.onGridChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void clearGuiReferences() {
|
|
||||||
this.lastGuiContainer = null;
|
|
||||||
this.pendingSnapshot = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private GuiContainer getGuiContainer() {
|
|
||||||
final GuiContainer firstGui = NEIClientUtils.getGuiContainer();
|
|
||||||
return (firstGui instanceof GuiRecipe<?>gui) ? gui.firstGui : firstGui;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Map<ItemStack, RecipeId> generateCraftables(CraftablesSnapshot snapshot) {
|
|
||||||
final List<IRecipeHandler> availableHandlers = getAvailableHandlers(snapshot.guiContainer);
|
|
||||||
final Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
|
|
||||||
|
|
||||||
if (!availableHandlers.isEmpty()) {
|
|
||||||
final Map<Item, List<ItemStack>> invByItem = indexInventoryByItem(snapshot.inventory.values());
|
|
||||||
|
|
||||||
if (snapshot.showOnlyFavorites) {
|
|
||||||
for (IRecipeHandler handler : availableHandlers) {
|
|
||||||
availableRecipes.putAll(filterHandlerRecipes(handler, invByItem, true));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
final List<RecipeCandidate> candidates = Collections.synchronizedList(new ArrayList<>());
|
|
||||||
|
|
||||||
for (IRecipeHandler handler : availableHandlers) {
|
|
||||||
collectHandlerCandidates(handler, invByItem, candidates);
|
|
||||||
}
|
|
||||||
|
|
||||||
candidates.sort(Comparator.comparing(c -> c.sortKeyItem, ITEM_SORT_COMPARATOR));
|
|
||||||
candidates.subList(0, Math.min(candidates.size(), snapshot.maxCandidates)).parallelStream()
|
|
||||||
.forEach(candidate -> buildCandidate(candidate, availableRecipes));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return availableRecipes;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<IRecipeHandler> getAvailableHandlers(GuiContainer firstGui) {
|
|
||||||
final List<IRecipeHandler> availableHandlers = new ArrayList<>();
|
|
||||||
|
|
||||||
for (String ident : RecipeInfo.getOverlayHandlerIdents(firstGui)) {
|
|
||||||
availableHandlers.addAll(identHandlers.computeIfAbsent(ident, GuiCraftingRecipe::getCraftingHandlers));
|
|
||||||
}
|
|
||||||
|
|
||||||
return availableHandlers;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Map<Item, List<ItemStack>> indexInventoryByItem(List<ItemStack> invStacks) {
|
|
||||||
final Map<Item, List<ItemStack>> index = new HashMap<>();
|
|
||||||
|
|
||||||
for (ItemStack stack : invStacks) {
|
|
||||||
index.computeIfAbsent(stack.getItem(), i -> new ArrayList<>()).add(stack);
|
|
||||||
}
|
|
||||||
|
|
||||||
return index;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void collectHandlerCandidates(IRecipeHandler handler, Map<Item, List<ItemStack>> invByItem,
|
|
||||||
List<RecipeCandidate> candidates) {
|
|
||||||
IntStream.range(0, handler.numRecipes()).parallel().forEach(recipeIndex -> {
|
|
||||||
final List<PositionedStack> ingredientStacks = handler.getIngredientStacks(recipeIndex);
|
|
||||||
|
|
||||||
if (existsIngredients(ingredientStacks, invByItem)) {
|
|
||||||
final ItemStack sortKeyItem = getCheapResultItem(handler, recipeIndex);
|
|
||||||
|
|
||||||
if (sortKeyItem != null) {
|
|
||||||
candidates.add(new RecipeCandidate(handler, recipeIndex, ingredientStacks, sortKeyItem));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void buildCandidate(RecipeCandidate candidate, Map<ItemStack, RecipeId> availableRecipes) {
|
|
||||||
final ItemStack result = getCheapResult(candidate.handler, candidate.recipeIndex);
|
|
||||||
|
|
||||||
if (result != null) {
|
|
||||||
final RecipeId recipeId = RecipeId.of(candidate.handler, candidate.recipeIndex, candidate.ingredientStacks);
|
|
||||||
|
|
||||||
synchronized (availableRecipes) {
|
|
||||||
availableRecipes.put(result, recipeId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ItemStack getCheapResultItem(IRecipeHandler handler, int recipeIndex) {
|
|
||||||
final PositionedStack result = Recipe
|
|
||||||
.getMainResult(handler.getResultStacks(recipeIndex), pStack -> pStack.items[0]);
|
|
||||||
return result != null ? result.item : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ItemStack getCheapResult(IRecipeHandler handler, int recipeIndex) {
|
|
||||||
final List<PositionedStack> results = handler.getResultStacks(recipeIndex);
|
|
||||||
|
|
||||||
if (results.isEmpty()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
final ItemStack stack = Recipe.getMainResult(results, pStack -> pStack.items[0]).item;
|
|
||||||
int stackSize = 0;
|
|
||||||
|
|
||||||
for (PositionedStack result : results) {
|
|
||||||
if (containsSameType(result, stack)) {
|
|
||||||
stackSize += StackInfo.getAmount(result.item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return StackInfo.withAmount(stack, stackSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean containsSameType(PositionedStack pStack, ItemStack stack) {
|
|
||||||
final ItemStack normalized = StackInfo.withAmount(stack, 0);
|
|
||||||
|
|
||||||
for (ItemStack permutation : pStack.items) {
|
|
||||||
if (NEIServerUtils.areStacksSameTypeWithNBT(StackInfo.withAmount(permutation, 0), normalized)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Map<ItemStack, RecipeId> filterHandlerRecipes(IRecipeHandler handler, Map<Item, List<ItemStack>> invByItem,
|
|
||||||
boolean showOnlyFavorites) {
|
|
||||||
final Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
|
|
||||||
|
|
||||||
IntStream.range(0, handler.numRecipes()).parallel().forEach(recipeIndex -> {
|
|
||||||
final List<PositionedStack> ingredientStacks = handler.getIngredientStacks(recipeIndex);
|
|
||||||
|
|
||||||
if (existsIngredients(ingredientStacks, invByItem)) {
|
|
||||||
final ItemStack result = getCheapResult(handler, recipeIndex);
|
|
||||||
|
|
||||||
if (result != null) {
|
|
||||||
final RecipeId recipeId = RecipeId.of(handler, recipeIndex, ingredientStacks);
|
|
||||||
|
|
||||||
if (!showOnlyFavorites || FavoriteRecipes.getFavorite(recipeId) != null) {
|
|
||||||
synchronized (availableRecipes) {
|
|
||||||
availableRecipes.put(result, recipeId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return availableRecipes;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean existsIngredients(List<PositionedStack> ingredients, Map<Item, List<ItemStack>> invByItem) {
|
|
||||||
final Map<ItemStack, Integer> usedItems = new HashMap<>();
|
|
||||||
|
|
||||||
for (PositionedStack pStack : ingredients) {
|
|
||||||
ItemStack used = null;
|
|
||||||
|
|
||||||
for (ItemStack permutation : pStack.items) {
|
|
||||||
final List<ItemStack> candidates = invByItem.get(permutation.getItem());
|
|
||||||
|
|
||||||
if (candidates == null) continue;
|
|
||||||
|
|
||||||
for (ItemStack is : candidates) {
|
|
||||||
if (usedItems.getOrDefault(is, is.stackSize) >= pStack.item.stackSize
|
|
||||||
&& NEIServerUtils.areStacksSameTypeCrafting(permutation, is)) {
|
|
||||||
used = is;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (used != null) break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (used != null) {
|
|
||||||
usedItems.put(used, usedItems.getOrDefault(used, used.stackSize) - pStack.item.stackSize);
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return !usedItems.isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,238 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
|
|
||||||
import org.apache.commons.io.IOUtils;
|
|
||||||
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
import com.google.gson.JsonParser;
|
|
||||||
import com.google.gson.JsonSyntaxException;
|
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
|
||||||
import codechicken.nei.ItemsGrid.ItemsGridSlot;
|
|
||||||
import codechicken.nei.ItemsGrid.MouseContext;
|
|
||||||
import codechicken.nei.recipe.Recipe.RecipeId;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
import codechicken.nei.util.NBTJson;
|
|
||||||
|
|
||||||
public class ItemHistoryPanel extends AbstractSubpanel<ItemsGrid<ItemHistoryPanel.HistoryGridSlot, MouseContext>> {
|
|
||||||
|
|
||||||
protected File historyFile = null;
|
|
||||||
|
|
||||||
public static class HistoryGridSlot extends ItemsGridSlot {
|
|
||||||
|
|
||||||
public HistoryGridSlot(int slotIndex, int itemIndex, ItemStack item) {
|
|
||||||
super(slotIndex, itemIndex, item);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public RecipeId getRecipeId() {
|
|
||||||
return FavoriteRecipes.getFavorite(this.item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemHistoryPanel() {
|
|
||||||
this.grid = new ItemsGrid<>() {
|
|
||||||
|
|
||||||
protected List<HistoryGridSlot> gridMask;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onGridChanged() {
|
|
||||||
this.gridMask = null;
|
|
||||||
super.onGridChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<HistoryGridSlot> getMask() {
|
|
||||||
|
|
||||||
if (this.gridMask == null) {
|
|
||||||
this.gridMask = new ArrayList<>();
|
|
||||||
int itemIndex = 0;
|
|
||||||
for (int slotIndex = 0; slotIndex < this.rows * this.columns && itemIndex < size(); slotIndex++) {
|
|
||||||
if (!isInvalidSlot(slotIndex)) {
|
|
||||||
this.gridMask.add(new HistoryGridSlot(slotIndex, itemIndex, getItem(itemIndex)));
|
|
||||||
itemIndex++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ItemHistoryPanel.this.updateLinePadding();
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.gridMask;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected MouseContext getMouseContext(int mousex, int mousey) {
|
|
||||||
final HistoryGridSlot hovered = getSlotMouseOver(mousex, mousey);
|
|
||||||
|
|
||||||
if (hovered != null) {
|
|
||||||
return new MouseContext(
|
|
||||||
hovered.slotIndex,
|
|
||||||
hovered.slotIndex / this.columns,
|
|
||||||
hovered.slotIndex % this.columns);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
|
|
||||||
return ItemQuantityField.prepareStackWithQuantity(itemStack, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int mousex, int mousey) {
|
|
||||||
if (this.grid.size() > 0) {
|
|
||||||
super.draw(mousex, mousey);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int setPanelWidth(int width) {
|
|
||||||
final int columns = width / ItemsGrid.SLOT_SIZE;
|
|
||||||
final int useRows = NEIClientConfig.getIntSetting("inventory.history.useRows");
|
|
||||||
final int rows = (int) Math.min(Math.ceil(this.grid.size() * 1f / columns), useRows);
|
|
||||||
|
|
||||||
this.w = width;
|
|
||||||
this.h = 8 + ItemsGrid.SLOT_SIZE * Math.max(rows, 1);
|
|
||||||
|
|
||||||
return rows;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void update() {
|
|
||||||
this.splittingLineColor = NEIClientConfig.getSetting("inventory.history.color").getHexValue();
|
|
||||||
super.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addItem(ItemStack stack) {
|
|
||||||
if (stack != null) {
|
|
||||||
ItemStack is = StackInfo.withAmount(stack, 0);
|
|
||||||
|
|
||||||
this.grid.realItems.removeIf(historyStack -> StackInfo.equalItemAndNBT(historyStack, stack, true));
|
|
||||||
this.grid.realItems.add(0, is);
|
|
||||||
|
|
||||||
if (this.grid.realItems.size() > Math.max(50, this.grid.rows * this.grid.columns)) {
|
|
||||||
this.grid.realItems.remove(this.grid.realItems.size() - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.grid.onItemsChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void load() {
|
|
||||||
|
|
||||||
if (!NEIClientConfig.getBooleanSetting("inventory.history.save")) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String worldPath = "global";
|
|
||||||
|
|
||||||
if (NEIClientConfig.getBooleanSetting("inventory.history.worldSpecific")) {
|
|
||||||
worldPath = NEIClientConfig.getWorldPath();
|
|
||||||
}
|
|
||||||
|
|
||||||
final File dir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
|
|
||||||
|
|
||||||
if (!dir.exists()) {
|
|
||||||
dir.mkdirs();
|
|
||||||
}
|
|
||||||
|
|
||||||
final File historyFile = new File(dir, "history.ini");
|
|
||||||
|
|
||||||
if (historyFile.equals(this.historyFile)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<String> itemStrings = Collections.emptyList();
|
|
||||||
|
|
||||||
if (historyFile.exists()) {
|
|
||||||
try (FileInputStream reader = new FileInputStream(historyFile)) {
|
|
||||||
NEIClientConfig.logger.info("Loading history from file {}", historyFile);
|
|
||||||
itemStrings = IOUtils.readLines(reader, StandardCharsets.UTF_8);
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load history from file {}", historyFile, e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final JsonParser parser = new JsonParser();
|
|
||||||
final int maxSize = Math.max(50, this.grid.rows * this.grid.columns);
|
|
||||||
|
|
||||||
this.grid.realItems.clear();
|
|
||||||
|
|
||||||
for (String itemStr : itemStrings) {
|
|
||||||
|
|
||||||
if (itemStr.isEmpty()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.grid.realItems.size() >= maxSize) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
JsonObject row = parser.parse(itemStr).getAsJsonObject();
|
|
||||||
NBTTagCompound itemStackNBT = (NBTTagCompound) NBTJson.toNbt(row.get("item"));
|
|
||||||
ItemStack itemStack = StackInfo.loadFromNBT(itemStackNBT);
|
|
||||||
|
|
||||||
if (itemStack != null) {
|
|
||||||
this.grid.realItems.add(itemStack);
|
|
||||||
} else {
|
|
||||||
NEIClientConfig.logger.warn(
|
|
||||||
"Failed to load history ItemStack from json string, the item no longer exists:\n{}",
|
|
||||||
itemStr);
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load history ItemStack from json string:\n{}", itemStr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.grid.onItemsChanged();
|
|
||||||
|
|
||||||
this.historyFile = historyFile;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void save() {
|
|
||||||
|
|
||||||
if (!NEIClientConfig.getBooleanSetting("inventory.history.save")) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.historyFile == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final List<String> strings = new ArrayList<>();
|
|
||||||
|
|
||||||
for (ItemStack stack : this.grid.realItems) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
final JsonObject row = new JsonObject();
|
|
||||||
row.add("item", NBTJson.toJsonObject(StackInfo.itemStackToNBT(stack)));
|
|
||||||
strings.add(NBTJson.toJson(row));
|
|
||||||
} catch (JsonSyntaxException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to stringify history ItemStack to json string");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try (FileOutputStream output = new FileOutputStream(this.historyFile)) {
|
|
||||||
IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to save history list to file {}", this.historyFile, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,32 +1,31 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import codechicken.nei.ThreadOperationTimer.TimeoutException;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.ForkJoinPool;
|
|
||||||
import java.util.concurrent.ForkJoinWorkerThread;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
|
||||||
import net.minecraft.util.StatCollector;
|
|
||||||
|
|
||||||
import com.google.common.collect.ArrayListMultimap;
|
|
||||||
import com.google.common.collect.ListMultimap;
|
|
||||||
|
|
||||||
import codechicken.nei.api.ItemFilter;
|
import codechicken.nei.api.ItemFilter;
|
||||||
import codechicken.nei.api.ItemFilter.ItemFilterProvider;
|
import codechicken.nei.api.ItemFilter.ItemFilterProvider;
|
||||||
import codechicken.nei.api.ItemInfo;
|
import codechicken.nei.api.ItemInfo;
|
||||||
import codechicken.nei.util.ItemUntranslator;
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import com.google.common.collect.ArrayListMultimap;
|
||||||
|
import com.google.common.collect.ListMultimap;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.IIcon;
|
||||||
|
|
||||||
public class ItemList {
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.ExecutionException;
|
||||||
|
import java.util.concurrent.ForkJoinPool;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
public class ItemList
|
||||||
|
{
|
||||||
/**
|
/**
|
||||||
* Fields are replaced atomically and contents never modified.
|
* Fields are replaced atomically and contents never modified.
|
||||||
*/
|
*/
|
||||||
public static volatile List<ItemStack> items = new ArrayList<>();
|
public static volatile List<ItemStack> items = new ArrayList<>();
|
||||||
/**
|
/**
|
||||||
* Fields are replaced atomically and contents never modified.
|
* Fields are replaced atomically and contents never modified.
|
||||||
*/
|
*/
|
||||||
@@ -37,43 +36,27 @@ public class ItemList {
|
|||||||
public static final List<ItemFilterProvider> itemFilterers = new LinkedList<>();
|
public static final List<ItemFilterProvider> itemFilterers = new LinkedList<>();
|
||||||
public static final List<ItemsLoadedCallback> loadCallbacks = new LinkedList<>();
|
public static final List<ItemsLoadedCallback> loadCallbacks = new LinkedList<>();
|
||||||
|
|
||||||
/**
|
private static final HashSet<Item> erroredItems = new HashSet<>();
|
||||||
* Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is actually finished or not.
|
private static final HashSet<String> stackTraces = new HashSet<>();
|
||||||
*/
|
|
||||||
public static boolean loadFinished;
|
|
||||||
|
|
||||||
public static class EverythingItemFilter implements ItemFilter {
|
|
||||||
|
|
||||||
|
public static class EverythingItemFilter implements ItemFilter
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(ItemStack item) {
|
public boolean matches(ItemStack item) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class NothingItemFilter implements ItemFilter {
|
public static class NothingItemFilter implements ItemFilter
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(ItemStack item) {
|
public boolean matches(ItemStack item) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class NegatedItemFilter implements ItemFilter {
|
public static class PatternItemFilter implements ItemFilter
|
||||||
|
{
|
||||||
public ItemFilter filter;
|
|
||||||
|
|
||||||
public NegatedItemFilter(ItemFilter filter) {
|
|
||||||
this.filter = filter;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean matches(ItemStack item) {
|
|
||||||
return this.filter == null || !this.filter.matches(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class PatternItemFilter implements ItemFilter {
|
|
||||||
|
|
||||||
public Pattern pattern;
|
public Pattern pattern;
|
||||||
|
|
||||||
public PatternItemFilter(Pattern pattern) {
|
public PatternItemFilter(Pattern pattern) {
|
||||||
@@ -82,68 +65,37 @@ public class ItemList {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(ItemStack item) {
|
public boolean matches(ItemStack item) {
|
||||||
String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(item.getDisplayName());
|
return pattern.matcher(ItemInfo.getSearchName(item)).find();
|
||||||
|
|
||||||
if (displayName != null && !displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
displayName = ItemUntranslator.getInstance().getItemStackDisplayName(item);
|
|
||||||
|
|
||||||
if (!displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (item.hasDisplayName()) {
|
|
||||||
displayName = EnumChatFormatting
|
|
||||||
.getTextWithoutFormattingCodes(item.getItem().getItemStackDisplayName(item));
|
|
||||||
|
|
||||||
if (displayName != null && !displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (String alias : ItemInfo.getAliases(item)) {
|
|
||||||
if (this.pattern.matcher(StatCollector.translateToLocal(alias)).find()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class AllMultiItemFilter implements ItemFilter {
|
public static class AllMultiItemFilter implements ItemFilter
|
||||||
|
{
|
||||||
public List<ItemFilter> filters;
|
public List<ItemFilter> filters;
|
||||||
|
|
||||||
public AllMultiItemFilter(List<ItemFilter> filters) {
|
public AllMultiItemFilter(List<ItemFilter> filters) {
|
||||||
this.filters = filters;
|
this.filters = filters;
|
||||||
}
|
}
|
||||||
|
|
||||||
public AllMultiItemFilter(ItemFilter... filters) {
|
|
||||||
this(new LinkedList<>(Arrays.asList(filters)));
|
|
||||||
}
|
|
||||||
|
|
||||||
public AllMultiItemFilter() {
|
public AllMultiItemFilter() {
|
||||||
this(new LinkedList<>());
|
this(new LinkedList<>());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(ItemStack item) {
|
public boolean matches(ItemStack item) {
|
||||||
for (ItemFilter filter : filters) try {
|
for(ItemFilter filter : filters)
|
||||||
if (filter != null && !filter.matches(item)) return false;
|
try {
|
||||||
} catch (Exception e) {
|
if (!filter.matches(item)) return false;
|
||||||
NEIClientConfig.logger
|
} catch (Exception e) {
|
||||||
.error("Exception filtering " + item + " with " + filter + " (" + e.getMessage() + ")", e);
|
NEIClientConfig.logger.error("Exception filtering "+item+" with "+filter, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class AnyMultiItemFilter implements ItemFilter {
|
public static class AnyMultiItemFilter implements ItemFilter
|
||||||
|
{
|
||||||
public List<ItemFilter> filters;
|
public List<ItemFilter> filters;
|
||||||
|
|
||||||
public AnyMultiItemFilter(List<ItemFilter> filters) {
|
public AnyMultiItemFilter(List<ItemFilter> filters) {
|
||||||
@@ -156,29 +108,29 @@ public class ItemList {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(ItemStack item) {
|
public boolean matches(ItemStack item) {
|
||||||
for (ItemFilter filter : filters) try {
|
for(ItemFilter filter : filters)
|
||||||
if (filter != null && filter.matches(item)) return true;
|
try {
|
||||||
} catch (Exception e) {
|
if (filter.matches(item)) return true;
|
||||||
NEIClientConfig.logger
|
} catch (Exception e) {
|
||||||
.error("Exception filtering " + item + " with " + filter + " (" + e.getMessage() + ")", e);
|
NEIClientConfig.logger.error("Exception filtering "+item+" with "+filter, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static interface ItemsLoadedCallback {
|
public static interface ItemsLoadedCallback
|
||||||
|
{
|
||||||
public void itemsLoaded();
|
public void itemsLoaded();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean itemMatchesAll(ItemStack item, List<ItemFilter> filters) {
|
public static boolean itemMatchesAll(ItemStack item, List<ItemFilter> filters) {
|
||||||
for (ItemFilter filter : filters) {
|
for(ItemFilter filter : filters) {
|
||||||
try {
|
try {
|
||||||
if (filter != null && !filter.matches(item)) return false;
|
if (!filter.matches(item))
|
||||||
|
return false;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
NEIClientConfig.logger
|
NEIClientConfig.logger.error("Exception filtering "+item+" with "+filter, e);
|
||||||
.error("Exception filtering " + item + " with " + filter + " (" + e.getMessage() + ")", e);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -186,7 +138,7 @@ public class ItemList {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated use getItemListFilter().matches(item)
|
* @deprecated use getItemListFilter().matches(item)
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static boolean itemMatches(ItemStack item) {
|
public static boolean itemMatches(ItemStack item) {
|
||||||
@@ -200,65 +152,120 @@ public class ItemList {
|
|||||||
public static List<ItemFilter> getItemFilters() {
|
public static List<ItemFilter> getItemFilters() {
|
||||||
LinkedList<ItemFilter> filters = new LinkedList<>();
|
LinkedList<ItemFilter> filters = new LinkedList<>();
|
||||||
synchronized (itemFilterers) {
|
synchronized (itemFilterers) {
|
||||||
for (ItemFilterProvider p : itemFilterers) {
|
for(ItemFilterProvider p : itemFilterers)
|
||||||
filters.add(p.getFilter());
|
filters.add(p.getFilter());
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return filters;
|
return filters;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack[] expandPermutations(ItemStack[] items) {
|
public static final RestartableTask loadItems = new RestartableTask("NEI Item Loading")
|
||||||
List<ItemStack> stacks = new ArrayList<>();
|
{
|
||||||
for (ItemStack item : items) {
|
private void damageSearch(Item item, List<ItemStack> permutations) {
|
||||||
if (item == null || item.getItem() == null) continue;
|
HashSet<String> damageIconSet = new HashSet<>();
|
||||||
|
for (int damage = 0; damage < 16; damage++)
|
||||||
if (item.getItemDamage() == Short.MAX_VALUE) {
|
try {
|
||||||
List<ItemStack> permutations = itemMap.get(item.getItem());
|
ItemStack itemstack = new ItemStack(item, 1, damage);
|
||||||
if (!permutations.isEmpty()) {
|
IIcon icon = item.getIconIndex(itemstack);
|
||||||
for (ItemStack stack : permutations) {
|
String name = GuiContainerManager.concatenatedDisplayName(itemstack, false);
|
||||||
ItemStack toAdd = stack.copy();
|
String s = name + "@" + (icon == null ? 0 : icon.hashCode());
|
||||||
toAdd.stackSize = item.stackSize;
|
if (!damageIconSet.contains(s)) {
|
||||||
stacks.add(toAdd);
|
damageIconSet.add(s);
|
||||||
|
permutations.add(itemstack);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
ItemStack base = new ItemStack(item.getItem(), item.stackSize);
|
|
||||||
base.stackTagCompound = item.stackTagCompound;
|
|
||||||
stacks.add(base);
|
|
||||||
}
|
}
|
||||||
continue;
|
catch(TimeoutException t) {
|
||||||
}
|
throw t;
|
||||||
|
}
|
||||||
stacks.add(item.copy());
|
catch(Throwable t) {
|
||||||
|
NEIServerUtils.logOnce(t, stackTraces, "Ommiting "+item+":"+damage+" "+item.getClass().getSimpleName(), item.toString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return stacks.toArray(new ItemStack[0]);
|
@Override
|
||||||
}
|
@SuppressWarnings("unchecked")
|
||||||
|
public void execute() {
|
||||||
|
// System.out.println("Executing NEI Item Loading");
|
||||||
|
ThreadOperationTimer timer = getTimer(500);
|
||||||
|
|
||||||
public static ForkJoinPool forkJoinPool;
|
LinkedList<ItemStack> items = new LinkedList<>();
|
||||||
|
LinkedList<ItemStack> permutations = new LinkedList<>();
|
||||||
|
ListMultimap<Item, ItemStack> itemMap = ArrayListMultimap.create();
|
||||||
|
|
||||||
static {
|
timer.setLimit(500);
|
||||||
final ForkJoinPool.ForkJoinWorkerThreadFactory factory = new ForkJoinPool.ForkJoinWorkerThreadFactory() {
|
for (Item item : (Iterable<Item>) Item.itemRegistry) {
|
||||||
|
if (interrupted()) return;
|
||||||
|
|
||||||
private int workerId;
|
if (item == null || erroredItems.contains(item))
|
||||||
|
continue;
|
||||||
|
|
||||||
@Override
|
try {
|
||||||
public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
|
timer.reset(item);
|
||||||
final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
|
|
||||||
worker.setName("NEI-worker-thread-" + workerId++);
|
permutations.clear();
|
||||||
return worker;
|
permutations.addAll(ItemInfo.itemOverrides.get(item));
|
||||||
|
|
||||||
|
if (permutations.isEmpty())
|
||||||
|
item.getSubItems(item, null, permutations);
|
||||||
|
|
||||||
|
if (permutations.isEmpty())
|
||||||
|
damageSearch(item, permutations);
|
||||||
|
|
||||||
|
permutations.addAll(ItemInfo.itemVariants.get(item));
|
||||||
|
|
||||||
|
timer.reset();
|
||||||
|
|
||||||
|
items.addAll(permutations);
|
||||||
|
itemMap.putAll(item, permutations);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
NEIServerConfig.logger.error("Removing item: " + item + " from list.", t);
|
||||||
|
erroredItems.add(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
int poolSize = Runtime.getRuntime().availableProcessors() * 2 / 3;
|
if(interrupted()) return;
|
||||||
if (poolSize < 1) poolSize = 1;
|
ItemList.items = items;
|
||||||
forkJoinPool = new ForkJoinPool(poolSize, factory, null, false);
|
ItemList.itemMap = itemMap;
|
||||||
|
for(ItemsLoadedCallback callback : loadCallbacks)
|
||||||
|
callback.itemsLoaded();
|
||||||
|
|
||||||
|
updateFilter.restart();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static ForkJoinPool getPool(int poolSize) {
|
||||||
|
if(poolSize < 1)
|
||||||
|
poolSize = 1;
|
||||||
|
|
||||||
|
return new ForkJoinPool(poolSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
// The item list pipeline lives in ItemListLoader; these references are kept for backward compatibility.
|
public static final int numProcessors = Runtime.getRuntime().availableProcessors();
|
||||||
public static final RestartableTask loadItems = ItemListLoader.loadItems;
|
public static ForkJoinPool forkJoinPool = getPool(numProcessors * 2 / 3);
|
||||||
|
|
||||||
public static final RestartableTask refreshItems = ItemListLoader.refreshItems;
|
public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering")
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
|
// System.out.println("Executing NEI Item Filtering");
|
||||||
|
ArrayList<ItemStack> filtered;
|
||||||
|
ItemFilter filter = getItemListFilter();
|
||||||
|
|
||||||
public static final RestartableTask updateFilter = ItemListLoader.updateFilter;
|
try {
|
||||||
|
filtered = ItemList.forkJoinPool.submit(() -> items.parallelStream()
|
||||||
|
.filter(filter::matches)
|
||||||
|
.collect(Collectors.toCollection(ArrayList::new))).get();
|
||||||
|
} catch (InterruptedException | ExecutionException e) {
|
||||||
|
filtered = new ArrayList<>();
|
||||||
|
e.printStackTrace();
|
||||||
|
stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
if(interrupted()) return;
|
||||||
|
ItemSorter.sort(filtered);
|
||||||
|
if(interrupted()) return;
|
||||||
|
ItemPanel.updateItemList(filtered);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use updateFilter.restart()
|
* @deprecated Use updateFilter.restart()
|
||||||
|
|||||||
@@ -1,383 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.IIcon;
|
|
||||||
import net.minecraftforge.fluids.IFluidContainerItem;
|
|
||||||
|
|
||||||
import com.google.common.base.Throwables;
|
|
||||||
import com.google.common.collect.ArrayListMultimap;
|
|
||||||
import com.google.common.collect.ListMultimap;
|
|
||||||
|
|
||||||
import codechicken.nei.ItemList.ItemsLoadedCallback;
|
|
||||||
import codechicken.nei.ThreadOperationTimer.TimeoutException;
|
|
||||||
import codechicken.nei.api.ItemFilter;
|
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import codechicken.nei.recipe.InformationHandler;
|
|
||||||
import codechicken.nei.recipe.RecipeHandlerRef;
|
|
||||||
import codechicken.nei.recipe.RepairRecipeHandler;
|
|
||||||
import codechicken.nei.search.TooltipFilter;
|
|
||||||
import cpw.mods.fml.common.FMLLog;
|
|
||||||
|
|
||||||
public class ItemListLoader {
|
|
||||||
|
|
||||||
private static final HashSet<Item> erroredItems = new HashSet<>();
|
|
||||||
private static Map<ItemStack, Integer> ordering = new HashMap<>();
|
|
||||||
|
|
||||||
private ItemListLoader() {}
|
|
||||||
|
|
||||||
private static void damageSearch(Item item, List<ItemStack> permutations) {
|
|
||||||
final Set<String> damageIconSet = new HashSet<>();
|
|
||||||
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
|
||||||
|
|
||||||
for (int damage = 0; damage < 16; damage++) {
|
|
||||||
try {
|
|
||||||
final ItemStack itemstack = new ItemStack(item, 1, damage);
|
|
||||||
final IIcon icon = item.getIconIndex(itemstack);
|
|
||||||
final String key = itemstack.getDisplayName() + "@"
|
|
||||||
+ (icon == null ? 0 : icon.hashCode())
|
|
||||||
+ "@"
|
|
||||||
+ getInformation(itemstack, player);
|
|
||||||
|
|
||||||
if (damageIconSet.add(key)) {
|
|
||||||
permutations.add(itemstack);
|
|
||||||
}
|
|
||||||
} catch (TimeoutException t) {
|
|
||||||
throw t;
|
|
||||||
} catch (Throwable t) {
|
|
||||||
NEIClientUtils.errorOnce(
|
|
||||||
"ItemListLoader: " + item.toString(),
|
|
||||||
"Ommiting " + item + ":" + damage + " " + item.getClass().getSimpleName(),
|
|
||||||
t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String getInformation(ItemStack stack, EntityPlayer player) {
|
|
||||||
try {
|
|
||||||
final List<String> tooltip = new ArrayList<>();
|
|
||||||
stack.getItem().addInformation(stack, player, tooltip, false);
|
|
||||||
return String.join("\n", tooltip);
|
|
||||||
} catch (Throwable ignored) {}
|
|
||||||
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void updateOrdering(List<ItemStack> items) {
|
|
||||||
final Map<ItemStack, Integer> newOrdering = new HashMap<>();
|
|
||||||
|
|
||||||
if (!CollapsibleItems.isEmpty()) {
|
|
||||||
final HashMap<Integer, Integer> groups = new HashMap<>();
|
|
||||||
int orderIndex = 0;
|
|
||||||
|
|
||||||
for (ItemStack stack : items) {
|
|
||||||
final int groupIndex = CollapsibleItems.getGroupIndex(stack);
|
|
||||||
|
|
||||||
if (groupIndex == -1) {
|
|
||||||
newOrdering.put(stack, orderIndex++);
|
|
||||||
} else {
|
|
||||||
|
|
||||||
if (!groups.containsKey(groupIndex)) {
|
|
||||||
groups.put(groupIndex, orderIndex++);
|
|
||||||
}
|
|
||||||
|
|
||||||
newOrdering.put(stack, groups.get(groupIndex));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
int orderIndex = 0;
|
|
||||||
|
|
||||||
for (ItemStack stack : items) {
|
|
||||||
newOrdering.put(stack, orderIndex++);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ordering = newOrdering;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<ItemStack> getPermutations(Item item) {
|
|
||||||
final List<ItemStack> permutations = new LinkedList<>(ItemInfo.itemOverrides.get(item));
|
|
||||||
|
|
||||||
if (permutations.isEmpty()) {
|
|
||||||
item.getSubItems(item, null, permutations);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (permutations.isEmpty()) {
|
|
||||||
damageSearch(item, permutations);
|
|
||||||
}
|
|
||||||
|
|
||||||
permutations.addAll(ItemInfo.itemVariants.get(item));
|
|
||||||
|
|
||||||
return permutations.stream()
|
|
||||||
.filter(
|
|
||||||
stack -> stack.getItem() != null && stack.getItem().delegate.name() != null
|
|
||||||
&& !ItemInfo.isHidden(stack))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void runChecked(ItemStack stack, Runnable action, String reason) {
|
|
||||||
int hashOld = 0;
|
|
||||||
if (stack.hasTagCompound()) {
|
|
||||||
hashOld = stack.stackTagCompound.hashCode();
|
|
||||||
}
|
|
||||||
|
|
||||||
action.run();
|
|
||||||
|
|
||||||
if (stack.hasTagCompound() && hashOld != stack.stackTagCompound.hashCode()) {
|
|
||||||
FMLLog.warning(
|
|
||||||
"NEI: Forced tag update with reason (" + reason + ") for " + stack + "(" + stack.getItem() + ")");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void forceTagCompoundInitialization(ItemStack stack) {
|
|
||||||
Item item = stack.getItem();
|
|
||||||
if (item == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (item instanceof IFluidContainerItem fluidItem) {
|
|
||||||
runChecked(stack, () -> fluidItem.getFluid(stack), "getFluid");
|
|
||||||
}
|
|
||||||
runChecked(stack, () -> item.isDamaged(stack), "isDamaged");
|
|
||||||
runChecked(stack, () -> item.getDamage(stack), "getDamage");
|
|
||||||
runChecked(stack, () -> item.showDurabilityBar(stack), "showDurabilityBar");
|
|
||||||
runChecked(stack, () -> item.getAttributeModifiers(stack), "getAttributeModifiers");
|
|
||||||
runChecked(stack, () -> item.getDurabilityForDisplay(stack), "getDurabilityForDisplay");
|
|
||||||
runChecked(stack, () -> item.getItemStackLimit(stack), "getItemStackLimit");
|
|
||||||
runChecked(stack, () -> item.getToolClasses(stack), "getToolClasses");
|
|
||||||
runChecked(stack, () -> item.getUnlocalizedNameInefficiently(stack), "getUnlocalizedNameInefficiently");
|
|
||||||
runChecked(stack, () -> item.hasEffect(stack), "hasEffect");
|
|
||||||
runChecked(stack, () -> item.getDigSpeed(stack, Blocks.stone, 0), "getDigSpeed");
|
|
||||||
|
|
||||||
/*
|
|
||||||
* unused... for now runChecked(stack, () -> GameRegistry.getFuelValue(stack), "getFuelValue");
|
|
||||||
* runChecked(stack, () -> item.getUnlocalizedName(stack), "getUnlocalizedName"); runChecked(stack, () ->
|
|
||||||
* item.doesContainerItemLeaveCraftingGrid(stack), "doesContainerItemLeaveCraftingGrid"); runChecked(stack, ()
|
|
||||||
* -> item.getItemUseAction(stack), "getItemUseAction"); runChecked(stack, () ->
|
|
||||||
* item.getMaxItemUseDuration(stack), "getMaxItemUseDuration"); runChecked(stack, () ->
|
|
||||||
* item.getPotionEffect(stack), "getPotionEffect"); runChecked(stack, () -> item.isPotionIngredient(stack),
|
|
||||||
* "isPotionIngredient"); runChecked(stack, () -> item.getRarity(stack), "getRarity"); runChecked(stack, () ->
|
|
||||||
* item.hasCustomEntity(stack), "hasCustomEntity"); runChecked(stack, () -> item.getSmeltingExperience(stack),
|
|
||||||
* "getSmeltingExperience"); runChecked(stack, () -> item.getMaxDamage(stack), "getMaxDamage");
|
|
||||||
* runChecked(stack, () -> item.getDamage(stack), "getDamage"); runChecked(stack, stack::isItemDamaged,
|
|
||||||
* "isItemDamaged"); runChecked(stack, () -> item.hasEffect(stack, 0), "hasEffect"); runChecked(stack, () ->
|
|
||||||
* item.getItemEnchantability(stack), "getItemEnchantability"); runChecked(stack, () ->
|
|
||||||
* item.isBeaconPayment(stack), "isBeaconPayment"); runChecked(stack, () -> item.getDamage(stack), "getDamage");
|
|
||||||
* runChecked(stack, () -> item.getDamage(stack), "getDamage"); runChecked(stack, () -> item.getDamage(stack),
|
|
||||||
* "getDamage");
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
private static List<ItemStack> gatherItems(ThreadOperationTimer timer) {
|
|
||||||
ItemSorter.instance.ordering.clear();
|
|
||||||
|
|
||||||
List<ItemStack> items = new ArrayList<>();
|
|
||||||
ListMultimap<Item, ItemStack> itemMap = ArrayListMultimap.create();
|
|
||||||
ItemStackSet unique = new ItemStackSet();
|
|
||||||
|
|
||||||
final List<Item> registryItems = new ArrayList<>();
|
|
||||||
for (Item item : (Iterable<Item>) Item.itemRegistry) registryItems.add(item);
|
|
||||||
|
|
||||||
registryItems.parallelStream().forEach(item -> {
|
|
||||||
if (item == null || item.delegate.name() == null || erroredItems.contains(item)) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
timer.reset(item);
|
|
||||||
List<ItemStack> permutations = getPermutations(item);
|
|
||||||
timer.reset();
|
|
||||||
|
|
||||||
synchronized (itemMap) {
|
|
||||||
itemMap.putAll(item, permutations);
|
|
||||||
}
|
|
||||||
} catch (Throwable t) {
|
|
||||||
NEIServerConfig.logger.error(
|
|
||||||
"Removing item: {} from list.\n{}: {}",
|
|
||||||
item,
|
|
||||||
t.getMessage(),
|
|
||||||
Throwables.getStackTraceAsString(t));
|
|
||||||
erroredItems.add(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
int index = 0;
|
|
||||||
for (Item item : (Iterable<Item>) Item.itemRegistry) {
|
|
||||||
for (ItemStack stack : itemMap.get(item)) {
|
|
||||||
ItemSorter.instance.ordering.put(stack, index++);
|
|
||||||
|
|
||||||
if (!unique.contains(stack)) {
|
|
||||||
unique.add(stack);
|
|
||||||
items.add(stack);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ItemList.itemMap = itemMap;
|
|
||||||
|
|
||||||
return items;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void buildItemCaches(List<ItemStack> items) {
|
|
||||||
SearchField.searchParser.clearCache();
|
|
||||||
TooltipFilter.clearCache();
|
|
||||||
InformationHandler.clearCache();
|
|
||||||
|
|
||||||
items.parallelStream().forEach(stack -> {
|
|
||||||
try {
|
|
||||||
forceTagCompoundInitialization(stack);
|
|
||||||
InformationHandler.populateStacks(stack);
|
|
||||||
} catch (Throwable t) {
|
|
||||||
NEIServerConfig.logger.error(
|
|
||||||
"Failed to build caches for: {}\n{}: {}",
|
|
||||||
stack,
|
|
||||||
t.getMessage(),
|
|
||||||
Throwables.getStackTraceAsString(t));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void indexCollapsibleItems(List<ItemStack> items) {
|
|
||||||
CollapsibleItems.clearCache();
|
|
||||||
items.parallelStream().forEach(CollapsibleItems::putItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final RestartableTask loadItems = new RestartableTask("NEI Item Loading") {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() {
|
|
||||||
if (!NEIClientConfig.isEnabled() || NEIClientUtils.mc().thePlayer == null) return;
|
|
||||||
|
|
||||||
final ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
|
|
||||||
LayoutManager.itemsLoaded = true;
|
|
||||||
ItemList.loadFinished = false;
|
|
||||||
warmTooltips.stop();
|
|
||||||
|
|
||||||
List<ItemStack> items = gatherItems(timer);
|
|
||||||
|
|
||||||
if (interrupted()) return;
|
|
||||||
buildItemCaches(items);
|
|
||||||
indexCollapsibleItems(items);
|
|
||||||
|
|
||||||
if (interrupted()) return;
|
|
||||||
ItemSorter.sort(items);
|
|
||||||
|
|
||||||
if (interrupted()) return;
|
|
||||||
ItemList.items = items;
|
|
||||||
for (ItemsLoadedCallback callback : ItemList.loadCallbacks) callback.itemsLoaded();
|
|
||||||
|
|
||||||
if (interrupted()) return;
|
|
||||||
updateOrdering(ItemList.items);
|
|
||||||
|
|
||||||
ItemList.loadFinished = true;
|
|
||||||
|
|
||||||
RepairRecipeHandler.findRepairRecipesOnceParallel();
|
|
||||||
RecipeHandlerRef.clearCache();
|
|
||||||
FavoriteRecipes.reload();
|
|
||||||
SubsetWidget.updateHiddenItems();
|
|
||||||
updateFilter.restart();
|
|
||||||
warmTooltips.restart();
|
|
||||||
loadBookmarks.restart();
|
|
||||||
loadHistory.restart();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
public static final RestartableTask warmTooltips = new RestartableTask("NEI Tooltip Caching") {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() {
|
|
||||||
if (!ItemList.loadFinished) return;
|
|
||||||
// Use the common pool, not ItemList.forkJoinPool, so it does not queue behind updateFilter.
|
|
||||||
ItemList.items.parallelStream().forEach(stack -> {
|
|
||||||
if (interrupted()) return;
|
|
||||||
try {
|
|
||||||
TooltipFilter.getSearchTooltip(stack);
|
|
||||||
} catch (Throwable ignored) {}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
public static final RestartableTask loadBookmarks = new RestartableTask("NEI Bookmark Loading") {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() {
|
|
||||||
ItemPanels.bookmarkPanel.load();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
public static final RestartableTask loadHistory = new RestartableTask("NEI History Loading") {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() {
|
|
||||||
ItemPanels.itemPanel.historyPanel.load();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
public static final RestartableTask refreshItems = new RestartableTask("NEI Item Reordering") {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() {
|
|
||||||
if (!ItemList.loadFinished) return;
|
|
||||||
|
|
||||||
final List<ItemStack> items = new ArrayList<>(ItemList.items);
|
|
||||||
|
|
||||||
indexCollapsibleItems(items);
|
|
||||||
|
|
||||||
if (interrupted()) return;
|
|
||||||
ItemSorter.sort(items);
|
|
||||||
|
|
||||||
if (interrupted()) return;
|
|
||||||
ItemList.items = items;
|
|
||||||
updateOrdering(ItemList.items);
|
|
||||||
|
|
||||||
FavoriteRecipes.reload();
|
|
||||||
SubsetWidget.updateHiddenItems();
|
|
||||||
updateFilter.restart();
|
|
||||||
loadBookmarks.restart();
|
|
||||||
loadHistory.restart();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering") {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() {
|
|
||||||
|
|
||||||
if (!ItemList.loadFinished) return;
|
|
||||||
ItemFilter filter = ItemList.getItemListFilter();
|
|
||||||
ArrayList<ItemStack> filtered;
|
|
||||||
|
|
||||||
try {
|
|
||||||
filtered = ItemList.forkJoinPool.submit(
|
|
||||||
() -> ItemList.items.parallelStream().filter(filter::matches)
|
|
||||||
.collect(Collectors.toCollection(ArrayList::new)))
|
|
||||||
.get();
|
|
||||||
} catch (InterruptedException | ExecutionException e) {
|
|
||||||
filtered = new ArrayList<>();
|
|
||||||
e.printStackTrace();
|
|
||||||
stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (interrupted()) return;
|
|
||||||
|
|
||||||
filtered.sort(Comparator.comparingInt(ordering::get));
|
|
||||||
|
|
||||||
if (interrupted()) return;
|
|
||||||
|
|
||||||
ItemPanel.updateItemList(filtered);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,11 +1,5 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.lang.reflect.Modifier;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.EntityList;
|
import net.minecraft.entity.EntityList;
|
||||||
@@ -17,313 +11,131 @@ import net.minecraft.init.Blocks;
|
|||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraft.tileentity.TileEntityMobSpawner;
|
import net.minecraft.tileentity.TileEntityMobSpawner;
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.client.MinecraftForgeClient;
|
import net.minecraftforge.client.MinecraftForgeClient;
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import java.util.HashMap;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
public class ItemMobSpawner extends ItemBlock {
|
public class ItemMobSpawner extends ItemBlock
|
||||||
|
{
|
||||||
|
private static Map<Integer, EntityLiving> entityHashMap;
|
||||||
|
private static Map<Integer, String> IDtoNameMap;
|
||||||
|
public static int idPig;
|
||||||
|
private static boolean loaded;
|
||||||
|
|
||||||
private static final Map<Integer, EntityLiving> entityHashMap = new ConcurrentHashMap<>();
|
public ItemMobSpawner() {
|
||||||
private static final Map<Integer, String> IDtoNameMap = new ConcurrentHashMap<>();
|
super(Blocks.mob_spawner);
|
||||||
private static final Map<Class<? extends Entity>, String> ENTITY_CLASS_TO_NAME_CACHE = new ConcurrentHashMap<>();
|
|
||||||
|
|
||||||
public static int idPig = 90;
|
hasSubtypes = true;
|
||||||
private static volatile boolean loaded = false;
|
MinecraftForgeClient.registerItemRenderer(this, new SpawnerRenderer());
|
||||||
|
|
||||||
// For asm
|
entityHashMap = new HashMap<>();
|
||||||
|
IDtoNameMap = new HashMap<>();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* These are ASM translated from BlockMobSpawner
|
||||||
|
*/
|
||||||
public static int placedX;
|
public static int placedX;
|
||||||
public static int placedY;
|
public static int placedY;
|
||||||
public static int placedZ;
|
public static int placedZ;
|
||||||
|
|
||||||
public static void setLastPlacedPosition(int x, int y, int z) {
|
|
||||||
placedX = x;
|
|
||||||
placedY = y;
|
|
||||||
placedZ = z;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int[] getLastPlacedPosition() {
|
|
||||||
return new int[] { placedX, placedY, placedZ };
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemMobSpawner() {
|
|
||||||
super(Blocks.mob_spawner);
|
|
||||||
hasSubtypes = true;
|
|
||||||
MinecraftForgeClient.registerItemRenderer(this, new SpawnerRenderer());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIconFromDamage(int meta) {
|
public IIcon getIconFromDamage(int par1) {
|
||||||
return Blocks.mob_spawner.getBlockTextureFromSide(0);
|
return Blocks.mob_spawner.getBlockTextureFromSide(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int par7, float par8, float par9, float par10) {
|
||||||
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int side,
|
if (super.onItemUse(itemstack, entityplayer, world, x, y, z, par7, par8, par9, par10) && world.isRemote) {
|
||||||
float hitX, float hitY, float hitZ) {
|
TileEntityMobSpawner tileentitymobspawner = (TileEntityMobSpawner) world.getTileEntity(placedX, placedY, placedZ);
|
||||||
int targetX = x;
|
if (tileentitymobspawner != null) {
|
||||||
int targetY = y;
|
setDefaultTag(itemstack);
|
||||||
int targetZ = z;
|
String mobtype = IDtoNameMap.get(itemstack.getItemDamage());
|
||||||
|
if (mobtype != null) {
|
||||||
if (!world.getBlock(x, y, z).isReplaceable(world, x, y, z)) {
|
NEICPH.sendMobSpawnerID(placedX, placedY, placedZ, mobtype);
|
||||||
ForgeDirection direction = ForgeDirection.getOrientation(side);
|
tileentitymobspawner.func_145881_a().setEntityName(mobtype);
|
||||||
targetX += direction.offsetX;
|
|
||||||
targetY += direction.offsetY;
|
|
||||||
targetZ += direction.offsetZ;
|
|
||||||
}
|
|
||||||
|
|
||||||
placedX = targetX;
|
|
||||||
placedY = targetY;
|
|
||||||
placedZ = targetZ;
|
|
||||||
|
|
||||||
String mobType = getMobTypeFromItemStack(itemstack);
|
|
||||||
|
|
||||||
boolean placed = super.onItemUse(itemstack, entityplayer, world, x, y, z, side, hitX, hitY, hitZ);
|
|
||||||
|
|
||||||
if (placed) {
|
|
||||||
TileEntity tileEntity = world.getTileEntity(targetX, targetY, targetZ);
|
|
||||||
|
|
||||||
if (tileEntity instanceof TileEntityMobSpawner spawner && mobType != null) {
|
|
||||||
spawner.func_145881_a().setEntityName(mobType);
|
|
||||||
|
|
||||||
if (!world.isRemote) {
|
|
||||||
world.markBlockForUpdate(targetX, targetY, targetZ);
|
|
||||||
NEICPH.sendMobSpawnerID(targetX, targetY, targetZ, mobType);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getMobTypeFromItemStack(ItemStack stack) {
|
|
||||||
int meta = getValidMetaData(stack);
|
|
||||||
return IDtoNameMap.get(meta);
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getValidMetaData(ItemStack stack) {
|
|
||||||
int meta = stack.getItemDamage();
|
|
||||||
if (meta == 0 || !IDtoNameMap.containsKey(meta)) {
|
|
||||||
return idPig;
|
|
||||||
}
|
|
||||||
return meta;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
@Override
|
@Override
|
||||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> tooltip, boolean advanced) {
|
public void addInformation(ItemStack itemstack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
|
||||||
int meta = getValidMetaData(itemstack);
|
setDefaultTag(itemstack);
|
||||||
EntityLiving entity = getEntity(meta);
|
int meta = itemstack.getItemDamage();
|
||||||
String mobName = IDtoNameMap.get(meta);
|
if (meta == 0) {
|
||||||
|
meta = idPig;
|
||||||
if (entity != null && mobName != null) {
|
|
||||||
EnumChatFormatting color = (entity instanceof IMob) ? EnumChatFormatting.DARK_RED
|
|
||||||
: EnumChatFormatting.DARK_AQUA;
|
|
||||||
tooltip.add(color + mobName);
|
|
||||||
}
|
}
|
||||||
|
Entity e = getEntity(meta);
|
||||||
|
list.add("\u00A7" + (e instanceof IMob ? "4" : "3") + IDtoNameMap.get(meta));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static EntityLiving getEntity(int id) {
|
public static EntityLiving getEntity(int ID) {
|
||||||
EntityLiving cached = entityHashMap.get(id);
|
EntityLiving e = entityHashMap.get(ID);
|
||||||
if (cached != null) {
|
if (e == null) {
|
||||||
return cached;
|
World world = NEIClientUtils.mc().theWorld;
|
||||||
}
|
loadSpawners(world);
|
||||||
|
Class<?> clazz = (Class<?>) EntityList.IDtoClassMapping.get(ID);
|
||||||
loadSpawners();
|
|
||||||
|
|
||||||
Class<?> entityClass = EntityList.IDtoClassMapping.get(id);
|
|
||||||
World world = NEIClientUtils.mc() != null ? NEIClientUtils.mc().theWorld : null;
|
|
||||||
|
|
||||||
if (isInvalidEntityClass(entityClass)) {
|
|
||||||
return cacheFallback(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
EntityLiving entity = createEntityInstance(entityClass, world, id);
|
|
||||||
if (entity != null) {
|
|
||||||
entityHashMap.put(id, entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
return entity;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean isInvalidEntityClass(Class<?> entityClass) {
|
|
||||||
if (entityClass == null) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int modifiers = entityClass.getModifiers();
|
|
||||||
if (Modifier.isAbstract(modifiers) || Modifier.isInterface(modifiers)) {
|
|
||||||
NEIClientConfig.logger.warn("Skipping abstract/interface entity class: {}", entityClass.getName());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!EntityLiving.class.isAssignableFrom(entityClass)) {
|
|
||||||
NEIClientConfig.logger.warn("Skipping non-EntityLiving class: {}", entityClass.getName());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
private static EntityLiving createEntityInstance(Class<?> entityClass, World world, int id) {
|
|
||||||
if (entityClass == null || world == null) {
|
|
||||||
NEIClientConfig.logger.debug("World or entity class is null, using fallback for ID: {}", id);
|
|
||||||
return getFallbackEntity(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
Class<? extends EntityLiving> livingClass = (Class<? extends EntityLiving>) entityClass;
|
|
||||||
return livingClass.getConstructor(World.class).newInstance(world);
|
|
||||||
} catch (Throwable t) {
|
|
||||||
logEntityCreationError(entityClass, id, t);
|
|
||||||
return getFallbackEntity(id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void logEntityCreationError(Class<?> entityClass, int id, Throwable t) {
|
|
||||||
String entityName = IDtoNameMap.getOrDefault(id, "unknown");
|
|
||||||
if (entityClass == null) {
|
|
||||||
NEIClientConfig.logger
|
|
||||||
.error("Failed to create entity instance: Class is null for ID {}, Name {}", id, entityName, t);
|
|
||||||
} else {
|
|
||||||
NEIClientConfig.logger.error(
|
|
||||||
"Failed to create instance of entity: Class {}, ID {}, Name {}",
|
|
||||||
entityClass.getName(),
|
|
||||||
id,
|
|
||||||
entityName,
|
|
||||||
t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static EntityLiving cacheFallback(int id) {
|
|
||||||
EntityLiving fallback = getFallbackEntity(id);
|
|
||||||
if (fallback != null) {
|
|
||||||
entityHashMap.put(id, fallback);
|
|
||||||
}
|
|
||||||
return fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static EntityLiving getFallbackEntity(int originalId) {
|
|
||||||
EntityLiving pig = entityHashMap.get(idPig);
|
|
||||||
if (pig == null) {
|
|
||||||
World world = NEIClientUtils.mc() != null ? NEIClientUtils.mc().theWorld : null;
|
|
||||||
|
|
||||||
if (world != null) {
|
|
||||||
try {
|
|
||||||
pig = new EntityPig(world);
|
|
||||||
entityHashMap.put(idPig, pig);
|
|
||||||
NEIClientConfig.logger.debug("Created fallback pig entity for ID: {}", originalId);
|
|
||||||
} catch (Exception e) {
|
|
||||||
NEIClientConfig.logger
|
|
||||||
.error("Failed to create fallback pig entity for original ID: {}", originalId, e);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
NEIClientConfig.logger.warn("World is null, cannot create fallback entity for ID: {}", originalId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return pig;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void clearEntityReferences() {
|
|
||||||
entityHashMap.clear();
|
|
||||||
NEIClientConfig.logger.debug("Cleared all entity references from cache");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void loadSpawners() {
|
|
||||||
if (loaded) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
synchronized (ItemMobSpawner.class) {
|
|
||||||
try {
|
try {
|
||||||
for (Map.Entry<Class<? extends Entity>, String> entry : EntityList.classToStringMapping.entrySet()) {
|
e = (EntityLiving) clazz.getConstructor(new Class[]{World.class}).newInstance(world);
|
||||||
|
} catch (Throwable t) {
|
||||||
Class<? extends Entity> clazz = entry.getKey();
|
if(clazz == null)
|
||||||
String name = entry.getValue();
|
NEIClientConfig.logger.error("Null class for entity ("+ID+", "+IDtoNameMap.get(ID));
|
||||||
|
else
|
||||||
if (shouldRegisterEntity(clazz, name)) {
|
NEIClientConfig.logger.error("Error creating instance of entity: " + clazz.getName(), t);
|
||||||
Integer id = (Integer) EntityList.classToIDMapping.get(clazz);
|
e = getEntity(idPig);
|
||||||
if (id != null) {
|
|
||||||
IDtoNameMap.put(id, name);
|
|
||||||
ENTITY_CLASS_TO_NAME_CACHE.put(clazz, name);
|
|
||||||
|
|
||||||
if ("Pig".equals(name)) {
|
|
||||||
idPig = id;
|
|
||||||
NEIClientConfig.logger.debug("Set pig entity ID to: {}", id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
loaded = true;
|
|
||||||
NEIClientConfig.logger.info("Loaded {} spawner entity mappings", IDtoNameMap.size());
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
NEIClientConfig.logger.error("Error loading spawners from entity list", e);
|
|
||||||
}
|
}
|
||||||
|
entityHashMap.put(ID, e);
|
||||||
}
|
}
|
||||||
|
return e;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean shouldRegisterEntity(Class<? extends Entity> clazz, String name) {
|
private void setDefaultTag(ItemStack itemstack) {
|
||||||
if (clazz == null || name == null || name.trim().isEmpty()) {
|
if (!IDtoNameMap.containsKey(itemstack.getItemDamage()))
|
||||||
return false;
|
itemstack.setItemDamage(idPig);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void loadSpawners(World world) {
|
||||||
|
if (loaded) return;
|
||||||
|
loaded = true;
|
||||||
|
HashMap<Class<Entity>, String> classToStringMapping = (HashMap<Class<Entity>, String>) EntityList.classToStringMapping;
|
||||||
|
HashMap<Class<Entity>, Integer> classToIDMapping = (HashMap<Class<Entity>, Integer>) EntityList.classToIDMapping;
|
||||||
|
for (Class<Entity> eclass : classToStringMapping.keySet()) {
|
||||||
|
if (!EntityLiving.class.isAssignableFrom(eclass))
|
||||||
|
continue;
|
||||||
|
try {
|
||||||
|
EntityLiving entityliving = (EntityLiving) eclass.getConstructor(new Class[]{World.class}).newInstance(world);
|
||||||
|
entityliving.isChild();
|
||||||
|
|
||||||
|
int id = classToIDMapping.get(eclass);
|
||||||
|
String name = classToStringMapping.get(eclass);
|
||||||
|
|
||||||
|
if (name.equals("EnderDragon"))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
IDtoNameMap.put(id, name);
|
||||||
|
|
||||||
|
if (name.equals("Pig"))
|
||||||
|
idPig = id;
|
||||||
|
} catch (Throwable ignored) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!EntityLiving.class.isAssignableFrom(clazz)) {
|
IDtoNameMap.entrySet().removeIf(e -> getEntity(e.getKey()).getClass() == EntityPig.class && !e.getValue().equals("Pig"));
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ("EnderDragon".equals(name) || "Giant".equals(name)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
|
public void getSubItems(Item item, CreativeTabs tab, List list) {
|
||||||
if (!NEIClientConfig.hasSMPCounterPart()) {
|
if(!NEIClientConfig.hasSMPCounterPart())
|
||||||
list.add(new ItemStack(item));
|
list.add(new ItemStack(item));
|
||||||
} else {
|
else
|
||||||
loadSpawners();
|
for(int i : IDtoNameMap.keySet())
|
||||||
for (int id : IDtoNameMap.keySet()) {
|
list.add(new ItemStack(item, 1, i));
|
||||||
ItemStack stack = new ItemStack(item, 1, id);
|
|
||||||
list.add(stack);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getEntityNameForMeta(int meta) {
|
|
||||||
loadSpawners();
|
|
||||||
return IDtoNameMap.getOrDefault(meta, IDtoNameMap.getOrDefault(idPig, "Pig"));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isValidEntityMeta(int meta) {
|
|
||||||
loadSpawners();
|
|
||||||
return IDtoNameMap.containsKey(meta) || meta == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Map<Integer, String> getRegisteredSpawnerEntities() {
|
|
||||||
loadSpawners();
|
|
||||||
return Collections.unmodifiableMap(IDtoNameMap);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isEntityValidForSpawner(Class<? extends Entity> entityClass) {
|
|
||||||
if (entityClass == null) return false;
|
|
||||||
|
|
||||||
String name = ENTITY_CLASS_TO_NAME_CACHE.get(entityClass);
|
|
||||||
if (name == null) {
|
|
||||||
name = EntityList.classToStringMapping.get(entityClass);
|
|
||||||
}
|
|
||||||
|
|
||||||
return name != null && shouldRegisterEntity(entityClass, name);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,277 +1,489 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
import java.util.List;
|
import codechicken.nei.api.GuiInfo;
|
||||||
import java.util.Map;
|
import codechicken.nei.api.INEIGuiHandler;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.recipe.GuiCraftingRecipe;
|
||||||
|
import codechicken.nei.recipe.GuiRecipe;
|
||||||
|
import codechicken.nei.recipe.GuiUsageRecipe;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
import java.util.ArrayList;
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.ItemsPanelGrid.ItemsPanelGridSlot;
|
|
||||||
import codechicken.nei.util.NEIMouseUtils;
|
|
||||||
|
|
||||||
public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
|
import static codechicken.lib.gui.GuiDraw.drawRect;
|
||||||
|
import static codechicken.nei.NEIClientConfig.canPerformAction;
|
||||||
|
|
||||||
|
public class ItemPanel extends Widget {
|
||||||
/**
|
/**
|
||||||
* Backwards compat :-/
|
* Backwards compat :-/
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unused")
|
|
||||||
@Deprecated
|
|
||||||
private int itemsPerPage = 0;
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static ArrayList<ItemStack> items = new ArrayList<>();
|
public static ArrayList<ItemStack> items = new ArrayList<>();
|
||||||
|
|
||||||
@Deprecated
|
/**
|
||||||
|
* Should not be externally modified, use updateItemList
|
||||||
|
*/
|
||||||
public ArrayList<ItemStack> realItems = new ArrayList<>();
|
public ArrayList<ItemStack> realItems = new ArrayList<>();
|
||||||
|
/**
|
||||||
|
* Swapped into visible items on update
|
||||||
|
*/
|
||||||
|
protected ArrayList<ItemStack> _items = realItems;
|
||||||
|
|
||||||
public ItemStack getStackMouseOver(int mousex, int mousey) {
|
public ArrayList<ItemStack> getItems() {
|
||||||
// *looks angrily at AppleCore*
|
return realItems;
|
||||||
return super.getStackMouseOver(mousex, mousey);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemHistoryPanel historyPanel = new ItemHistoryPanel();
|
|
||||||
public ItemCraftablesPanel craftablesPanel = new ItemCraftablesPanel();
|
|
||||||
protected Button toggleGroups;
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static class ItemPanelSlot extends ItemsPanelGridSlot {
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public ItemPanelSlot(int idx, ItemStack item) {
|
|
||||||
this(idx, 0, item);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public ItemPanelSlot(int idx) {
|
|
||||||
this(idx, 0, ItemPanels.itemPanel.getGrid().getItem(idx));
|
|
||||||
}
|
|
||||||
|
|
||||||
private ItemPanelSlot(int slotIndex, int itemIndex, ItemStack item) {
|
|
||||||
super(slotIndex, itemIndex, item);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static ItemPanelSlot of(ItemsPanelGridSlot slot) {
|
|
||||||
|
|
||||||
if (slot != null) {
|
|
||||||
ItemPanelSlot customSlot = new ItemPanelSlot(slot.slotIndex, slot.itemIndex, slot.item);
|
|
||||||
customSlot.groupIndex = slot.groupIndex;
|
|
||||||
customSlot.displayName = slot.displayName;
|
|
||||||
customSlot.bgItemStack = slot.bgItemStack;
|
|
||||||
customSlot.groupSize = slot.groupSize;
|
|
||||||
customSlot.extended = slot.extended;
|
|
||||||
customSlot.bgColor = slot.bgColor;
|
|
||||||
return customSlot;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemPanel() {
|
|
||||||
this.grid = new ItemsPanelGrid();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void updateItemList(ArrayList<ItemStack> newItems) {
|
public static void updateItemList(ArrayList<ItemStack> newItems) {
|
||||||
ItemPanels.itemPanel.getGrid().setItems(newItems);
|
ItemPanels.itemPanel._items = newItems;
|
||||||
ItemPanels.itemPanel.realItems = newItems;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public class ItemPanelSlot
|
||||||
public void init() {
|
{
|
||||||
super.init();
|
public ItemStack item;
|
||||||
|
public int slotIndex;
|
||||||
|
|
||||||
toggleGroups = new Button("G") {
|
public ItemPanelSlot(int index) {
|
||||||
|
item = realItems.get(index);
|
||||||
|
slotIndex = index;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemStack draggedStack;
|
||||||
|
public int mouseDownSlot = -1;
|
||||||
|
|
||||||
|
public Button prev;
|
||||||
|
public Button next;
|
||||||
|
public Label pageLabel;
|
||||||
|
|
||||||
|
|
||||||
|
private int marginLeft;
|
||||||
|
private int marginTop;
|
||||||
|
private int rows;
|
||||||
|
private int columns;
|
||||||
|
|
||||||
|
private boolean[] validSlotMap;
|
||||||
|
private int firstIndex;
|
||||||
|
private int itemsPerPage;
|
||||||
|
|
||||||
|
private int page;
|
||||||
|
private int numPages;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public void init() {
|
||||||
|
pageLabel = new Label("(0/0)", true);
|
||||||
|
|
||||||
|
prev = new Button("Prev")
|
||||||
|
{
|
||||||
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
|
if (!rightclick) {
|
||||||
|
scroll(-1);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getRenderLabel() {
|
public String getRenderLabel() {
|
||||||
return NEIClientUtils.translate("itempanel.collapsed.button");
|
return "<";
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getButtonTip() {
|
|
||||||
return NEIClientUtils.translate("itempanel.collapsed.button.tip");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
|
||||||
CollapsibleItems.toggleGroups(rightclick ? false : null);
|
|
||||||
ItemList.updateFilter.restart();
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
next = new Button("Next")
|
||||||
|
{
|
||||||
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
|
if (!rightclick) {
|
||||||
|
scroll(1);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getRenderLabel() {
|
||||||
|
return ">";
|
||||||
|
}
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public int getX(GuiContainer gui) {
|
||||||
public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
|
return (gui.xSize + gui.width) / 2 + 3;
|
||||||
// use ItemPanelSlot for Backwards compat
|
}
|
||||||
return ItemPanelSlot.of(this.grid.getSlotMouseOver(mousex, mousey));
|
|
||||||
|
public int getMarginLeft() {
|
||||||
|
return x + (w % 18) / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getMarginTop() {
|
||||||
|
return y + (h % 18) / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getButtonTop() {
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getNextX(GuiContainer gui) {
|
||||||
|
return gui.width - prev.w - 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getPrevX(GuiContainer gui) {
|
||||||
|
return (gui.xSize + gui.width) / 2 + 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getPageX(GuiContainer gui) {
|
||||||
|
return gui.guiLeft * 3 / 2 + gui.xSize + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getHeight(GuiContainer gui) {
|
||||||
|
return gui.height - 15 - y;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getWidth(GuiContainer gui) {
|
||||||
|
return LayoutManager.getSideWidth(gui) - x;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLabelText() {
|
public String getLabelText() {
|
||||||
return String.format("%d/%d", getPage(), Math.max(1, getNumPages()));
|
return pageLabel.text = "(" + getPage() + "/" + getNumPages() + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
protected void setItems() {
|
||||||
public Rectangle4i calculateBounds(GuiContainer gui) {
|
realItems = _items;
|
||||||
final int maxWidth = (gui.width - 176) / 2 - PADDING * 2;
|
|
||||||
final int maxHeight = gui.height - PADDING * 2;
|
|
||||||
final int freeSpace = (gui.width - gui.xSize) / 2 - PADDING * 2;
|
|
||||||
|
|
||||||
final int paddingLeft = (int) Math
|
// Backwards compat
|
||||||
.ceil(maxWidth * NEIClientConfig.getSetting("world.panels.items.left").getIntValue() / 100000.0);
|
ItemPanels.itemPanel._items = _items;
|
||||||
final int paddingTop = (int) Math
|
|
||||||
.ceil(maxHeight * NEIClientConfig.getSetting("world.panels.items.top").getIntValue() / 100000.0);
|
|
||||||
final int paddingRight = (int) Math
|
|
||||||
.ceil(maxWidth * NEIClientConfig.getSetting("world.panels.items.right").getIntValue() / 100000.0);
|
|
||||||
final int paddingBottom = (int) Math
|
|
||||||
.ceil(maxHeight * NEIClientConfig.getSetting("world.panels.items.bottom").getIntValue() / 100000.0);
|
|
||||||
|
|
||||||
final int width = Math.max(
|
|
||||||
ItemsGrid.SLOT_SIZE,
|
|
||||||
snapDownToMultiple(
|
|
||||||
Math.min(freeSpace - paddingRight, maxWidth - paddingLeft - paddingRight),
|
|
||||||
ItemsGrid.SLOT_SIZE));
|
|
||||||
final int height = Math.max(ItemsGrid.SLOT_SIZE, maxHeight - paddingTop - paddingBottom);
|
|
||||||
|
|
||||||
return new Rectangle4i(gui.width - width - PADDING - paddingRight, paddingTop + PADDING, width, height);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected int resizeHeader(GuiContainer gui) {
|
|
||||||
int marginTop = super.resizeHeader(gui);
|
|
||||||
|
|
||||||
toggleGroups.w = pageNext.w;
|
|
||||||
toggleGroups.h = pageNext.h;
|
|
||||||
toggleGroups.y = pageNext.y;
|
|
||||||
toggleGroups.x = pageNext.x - toggleGroups.w - 2;
|
|
||||||
|
|
||||||
return marginTop;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int resizeFooter(GuiContainer gui) {
|
|
||||||
int footerY = y + h;
|
|
||||||
int footerHeight = 0;
|
|
||||||
|
|
||||||
if (grid.getPerPage() == 0) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered()) {
|
|
||||||
footerY = LayoutManager.quantity.y;
|
|
||||||
footerHeight = LayoutManager.quantity.h + PanelWidget.PADDING;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.showHistoryPanelWidget()) {
|
|
||||||
historyPanel.x = x;
|
|
||||||
|
|
||||||
if (historyPanel.setPanelWidth(w) != 0) {
|
|
||||||
footerY = historyPanel.y = footerY - historyPanel.h;
|
|
||||||
footerHeight += historyPanel.h;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.showCraftablesPanelWidget()) {
|
|
||||||
craftablesPanel.x = x;
|
|
||||||
|
|
||||||
if (craftablesPanel.setPanelWidth(w) != 0) {
|
|
||||||
footerY = craftablesPanel.y = footerY - craftablesPanel.h;
|
|
||||||
footerHeight += craftablesPanel.h;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return footerHeight;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setVisible() {
|
|
||||||
super.setVisible();
|
|
||||||
|
|
||||||
if (grid.getPerPage() > 0) {
|
|
||||||
|
|
||||||
if (!CollapsibleItems.isEmpty() && !grid.isEmpty()) {
|
|
||||||
LayoutManager.addWidget(toggleGroups);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.showCraftablesPanelWidget()) {
|
|
||||||
LayoutManager.addWidget(craftablesPanel);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.showHistoryPanelWidget()) {
|
|
||||||
LayoutManager.addWidget(historyPanel);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void resize(GuiContainer gui) {
|
public void resize(GuiContainer gui) {
|
||||||
super.resize(gui);
|
setItems();
|
||||||
this.historyPanel.resize(gui);
|
final int buttonHeight = 16;
|
||||||
this.craftablesPanel.resize(gui);
|
final int buttonWidth = 16;
|
||||||
|
|
||||||
|
prev.x = getPrevX(gui);
|
||||||
|
prev.y = getButtonTop();
|
||||||
|
prev.h = buttonHeight;
|
||||||
|
prev.w = buttonWidth;
|
||||||
|
|
||||||
|
next.x = getNextX(gui);
|
||||||
|
next.y = getButtonTop();
|
||||||
|
next.h = buttonHeight;
|
||||||
|
next.w = buttonWidth;
|
||||||
|
|
||||||
|
pageLabel.x = getPageX(gui);
|
||||||
|
pageLabel.y = prev.y + 5;
|
||||||
|
pageLabel.text = getLabelText();
|
||||||
|
|
||||||
|
y = prev.h + prev.y;
|
||||||
|
x = getX(gui);
|
||||||
|
w = getWidth(gui);
|
||||||
|
h = getHeight(gui);
|
||||||
|
|
||||||
|
marginLeft = getMarginLeft();
|
||||||
|
marginTop = getMarginTop();
|
||||||
|
columns = w / 18;
|
||||||
|
rows = h / 18;
|
||||||
|
//sometimes width and height can be negative with certain resizing
|
||||||
|
if(rows < 0) rows = 0;
|
||||||
|
if(columns < 0) columns = 0;
|
||||||
|
|
||||||
|
calculatePage();
|
||||||
|
updateValidSlots();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
|
private void calculatePage() {
|
||||||
return ItemQuantityField.prepareStackWithQuantity(itemStack, 0);
|
if (itemsPerPage == 0)
|
||||||
|
numPages = 0;
|
||||||
|
else
|
||||||
|
numPages = (int) Math.ceil((float) realItems.size() / (float) itemsPerPage);
|
||||||
|
|
||||||
|
if (firstIndex >= realItems.size())
|
||||||
|
firstIndex = 0;
|
||||||
|
|
||||||
|
if (numPages == 0)
|
||||||
|
page = 0;
|
||||||
|
else
|
||||||
|
page = firstIndex / itemsPerPage + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setVisible() {
|
||||||
|
LayoutManager.addWidget(prev);
|
||||||
|
LayoutManager.addWidget(next);
|
||||||
|
LayoutManager.addWidget(pageLabel);
|
||||||
|
|
||||||
|
}
|
||||||
|
private void updateValidSlots() {
|
||||||
|
GuiContainer gui = NEIClientUtils.getGuiContainer();
|
||||||
|
validSlotMap = new boolean[rows * columns];
|
||||||
|
itemsPerPage = 0;
|
||||||
|
for (int i = 0; i < validSlotMap.length; i++)
|
||||||
|
if (slotValid(gui, i)) {
|
||||||
|
validSlotMap[i] = true;
|
||||||
|
itemsPerPage++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean slotValid(GuiContainer gui, int i) {
|
||||||
|
Rectangle4i rect = getSlotRect(i);
|
||||||
|
try {
|
||||||
|
GuiInfo.readLock.lock();
|
||||||
|
if(GuiInfo.guiHandlers.stream().anyMatch(handler -> handler.hideItemPanelSlot(gui, rect.x, rect.y, rect.w, rect.h)))
|
||||||
|
return false;
|
||||||
|
} finally {
|
||||||
|
GuiInfo.readLock.unlock();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Rectangle4i getSlotRect(int i) {
|
||||||
|
return getSlotRect(i / columns, i % columns);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Rectangle4i getSlotRect(int row, int column) {
|
||||||
|
return new Rectangle4i(marginLeft + column * 18, marginTop + row * 18, 18, 18);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> handleItemTooltip(ItemStack itemstack, int mousex, int mousey, List<String> currenttip) {
|
public void draw(int mousex, int mousey) {
|
||||||
|
if (itemsPerPage == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
if (!this.grid.forceExpand && !currenttip.isEmpty()) {
|
GuiContainerManager.enableMatrixStackLogging();
|
||||||
final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
int index = firstIndex;
|
||||||
|
for (int i = 0; i < rows * columns && index < realItems.size(); i++) {
|
||||||
|
if (validSlotMap[i]) {
|
||||||
|
Rectangle4i rect = getSlotRect(i);
|
||||||
|
if (rect.contains(mousex, mousey))
|
||||||
|
drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555);//highlight
|
||||||
|
|
||||||
if (hoverSlot != null && hoverSlot.groupIndex >= 0
|
GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, realItems.get(index));
|
||||||
&& NEIClientConfig.getBooleanSetting("inventory.collapsibleItems.customName")
|
|
||||||
&& !hoverSlot.extended
|
index++;
|
||||||
&& !"".equals(hoverSlot.displayName)) {
|
|
||||||
currenttip.clear();
|
|
||||||
currenttip.add(hoverSlot.displayName + GuiDraw.TOOLTIP_LINESPACE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
GuiContainerManager.disableMatrixStackLogging();
|
||||||
|
}
|
||||||
|
|
||||||
return super.handleItemTooltip(itemstack, mousex, mousey, currenttip);
|
@Override
|
||||||
|
public void postDraw(int mousex, int mousey) {
|
||||||
|
if (draggedStack != null) {
|
||||||
|
GuiContainerManager.drawItems.zLevel += 100;
|
||||||
|
GuiContainerManager.drawItem(mousex - 8, mousey - 8, draggedStack);
|
||||||
|
GuiContainerManager.drawItems.zLevel -= 100;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
|
||||||
|
if (mouseDownSlot >= 0 && draggedStack == null && NEIClientUtils.getHeldItem() == null &&
|
||||||
|
NEIClientConfig.hasSMPCounterPart() && !GuiInfo.hasCustomSlots(NEIClientUtils.getGuiContainer())) {
|
||||||
|
ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
|
||||||
|
ItemStack stack = new ItemPanelSlot(mouseDownSlot).item;
|
||||||
|
if (stack != null && (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500)) {
|
||||||
|
int amount = NEIClientConfig.getItemQuantity();
|
||||||
|
if (amount == 0)
|
||||||
|
amount = stack.getMaxStackSize();
|
||||||
|
|
||||||
|
draggedStack = NEIServerUtils.copyStack(stack, amount);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handleClick(int mousex, int mousey, int button) {
|
public boolean handleClick(int mousex, int mousey, int button) {
|
||||||
|
if (handleDraggedClick(mousex, mousey, button))
|
||||||
|
return true;
|
||||||
|
|
||||||
if (button == 0 && !this.grid.forceExpand && NEIClientUtils.altKey()) {
|
if (NEIClientUtils.getHeldItem() != null) {
|
||||||
final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
try {
|
||||||
|
GuiInfo.readLock.lock();
|
||||||
if (hoverSlot != null && hoverSlot.groupIndex >= 0) {
|
if (GuiInfo.guiHandlers.stream().anyMatch(handler -> handler.hideItemPanelSlot(NEIClientUtils.getGuiContainer(), mousex, mousey, 1, 1)))
|
||||||
CollapsibleItems.setExpanded(hoverSlot.groupIndex, !hoverSlot.extended);
|
return false;
|
||||||
this.grid.setItems(this.grid.rawItems);
|
} finally {
|
||||||
NEIClientUtils.playClickSound();
|
GuiInfo.readLock.unlock();
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item"))
|
||||||
|
if (button == 1)
|
||||||
|
NEIClientUtils.decreaseSlotStack(-999);
|
||||||
|
else
|
||||||
|
NEIClientUtils.deleteHeldItem();
|
||||||
|
else
|
||||||
|
NEIClientUtils.dropHeldItem();
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.handleClick(mousex, mousey, button);
|
ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
|
||||||
|
if (hoverSlot != null) {
|
||||||
|
if (button == 2) {
|
||||||
|
ItemStack stack = hoverSlot.item;
|
||||||
|
if (stack != null) {
|
||||||
|
int amount = NEIClientConfig.getItemQuantity();
|
||||||
|
if (amount == 0)
|
||||||
|
amount = stack.getMaxStackSize();
|
||||||
|
|
||||||
|
draggedStack = NEIServerUtils.copyStack(stack, amount);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
mouseDownSlot = hoverSlot.slotIndex;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean handleDraggedClick(int mousex, int mousey, int button) {
|
||||||
|
if (draggedStack == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
GuiContainer gui = NEIClientUtils.getGuiContainer();
|
||||||
|
boolean handled = false;
|
||||||
|
try {
|
||||||
|
GuiInfo.readLock.lock();
|
||||||
|
for (INEIGuiHandler handler : GuiInfo.guiHandlers) {
|
||||||
|
if (handler.handleDragNDrop(gui, mousex, mousey, draggedStack, button)) {
|
||||||
|
handled = true;
|
||||||
|
if (draggedStack.stackSize == 0) {
|
||||||
|
draggedStack = null;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
GuiInfo.readLock.unlock();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (handled)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
Slot overSlot = gui.getSlotAtPosition(mousex, mousey);
|
||||||
|
if (overSlot != null && overSlot.isItemValid(draggedStack)) {
|
||||||
|
if (NEIClientConfig.canCheatItem(draggedStack)) {
|
||||||
|
int contents = overSlot.getHasStack() ? overSlot.getStack().stackSize : 0;
|
||||||
|
int add = button == 0 ? draggedStack.stackSize : 1;
|
||||||
|
if (overSlot.getHasStack() && !NEIServerUtils.areStacksSameType(draggedStack, overSlot.getStack()))
|
||||||
|
contents = 0;
|
||||||
|
int total = Math.min(contents + add, Math.min(overSlot.getSlotStackLimit(), draggedStack.getMaxStackSize()));
|
||||||
|
|
||||||
|
if (total > contents) {
|
||||||
|
NEIClientUtils.setSlotContents(overSlot.slotNumber, NEIServerUtils.copyStack(draggedStack, total), true);
|
||||||
|
NEICPH.sendGiveItem(NEIServerUtils.copyStack(draggedStack, total), false, false);
|
||||||
|
draggedStack.stackSize -= total - contents;
|
||||||
|
}
|
||||||
|
if (draggedStack.stackSize == 0)
|
||||||
|
draggedStack = null;
|
||||||
|
} else {
|
||||||
|
draggedStack = null;
|
||||||
|
}
|
||||||
|
} else if (mousex < gui.guiLeft || mousey < gui.guiTop || mousex >= gui.guiLeft + gui.xSize || mousey >= gui.guiTop + gui.ySize) {
|
||||||
|
draggedStack = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<String, String> handleHotkeys(int mousex, int mousey, Map<String, String> hotkeys) {
|
public boolean handleClickExt(int mousex, int mousey, int button) {
|
||||||
final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
return handleDraggedClick(mousex, mousey, button);
|
||||||
|
}
|
||||||
|
|
||||||
if (!this.grid.forceExpand && hoverSlot != null && hoverSlot.groupIndex >= 0 && hoverSlot.groupSize > 1) {
|
@Override
|
||||||
final String message = hoverSlot.extended ? "itempanel.collapsed.hint.collapse"
|
public void mouseUp(int mousex, int mousey, int button) {
|
||||||
: "itempanel.collapsed.hint.expand";
|
ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
|
||||||
hotkeys.put(
|
if (hoverSlot != null && hoverSlot.slotIndex == mouseDownSlot && draggedStack == null) {
|
||||||
NEIClientUtils.getKeyName(NEIClientUtils.ALT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
|
ItemStack item = hoverSlot.item;
|
||||||
NEIClientUtils.translate(message, hoverSlot.groupSize));
|
if (NEIController.manager.window instanceof GuiRecipe || !NEIClientConfig.canCheatItem(item)) {
|
||||||
|
if (button == 0)
|
||||||
|
GuiCraftingRecipe.openRecipeGui("item", item);
|
||||||
|
else if (button == 1)
|
||||||
|
GuiUsageRecipe.openRecipeGui("item", item);
|
||||||
|
|
||||||
|
draggedStack = null;
|
||||||
|
mouseDownSlot = -1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
NEIClientUtils.cheatItem(item, button, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.handleHotkeys(mousex, mousey, hotkeys);
|
mouseDownSlot = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean containsWithSubpanels(int px, int py) {
|
@Override
|
||||||
return contains(px, py) || NEIClientConfig.showHistoryPanelWidget() && this.historyPanel.contains(px, py)
|
public boolean onMouseWheel(int i, int mousex, int mousey) {
|
||||||
|| NEIClientConfig.showCraftablesPanelWidget() && this.craftablesPanel.contains(px, py);
|
if (!contains(mousex, mousey))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
scroll(-i);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean handleKeyPress(int keyID, char keyChar) {
|
||||||
|
if (keyID == NEIClientConfig.getKeyBinding("gui.next")) {
|
||||||
|
scroll(1);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (keyID == NEIClientConfig.getKeyBinding("gui.prev")) {
|
||||||
|
scroll(-1);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack getStackMouseOver(int mousex, int mousey) {
|
||||||
|
ItemPanelSlot slot = getSlotMouseOver(mousex, mousey);
|
||||||
|
return slot == null ? null : slot.item;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
|
||||||
|
int index = firstIndex;
|
||||||
|
for (int i = 0; i < rows * columns && index < realItems.size(); i++)
|
||||||
|
if (validSlotMap[i]) {
|
||||||
|
if (getSlotRect(i).contains(mousex, mousey))
|
||||||
|
return new ItemPanelSlot(index);
|
||||||
|
index++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void scroll(int i) {
|
||||||
|
if (itemsPerPage != 0) {
|
||||||
|
int oldIndex = firstIndex;
|
||||||
|
firstIndex += i * itemsPerPage;
|
||||||
|
if (firstIndex >= realItems.size())
|
||||||
|
firstIndex = 0;
|
||||||
|
if (firstIndex < 0)
|
||||||
|
if (oldIndex > 0)
|
||||||
|
firstIndex = 0;
|
||||||
|
else
|
||||||
|
firstIndex = (realItems.size() - 1) / itemsPerPage * itemsPerPage;
|
||||||
|
|
||||||
|
calculatePage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getPage() {
|
||||||
|
return page;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getNumPages() {
|
||||||
|
return numPages;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean contains(int px, int py) {
|
||||||
|
GuiContainer gui = NEIClientUtils.getGuiContainer();
|
||||||
|
Rectangle4i rect = new Rectangle4i(px, py, 1, 1);
|
||||||
|
try {
|
||||||
|
GuiInfo.readLock.lock();
|
||||||
|
if(GuiInfo.guiHandlers.stream().anyMatch(handler -> handler.hideItemPanelSlot(gui, rect.x, rect.y, rect.w, rect.h)))
|
||||||
|
return false;
|
||||||
|
} finally {
|
||||||
|
GuiInfo.readLock.unlock();
|
||||||
|
}
|
||||||
|
return super.contains(px, py);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
public class ItemPanels {
|
public class ItemPanels {
|
||||||
|
|
||||||
public static final ItemPanel itemPanel = new ItemPanel();
|
public static final ItemPanel itemPanel = new ItemPanel();
|
||||||
public static final BookmarkPanel bookmarkPanel = new BookmarkPanel();
|
public static final BookmarkPanel bookmarkPanel = new BookmarkPanel();
|
||||||
}
|
}
|
||||||
@@ -1,94 +1,24 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
public class ItemQuantityField extends TextField
|
||||||
import net.minecraft.item.ItemStack;
|
{
|
||||||
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
|
|
||||||
public class ItemQuantityField extends TextField {
|
|
||||||
|
|
||||||
public ItemQuantityField(String ident) {
|
public ItemQuantityField(String ident) {
|
||||||
super(ident);
|
super(ident);
|
||||||
centered = true;
|
centered = true;
|
||||||
field.setDisabledTextColour(0xFF303030);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public int intValue() {
|
||||||
protected void initInternalTextField() {
|
return intValue(text());
|
||||||
field = new FormattedTextField(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0) {
|
|
||||||
|
|
||||||
{
|
|
||||||
setPlaceholder(NEIClientUtils.translate("itempanel.quantity.default"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getText() {
|
|
||||||
String text = super.getText();
|
|
||||||
return !isFocused() && "0".equals(text) ? "" : text;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected boolean beforeWrite(String text) {
|
|
||||||
if (text == null || text.isEmpty()) return true;
|
|
||||||
try {
|
|
||||||
return Integer.parseInt(text) >= 0;
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean textboxKeyTyped(char keyChar, int keyID) {
|
|
||||||
if (!isFocused()) return false;
|
|
||||||
|
|
||||||
if (super.textboxKeyTyped(keyChar, keyID)) {
|
|
||||||
return true;
|
|
||||||
} else if (keyID == Keyboard.KEY_DOWN) {
|
|
||||||
setText(Integer.toString(Math.max(0, getInteger() - 1)));
|
|
||||||
return true;
|
|
||||||
} else if (keyID == Keyboard.KEY_UP) {
|
|
||||||
setText(Integer.toString(getInteger() + 1));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getInteger() {
|
|
||||||
try {
|
|
||||||
return Math.max(0, Integer.parseInt(text()));
|
|
||||||
} catch (NumberFormatException nfe) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
field.setMaxStringLength(maxSearchLength);
|
|
||||||
field.setCursorPositionZero();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private int getInteger() {
|
public int intValue(String s) {
|
||||||
try {
|
try {
|
||||||
return Math.max(0, Integer.parseInt(text()));
|
return Math.max(0, Integer.parseInt(s));
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack prepareStackWithQuantity(ItemStack stack, long amount) {
|
|
||||||
if (stack == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (amount == 0) {
|
|
||||||
amount = NEIClientUtils.getScrollMultiplier(stack);
|
|
||||||
}
|
|
||||||
|
|
||||||
return StackInfo.withAmount(stack, amount);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void gainFocus() {
|
public void gainFocus() {
|
||||||
if (text().equals("0")) {
|
if (text().equals("0")) {
|
||||||
@@ -103,22 +33,6 @@ public class ItemQuantityField extends TextField {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTextChange(String oldText) {
|
public void onTextChange(String oldText) {
|
||||||
NEIClientUtils.setItemQuantity(getInteger());
|
NEIClientUtils.setItemQuantity(intValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onMouseWheel(int i, int mx, int my) {
|
|
||||||
if (!contains(mx, my)) return false;
|
|
||||||
int multiplier = 1;
|
|
||||||
|
|
||||||
if (NEIClientUtils.shiftKey()) {
|
|
||||||
multiplier = 10;
|
|
||||||
} else if (NEIClientUtils.controlKey()) {
|
|
||||||
multiplier = 64;
|
|
||||||
}
|
|
||||||
|
|
||||||
setText(Integer.toString(Math.max(0, getInteger() + i * multiplier)));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,25 +1,24 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import codechicken.lib.config.ConfigTagParent;
|
||||||
|
import codechicken.nei.ItemList.ItemsLoadedCallback;
|
||||||
|
import codechicken.nei.api.API;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.config.GuiItemSorter;
|
||||||
|
import codechicken.nei.config.OptionOpenGui;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.StatCollector;
|
|
||||||
|
|
||||||
import codechicken.lib.config.ConfigTagParent;
|
|
||||||
import codechicken.nei.api.API;
|
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import codechicken.nei.config.GuiItemSorter;
|
|
||||||
import codechicken.nei.config.OptionOpenGui;
|
|
||||||
|
|
||||||
public class ItemSorter implements Comparator<ItemStack> {
|
|
||||||
|
|
||||||
public static class SortEntry {
|
|
||||||
|
|
||||||
|
public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
|
||||||
|
{
|
||||||
|
public static class SortEntry
|
||||||
|
{
|
||||||
public final String name;
|
public final String name;
|
||||||
public final Comparator<ItemStack> comparator;
|
public final Comparator<ItemStack> comparator;
|
||||||
|
|
||||||
@@ -33,7 +32,7 @@ public class ItemSorter implements Comparator<ItemStack> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getTooltip() {
|
public String getTooltip() {
|
||||||
String tipname = name + ".tip";
|
String tipname = name+".tip";
|
||||||
String tip = StatCollector.translateToLocal(tipname);
|
String tip = StatCollector.translateToLocal(tipname);
|
||||||
return !tip.equals(tipname) ? tip : null;
|
return !tip.equals(tipname) ? tip : null;
|
||||||
}
|
}
|
||||||
@@ -43,11 +42,12 @@ public class ItemSorter implements Comparator<ItemStack> {
|
|||||||
public static ArrayList<SortEntry> list = new ArrayList<>();
|
public static ArrayList<SortEntry> list = new ArrayList<>();
|
||||||
public static final ItemSorter instance = new ItemSorter();
|
public static final ItemSorter instance = new ItemSorter();
|
||||||
|
|
||||||
// optimisations
|
//optimisations
|
||||||
public Map<ItemStack, Integer> ordering = new HashMap<>();
|
public HashMap<ItemStack, Integer> ordering = null;
|
||||||
|
|
||||||
public static void sort(List<ItemStack> items) {
|
public static void sort(ArrayList<ItemStack> items) {
|
||||||
try {
|
try {
|
||||||
|
// items = (ArrayList<ItemStack>) items.parallelStream().sorted(instance).collect(Collectors.toList());
|
||||||
items.sort(instance);
|
items.sort(instance);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
NEIClientConfig.logger.error("Exception sorting item list", e);
|
NEIClientConfig.logger.error("Exception sorting item list", e);
|
||||||
@@ -56,15 +56,26 @@ public class ItemSorter implements Comparator<ItemStack> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compare(ItemStack o1, ItemStack o2) {
|
public int compare(ItemStack o1, ItemStack o2) {
|
||||||
for (SortEntry e : list) {
|
for(SortEntry e : list) {
|
||||||
int c = e.comparator.compare(o1, o2);
|
int c = e.comparator.compare(o1, o2);
|
||||||
if (c != 0) return c;
|
if(c != 0) return c;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void itemsLoaded() {
|
||||||
|
HashMap<ItemStack, Integer> newMap = new HashMap<>();
|
||||||
|
int i = 0;
|
||||||
|
for(ItemStack stack : ItemList.items)
|
||||||
|
newMap.put(stack, i++);
|
||||||
|
ordering = newMap;
|
||||||
|
}
|
||||||
|
|
||||||
public static SortEntry find(String name) {
|
public static SortEntry find(String name) {
|
||||||
for (SortEntry e : entries) if (e.name.equals(name)) return e;
|
for(SortEntry e : entries)
|
||||||
|
if(e.name.equals(name))
|
||||||
|
return e;
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -78,11 +89,11 @@ public class ItemSorter implements Comparator<ItemStack> {
|
|||||||
entries.add(e);
|
entries.add(e);
|
||||||
ArrayList<SortEntry> nlist = new ArrayList<>(list);
|
ArrayList<SortEntry> nlist = new ArrayList<>(list);
|
||||||
nlist.add(e);
|
nlist.add(e);
|
||||||
list = nlist; // concurrency
|
list = nlist;//concurrency
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void initConfig(ConfigTagParent tag) {
|
public static void initConfig(ConfigTagParent tag) {
|
||||||
// minecraft, mod, id, default, meta, name
|
//minecraft, mod, id, default, meta, name
|
||||||
API.addSortOption("nei.itemsort.minecraft", (o1, o2) -> {
|
API.addSortOption("nei.itemsort.minecraft", (o1, o2) -> {
|
||||||
boolean m1 = "minecraft".equals(ItemInfo.itemOwners.get(o1.getItem()));
|
boolean m1 = "minecraft".equals(ItemInfo.itemOwners.get(o1.getItem()));
|
||||||
boolean m2 = "minecraft".equals(ItemInfo.itemOwners.get(o2.getItem()));
|
boolean m2 = "minecraft".equals(ItemInfo.itemOwners.get(o2.getItem()));
|
||||||
@@ -91,8 +102,8 @@ public class ItemSorter implements Comparator<ItemStack> {
|
|||||||
API.addSortOption("nei.itemsort.mod", (o1, o2) -> {
|
API.addSortOption("nei.itemsort.mod", (o1, o2) -> {
|
||||||
String mod1 = ItemInfo.itemOwners.get(o1.getItem());
|
String mod1 = ItemInfo.itemOwners.get(o1.getItem());
|
||||||
String mod2 = ItemInfo.itemOwners.get(o2.getItem());
|
String mod2 = ItemInfo.itemOwners.get(o2.getItem());
|
||||||
if (mod1 == null) return mod2 == null ? 0 : 1;
|
if(mod1 == null) return mod2 == null ? 0 : 1;
|
||||||
if (mod2 == null) return -1;
|
if(mod2 == null) return -1;
|
||||||
return mod1.compareTo(mod2);
|
return mod1.compareTo(mod2);
|
||||||
});
|
});
|
||||||
API.addSortOption("nei.itemsort.id", (o1, o2) -> {
|
API.addSortOption("nei.itemsort.id", (o1, o2) -> {
|
||||||
@@ -103,8 +114,8 @@ public class ItemSorter implements Comparator<ItemStack> {
|
|||||||
API.addSortOption("nei.itemsort.default", (o1, o2) -> {
|
API.addSortOption("nei.itemsort.default", (o1, o2) -> {
|
||||||
Integer order1 = instance.ordering.get(o1);
|
Integer order1 = instance.ordering.get(o1);
|
||||||
Integer order2 = instance.ordering.get(o2);
|
Integer order2 = instance.ordering.get(o2);
|
||||||
if (order1 == null) return order2 == null ? 0 : 1;
|
if(order1 == null) return order2 == null ? 0 : 1;
|
||||||
if (order2 == null) return -1;
|
if(order2 == null) return -1;
|
||||||
return compareInt(order1, order2);
|
return compareInt(order1, order2);
|
||||||
});
|
});
|
||||||
API.addSortOption("nei.itemsort.damage", (o1, o2) -> {
|
API.addSortOption("nei.itemsort.damage", (o1, o2) -> {
|
||||||
@@ -113,32 +124,44 @@ public class ItemSorter implements Comparator<ItemStack> {
|
|||||||
return compareInt(id1, id2);
|
return compareInt(id1, id2);
|
||||||
});
|
});
|
||||||
API.addSortOption("nei.itemsort.name", (o1, o2) -> {
|
API.addSortOption("nei.itemsort.name", (o1, o2) -> {
|
||||||
String name1 = o1.getDisplayName();
|
String name1 = ItemInfo.getSearchName(o1);
|
||||||
String name2 = o2.getDisplayName();
|
String name2 = ItemInfo.getSearchName(o2);
|
||||||
return name1.compareTo(name2);
|
return name1.compareTo(name2);
|
||||||
});
|
});
|
||||||
tag.getTag("inventory.itemsort").setDefaultValue(getSaveString(list));
|
tag.getTag("inventory.itemsort").setDefaultValue(getSaveString(list));
|
||||||
API.addOption(new OptionOpenGui("inventory.itemsort", GuiItemSorter.class));
|
API.addOption(new OptionOpenGui("inventory.itemsort", GuiItemSorter.class) {
|
||||||
|
@Override
|
||||||
|
public void useGlobals() {
|
||||||
|
super.useGlobals();
|
||||||
|
list = fromSaveString(activeTag().getValue());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
ItemList.loadCallbacks.add(instance);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getSaveString(List<SortEntry> list) {
|
public static String getSaveString(List<SortEntry> list) {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
for (SortEntry e : list) {
|
for(SortEntry e : list) {
|
||||||
if (sb.length() > 0) sb.append(',');
|
if(sb.length() > 0)
|
||||||
|
sb.append(',');
|
||||||
sb.append(e.name);
|
sb.append(e.name);
|
||||||
}
|
}
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ArrayList<SortEntry> fromSaveString(String s) {
|
public static ArrayList<SortEntry> fromSaveString(String s) {
|
||||||
if (s == null) return new ArrayList<>(entries);
|
if(s == null)
|
||||||
|
return new ArrayList<>(entries);
|
||||||
|
|
||||||
ArrayList<SortEntry> list = new ArrayList<>();
|
ArrayList<SortEntry> list = new ArrayList<>();
|
||||||
for (String s2 : s.split(",")) {
|
for(String s2 : s.split(",")) {
|
||||||
SortEntry e = find(s2.trim());
|
SortEntry e = find(s2.trim());
|
||||||
if (e != null) list.add(e);
|
if(e != null)
|
||||||
|
list.add(e);
|
||||||
}
|
}
|
||||||
for (SortEntry e : entries) if (!list.contains(e)) list.add(e);
|
for(SortEntry e : entries)
|
||||||
|
if(!list.contains(e))
|
||||||
|
list.add(e);
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,143 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.function.Predicate;
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
|
|
||||||
public class ItemStackAmount {
|
|
||||||
|
|
||||||
private final Map<NBTTagCompound, Long> itemMap = new LinkedHashMap<>();
|
|
||||||
|
|
||||||
public void putAll(ItemStackAmount amounts) {
|
|
||||||
for (Map.Entry<NBTTagCompound, Long> entry : amounts.itemMap.entrySet()) {
|
|
||||||
this.itemMap.put(entry.getKey(), entry.getValue() + this.itemMap.getOrDefault(entry.getKey(), 0L));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addAll(Iterable<ItemStack> items) {
|
|
||||||
for (ItemStack stack : items) {
|
|
||||||
add(stack);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void add(ItemStack item) {
|
|
||||||
add(item, (long) StackInfo.getAmount(item));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void add(ItemStack stack, Long value) {
|
|
||||||
if (stack == null || stack.getItem() == null) return;
|
|
||||||
final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
|
|
||||||
|
|
||||||
if (key != null) {
|
|
||||||
this.itemMap.put(key, value + this.itemMap.getOrDefault(key, 0L));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long get(ItemStack stack) {
|
|
||||||
if (stack == null || stack.getItem() == null) return null;
|
|
||||||
final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
|
|
||||||
|
|
||||||
return this.itemMap.get(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void put(ItemStack stack, long value) {
|
|
||||||
if (stack == null || stack.getItem() == null) return;
|
|
||||||
final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
|
|
||||||
|
|
||||||
if (key != null) {
|
|
||||||
this.itemMap.put(key, value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public long getOrDefault(ItemStack stack, long defaultAmount) {
|
|
||||||
final Long e = get(stack);
|
|
||||||
|
|
||||||
return e == null ? defaultAmount : e;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean contains(ItemStack stack) {
|
|
||||||
return get(stack) != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void clear() {
|
|
||||||
this.itemMap.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long remove(ItemStack stack) {
|
|
||||||
if (stack == null || stack.getItem() == null) return null;
|
|
||||||
final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
|
|
||||||
|
|
||||||
return this.itemMap.remove(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean removeIf(Predicate<Map.Entry<NBTTagCompound, Long>> predicate) {
|
|
||||||
return this.itemMap.entrySet().removeIf(predicate);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Set<Map.Entry<NBTTagCompound, Long>> entrySet() {
|
|
||||||
return this.itemMap.entrySet();
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<ItemStack> values() {
|
|
||||||
List<ItemStack> list = new ArrayList<>();
|
|
||||||
|
|
||||||
for (Map.Entry<NBTTagCompound, Long> entry : this.itemMap.entrySet()) {
|
|
||||||
list.add(StackInfo.loadFromNBT(entry.getKey(), Math.max(0, entry.getValue())));
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int size() {
|
|
||||||
return this.itemMap.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isEmpty() {
|
|
||||||
return this.itemMap.isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object obj) {
|
|
||||||
|
|
||||||
if (obj instanceof ItemStackAmount items) {
|
|
||||||
return this.itemMap.equals(items.itemMap);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ItemStackAmount of(ItemStackAmount map) {
|
|
||||||
ItemStackAmount result = new ItemStackAmount();
|
|
||||||
result.itemMap.putAll(map.itemMap);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ItemStackAmount of(ItemStackMap<Long> map) {
|
|
||||||
ItemStackAmount result = new ItemStackAmount();
|
|
||||||
|
|
||||||
for (ItemStackMap.Entry<Long> entry : map.entries()) {
|
|
||||||
result.put(entry.key, entry.value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ItemStackAmount of(Iterable<ItemStack> items) {
|
|
||||||
ItemStackAmount result = new ItemStackAmount();
|
|
||||||
|
|
||||||
for (ItemStack stack : items) {
|
|
||||||
result.add(stack);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,38 +1,30 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import com.google.common.base.Objects;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import static codechicken.lib.inventory.InventoryUtils.actualDamage;
|
import static codechicken.lib.inventory.InventoryUtils.actualDamage;
|
||||||
import static codechicken.lib.inventory.InventoryUtils.newItemStack;
|
import static codechicken.lib.inventory.InventoryUtils.newItemStack;
|
||||||
import static net.minecraftforge.oredict.OreDictionary.WILDCARD_VALUE;
|
import static net.minecraftforge.oredict.OreDictionary.WILDCARD_VALUE;
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
|
|
||||||
import com.google.common.base.Objects;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A maplike class for ItemStack keys with wildcard damage/NBT. Optimised for lookup
|
* A maplike class for ItemStack keys with wildcard damage/NBT. Optimised for lookup
|
||||||
*/
|
*/
|
||||||
public class ItemStackMap<T> {
|
public class ItemStackMap<T>
|
||||||
|
{
|
||||||
public static class StackMetaKey {
|
public static class StackMetaKey
|
||||||
|
{
|
||||||
public final int damage;
|
public final int damage;
|
||||||
public final NBTTagCompound tag;
|
public final NBTTagCompound tag;
|
||||||
private final int hashCode;
|
|
||||||
|
|
||||||
public StackMetaKey(int damage, NBTTagCompound tag) {
|
public StackMetaKey(int damage, NBTTagCompound tag) {
|
||||||
if (tag != null && tag.hasNoTags()) {
|
|
||||||
tag = null;
|
|
||||||
}
|
|
||||||
this.hashCode = Objects.hashCode(damage, tag);
|
|
||||||
this.damage = damage;
|
this.damage = damage;
|
||||||
this.tag = tag;
|
this.tag = tag;
|
||||||
}
|
}
|
||||||
@@ -42,17 +34,19 @@ public class ItemStackMap<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return this.hashCode;
|
return Objects.hashCode(damage, tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (!(o instanceof StackMetaKey t)) return false;
|
if (!(o instanceof StackMetaKey))
|
||||||
|
return false;
|
||||||
|
StackMetaKey t = (StackMetaKey) o;
|
||||||
return damage == t.damage && Objects.equal(tag, t.tag);
|
return damage == t.damage && Objects.equal(tag, t.tag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Entry<T> {
|
public static class Entry<T>
|
||||||
|
{
|
||||||
public final ItemStack key;
|
public final ItemStack key;
|
||||||
public final T value;
|
public final T value;
|
||||||
|
|
||||||
@@ -62,8 +56,8 @@ public class ItemStackMap<T> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class DetailMap {
|
public class DetailMap
|
||||||
|
{
|
||||||
private boolean hasWildcard;
|
private boolean hasWildcard;
|
||||||
private T wildcard;
|
private T wildcard;
|
||||||
private HashMap<Integer, T> damageMap;
|
private HashMap<Integer, T> damageMap;
|
||||||
@@ -72,7 +66,8 @@ public class ItemStackMap<T> {
|
|||||||
private int size;
|
private int size;
|
||||||
|
|
||||||
public T get(ItemStack key) {
|
public T get(ItemStack key) {
|
||||||
if (wildcard != null) return wildcard;
|
if (wildcard != null)
|
||||||
|
return wildcard;
|
||||||
|
|
||||||
if (damageMap != null) {
|
if (damageMap != null) {
|
||||||
final T ret = damageMap.get(actualDamage(key));
|
final T ret = damageMap.get(actualDamage(key));
|
||||||
@@ -82,7 +77,8 @@ public class ItemStackMap<T> {
|
|||||||
final T ret = tagMap.get(key.stackTagCompound);
|
final T ret = tagMap.get(key.stackTagCompound);
|
||||||
if (ret != null) return ret;
|
if (ret != null) return ret;
|
||||||
}
|
}
|
||||||
if (metaMap != null) return metaMap.get(new StackMetaKey(key));
|
if (metaMap != null)
|
||||||
|
return metaMap.get(new StackMetaKey(key));
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -133,50 +129,63 @@ public class ItemStackMap<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void updateSize() {
|
private void updateSize() {
|
||||||
int newSize = (hasWildcard ? 1 : 0) + (metaMap != null ? metaMap.size() : 0)
|
int newSize = (hasWildcard ? 1 : 0) +
|
||||||
+ (tagMap != null ? tagMap.size() : 0)
|
(metaMap != null ? metaMap.size() : 0) +
|
||||||
+ (damageMap != null ? damageMap.size() : 0);
|
(tagMap != null ? tagMap.size() : 0) +
|
||||||
|
(damageMap != null ? damageMap.size() : 0);
|
||||||
|
|
||||||
if (newSize != size) {
|
if(newSize != size) {
|
||||||
ItemStackMap.this.size += newSize - size;
|
ItemStackMap.this.size += newSize-size;
|
||||||
size = newSize;
|
size = newSize;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addKeys(Item item, List<ItemStack> list) {
|
public void addKeys(Item item, List<ItemStack> list) {
|
||||||
if (wildcard != null) list.add(wildcard(item));
|
if (wildcard != null)
|
||||||
|
list.add(wildcard(item));
|
||||||
if (damageMap != null)
|
if (damageMap != null)
|
||||||
for (int damage : damageMap.keySet()) list.add(newItemStack(item, 1, damage, WILDCARD_TAG));
|
for (int damage : damageMap.keySet())
|
||||||
|
list.add(newItemStack(item, 1, damage, WILDCARD_TAG));
|
||||||
if (tagMap != null)
|
if (tagMap != null)
|
||||||
for (NBTTagCompound tag : tagMap.keySet()) list.add(newItemStack(item, 1, WILDCARD_VALUE, tag));
|
for (NBTTagCompound tag : tagMap.keySet())
|
||||||
|
list.add(newItemStack(item, 1, WILDCARD_VALUE, tag));
|
||||||
if (metaMap != null)
|
if (metaMap != null)
|
||||||
for (StackMetaKey key : metaMap.keySet()) list.add(newItemStack(item, 1, key.damage, key.tag));
|
for (StackMetaKey key : metaMap.keySet())
|
||||||
|
list.add(newItemStack(item, 1, key.damage, key.tag));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addValues(List<T> list) {
|
public void addValues(List<T> list) {
|
||||||
if (wildcard != null) list.add(wildcard);
|
if (wildcard != null)
|
||||||
if (damageMap != null) list.addAll(damageMap.values());
|
list.add(wildcard);
|
||||||
if (tagMap != null) list.addAll(tagMap.values());
|
if (damageMap != null)
|
||||||
if (metaMap != null) list.addAll(metaMap.values());
|
list.addAll(damageMap.values());
|
||||||
|
if (tagMap != null)
|
||||||
|
list.addAll(tagMap.values());
|
||||||
|
if (metaMap != null)
|
||||||
|
list.addAll(metaMap.values());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addEntries(Item item, List<Entry<T>> list) {
|
public void addEntries(Item item, List<Entry<T>> list) {
|
||||||
if (wildcard != null) list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG), wildcard));
|
if (wildcard != null)
|
||||||
if (damageMap != null) for (Map.Entry<Integer, T> entry : damageMap.entrySet())
|
list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG), wildcard));
|
||||||
list.add(new Entry<>(newItemStack(item, 1, entry.getKey(), WILDCARD_TAG), entry.getValue()));
|
if (damageMap != null)
|
||||||
if (tagMap != null) for (Map.Entry<NBTTagCompound, T> entry : tagMap.entrySet())
|
for (Map.Entry<Integer, T> entry : damageMap.entrySet())
|
||||||
list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, entry.getKey()), entry.getValue()));
|
list.add(new Entry<>(newItemStack(item, 1, entry.getKey(), WILDCARD_TAG), entry.getValue()));
|
||||||
if (metaMap != null) for (Map.Entry<StackMetaKey, T> entry : metaMap.entrySet()) list.add(
|
if (tagMap != null)
|
||||||
new Entry<>(newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
|
for (Map.Entry<NBTTagCompound, T> entry : tagMap.entrySet())
|
||||||
|
list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, entry.getKey()), entry.getValue()));
|
||||||
|
if (metaMap != null)
|
||||||
|
for (Map.Entry<StackMetaKey, T> entry : metaMap.entrySet())
|
||||||
|
list.add(new Entry<>(newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getKeyType(int damage, NBTTagCompound tag) {
|
public static int getKeyType(int damage, NBTTagCompound tag) {
|
||||||
int i = 0;
|
int i = 0;
|
||||||
if (isWildcard(damage)) i = 1;
|
if (isWildcard(damage)) i = 1;
|
||||||
if (isWildcard(tag)) i |= 2;
|
if (isWildcard(tag)) i |= 2;
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack wildcard(Item item) {
|
public static ItemStack wildcard(Item item) {
|
||||||
return newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG);
|
return newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG);
|
||||||
@@ -197,7 +206,7 @@ public class ItemStackMap<T> {
|
|||||||
WILDCARD_TAG.setBoolean("*", true);
|
WILDCARD_TAG.setBoolean("*", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final Map<Item, DetailMap> itemMap = new LinkedHashMap<>();
|
private final HashMap<Item, DetailMap> itemMap = new HashMap<>();
|
||||||
private int size;
|
private int size;
|
||||||
|
|
||||||
public T get(ItemStack key) {
|
public T get(ItemStack key) {
|
||||||
@@ -209,38 +218,23 @@ public class ItemStackMap<T> {
|
|||||||
return map == null ? null : map.get(key);
|
return map == null ? null : map.get(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
public T getOrDefault(ItemStack key, T defaultValue) {
|
|
||||||
T e = get(key);
|
|
||||||
return e == null ? defaultValue : e;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void put(ItemStack key, T value) {
|
public void put(ItemStack key, T value) {
|
||||||
if (key == null || key.getItem() == null) return;
|
if (key == null || key.getItem() == null)
|
||||||
|
return;
|
||||||
|
|
||||||
DetailMap map = itemMap.computeIfAbsent(key.getItem(), k -> new DetailMap());
|
DetailMap map = itemMap.get(key.getItem());
|
||||||
|
if (map == null)
|
||||||
|
itemMap.put(key.getItem(), map = new DetailMap());
|
||||||
map.put(key, value);
|
map.put(key, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public T computeIfAbsent(ItemStack key, Function<ItemStack, ? extends T> mappingFunction) {
|
|
||||||
T value;
|
|
||||||
if ((value = get(key)) == null) {
|
|
||||||
T newValue;
|
|
||||||
if ((newValue = mappingFunction.apply(key)) != null) {
|
|
||||||
put(key, newValue);
|
|
||||||
return newValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void clear() {
|
public void clear() {
|
||||||
itemMap.clear();
|
itemMap.clear();
|
||||||
size = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public T remove(ItemStack key) {
|
public T remove(ItemStack key) {
|
||||||
if (key == null || key.getItem() == null) return null;
|
if (key == null || key.getItem() == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
DetailMap map = itemMap.get(key.getItem());
|
DetailMap map = itemMap.get(key.getItem());
|
||||||
return map == null ? null : map.remove(key);
|
return map == null ? null : map.remove(key);
|
||||||
@@ -248,19 +242,22 @@ public class ItemStackMap<T> {
|
|||||||
|
|
||||||
public List<ItemStack> keys() {
|
public List<ItemStack> keys() {
|
||||||
LinkedList<ItemStack> list = new LinkedList<>();
|
LinkedList<ItemStack> list = new LinkedList<>();
|
||||||
for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet()) entry.getValue().addKeys(entry.getKey(), list);
|
for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet())
|
||||||
|
entry.getValue().addKeys(entry.getKey(), list);
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<T> values() {
|
public List<T> values() {
|
||||||
LinkedList<T> list = new LinkedList<>();
|
LinkedList<T> list = new LinkedList<>();
|
||||||
for (DetailMap map : itemMap.values()) map.addValues(list);
|
for (DetailMap map : itemMap.values())
|
||||||
|
map.addValues(list);
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Entry<T>> entries() {
|
public List<Entry<T>> entries() {
|
||||||
LinkedList<Entry<T>> list = new LinkedList<>();
|
LinkedList<Entry<T>> list = new LinkedList<>();
|
||||||
for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet()) entry.getValue().addEntries(entry.getKey(), list);
|
for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet())
|
||||||
|
entry.getValue().addEntries(entry.getKey(), list);
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,25 +1,27 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import codechicken.nei.api.ItemFilter;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import codechicken.nei.api.ItemFilter;
|
public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter
|
||||||
|
{
|
||||||
public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter {
|
|
||||||
|
|
||||||
public ItemStackSet with(ItemStack... items) {
|
public ItemStackSet with(ItemStack... items) {
|
||||||
for (ItemStack item : items) add(item);
|
for(ItemStack item : items)
|
||||||
|
add(item);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ItemStackSet with(Item... items) {
|
public ItemStackSet with(Item... items) {
|
||||||
for (Item item : items) add(ItemStackMap.wildcard(item));
|
for(Item item : items)
|
||||||
|
add(ItemStackMap.wildcard(item));
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ItemStackSet with(Block... blocks) {
|
public ItemStackSet with(Block... blocks) {
|
||||||
for (Block block : blocks) add(ItemStackMap.wildcard(Item.getItemFromBlock(block)));
|
for(Block block : blocks)
|
||||||
|
add(ItemStackMap.wildcard(Item.getItemFromBlock(block)));
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -27,16 +29,6 @@ public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter
|
|||||||
put(item, item);
|
put(item, item);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ItemStackSet addAll(Iterable<ItemStack> items) {
|
|
||||||
for (ItemStack item : items) add(item);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStackSet removeAll(Iterable<ItemStack> items) {
|
|
||||||
for (ItemStack item : items) remove(item);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean contains(ItemStack item) {
|
public boolean contains(ItemStack item) {
|
||||||
return get(item) != null;
|
return get(item) != null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,282 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.awt.Point;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.guihook.IContainerInputHandler;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
|
|
||||||
public class ItemZoom extends Widget implements IContainerInputHandler {
|
|
||||||
|
|
||||||
public static final int MIN_ZOOM = 0;
|
|
||||||
public static final int MAX_ZOOM = 1000;
|
|
||||||
|
|
||||||
private static final int MIN_SCALE = 2;
|
|
||||||
private static final int SLOT_SIZE = 16;
|
|
||||||
|
|
||||||
private Boolean previousKeyboardRepeatEnabled = null;
|
|
||||||
|
|
||||||
private ItemStack stack = null;
|
|
||||||
private String displayName = "";
|
|
||||||
private int availableAreaWidth = 0;
|
|
||||||
private float xPosition = 0;
|
|
||||||
private float yPosition = 0;
|
|
||||||
private float scale = 1;
|
|
||||||
|
|
||||||
public ItemZoom() {
|
|
||||||
GuiContainerManager.addInputHandler(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int mx, int my) {
|
|
||||||
|
|
||||||
if (this.stack != null && this.availableAreaWidth >= SLOT_SIZE * 2
|
|
||||||
&& (NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled")
|
|
||||||
|| KeyManager.isKeyDown("itemzoom.hold"))
|
|
||||||
&& GuiContainerManager.shouldShowTooltip(NEIClientUtils.getGuiContainer())) {
|
|
||||||
final float inverseScaleFactor = 1.0f / this.scale;
|
|
||||||
final float screenScale = getScreenScale();
|
|
||||||
final float size = SLOT_SIZE * this.scale;
|
|
||||||
int shiftText = 10;
|
|
||||||
|
|
||||||
GL11.glPushMatrix();
|
|
||||||
GL11.glScaled(screenScale, screenScale, 1);
|
|
||||||
GL11.glScaled(this.scale, this.scale, 2);
|
|
||||||
GL11.glTranslated(this.xPosition * inverseScaleFactor, this.yPosition * inverseScaleFactor, 0);
|
|
||||||
|
|
||||||
GuiContainerManager.drawItem(0, 0, this.stack, false, "");
|
|
||||||
|
|
||||||
GL11.glPopMatrix();
|
|
||||||
|
|
||||||
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
|
|
||||||
GuiContainerManager.enable2DRender();
|
|
||||||
|
|
||||||
if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.showName")) {
|
|
||||||
String dispalyName = NEIClientUtils
|
|
||||||
.cropText(GuiDraw.fontRenderer, this.displayName, this.availableAreaWidth);
|
|
||||||
GuiDraw.drawStringC(
|
|
||||||
dispalyName,
|
|
||||||
(int) ((this.xPosition + size / 2) * screenScale),
|
|
||||||
(int) ((this.yPosition + size) * screenScale) + shiftText,
|
|
||||||
NEIClientConfig.getSetting("inventory.itemzoom.nameColor").getHexValue());
|
|
||||||
shiftText += GuiDraw.fontRenderer.FONT_HEIGHT;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled")
|
|
||||||
&& NEIClientConfig.getBooleanSetting("inventory.itemzoom.helpText")) {
|
|
||||||
String keyName = KeyManager.getKeyName("itemzoom.toggle", NEIClientUtils.SHIFT_HASH);
|
|
||||||
|
|
||||||
if (keyName != null) {
|
|
||||||
String helpText = NEIClientUtils.translate("itemzoom.toggle", keyName);
|
|
||||||
List<String> lines = GuiDraw.fontRenderer
|
|
||||||
.listFormattedStringToWidth(helpText, this.availableAreaWidth);
|
|
||||||
|
|
||||||
for (String line : lines) {
|
|
||||||
GuiDraw.drawStringC(
|
|
||||||
line,
|
|
||||||
(int) ((this.xPosition + size / 2) * screenScale),
|
|
||||||
(int) ((this.yPosition + size) * screenScale) + 10 + shiftText,
|
|
||||||
0x66555555);
|
|
||||||
shiftText += GuiDraw.fontRenderer.FONT_HEIGHT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
GL11.glPopAttrib();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void resize(GuiContainer gui) {
|
|
||||||
final ItemStack stack = getStackMouseOver(gui);
|
|
||||||
|
|
||||||
if (stack != null && (!NEIClientConfig.getBooleanSetting("inventory.itemzoom.onlySolid")
|
|
||||||
|| Block.getBlockFromItem(stack.getItem()).getMaterial().isSolid())) {
|
|
||||||
final float screenScale = 1.0f / getScreenScale();
|
|
||||||
final float availableAreaWidth = (gui.width - gui.xSize) / 2 * screenScale;
|
|
||||||
final float availableAreaHeight = gui.height * screenScale;
|
|
||||||
final Point mouse = GuiDraw.getMousePosition();
|
|
||||||
|
|
||||||
this.scale = Math.round(getZoomAmount(gui) * getPointSize(gui) / SLOT_SIZE);
|
|
||||||
this.yPosition = (availableAreaHeight - this.scale * SLOT_SIZE) / 2;
|
|
||||||
this.xPosition = (availableAreaWidth - this.scale * SLOT_SIZE) / 2;
|
|
||||||
this.availableAreaWidth = (int) (availableAreaWidth / screenScale);
|
|
||||||
|
|
||||||
final float rightSideShift = gui.width * screenScale - availableAreaWidth;
|
|
||||||
final boolean leftSideFree = availableAreaWidth / screenScale < mouse.x;
|
|
||||||
final boolean rightSideFree = mouse.x < gui.width - availableAreaWidth / screenScale;
|
|
||||||
|
|
||||||
final boolean showOnRight = leftSideFree && rightSideFree ? !preferLeftSide() : !leftSideFree;
|
|
||||||
|
|
||||||
if (showOnRight) {
|
|
||||||
this.xPosition += rightSideShift;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.displayName = stack.getDisplayName();
|
|
||||||
} catch (Throwable ignored) {
|
|
||||||
this.displayName = "Unnamed";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Copying the stack copies its whole NBT, so it is only done when the hovered stack changes
|
|
||||||
final boolean sameStack = this.stack != null && this.stack.isItemEqual(stack)
|
|
||||||
&& ItemStack.areItemStackTagsEqual(this.stack, stack);
|
|
||||||
if (!sameStack) {
|
|
||||||
this.stack = StackInfo.withAmount(stack, 0);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.stack = null;
|
|
||||||
this.displayName = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean preferLeftSide() {
|
|
||||||
switch (NEIClientConfig.getIntSetting("inventory.itemzoom.preferredSide")) {
|
|
||||||
case 1:
|
|
||||||
return true;
|
|
||||||
case 2:
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
final int leftCount = NEIClientConfig.isBookmarkPanelHidden()
|
|
||||||
|| ItemPanels.bookmarkPanel.getGrid().getPerPage() == 0 ? 0 : ItemPanels.bookmarkPanel.getGrid().size();
|
|
||||||
final int rightCount = ItemPanels.itemPanel.getGrid().getPerPage() == 0 ? 0
|
|
||||||
: ItemPanels.itemPanel.getGrid().size();
|
|
||||||
|
|
||||||
return leftCount <= rightCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
private float getPointSize(GuiContainer gui) {
|
|
||||||
final float screenScale = 1.0f / getScreenScale();
|
|
||||||
final float availableAreaWidth = (gui.width - (gui.xSize + gui.width) / 2) * screenScale;
|
|
||||||
return availableAreaWidth / MAX_ZOOM;
|
|
||||||
}
|
|
||||||
|
|
||||||
private float getScreenScale() {
|
|
||||||
return Minecraft.getMinecraft().currentScreen.width * 1f / Minecraft.getMinecraft().displayWidth;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getZoomAmount(GuiContainer gui) {
|
|
||||||
return Math.max(
|
|
||||||
Math.round(SLOT_SIZE * MIN_SCALE / getPointSize(gui)),
|
|
||||||
NEIClientConfig.getIntSetting("inventory.itemzoom.zoom"));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void increaseZoom(GuiContainer gui) {
|
|
||||||
final float pointSize = getPointSize(gui);
|
|
||||||
final float scale = Math.round(getZoomAmount(gui) * pointSize / SLOT_SIZE);
|
|
||||||
|
|
||||||
NEIClientConfig.setIntSetting(
|
|
||||||
"inventory.itemzoom.zoom",
|
|
||||||
Math.min(MAX_ZOOM, Math.round((scale + 1) / (pointSize / SLOT_SIZE))));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void decreaseZoom(GuiContainer gui) {
|
|
||||||
final float pointSize = getPointSize(gui);
|
|
||||||
final float scale = Math.round(getZoomAmount(gui) * pointSize / SLOT_SIZE);
|
|
||||||
|
|
||||||
NEIClientConfig.setIntSetting(
|
|
||||||
"inventory.itemzoom.zoom",
|
|
||||||
Math.max(MIN_ZOOM, Math.round(Math.max(MIN_SCALE, scale - 1) / (pointSize / SLOT_SIZE))));
|
|
||||||
}
|
|
||||||
|
|
||||||
private ItemStack getStackMouseOver(GuiContainer gui) {
|
|
||||||
|
|
||||||
if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.neiOnly")) {
|
|
||||||
final Point mouse = GuiDraw.getMousePosition();
|
|
||||||
ItemStack stack = ItemPanels.itemPanel.getStackMouseOver(mouse.x, mouse.y);
|
|
||||||
|
|
||||||
if (stack == null) {
|
|
||||||
stack = ItemPanels.bookmarkPanel.getStackMouseOver(mouse.x, mouse.y);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stack == null) {
|
|
||||||
stack = ItemPanels.itemPanel.historyPanel.getStackMouseOver(mouse.x, mouse.y);
|
|
||||||
}
|
|
||||||
|
|
||||||
return stack;
|
|
||||||
}
|
|
||||||
|
|
||||||
return GuiContainerManager.getStackMouseOver(gui);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onHotkeyPressed(GuiContainer gui) {
|
|
||||||
|
|
||||||
if (KeyManager.isHashDown("itemzoom.toggle", NEIClientUtils.SHIFT_HASH)) {
|
|
||||||
NEIClientConfig.getSetting("inventory.itemzoom.enabled")
|
|
||||||
.setBooleanValue(!NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled"));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.stack != null && KeyManager.isKeyDown("itemzoom.hold")) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.stack != null && KeyManager.isKeyDown("itemzoom.zoom_in")) {
|
|
||||||
increaseZoom(gui);
|
|
||||||
previousKeyboardRepeatEnabled = Keyboard.areRepeatEventsEnabled();
|
|
||||||
Keyboard.enableRepeatEvents(true);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.stack != null && KeyManager.isKeyDown("itemzoom.zoom_out")) {
|
|
||||||
decreaseZoom(gui);
|
|
||||||
previousKeyboardRepeatEnabled = Keyboard.areRepeatEventsEnabled();
|
|
||||||
Keyboard.enableRepeatEvents(true);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (previousKeyboardRepeatEnabled != null) {
|
|
||||||
Keyboard.enableRepeatEvents(previousKeyboardRepeatEnabled);
|
|
||||||
previousKeyboardRepeatEnabled = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,581 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.ScaledResolution;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.client.renderer.OpenGlHelper;
|
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
|
||||||
import net.minecraft.client.shader.Framebuffer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
import org.lwjgl.opengl.GL30;
|
|
||||||
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.api.GuiInfo;
|
|
||||||
import codechicken.nei.api.INEIGuiHandler;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.recipe.Recipe.RecipeId;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
|
|
||||||
public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends ItemsGrid.MouseContext> {
|
|
||||||
|
|
||||||
protected static class ScreenCapture {
|
|
||||||
|
|
||||||
private long nextCacheRefresh = 0;
|
|
||||||
private final Framebuffer framebuffer;
|
|
||||||
|
|
||||||
public ScreenCapture() {
|
|
||||||
this.framebuffer = new Framebuffer(1, 1, true);
|
|
||||||
this.framebuffer.setFramebufferColor(0.0F, 0.0F, 0.0F, 0.0F);
|
|
||||||
Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int getGridRenderingCacheFPS(int mode) {
|
|
||||||
return mode == 1 ? NEIClientConfig.getIntSetting("inventory.gridRenderingCacheFPS") : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean needRefresh(int mode) {
|
|
||||||
final Minecraft minecraft = Minecraft.getMinecraft();
|
|
||||||
return this.nextCacheRefresh == 0 || this.framebuffer.framebufferWidth != minecraft.displayWidth
|
|
||||||
|| framebuffer.framebufferHeight != minecraft.displayHeight
|
|
||||||
|| getGridRenderingCacheFPS(mode) > 0 && this.nextCacheRefresh < System.currentTimeMillis();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void refreshBuffer() {
|
|
||||||
this.nextCacheRefresh = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void captureScreen(Runnable callback, int mode) {
|
|
||||||
GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
|
|
||||||
|
|
||||||
resetFramebuffer();
|
|
||||||
this.framebuffer.bindFramebuffer(false);
|
|
||||||
|
|
||||||
/* Set up some rendering state needed for items to work correctly */
|
|
||||||
GL11.glDisable(GL11.GL_BLEND);
|
|
||||||
GL11.glDepthMask(true);
|
|
||||||
OpenGlHelper.glBlendFunc(
|
|
||||||
GL11.GL_SRC_ALPHA,
|
|
||||||
GL11.GL_ONE_MINUS_SRC_ALPHA,
|
|
||||||
GL11.GL_SRC_ALPHA,
|
|
||||||
GL11.GL_ONE_MINUS_SRC_ALPHA);
|
|
||||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
|
||||||
|
|
||||||
callback.run();
|
|
||||||
|
|
||||||
GL11.glPopAttrib();
|
|
||||||
|
|
||||||
Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
|
|
||||||
this.nextCacheRefresh = System.currentTimeMillis() + (1000 / Math.max(1, getGridRenderingCacheFPS(mode)));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void resetFramebuffer() {
|
|
||||||
final Minecraft minecraft = Minecraft.getMinecraft();
|
|
||||||
|
|
||||||
if (this.framebuffer.framebufferWidth != minecraft.displayWidth
|
|
||||||
|| framebuffer.framebufferHeight != minecraft.displayHeight) {
|
|
||||||
this.framebuffer.createBindFramebuffer(minecraft.displayWidth, minecraft.displayHeight);
|
|
||||||
this.framebuffer.setFramebufferFilter(GL11.GL_NEAREST);
|
|
||||||
} else {
|
|
||||||
this.framebuffer.framebufferClear();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Copy stencil values (required by mui2)
|
|
||||||
OpenGlHelper.func_153171_g(GL30.GL_READ_FRAMEBUFFER, minecraft.getFramebuffer().framebufferObject);
|
|
||||||
OpenGlHelper.func_153171_g(GL30.GL_DRAW_FRAMEBUFFER, this.framebuffer.framebufferObject);
|
|
||||||
GL30.glBlitFramebuffer(
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
minecraft.displayWidth,
|
|
||||||
minecraft.displayHeight,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
minecraft.displayWidth,
|
|
||||||
minecraft.displayHeight,
|
|
||||||
GL11.GL_DEPTH_BUFFER_BIT | GL11.GL_STENCIL_BUFFER_BIT,
|
|
||||||
GL11.GL_NEAREST);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void renderCapturedScreen() {
|
|
||||||
this.framebuffer.bindFramebufferTexture();
|
|
||||||
|
|
||||||
final Tessellator tessellator = Tessellator.instance;
|
|
||||||
final Minecraft minecraft = Minecraft.getMinecraft();
|
|
||||||
final ScaledResolution scaledresolution = new ScaledResolution(
|
|
||||||
minecraft,
|
|
||||||
minecraft.displayWidth,
|
|
||||||
minecraft.displayHeight);
|
|
||||||
|
|
||||||
/* Set up some rendering state needed for items to work correctly */
|
|
||||||
GL11.glEnable(GL11.GL_BLEND);
|
|
||||||
OpenGlHelper
|
|
||||||
.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
|
||||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
|
||||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
|
||||||
|
|
||||||
tessellator.startDrawingQuads();
|
|
||||||
|
|
||||||
tessellator.addVertexWithUV(0, scaledresolution.getScaledHeight_double(), 0.0, 0, 0);
|
|
||||||
tessellator.addVertexWithUV(
|
|
||||||
scaledresolution.getScaledWidth_double(),
|
|
||||||
scaledresolution.getScaledHeight_double(),
|
|
||||||
0.0,
|
|
||||||
1,
|
|
||||||
0);
|
|
||||||
tessellator.addVertexWithUV(scaledresolution.getScaledWidth_double(), 0, 0.0, 1, 1);
|
|
||||||
tessellator.addVertexWithUV(0, 0, 0, 0, 1);
|
|
||||||
|
|
||||||
tessellator.draw();
|
|
||||||
|
|
||||||
this.framebuffer.unbindFramebufferTexture();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ItemsGridSlot {
|
|
||||||
|
|
||||||
protected static final float DEFAULT_SLOT_SIZE = 18f;
|
|
||||||
protected static final float LINE_WIDTH = 0.75f;
|
|
||||||
|
|
||||||
public final ItemStack item;
|
|
||||||
public final int slotIndex;
|
|
||||||
public final int itemIndex;
|
|
||||||
|
|
||||||
public Color borderColor = Color.BLACK;
|
|
||||||
|
|
||||||
public boolean borderLeft = false;
|
|
||||||
public boolean borderTop = false;
|
|
||||||
public boolean borderRight = false;
|
|
||||||
public boolean borderBottom = false;
|
|
||||||
|
|
||||||
public ItemsGridSlot(int slotIndex, int itemIndex, ItemStack itemStack) {
|
|
||||||
this.slotIndex = slotIndex;
|
|
||||||
this.itemIndex = itemIndex;
|
|
||||||
this.item = itemStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack getItemStack() {
|
|
||||||
return this.item;
|
|
||||||
}
|
|
||||||
|
|
||||||
public <M extends MouseContext> void beforeDraw(Rectangle4i rect, M mouseContext) {
|
|
||||||
if (mouseContext != null && mouseContext.slotIndex == this.slotIndex) {
|
|
||||||
NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, HIGHLIGHT_COLOR);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public <M extends MouseContext> void afterDraw(Rectangle4i rect, M mouseContext) {}
|
|
||||||
|
|
||||||
public RecipeId getRecipeId() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void drawItem(Rectangle4i rect) {
|
|
||||||
drawItem(getItemStack(), rect);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void drawItem(ItemStack stack, Rectangle4i rect) {
|
|
||||||
|
|
||||||
if (rect.w != DEFAULT_SLOT_SIZE) {
|
|
||||||
final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
|
|
||||||
GL11.glTranslatef(rect.x + 1, rect.y + 1, 0);
|
|
||||||
GL11.glScaled(panelFactor, panelFactor, 1);
|
|
||||||
|
|
||||||
GuiContainerManager.drawItem(0, 0, stack, true, "");
|
|
||||||
|
|
||||||
GL11.glScaled(1f / panelFactor, 1f / panelFactor, 1);
|
|
||||||
GL11.glTranslatef(-1 * (rect.x + 1), -1 * (rect.y + 1), 0);
|
|
||||||
} else {
|
|
||||||
GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, stack, true, "");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void drawBorder(Rectangle4i rect) {
|
|
||||||
float halfLineWidth = LINE_WIDTH / 2f;
|
|
||||||
|
|
||||||
if (this.borderLeft) {
|
|
||||||
NEIClientUtils
|
|
||||||
.drawRect(rect.x - halfLineWidth, rect.y + halfLineWidth, LINE_WIDTH, rect.h, this.borderColor);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.borderRight) {
|
|
||||||
NEIClientUtils.drawRect(
|
|
||||||
rect.x + rect.w - halfLineWidth,
|
|
||||||
rect.y - halfLineWidth,
|
|
||||||
LINE_WIDTH,
|
|
||||||
rect.h,
|
|
||||||
this.borderColor);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.borderTop) {
|
|
||||||
NEIClientUtils
|
|
||||||
.drawRect(rect.x - halfLineWidth, rect.y - halfLineWidth, rect.w, LINE_WIDTH, this.borderColor);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.borderBottom) {
|
|
||||||
NEIClientUtils.drawRect(
|
|
||||||
rect.x + halfLineWidth,
|
|
||||||
rect.y + rect.h - halfLineWidth,
|
|
||||||
rect.w,
|
|
||||||
LINE_WIDTH,
|
|
||||||
this.borderColor);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class MouseContext {
|
|
||||||
|
|
||||||
public final int slotIndex;
|
|
||||||
public final int columnIndex;
|
|
||||||
public final int rowIndex;
|
|
||||||
|
|
||||||
public MouseContext(int slotIndex, int rowIndex, int columnIndex) {
|
|
||||||
this.slotIndex = slotIndex;
|
|
||||||
this.rowIndex = rowIndex;
|
|
||||||
this.columnIndex = columnIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return Objects.hash(this.rowIndex, this.slotIndex, this.columnIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean equals(Object obj) {
|
|
||||||
|
|
||||||
if (obj instanceof MouseContext context) {
|
|
||||||
return this.columnIndex == context.columnIndex && this.rowIndex == context.rowIndex
|
|
||||||
&& this.slotIndex == context.slotIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int SLOT_SIZE = 18;
|
|
||||||
public static final Color HIGHLIGHT_COLOR = new Color(0xee555555, true);
|
|
||||||
|
|
||||||
protected int width;
|
|
||||||
protected int height;
|
|
||||||
|
|
||||||
protected int marginLeft;
|
|
||||||
protected int marginTop;
|
|
||||||
|
|
||||||
protected int paddingLeft;
|
|
||||||
|
|
||||||
protected ArrayList<ItemStack> realItems = new ArrayList<>();
|
|
||||||
|
|
||||||
protected int page;
|
|
||||||
protected int perPage;
|
|
||||||
|
|
||||||
protected int rows;
|
|
||||||
protected int columns;
|
|
||||||
|
|
||||||
protected boolean[] invalidSlotMap;
|
|
||||||
|
|
||||||
private final GridOverlapScanner overlapScanner = new GridOverlapScanner();
|
|
||||||
|
|
||||||
protected ScreenCapture screenCapture = null;
|
|
||||||
|
|
||||||
public ArrayList<ItemStack> getItems() {
|
|
||||||
return realItems;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack getItem(int itemIndex) {
|
|
||||||
return realItems.get(itemIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
public int size() {
|
|
||||||
return realItems.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isEmpty() {
|
|
||||||
return realItems.isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int indexOf(ItemStack stackA, boolean useNBT) {
|
|
||||||
|
|
||||||
for (int idx = 0; idx < realItems.size(); idx++) {
|
|
||||||
if (StackInfo.equalItemAndNBT(stackA, realItems.get(idx), useNBT)) {
|
|
||||||
return idx;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPage(int page) {
|
|
||||||
this.page = Math.max(0, Math.min(page, getNumPages() - 1));
|
|
||||||
onGridChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getPage() {
|
|
||||||
return page + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getPerPage() {
|
|
||||||
return perPage;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getNumPages() {
|
|
||||||
if (perPage > 0) {
|
|
||||||
return (int) Math.ceil((float) realItems.size() / (float) perPage);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getRows() {
|
|
||||||
return rows;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getColumns() {
|
|
||||||
return columns;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getLastRowIndex() {
|
|
||||||
final List<T> mask = getMask();
|
|
||||||
|
|
||||||
return this.columns > 0 && !mask.isEmpty()
|
|
||||||
? (int) Math.ceil((float) (mask.get(mask.size() - 1).slotIndex + 1) / this.columns) - 1
|
|
||||||
: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGridSize(int mleft, int mtop, int w, int h) {
|
|
||||||
final int newWidth = Math.max(0, w);
|
|
||||||
final int newHeight = Math.max(0, h);
|
|
||||||
final boolean changed = marginLeft != mleft || marginTop != mtop || width != newWidth || height != newHeight;
|
|
||||||
|
|
||||||
marginLeft = mleft;
|
|
||||||
marginTop = mtop;
|
|
||||||
|
|
||||||
width = newWidth;
|
|
||||||
height = newHeight;
|
|
||||||
|
|
||||||
this.columns = newWidth / SLOT_SIZE;
|
|
||||||
this.rows = newHeight / SLOT_SIZE;
|
|
||||||
|
|
||||||
paddingLeft = (width % SLOT_SIZE) / 2;
|
|
||||||
|
|
||||||
if (changed) {
|
|
||||||
this.overlapScanner.invalidate();
|
|
||||||
onGridChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void shiftPage(int shift) {
|
|
||||||
if (perPage == 0) {
|
|
||||||
page = 0;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final int numPages = getNumPages();
|
|
||||||
final int oldPage = page;
|
|
||||||
page += shift;
|
|
||||||
|
|
||||||
if (page >= numPages) {
|
|
||||||
page = page - numPages;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (page < 0) {
|
|
||||||
page = numPages + page;
|
|
||||||
}
|
|
||||||
|
|
||||||
page = Math.max(0, Math.min(page, numPages - 1));
|
|
||||||
|
|
||||||
if (page != oldPage) {
|
|
||||||
onGridChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void onGridChanged() {
|
|
||||||
if (this.screenCapture != null) {
|
|
||||||
this.screenCapture.refreshBuffer();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onItemsChanged() {
|
|
||||||
onGridChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void refresh(GuiContainer gui) {
|
|
||||||
if (this.overlapScanner.shouldRefresh()) {
|
|
||||||
updateGuiOverlapSlots(gui);
|
|
||||||
}
|
|
||||||
shiftPage(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void updateGuiOverlapSlots(GuiContainer gui) {
|
|
||||||
final boolean[] oldSlotMap = this.invalidSlotMap;
|
|
||||||
final int size = this.rows * this.columns;
|
|
||||||
final boolean[] slotMap = new boolean[size];
|
|
||||||
|
|
||||||
this.perPage = size;
|
|
||||||
|
|
||||||
if (gui != null && size > 0) {
|
|
||||||
final INEIGuiHandler[] handlers = GuiInfo.getGuiHandlersSnapshot();
|
|
||||||
final Rectangle4i origin = getSlotRect(0, 0);
|
|
||||||
|
|
||||||
this.perPage -= this.overlapScanner.scan(
|
|
||||||
rect -> GuiInfo.hideItemPanelSlot(gui, rect, handlers),
|
|
||||||
origin.x,
|
|
||||||
origin.y,
|
|
||||||
SLOT_SIZE,
|
|
||||||
this.rows,
|
|
||||||
this.columns,
|
|
||||||
origin.x + this.columns * SLOT_SIZE > gui.guiLeft,
|
|
||||||
origin.x < gui.guiLeft + gui.xSize,
|
|
||||||
slotMap);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.invalidSlotMap = slotMap;
|
|
||||||
|
|
||||||
if (!Arrays.equals(oldSlotMap, slotMap)) {
|
|
||||||
onGridChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public T getSlotMouseOver(int mousex, int mousey) {
|
|
||||||
if (!contains(mousex, mousey)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
final int overRow = getRowIndex(mousey);
|
|
||||||
final int overColumn = getColumnIndex(mousex);
|
|
||||||
final int slt = columns * overRow + overColumn;
|
|
||||||
|
|
||||||
if (overRow >= rows || overColumn >= columns) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return getSlotBySlotIndex(slt);
|
|
||||||
}
|
|
||||||
|
|
||||||
public T getSlotBySlotIndex(int slotIndex) {
|
|
||||||
return getMask().stream().filter(item -> item.slotIndex == slotIndex).findAny().orElse(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public T getSlotByItemIndex(int itemIndex) {
|
|
||||||
return getMask().stream().filter(item -> item.itemIndex == itemIndex).findAny().orElse(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Rectangle4i getItemRect(int itemIndex) {
|
|
||||||
final T item = getSlotByItemIndex(itemIndex);
|
|
||||||
return item != null ? getSlotRect(item.slotIndex) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Rectangle4i getSlotRect(int slotIndex) {
|
|
||||||
return getSlotRect(slotIndex / columns, slotIndex % columns);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Rectangle4i getSlotRect(int row, int column) {
|
|
||||||
return new Rectangle4i(
|
|
||||||
marginLeft + paddingLeft + column * SLOT_SIZE,
|
|
||||||
marginTop + row * SLOT_SIZE,
|
|
||||||
SLOT_SIZE,
|
|
||||||
SLOT_SIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getRowIndex(int mousey) {
|
|
||||||
return (mousey - this.marginTop) / SLOT_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getColumnIndex(int mousex) {
|
|
||||||
return (mousex - this.marginLeft - this.paddingLeft) / SLOT_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isInvalidSlot(int index) {
|
|
||||||
return invalidSlotMap[index];
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract List<T> getMask();
|
|
||||||
|
|
||||||
protected abstract M getMouseContext(int mousex, int mousey);
|
|
||||||
|
|
||||||
protected void beforeDrawItems(int mousex, int mousey, M mouseContext) {
|
|
||||||
for (T item : getMask()) {
|
|
||||||
item.beforeDraw(getSlotRect(item.slotIndex), mouseContext);
|
|
||||||
}
|
|
||||||
for (T item : getMask()) {
|
|
||||||
item.drawBorder(getSlotRect(item.slotIndex));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void afterDrawItems(int mousex, int mousey, M mouseContext) {
|
|
||||||
for (T item : getMask()) {
|
|
||||||
item.afterDraw(getSlotRect(item.slotIndex), mouseContext);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void update() {}
|
|
||||||
|
|
||||||
protected void drawItems() {
|
|
||||||
|
|
||||||
for (T item : getMask()) {
|
|
||||||
item.drawItem(getSlotRect(item.slotIndex));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int getGridRenderingCacheMode() {
|
|
||||||
return NEIClientConfig.getGridRenderingCacheMode();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void draw(int mousex, int mousey) {
|
|
||||||
if (getPerPage() == 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final int gridRenderingCacheMode = getGridRenderingCacheMode();
|
|
||||||
final M mouseContext = getMouseContext(mousex, mousey);
|
|
||||||
|
|
||||||
beforeDrawItems(mousex, mousey, mouseContext);
|
|
||||||
|
|
||||||
if (gridRenderingCacheMode > 0) {
|
|
||||||
|
|
||||||
if (this.screenCapture == null) {
|
|
||||||
this.screenCapture = new ScreenCapture();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.screenCapture.needRefresh(gridRenderingCacheMode)) {
|
|
||||||
this.screenCapture.captureScreen(() -> {
|
|
||||||
GuiContainerManager.enableMatrixStackLogging();
|
|
||||||
drawItems();
|
|
||||||
GuiContainerManager.disableMatrixStackLogging();
|
|
||||||
}, gridRenderingCacheMode);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.screenCapture.renderCapturedScreen();
|
|
||||||
} else {
|
|
||||||
GuiContainerManager.enableMatrixStackLogging();
|
|
||||||
drawItems();
|
|
||||||
GuiContainerManager.disableMatrixStackLogging();
|
|
||||||
}
|
|
||||||
|
|
||||||
afterDrawItems(mousex, mousey, mouseContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean contains(int px, int py) {
|
|
||||||
final Rectangle4i rect = new Rectangle4i(
|
|
||||||
marginLeft + paddingLeft,
|
|
||||||
marginTop,
|
|
||||||
columns * SLOT_SIZE,
|
|
||||||
rows * SLOT_SIZE);
|
|
||||||
|
|
||||||
if (!rect.contains(px, py)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return !isInvalidSlot(columns * getRowIndex(py) + getColumnIndex(px));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,259 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.ItemsGrid.ItemsGridSlot;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.recipe.Recipe.RecipeId;
|
|
||||||
|
|
||||||
public class ItemsPanelGrid extends ItemsGrid<ItemsPanelGrid.ItemsPanelGridSlot, ItemsPanelGrid.MouseContext> {
|
|
||||||
|
|
||||||
public static class ItemsPanelGridSlot extends ItemsGridSlot {
|
|
||||||
|
|
||||||
protected static final float LINE_WIDTH = 0.75f;
|
|
||||||
|
|
||||||
public int groupIndex = -1;
|
|
||||||
public String displayName = "";
|
|
||||||
public ItemStack bgItemStack;
|
|
||||||
public int groupSize = 1;
|
|
||||||
public boolean extended = false;
|
|
||||||
|
|
||||||
public Color bgColor = null;
|
|
||||||
|
|
||||||
public ItemsPanelGridSlot(int slotIndex, int itemIndex, ItemStack itemStack) {
|
|
||||||
super(slotIndex, itemIndex, itemStack);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack getBGItem() {
|
|
||||||
return this.bgItemStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public RecipeId getRecipeId() {
|
|
||||||
return FavoriteRecipes.getFavorite(this.item);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void beforeDraw(Rectangle4i rect, MouseContext mouseContext) {
|
|
||||||
super.beforeDraw(rect, mouseContext);
|
|
||||||
|
|
||||||
if (this.bgColor != null) {
|
|
||||||
NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, this.bgColor);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawItem(Rectangle4i rect) {
|
|
||||||
|
|
||||||
if (!this.extended && getBGItem() != null) {
|
|
||||||
GuiContainerManager.drawItems.zLevel -= 10F;
|
|
||||||
super.drawItem(getBGItem(), rect.offset(1, -1));
|
|
||||||
GuiContainerManager.drawItems.zLevel += 10F;
|
|
||||||
super.drawItem(getItemStack(), rect.offset(-2, 2));
|
|
||||||
} else {
|
|
||||||
super.drawItem(rect);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public ArrayList<ItemStack> newItems;
|
|
||||||
public ArrayList<ItemStack> rawItems = new ArrayList<>();
|
|
||||||
protected List<ItemsPanelGridSlot> gridMask;
|
|
||||||
|
|
||||||
protected final Map<Integer, Integer> itemToGroup = new HashMap<>();
|
|
||||||
protected final Map<Integer, List<ItemStack>> groupItems = new HashMap<>();
|
|
||||||
protected boolean forceExpand = false;
|
|
||||||
|
|
||||||
public void setItems(ArrayList<ItemStack> items) {
|
|
||||||
newItems = items;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void updateScale() {
|
|
||||||
SLOT_SIZE = 2 + (int) Math.ceil(8f * NEIClientConfig.getIntSetting("inventory.itempanelScale") / 100) * 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void refresh(GuiContainer gui) {
|
|
||||||
|
|
||||||
if (this.newItems != null) {
|
|
||||||
if (this.rawItems.size() != this.newItems.size()) {
|
|
||||||
this.page = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.groupItems.clear();
|
|
||||||
this.itemToGroup.clear();
|
|
||||||
this.forceExpand = false;
|
|
||||||
|
|
||||||
if (!CollapsibleItems.isEmpty() && !this.newItems.isEmpty()) {
|
|
||||||
final Set<Integer> groups = new HashSet<>();
|
|
||||||
boolean outsideGroup = false;
|
|
||||||
|
|
||||||
this.realItems = new ArrayList<>();
|
|
||||||
this.rawItems = new ArrayList<>(this.newItems);
|
|
||||||
|
|
||||||
for (ItemStack stack : this.newItems) {
|
|
||||||
final int groupIndex = CollapsibleItems.getGroupIndex(stack);
|
|
||||||
|
|
||||||
if (groupIndex == -1) {
|
|
||||||
this.realItems.add(stack);
|
|
||||||
outsideGroup = true;
|
|
||||||
} else {
|
|
||||||
|
|
||||||
if (!groups.contains(groupIndex) || CollapsibleItems.isExpanded(groupIndex)) {
|
|
||||||
this.itemToGroup.put(this.realItems.size(), groupIndex);
|
|
||||||
this.realItems.add(stack);
|
|
||||||
groups.add(groupIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.groupItems.computeIfAbsent(groupIndex, gi -> new ArrayList<>()).add(stack);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// automatically opens if there are elements from only one group
|
|
||||||
if (!outsideGroup && groups.size() == 1) {
|
|
||||||
final int groupIndex = groups.iterator().next();
|
|
||||||
this.realItems = new ArrayList<>(this.newItems);
|
|
||||||
this.itemToGroup.clear();
|
|
||||||
this.forceExpand = true;
|
|
||||||
|
|
||||||
for (int itemIndex = 0; itemIndex < this.realItems.size(); itemIndex++) {
|
|
||||||
this.itemToGroup.put(itemIndex, groupIndex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.realItems = new ArrayList<>(this.newItems);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.newItems = null;
|
|
||||||
onItemsChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
super.refresh(gui);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onGridChanged() {
|
|
||||||
this.gridMask = null;
|
|
||||||
super.onGridChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<ItemsPanelGridSlot> getMask() {
|
|
||||||
|
|
||||||
if (this.gridMask == null) {
|
|
||||||
this.gridMask = new ArrayList<>();
|
|
||||||
int itemIndex = page * perPage;
|
|
||||||
|
|
||||||
for (int slotIndex = 0; slotIndex < rows * columns && itemIndex < size(); slotIndex++) {
|
|
||||||
if (!isInvalidSlot(slotIndex)) {
|
|
||||||
this.gridMask.add(new ItemsPanelGridSlot(slotIndex, itemIndex, getItem(itemIndex)));
|
|
||||||
itemIndex++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
calculateGroupBorders(this.gridMask);
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.gridMask;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected MouseContext getMouseContext(int mousex, int mousey) {
|
|
||||||
final ItemsPanelGridSlot hovered = getSlotMouseOver(mousex, mousey);
|
|
||||||
|
|
||||||
if (hovered != null) {
|
|
||||||
return new MouseContext(
|
|
||||||
hovered.slotIndex,
|
|
||||||
hovered.slotIndex / this.columns,
|
|
||||||
hovered.slotIndex % this.columns);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void calculateGroupBorders(List<ItemsPanelGridSlot> gridMask) {
|
|
||||||
|
|
||||||
if (gridMask.isEmpty() || this.groupItems.isEmpty()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final Color collapsedBGColor = new Color(
|
|
||||||
NEIClientConfig.getSetting("inventory.collapsibleItems.collapsedColor").getHexValue(),
|
|
||||||
true);
|
|
||||||
final Color expandedBGColor = new Color(
|
|
||||||
NEIClientConfig.getSetting("inventory.collapsibleItems.expandedColor").getHexValue(),
|
|
||||||
true);
|
|
||||||
final Color collapsedBorderColor = darkerColor(collapsedBGColor);
|
|
||||||
final Color expandedBorderColor = darkerColor(expandedBGColor);
|
|
||||||
final Map<Integer, Integer> borderGrid = new HashMap<>();
|
|
||||||
|
|
||||||
for (ItemsPanelGridSlot item : gridMask) {
|
|
||||||
borderGrid.put(item.slotIndex, this.itemToGroup.getOrDefault(item.itemIndex, -1));
|
|
||||||
}
|
|
||||||
|
|
||||||
for (ItemsPanelGridSlot item : gridMask) {
|
|
||||||
final int groupIndex = borderGrid.get(item.slotIndex);
|
|
||||||
final List<ItemStack> groupItems = this.groupItems.get(groupIndex);
|
|
||||||
|
|
||||||
if (groupItems == null || groupItems.size() == 1) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
int column = item.slotIndex % this.columns;
|
|
||||||
int row = item.slotIndex / this.columns;
|
|
||||||
int prevSlotIndex = (row - 1) * this.columns + column;
|
|
||||||
int nextSlotIndex = (row + 1) * this.columns + column;
|
|
||||||
|
|
||||||
item.groupIndex = groupIndex;
|
|
||||||
item.groupSize = groupItems.size();
|
|
||||||
item.bgItemStack = groupItems.get(groupItems.size() - 1);
|
|
||||||
item.displayName = CollapsibleItems.getDisplayName(groupIndex);
|
|
||||||
item.extended = this.forceExpand || CollapsibleItems.isExpanded(groupIndex);
|
|
||||||
item.bgColor = item.extended ? expandedBGColor : collapsedBGColor;
|
|
||||||
|
|
||||||
item.borderColor = item.extended ? expandedBorderColor : collapsedBorderColor;
|
|
||||||
item.borderLeft = column == 0 || borderGrid.getOrDefault(item.slotIndex - 1, -1) != groupIndex;
|
|
||||||
item.borderRight = column + 1 == this.columns
|
|
||||||
|| borderGrid.getOrDefault(item.slotIndex + 1, -1) != groupIndex;
|
|
||||||
item.borderTop = borderGrid.getOrDefault(prevSlotIndex, -1) != groupIndex;
|
|
||||||
item.borderBottom = borderGrid.getOrDefault(nextSlotIndex, -1) != groupIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Color darkerColor(Color color) {
|
|
||||||
return new Color(
|
|
||||||
color.getRed(),
|
|
||||||
color.getGreen(),
|
|
||||||
color.getBlue(),
|
|
||||||
Math.min((int) (color.getAlpha() + (255f / 5) * 2), 255));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void draw(int mousex, int mousey) {
|
|
||||||
if (ItemList.loadFinished) {
|
|
||||||
super.draw(mousex, mousey);
|
|
||||||
} else {
|
|
||||||
GuiDraw.drawStringC(
|
|
||||||
NEIClientUtils
|
|
||||||
.cropText(GuiDraw.fontRenderer, NEIClientUtils.translate("itempanel.loading"), width - 10),
|
|
||||||
marginLeft + width / 2,
|
|
||||||
marginTop + height / 2,
|
|
||||||
0xffffff,
|
|
||||||
true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,410 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import static codechicken.lib.gui.GuiDraw.fontRenderer;
|
|
||||||
|
|
||||||
import java.awt.Dimension;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.IdentityHashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import net.minecraft.client.renderer.RenderHelper;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
import org.lwjgl.opengl.GL12;
|
|
||||||
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
|
||||||
import codechicken.lib.gui.GuiDraw.ITooltipLineHandler;
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.NEIClientUtils.Alignment;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
import codechicken.nei.util.ReadableNumberConverter;
|
|
||||||
|
|
||||||
public class ItemsTooltipLineHandler implements ITooltipLineHandler {
|
|
||||||
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface AmountRenderer {
|
|
||||||
|
|
||||||
void draw(int x, int y, ItemStack stack, long amount);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class NoAmountRenderer implements AmountRenderer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int x, int y, ItemStack stack, long amount) {
|
|
||||||
GuiContainerManager.drawItem(x, y, stack, true, "");
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static void drawAmountText(String text, Rectangle4i rect, int color, Alignment alignment) {
|
|
||||||
NEIClientUtils.drawNEIOverlayText(text, rect, 1, color, true, alignment);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class TotalAmountRenderer extends NoAmountRenderer {
|
|
||||||
|
|
||||||
private static class AmountText {
|
|
||||||
|
|
||||||
public final String text;
|
|
||||||
public final Alignment alignment;
|
|
||||||
|
|
||||||
public AmountText(String text, Alignment alignment) {
|
|
||||||
this.text = text;
|
|
||||||
this.alignment = alignment;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private final Map<ItemStack, AmountText> cache = new IdentityHashMap<>();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int x, int y, ItemStack stack, long amount) {
|
|
||||||
super.draw(x, y, stack, amount);
|
|
||||||
drawAmount(new Rectangle4i(x, y, SLOT_SIZE - 2, SLOT_SIZE - 2), stack, amount);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void drawAmount(Rectangle4i rect, ItemStack stack, long amount) {
|
|
||||||
final AmountText amountText = this.cache.computeIfAbsent(stack, key -> {
|
|
||||||
final boolean isFluidDisplay = StackInfo.isFluidDisplayItem(key);
|
|
||||||
final String text = formatAmount(key, amount);
|
|
||||||
|
|
||||||
return new AmountText(
|
|
||||||
isFluidDisplay && !text.isEmpty() ? text + "L" : text,
|
|
||||||
isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!amountText.text.isEmpty()) {
|
|
||||||
drawAmountText(amountText.text, rect, 0xFFFFFF, amountText.alignment);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected String formatAmount(ItemStack stack, long amount) {
|
|
||||||
return amount == 0 ? "" : ReadableNumberConverter.INSTANCE.toWideReadableForm(amount);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class StacksAmountRenderer extends NoAmountRenderer {
|
|
||||||
|
|
||||||
private static class StacksText {
|
|
||||||
|
|
||||||
public final String stacks;
|
|
||||||
public final String remainder;
|
|
||||||
public final int color;
|
|
||||||
|
|
||||||
public StacksText(String stacks, String remainder, int color) {
|
|
||||||
this.stacks = stacks;
|
|
||||||
this.remainder = remainder;
|
|
||||||
this.color = color;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private final Map<ItemStack, StacksText> cache = new IdentityHashMap<>();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int x, int y, ItemStack stack, long amount) {
|
|
||||||
super.draw(x, y, stack, amount);
|
|
||||||
drawAmount(new Rectangle4i(x, y, SLOT_SIZE - 2, SLOT_SIZE - 2), stack, amount);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void drawAmount(Rectangle4i rect, ItemStack stack, long amount) {
|
|
||||||
final StacksText stacksText = this.cache.computeIfAbsent(stack, key -> formatAmount(key, amount));
|
|
||||||
|
|
||||||
if (!stacksText.stacks.isEmpty()) {
|
|
||||||
drawAmountText(stacksText.stacks, rect, stacksText.color, Alignment.TopLeft);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!stacksText.remainder.isEmpty()) {
|
|
||||||
drawAmountText(stacksText.remainder, rect, stacksText.color, Alignment.BottomRight);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private StacksText formatAmount(ItemStack stack, long amount) {
|
|
||||||
final long stackSize = StackInfo.isFluidDisplayItem(stack) ? FLUID_STACK_SIZE
|
|
||||||
: Math.max(1, stack.getMaxStackSize());
|
|
||||||
final long stacks = amount / stackSize;
|
|
||||||
final long remainder = amount % stackSize;
|
|
||||||
final String prefix = getPrefix(stack);
|
|
||||||
|
|
||||||
return new StacksText(
|
|
||||||
stacks > 0 ? prefix + "x" + ReadableNumberConverter.INSTANCE.toWideReadableForm(stacks) : "",
|
|
||||||
remainder > 0
|
|
||||||
? (stacks > 0 ? "+" : prefix)
|
|
||||||
+ ReadableNumberConverter.INSTANCE.toWideReadableForm(remainder)
|
|
||||||
: "",
|
|
||||||
getColor(stack));
|
|
||||||
}
|
|
||||||
|
|
||||||
protected String getPrefix(ItemStack stack) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int getColor(ItemStack stack) {
|
|
||||||
return 0xFFFFFF;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static final int SLOT_SIZE = 18;
|
|
||||||
protected static final int ICON_SIZE = 16;
|
|
||||||
protected static final int ICON_OFFSET = 1;
|
|
||||||
protected static final int MAX_COLUMNS = 11;
|
|
||||||
protected static final int MARGIN_TOP = 2;
|
|
||||||
protected static final int LABEL_MARGIN = 15;
|
|
||||||
protected static final int NAME_MARGIN = 2;
|
|
||||||
protected static final int DEFAULT_MAX_ROWS = 5;
|
|
||||||
protected static final int FLUID_STACK_SIZE = 144;
|
|
||||||
|
|
||||||
protected final List<ItemStack> items;
|
|
||||||
protected final List<Long> amounts = new ArrayList<>();
|
|
||||||
protected final List<String> names = new ArrayList<>();
|
|
||||||
|
|
||||||
protected AmountRenderer amountRenderer;
|
|
||||||
|
|
||||||
protected String label;
|
|
||||||
protected EnumChatFormatting labelColor = EnumChatFormatting.GRAY;
|
|
||||||
|
|
||||||
protected int activeStackIndex = -1;
|
|
||||||
protected Dimension size = new Dimension();
|
|
||||||
|
|
||||||
protected int maxNamedRows = Integer.MAX_VALUE;
|
|
||||||
|
|
||||||
protected int length = 0;
|
|
||||||
protected int rows = 0;
|
|
||||||
protected int nameRows = 0;
|
|
||||||
protected int gridColumns = 0;
|
|
||||||
protected int gridCount = 0;
|
|
||||||
|
|
||||||
public static ItemsTooltipLineHandler of(String label, List<ItemStack> items, int maxRows, int maxNamedRows) {
|
|
||||||
return new ItemsTooltipLineHandler(label, items, true, maxRows, maxNamedRows);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemsTooltipLineHandler(String label, List<ItemStack> items) {
|
|
||||||
this(label, items, true, DEFAULT_MAX_ROWS, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemsTooltipLineHandler(String label, List<ItemStack> items, boolean saveStackSize, int maxRows) {
|
|
||||||
this(label, items, saveStackSize, maxRows, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected ItemsTooltipLineHandler(String label, List<ItemStack> items, boolean saveStackSize, int maxRows,
|
|
||||||
int maxNamedRows) {
|
|
||||||
this.label = label;
|
|
||||||
this.items = groupingItemStacks(items);
|
|
||||||
this.amountRenderer = saveStackSize ? new TotalAmountRenderer() : new NoAmountRenderer();
|
|
||||||
this.length = this.items.size();
|
|
||||||
this.maxNamedRows = maxNamedRows;
|
|
||||||
|
|
||||||
setMaxRows(maxRows);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static int headerHeight() {
|
|
||||||
return fontRenderer.FONT_HEIGHT + 2 + MARGIN_TOP;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemsTooltipLineHandler setMaxRows(int maxRows) {
|
|
||||||
if (this.length == 0) {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.names.clear();
|
|
||||||
this.nameRows = 0;
|
|
||||||
|
|
||||||
if (!layoutWithNames(maxRows)) {
|
|
||||||
layoutAsGrid(maxRows);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.size.height = this.rows * SLOT_SIZE + headerHeight();
|
|
||||||
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getRows() {
|
|
||||||
return this.rows;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected boolean layoutWithNames(int maxRows) {
|
|
||||||
final int maxNames = Math.min(this.maxNamedRows, this.length <= maxRows ? this.length : maxRows - 1);
|
|
||||||
final int[] lineWidth = new int[maxNames + 1];
|
|
||||||
lineWidth[0] = labelWidth();
|
|
||||||
|
|
||||||
for (int index = 0; index < maxNames; index++) {
|
|
||||||
final String name = this.items.get(index).getDisplayName();
|
|
||||||
this.names.add(name);
|
|
||||||
lineWidth[index + 1] = Math
|
|
||||||
.max(lineWidth[index], SLOT_SIZE + NAME_MARGIN + fontRenderer.getStringWidth(name));
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int named = maxNames; named >= 0; named--) {
|
|
||||||
final int rest = this.length - named;
|
|
||||||
final int width = Math.max(lineWidth[named], Math.min(rest, MAX_COLUMNS) * SLOT_SIZE);
|
|
||||||
final int columns = Math.max(1, width / SLOT_SIZE);
|
|
||||||
final int restRows = (int) Math.ceil((float) rest / columns);
|
|
||||||
|
|
||||||
if (named + restRows <= maxRows) {
|
|
||||||
this.nameRows = named;
|
|
||||||
this.gridColumns = columns;
|
|
||||||
this.gridCount = rest;
|
|
||||||
this.rows = named + restRows;
|
|
||||||
this.size.width = width;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.names.clear();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void layoutAsGrid(int maxRows) {
|
|
||||||
this.gridColumns = Math.min(MAX_COLUMNS, this.length);
|
|
||||||
this.rows = Math.min(maxRows, (int) Math.ceil((float) this.length / this.gridColumns));
|
|
||||||
this.gridCount = Math.min(this.length, this.gridColumns * this.rows);
|
|
||||||
this.size.width = Math.max(this.gridColumns * SLOT_SIZE, labelWidth());
|
|
||||||
|
|
||||||
if (this.gridCount < this.length) {
|
|
||||||
this.gridCount -= reservedColumns(this.length - this.gridCount);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int labelWidth() {
|
|
||||||
return fontRenderer.getStringWidth(this.label) + LABEL_MARGIN;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int reservedColumns(int hidden) {
|
|
||||||
return (int) Math.ceil((float) (fontRenderer.getStringWidth("+" + hidden) - 2) / SLOT_SIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemsTooltipLineHandler setAmountRenderer(AmountRenderer amountRenderer) {
|
|
||||||
this.amountRenderer = amountRenderer;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setActiveStack(ItemStack activeStack) {
|
|
||||||
final ItemStack realStack = items.stream().filter(stack -> NEIClientUtils.areStacksSameType(stack, activeStack))
|
|
||||||
.findFirst().orElse(null);
|
|
||||||
this.activeStackIndex = items.indexOf(realStack);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack getActiveStack() {
|
|
||||||
return this.activeStackIndex == -1 ? null : this.items.get(this.activeStackIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<ItemStack> getItems() {
|
|
||||||
return this.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isEmpty() {
|
|
||||||
return this.items.isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dimension getSize() {
|
|
||||||
return this.size;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLabelColor(EnumChatFormatting color) {
|
|
||||||
this.labelColor = color;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLabel(String label) {
|
|
||||||
this.label = label;
|
|
||||||
this.size.width = Math.max(this.size.width, labelWidth());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int x, int y) {
|
|
||||||
if (this.length == 0) return;
|
|
||||||
|
|
||||||
y += MARGIN_TOP;
|
|
||||||
|
|
||||||
fontRenderer.drawStringWithShadow(this.labelColor + this.label + ":", x, y, 0);
|
|
||||||
|
|
||||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
|
||||||
|
|
||||||
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
|
|
||||||
RenderHelper.enableGUIStandardItemLighting();
|
|
||||||
|
|
||||||
final int xTranslation = x;
|
|
||||||
final int yTranslation = y + fontRenderer.FONT_HEIGHT + 2;
|
|
||||||
final int zTranslation = GuiContainerManager.TOOLTIP_Z_OFFSET;
|
|
||||||
GL11.glTranslatef(xTranslation, yTranslation, zTranslation);
|
|
||||||
|
|
||||||
final int gridShift = gridIndexShift();
|
|
||||||
|
|
||||||
for (int index = 0; index < this.nameRows; index++) {
|
|
||||||
drawSlot(0, index * SLOT_SIZE, index);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int index = 0; index < this.gridCount; index++) {
|
|
||||||
drawSlot(
|
|
||||||
(index % this.gridColumns) * SLOT_SIZE,
|
|
||||||
(this.nameRows + index / this.gridColumns) * SLOT_SIZE,
|
|
||||||
this.nameRows + gridShift + index);
|
|
||||||
}
|
|
||||||
|
|
||||||
NEIClientUtils.gl2DRenderContext(() -> {
|
|
||||||
final int textShift = ICON_OFFSET + Math.round((ICON_SIZE - fontRenderer.FONT_HEIGHT) / 2f);
|
|
||||||
|
|
||||||
for (int index = 0; index < this.nameRows; index++) {
|
|
||||||
fontRenderer.drawStringWithShadow(
|
|
||||||
EnumChatFormatting.GRAY + this.names.get(index),
|
|
||||||
SLOT_SIZE + NAME_MARGIN,
|
|
||||||
index * SLOT_SIZE + textShift,
|
|
||||||
0xFFFFFF);
|
|
||||||
}
|
|
||||||
|
|
||||||
final int hidden = this.length - this.nameRows - this.gridCount;
|
|
||||||
|
|
||||||
if (hidden > 0) {
|
|
||||||
final String text = "+" + hidden;
|
|
||||||
fontRenderer.drawStringWithShadow(
|
|
||||||
EnumChatFormatting.GRAY + text,
|
|
||||||
this.size.width - fontRenderer.getStringWidth(text) - 2,
|
|
||||||
(this.rows - 1) * SLOT_SIZE + textShift,
|
|
||||||
0xFFFFFF);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
GL11.glTranslatef(-xTranslation, -yTranslation, -zTranslation);
|
|
||||||
GL11.glPopAttrib();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int gridIndexShift() {
|
|
||||||
if (this.nameRows > 0 || this.activeStackIndex == -1) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Math.max(0, Math.min(this.length - this.gridCount, this.activeStackIndex - this.gridCount + 2));
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void drawSlot(int x, int y, int index) {
|
|
||||||
if (this.activeStackIndex == index) {
|
|
||||||
NEIClientUtils.gl2DRenderContext(() -> GuiDraw.drawRect(x, y, SLOT_SIZE, SLOT_SIZE, 0x66555555));
|
|
||||||
}
|
|
||||||
|
|
||||||
drawStackWithAmount(x, y, index);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void drawStackWithAmount(int x, int y, int index) {
|
|
||||||
this.amountRenderer.draw(x + ICON_OFFSET, y + ICON_OFFSET, this.items.get(index), this.amounts.get(index));
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<ItemStack> groupingItemStacks(List<ItemStack> items) {
|
|
||||||
final List<ItemStack> result = new ArrayList<>();
|
|
||||||
|
|
||||||
for (Map.Entry<NBTTagCompound, Long> entry : ItemStackAmount.of(items).entrySet()) {
|
|
||||||
result.add(StackInfo.loadFromNBT(entry.getKey(), 0));
|
|
||||||
this.amounts.add(Math.max(0, entry.getValue()));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.isEmpty()) {
|
|
||||||
for (ItemStack stack : items) {
|
|
||||||
result.add(stack);
|
|
||||||
this.amounts.add(0L);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,200 +1,52 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import org.lwjgl.input.Keyboard;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.Map;
|
import java.util.Map.Entry;
|
||||||
import java.util.StringJoiner;
|
|
||||||
import java.util.function.BooleanSupplier;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.settings.KeyBinding;
|
|
||||||
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
import org.lwjgl.input.Mouse;
|
|
||||||
|
|
||||||
import codechicken.nei.util.NEIKeyboardUtils;
|
|
||||||
import codechicken.nei.util.NEIMouseUtils;
|
|
||||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers NEI key bindings as vanilla {@link KeyBinding}s and exposes their state to the rest of NEI.
|
* Good old down/held/up keystate tracker
|
||||||
*/
|
*/
|
||||||
public class KeyManager {
|
public class KeyManager
|
||||||
|
{
|
||||||
public static interface IKeyStateTracker {
|
public static interface IKeyStateTracker
|
||||||
|
{
|
||||||
public void tickKeyStates();
|
public void tickKeyStates();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class KeyState
|
||||||
|
{
|
||||||
|
public boolean down;
|
||||||
|
public boolean held;
|
||||||
|
public boolean up;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static HashMap<String, KeyState> keyStates = new HashMap<>();
|
||||||
public static LinkedList<IKeyStateTracker> trackers = new LinkedList<>();
|
public static LinkedList<IKeyStateTracker> trackers = new LinkedList<>();
|
||||||
private static final Map<String, KeyBinding> keyBindings = new HashMap<>();
|
|
||||||
private static final Map<String, String> keyAliases = new HashMap<>();
|
public static void tickKeyStates()
|
||||||
private static volatile boolean pendingOptionsReload = false;
|
{
|
||||||
private static int clickedButton = -1;
|
for(Entry<String, KeyState> entry : keyStates.entrySet())
|
||||||
|
{
|
||||||
static {
|
int keyCode = NEIClientConfig.getKeyBinding(entry.getKey());
|
||||||
// Aliases for legacy keybinds
|
boolean down = keyCode != 0 && Keyboard.isKeyDown(keyCode);
|
||||||
keyAliases.put("gui.recipe", "recipe.recipe");
|
KeyState state = entry.getValue();
|
||||||
keyAliases.put("gui.usage", "recipe.usage");
|
if(down)
|
||||||
keyAliases.put("gui.hide_bookmarks", "bookmark.hide");
|
{
|
||||||
}
|
state.down = !state.held;
|
||||||
|
state.up = false;
|
||||||
public static KeyBinding registerKeyBinding(String ident, int defaultKey) {
|
|
||||||
return keyBindings.computeIfAbsent(ident, id -> {
|
|
||||||
final KeyBinding binding = new KeyBinding(
|
|
||||||
"nei.options.keys." + id,
|
|
||||||
NEIKeyboardUtils.unhash(defaultKey),
|
|
||||||
categoryFor(id));
|
|
||||||
ClientRegistry.registerKeyBinding(binding);
|
|
||||||
return binding;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public static KeyBinding getKeyBinding(String ident) {
|
|
||||||
return keyBindings.get(keyAliases.getOrDefault(ident, ident));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isRegistered(String description) {
|
|
||||||
for (KeyBinding binding : keyBindings.values()) {
|
|
||||||
if (binding.getKeyDescription().equals(description)) {
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
return false;
|
{
|
||||||
}
|
state.up = state.held;
|
||||||
|
state.down = false;
|
||||||
public static int getKeyCode(String ident) {
|
|
||||||
final KeyBinding binding = getKeyBinding(ident);
|
|
||||||
return binding == null ? Keyboard.KEY_NONE : binding.getKeyCode();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isKeyDown(String ident) {
|
|
||||||
final KeyBinding binding = getKeyBinding(ident);
|
|
||||||
|
|
||||||
if (binding != null) {
|
|
||||||
final int keyCode = binding.getKeyCode();
|
|
||||||
|
|
||||||
if (keyCode < 0) {
|
|
||||||
final int button = keyCode + 100;
|
|
||||||
return Mouse.isButtonDown(button) || button == clickedButton;
|
|
||||||
} else if (keyCode > Keyboard.KEY_NONE && keyCode < Keyboard.KEYBOARD_SIZE) {
|
|
||||||
return Keyboard.isKeyDown(keyCode);
|
|
||||||
}
|
}
|
||||||
|
state.held = down;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
for(IKeyStateTracker tracker : trackers)
|
||||||
}
|
tracker.tickKeyStates();
|
||||||
|
|
||||||
/**
|
|
||||||
* Whether any NEI key binding is assigned to the given mouse button.
|
|
||||||
*/
|
|
||||||
public static boolean isMouseBound(int button) {
|
|
||||||
for (KeyBinding binding : keyBindings.values()) {
|
|
||||||
if (binding.getKeyCode() == button - 100) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Runs a hotkey handler for a click of the given mouse button if the button is bound to any NEI key binding. The
|
|
||||||
* button is reported as down by {@link #isKeyDown} for the duration of the call, because the LWJGL button state can
|
|
||||||
* already be released when a quick click is processed.
|
|
||||||
*
|
|
||||||
* @return true if the click was consumed by the handler
|
|
||||||
*/
|
|
||||||
public static boolean handleMouseHotkey(int button, BooleanSupplier handler) {
|
|
||||||
if (!isMouseBound(button)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
final int previous = clickedButton;
|
|
||||||
clickedButton = button;
|
|
||||||
|
|
||||||
try {
|
|
||||||
return handler.getAsBoolean();
|
|
||||||
} finally {
|
|
||||||
clickedButton = previous;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isHashDown(String ident) {
|
|
||||||
return isHashDown(ident, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isHashDown(String ident, int modifierMask) {
|
|
||||||
|
|
||||||
if (!isKeyDown(ident)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIKeyboardUtils.isHashKey(getKeyCode(ident))) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ((modifierMask & NEIKeyboardUtils.CTRL_HASH) != 0) == NEIClientUtils.controlKey()
|
|
||||||
&& ((modifierMask & NEIKeyboardUtils.SHIFT_HASH) != 0) == NEIClientUtils.shiftKey()
|
|
||||||
&& ((modifierMask & NEIKeyboardUtils.ALT_HASH) != 0) == NEIClientUtils.altKey();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getKeyName(String ident) {
|
|
||||||
return getKeyName(ident, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getKeyName(String ident, int meta) {
|
|
||||||
final int keyCode = getKeyCode(ident);
|
|
||||||
return keyCode == Keyboard.KEY_NONE ? null : NEIKeyboardUtils.getKeyName(keyCode, meta);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getKeyName(String ident, int meta, int mouseBind) {
|
|
||||||
final int keyCode = getKeyCode(ident);
|
|
||||||
return keyCode == Keyboard.KEY_NONE && mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? null
|
|
||||||
: getKeyName(keyCode, meta, mouseBind);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getKeyName(int keyBind, int mouseBind) {
|
|
||||||
final int keyCode = NEIKeyboardUtils.unhash(keyBind);
|
|
||||||
return getKeyName(keyCode, keyBind - keyCode, mouseBind);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String getKeyName(int keyCode, int hash, int mouseBind) {
|
|
||||||
StringJoiner keyText = new StringJoiner(" + ");
|
|
||||||
String keyHash = keyCode == Keyboard.KEY_NONE && hash == 0 ? "" : NEIKeyboardUtils.getKeyName(keyCode, hash);
|
|
||||||
String mouseHash = mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? "" : NEIMouseUtils.getKeyName(mouseBind);
|
|
||||||
|
|
||||||
if (!keyHash.isEmpty()) {
|
|
||||||
keyText.add(keyHash);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!mouseHash.isEmpty()) {
|
|
||||||
keyText.add(mouseHash);
|
|
||||||
}
|
|
||||||
|
|
||||||
return keyText.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isPressed(String ident) {
|
|
||||||
final KeyBinding binding = getKeyBinding(ident);
|
|
||||||
return binding != null && binding.isPressed();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String categoryFor(String ident) {
|
|
||||||
final int dot = ident.indexOf('.');
|
|
||||||
return dot < 0 ? "nei.options.keys" : "nei.options.keys." + ident.substring(0, dot);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void requestOptionsReload() {
|
|
||||||
pendingOptionsReload = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void tickKeyStates() {
|
|
||||||
|
|
||||||
if (pendingOptionsReload) {
|
|
||||||
pendingOptionsReload = false;
|
|
||||||
Minecraft.getMinecraft().gameSettings.loadOptions();
|
|
||||||
}
|
|
||||||
|
|
||||||
for (IKeyStateTracker tracker : trackers) tracker.tickKeyStates();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
// Simple LRUCache
|
|
||||||
public class LRUCache<K, V> extends LinkedHashMap<K, V> {
|
|
||||||
|
|
||||||
private final int capacity;
|
|
||||||
|
|
||||||
public LRUCache(int capacity) {
|
|
||||||
super(capacity, 0.75f, true);
|
|
||||||
this.capacity = capacity;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
|
|
||||||
return size() > capacity;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -3,25 +3,30 @@ package codechicken.nei;
|
|||||||
import static codechicken.lib.gui.GuiDraw.drawString;
|
import static codechicken.lib.gui.GuiDraw.drawString;
|
||||||
import static codechicken.lib.gui.GuiDraw.drawStringC;
|
import static codechicken.lib.gui.GuiDraw.drawStringC;
|
||||||
|
|
||||||
public class Label extends Widget {
|
public class Label extends Widget
|
||||||
|
{
|
||||||
final boolean centered;
|
final boolean centered;
|
||||||
final int colour;
|
final int colour;
|
||||||
public String text;
|
public String text;
|
||||||
|
|
||||||
public Label(String s, boolean center, int color) {
|
public Label(String s, boolean center, int color)
|
||||||
|
{
|
||||||
text = s;
|
text = s;
|
||||||
centered = center;
|
centered = center;
|
||||||
colour = color;
|
colour = color;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Label(String s, boolean center) {
|
public Label(String s, boolean center)
|
||||||
|
{
|
||||||
this(s, center, 0xFFFFFFFF);
|
this(s, center, 0xFFFFFFFF);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void draw(int mousex, int mousey) {
|
public void draw(int mousex, int mousey)
|
||||||
if (centered) drawStringC(text, x, y, colour);
|
{
|
||||||
else drawString(text, x, y, colour);
|
if(centered)
|
||||||
|
drawStringC(text, x, y, colour);
|
||||||
|
else
|
||||||
|
drawString(text, x, y, colour);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,19 +1,34 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.lib.gui.GuiDraw.drawStringC;
|
import codechicken.nei.api.LayoutStyle;
|
||||||
|
import codechicken.nei.drawable.DrawableBuilder;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
import static codechicken.lib.gui.GuiDraw.drawStringC;
|
||||||
import codechicken.nei.api.LayoutStyle;
|
import static codechicken.nei.LayoutManager.bookmarkPanel;
|
||||||
|
import static codechicken.nei.LayoutManager.bookmarksButton;
|
||||||
public class LayoutStyleMinecraft extends LayoutStyle {
|
import static codechicken.nei.LayoutManager.delete;
|
||||||
|
import static codechicken.nei.LayoutManager.dropDown;
|
||||||
protected static final int BUTTON_SIZE = 20;
|
import static codechicken.nei.LayoutManager.gamemode;
|
||||||
protected static final int MARGIN = 2;
|
import static codechicken.nei.LayoutManager.heal;
|
||||||
|
import static codechicken.nei.LayoutManager.itemPanel;
|
||||||
|
import static codechicken.nei.LayoutManager.itemPresenceOverlays;
|
||||||
|
import static codechicken.nei.LayoutManager.less;
|
||||||
|
import static codechicken.nei.LayoutManager.magnet;
|
||||||
|
import static codechicken.nei.LayoutManager.more;
|
||||||
|
import static codechicken.nei.LayoutManager.options;
|
||||||
|
import static codechicken.nei.LayoutManager.quantity;
|
||||||
|
import static codechicken.nei.LayoutManager.rain;
|
||||||
|
import static codechicken.nei.LayoutManager.searchField;
|
||||||
|
import static codechicken.nei.LayoutManager.timeButtons;
|
||||||
|
import static codechicken.nei.NEIClientConfig.canPerformAction;
|
||||||
|
import static codechicken.nei.NEIClientConfig.disabledActions;
|
||||||
|
import static codechicken.nei.NEIClientConfig.getMagnetMode;
|
||||||
|
import static codechicken.nei.NEIClientConfig.isEnabled;
|
||||||
|
|
||||||
|
public class LayoutStyleMinecraft extends LayoutStyle
|
||||||
|
{
|
||||||
public int buttonCount;
|
public int buttonCount;
|
||||||
public int leftSize;
|
public int leftSize;
|
||||||
public int numButtons;
|
public int numButtons;
|
||||||
@@ -25,18 +40,19 @@ public class LayoutStyleMinecraft extends LayoutStyle {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
LayoutManager.delete.icon = new Image(144, 12, 12, 12);
|
delete.icon = new Image(144, 12, 12, 12);
|
||||||
LayoutManager.rain.icon = new Image(120, 12, 12, 12);
|
rain.icon = new Image(120, 12, 12, 12);
|
||||||
LayoutManager.gamemode.icons[0] = new Image(132, 12, 12, 12);
|
gamemode.icons[0] = new Image(132, 12, 12, 12);
|
||||||
LayoutManager.gamemode.icons[1] = new Image(156, 12, 12, 12);
|
gamemode.icons[1] = new Image(156, 12, 12, 12);
|
||||||
LayoutManager.gamemode.icons[2] = new Image(168, 12, 12, 12);
|
gamemode.icons[2] = new Image(168, 12, 12, 12);
|
||||||
LayoutManager.magnet.icons[0] = new Image(180, 24, 12, 12);
|
magnet.icon = new Image(180, 24, 12, 12);
|
||||||
LayoutManager.magnet.icons[1] = new Image(180, 36, 12, 12);
|
timeButtons[0].icon = new Image(132, 24, 12, 12);
|
||||||
LayoutManager.timeButtons[0].icon = new Image(132, 24, 12, 12);
|
timeButtons[1].icon = new Image(120, 24, 12, 12);
|
||||||
LayoutManager.timeButtons[1].icon = new Image(120, 24, 12, 12);
|
timeButtons[2].icon = new Image(144, 24, 12, 12);
|
||||||
LayoutManager.timeButtons[2].icon = new Image(144, 24, 12, 12);
|
timeButtons[3].icon = new Image(156, 24, 12, 12);
|
||||||
LayoutManager.timeButtons[3].icon = new Image(156, 24, 12, 12);
|
heal.icon = new Image(168, 24, 12, 12);
|
||||||
LayoutManager.heal.icon = new Image(168, 24, 12, 12);
|
itemPresenceOverlays[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 40, 8, 8).build();
|
||||||
|
itemPresenceOverlays[1] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 8, 40, 8, 8).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -48,179 +64,103 @@ public class LayoutStyleMinecraft extends LayoutStyle {
|
|||||||
public void layout(GuiContainer gui, VisiblityData visiblity) {
|
public void layout(GuiContainer gui, VisiblityData visiblity) {
|
||||||
reset();
|
reset();
|
||||||
|
|
||||||
leftSize = (gui.width - gui.xSize) / 2 - 4;
|
leftSize = ItemPanels.bookmarkPanel.getWidth(gui);
|
||||||
numButtons = Math.max(leftSize / 20, 1);
|
numButtons = Math.max(leftSize / 18, 1);
|
||||||
|
|
||||||
LayoutManager.delete.state = 0x4;
|
delete.state = 0x4;
|
||||||
if (NEIController.getDeleteMode()) {
|
if (NEIController.getDeleteMode())
|
||||||
LayoutManager.delete.state |= 1;
|
delete.state |= 1;
|
||||||
} else if (!visiblity.enableDeleteMode) {
|
else if (!visiblity.enableDeleteMode)
|
||||||
LayoutManager.delete.state |= 2;
|
delete.state |= 2;
|
||||||
}
|
|
||||||
|
|
||||||
LayoutManager.rain.state = 0x4;
|
rain.state = 0x4;
|
||||||
if (NEIClientConfig.disabledActions.contains("rain")) {
|
if (disabledActions.contains("rain"))
|
||||||
LayoutManager.rain.state |= 2;
|
rain.state |= 2;
|
||||||
} else if (NEIClientUtils.isRaining()) {
|
else if (NEIClientUtils.isRaining())
|
||||||
LayoutManager.rain.state |= 1;
|
rain.state |= 1;
|
||||||
}
|
|
||||||
|
|
||||||
LayoutManager.gamemode.state = 0x4;
|
gamemode.state = 0x4;
|
||||||
if (NEIClientUtils.getGamemode() != 0) {
|
if (NEIClientUtils.getGamemode() != 0) {
|
||||||
LayoutManager.gamemode.state |= 0x1;
|
gamemode.state |= 0x1;
|
||||||
LayoutManager.gamemode.index = NEIClientUtils.getGamemode() - 1;
|
gamemode.index = NEIClientUtils.getGamemode() - 1;
|
||||||
} else {
|
} else {
|
||||||
if (NEIClientUtils.isValidGamemode("creative")) {
|
if (NEIClientUtils.isValidGamemode("creative"))
|
||||||
LayoutManager.gamemode.index = 0;
|
gamemode.index = 0;
|
||||||
} else if (NEIClientUtils.isValidGamemode("creative+")) {
|
else if (NEIClientUtils.isValidGamemode("creative+"))
|
||||||
LayoutManager.gamemode.index = 1;
|
gamemode.index = 1;
|
||||||
} else if (NEIClientUtils.isValidGamemode("adventure")) {
|
else if (NEIClientUtils.isValidGamemode("adventure"))
|
||||||
LayoutManager.gamemode.index = 2;
|
gamemode.index = 2;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
LayoutManager.bookmarksButton.index = NEIClientConfig.isBookmarkPanelHidden() ? 0 : 1;
|
bookmarksButton.index = NEIClientConfig.isBookmarkPanelHidden() ? 0 : 1;
|
||||||
LayoutManager.options.index = NEIClientConfig.getCheatMode();
|
options.index = NEIClientConfig.getCheatMode();
|
||||||
|
|
||||||
LayoutManager.magnet.state = 0x4 | (NEIClientConfig.getMagnetMode() ? 1 : 0);
|
magnet.state = 0x4 | (getMagnetMode() ? 1 : 0);
|
||||||
LayoutManager.magnet.index = (LayoutManager.magnet.state & 0x1) != 0 ? 1 : 0;
|
|
||||||
|
|
||||||
if (NEIClientConfig.canPerformAction("delete")) {
|
if (canPerformAction("delete"))
|
||||||
layoutButton(LayoutManager.delete);
|
layoutButton(delete);
|
||||||
}
|
if (canPerformAction("rain"))
|
||||||
|
layoutButton(rain);
|
||||||
if (NEIClientConfig.canPerformAction("rain")) {
|
if (NEIClientUtils.isValidGamemode("creative") ||
|
||||||
layoutButton(LayoutManager.rain);
|
NEIClientUtils.isValidGamemode("creative+") ||
|
||||||
}
|
NEIClientUtils.isValidGamemode("adventure"))
|
||||||
|
layoutButton(gamemode);
|
||||||
if (NEIClientUtils.isValidGamemode("creative") || NEIClientUtils.isValidGamemode("creative+")
|
if (canPerformAction("magnet"))
|
||||||
|| NEIClientUtils.isValidGamemode("adventure")) {
|
layoutButton(magnet);
|
||||||
layoutButton(LayoutManager.gamemode);
|
if (canPerformAction("time")) {
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.canPerformAction("magnet")) {
|
|
||||||
layoutButton(LayoutManager.magnet);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.canPerformAction("time")) {
|
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
LayoutManager.timeButtons[i].state = NEIClientConfig.disabledActions.contains(NEIActions.timeZones[i])
|
timeButtons[i].state = disabledActions.contains(NEIActions.timeZones[i]) ? 2 : 0;
|
||||||
? 2
|
layoutButton(timeButtons[i]);
|
||||||
: 0;
|
|
||||||
layoutButton(LayoutManager.timeButtons[i]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (canPerformAction("heal"))
|
||||||
|
layoutButton(heal);
|
||||||
|
|
||||||
if (NEIClientConfig.canPerformAction("heal")) {
|
itemPanel.resize(gui);
|
||||||
layoutButton(LayoutManager.heal);
|
bookmarkPanel.resize(gui);
|
||||||
|
|
||||||
|
more.w = more.h = less.w = less.h = 16;
|
||||||
|
less.x = itemPanel.prev.x;
|
||||||
|
more.x = gui.width - less.w - 2;
|
||||||
|
more.y = less.y = gui.height - more.h - 2;
|
||||||
|
|
||||||
|
quantity.x = less.x + less.w + 2;
|
||||||
|
quantity.y = less.y;
|
||||||
|
quantity.w = more.x - quantity.x - 2;
|
||||||
|
quantity.h = less.h;
|
||||||
|
|
||||||
|
options.x = isEnabled() ? 0 : 6;
|
||||||
|
options.y = isEnabled() ? gui.height - 22 : gui.height - 28;
|
||||||
|
options.w = 22;
|
||||||
|
options.h = 22;
|
||||||
|
|
||||||
|
bookmarksButton.x = 24 + (isEnabled() ? 0 : 6);
|
||||||
|
bookmarksButton.y = isEnabled() ? gui.height - 22 : gui.height - 28;
|
||||||
|
bookmarksButton.w = 22;
|
||||||
|
bookmarksButton.h = 22;
|
||||||
|
|
||||||
|
searchField.y = gui.height - searchField.h - 2;
|
||||||
|
|
||||||
|
dropDown.x = Math.min(numButtons, buttonCount) * 20 + 3;
|
||||||
|
dropDown.h = 20;
|
||||||
|
dropDown.w = itemPanel.x - dropDown.x - 3;
|
||||||
|
|
||||||
|
searchField.h = 20;
|
||||||
|
searchField.w = 150;
|
||||||
|
searchField.x = (gui.width - searchField.w) / 2;
|
||||||
|
|
||||||
|
if (!visiblity.showItemSection) {
|
||||||
|
searchField.setFocus(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
layoutFooter(gui, visiblity);
|
|
||||||
|
|
||||||
LayoutManager.itemPanel.resize(gui);
|
|
||||||
LayoutManager.bookmarkPanel.resize(gui);
|
|
||||||
LayoutManager.itemZoom.resize(gui);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void layoutFooter(GuiContainer gui, VisiblityData visiblity) {
|
|
||||||
|
|
||||||
LayoutManager.options.x = MARGIN;
|
|
||||||
LayoutManager.options.y = gui.height - BUTTON_SIZE - MARGIN;
|
|
||||||
LayoutManager.options.w = LayoutManager.options.h = BUTTON_SIZE;
|
|
||||||
|
|
||||||
LayoutManager.bookmarksButton.x = LayoutManager.options.x + LayoutManager.options.w + MARGIN;
|
|
||||||
LayoutManager.bookmarksButton.y = gui.height - BUTTON_SIZE - MARGIN;
|
|
||||||
LayoutManager.bookmarksButton.w = LayoutManager.bookmarksButton.h = BUTTON_SIZE;
|
|
||||||
|
|
||||||
final Rectangle4i searchArea = getSearchFieldArea(gui);
|
|
||||||
final Rectangle4i quantityArea = getQuantityFieldArea(visiblity);
|
|
||||||
|
|
||||||
LayoutManager.searchField.x = searchArea.x;
|
|
||||||
LayoutManager.searchField.y = searchArea.y;
|
|
||||||
LayoutManager.searchField.w = searchArea.w;
|
|
||||||
LayoutManager.searchField.h = searchArea.h;
|
|
||||||
|
|
||||||
if (!NEIClientConfig.subsetWidgetOnTop() && visiblity.showSubsetDropdown) {
|
|
||||||
LayoutManager.dropDown.x = searchArea.x;
|
|
||||||
LayoutManager.dropDown.y = searchArea.y;
|
|
||||||
LayoutManager.dropDown.h = LayoutManager.dropDown.w = BUTTON_SIZE;
|
|
||||||
|
|
||||||
LayoutManager.searchField.x += BUTTON_SIZE;
|
|
||||||
LayoutManager.searchField.w -= BUTTON_SIZE;
|
|
||||||
} else {
|
|
||||||
LayoutManager.dropDown.h = 16;
|
|
||||||
LayoutManager.dropDown.w = 150;
|
|
||||||
LayoutManager.dropDown.y = MARGIN;
|
|
||||||
LayoutManager.dropDown.x = (gui.width - LayoutManager.dropDown.w) / 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (quantityArea.w == ItemPanels.itemPanel.w) {
|
|
||||||
LayoutManager.more.w = LayoutManager.less.w = BUTTON_SIZE;
|
|
||||||
LayoutManager.more.h = LayoutManager.less.h = LayoutManager.quantity.h = quantityArea.h;
|
|
||||||
LayoutManager.more.y = LayoutManager.less.y = LayoutManager.quantity.y = quantityArea.y;
|
|
||||||
|
|
||||||
LayoutManager.less.x = quantityArea.x;
|
|
||||||
LayoutManager.more.x = quantityArea.x2() - BUTTON_SIZE;
|
|
||||||
|
|
||||||
LayoutManager.quantity.x = LayoutManager.less.x + LayoutManager.less.w + 1;
|
|
||||||
LayoutManager.quantity.w = LayoutManager.more.x - LayoutManager.quantity.x - 1;
|
|
||||||
} else {
|
|
||||||
LayoutManager.quantity.x = quantityArea.x;
|
|
||||||
LayoutManager.quantity.w = quantityArea.w - 18;
|
|
||||||
LayoutManager.quantity.y = LayoutManager.more.y = quantityArea.y;
|
|
||||||
LayoutManager.quantity.h = quantityArea.h;
|
|
||||||
|
|
||||||
LayoutManager.more.w = LayoutManager.less.w = 18;
|
|
||||||
LayoutManager.more.x = LayoutManager.less.x = LayoutManager.quantity.x + LayoutManager.quantity.w;
|
|
||||||
LayoutManager.more.h = LayoutManager.less.h = LayoutManager.quantity.h / 2;
|
|
||||||
LayoutManager.less.y = LayoutManager.more.y + LayoutManager.more.h;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private Rectangle4i getSearchFieldArea(GuiContainer gui) {
|
|
||||||
final Rectangle4i area = new Rectangle4i(0, 0, 0, BUTTON_SIZE);
|
|
||||||
|
|
||||||
if (NEIClientConfig.isSearchWidgetCentered()) {
|
|
||||||
area.w = Math.min(gui.xSize, 176) - MARGIN * 2;
|
|
||||||
area.x = (gui.width - area.w) / 2;
|
|
||||||
area.y = gui.height - BUTTON_SIZE - MARGIN;
|
|
||||||
} else if (NEIClientConfig.showItemQuantityWidget()) {
|
|
||||||
area.w = ItemPanels.itemPanel.w - (int) Math.max(BUTTON_SIZE * 2.5f, ItemPanels.itemPanel.w * 0.3f) - 1;
|
|
||||||
area.x = ItemPanels.itemPanel.x;
|
|
||||||
area.y = ItemPanels.itemPanel.y + ItemPanels.itemPanel.h - BUTTON_SIZE;
|
|
||||||
} else {
|
|
||||||
area.w = ItemPanels.itemPanel.w;
|
|
||||||
area.x = ItemPanels.itemPanel.x;
|
|
||||||
area.y = ItemPanels.itemPanel.y + ItemPanels.itemPanel.h - BUTTON_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return area;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Rectangle4i getQuantityFieldArea(VisiblityData visiblity) {
|
|
||||||
final Rectangle4i area = new Rectangle4i(0, 0, 0, BUTTON_SIZE);
|
|
||||||
|
|
||||||
if (!visiblity.showSearchSection || NEIClientConfig.isSearchWidgetCentered()) {
|
|
||||||
area.w = ItemPanels.itemPanel.w;
|
|
||||||
area.x = ItemPanels.itemPanel.x;
|
|
||||||
} else {
|
|
||||||
area.w = (int) Math.max(BUTTON_SIZE * 2.5f, ItemPanels.itemPanel.w * 0.3f);
|
|
||||||
area.x = ItemPanels.itemPanel.x + ItemPanels.itemPanel.w - area.w;
|
|
||||||
}
|
|
||||||
|
|
||||||
area.y = ItemPanels.itemPanel.y + ItemPanels.itemPanel.h - BUTTON_SIZE;
|
|
||||||
|
|
||||||
return area;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void layoutButton(Button button) {
|
public void layoutButton(Button button) {
|
||||||
|
button.x = 2 + (buttonCount % numButtons) * 20;
|
||||||
|
button.y = (buttonCount / numButtons) * 18;
|
||||||
|
|
||||||
button.h = 17;
|
button.h = 17;
|
||||||
button.w = button.contentWidth() + 6;
|
button.w = button.contentWidth() + 6;
|
||||||
|
|
||||||
button.x = MARGIN + (buttonCount % numButtons) * (button.w + MARGIN);
|
|
||||||
button.y = MARGIN + (buttonCount / numButtons) * (button.h + MARGIN);
|
|
||||||
|
|
||||||
buttonCount++;
|
buttonCount++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -230,20 +170,18 @@ public class LayoutStyleMinecraft extends LayoutStyle {
|
|||||||
GL11.glColor4f(1, 1, 1, 1);
|
GL11.glColor4f(1, 1, 1, 1);
|
||||||
|
|
||||||
int tex;
|
int tex;
|
||||||
if ((b.state & 0x3) == 2) tex = 0;
|
if ((b.state & 0x3) == 2)
|
||||||
else if ((b.state & 0x4) == 0 && b.contains(mousex, mousey) || // not a state button and mouseover
|
tex = 0;
|
||||||
(b.state & 0x3) == 1) // state active
|
else if ((b.state & 0x4) == 0 && b.contains(mousex, mousey) ||//not a state button and mouseover
|
||||||
|
(b.state & 0x3) == 1)//state active
|
||||||
tex = 2;
|
tex = 2;
|
||||||
else tex = 1;
|
else
|
||||||
|
tex = 1;
|
||||||
LayoutManager.drawButtonBackground(b.x, b.y, b.w, b.h, true, tex);
|
LayoutManager.drawButtonBackground(b.x, b.y, b.w, b.h, true, tex);
|
||||||
|
|
||||||
Image icon = b.getRenderIcon();
|
Image icon = b.getRenderIcon();
|
||||||
if (icon == null) {
|
if (icon == null) {
|
||||||
int labelColor = b.getRenderLabelColor();
|
int colour = tex == 2 ? 0xffffa0 : tex == 0 ? 0x601010 : 0xe0e0e0;
|
||||||
int colour = labelColor != 0 ? labelColor
|
|
||||||
: tex == 2 ? ColorUtils.buttonLabelHover.getColor()
|
|
||||||
: tex == 0 ? ColorUtils.buttonLabelDisabled.getColor()
|
|
||||||
: ColorUtils.buttonLabelNormal.getColor();
|
|
||||||
|
|
||||||
drawStringC(b.getRenderLabel(), b.x + b.w / 2, b.y + (b.h - 8) / 2, colour);
|
drawStringC(b.getRenderLabel(), b.x + b.w / 2, b.y + (b.h - 8) / 2, colour);
|
||||||
} else {
|
} else {
|
||||||
@@ -258,16 +196,12 @@ public class LayoutStyleMinecraft extends LayoutStyle {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawSubsetTag(String text, int x, int y, int w, int h, int state, boolean mouseover) {
|
public void drawSubsetTag(String text, int x, int y, int w, int h, int state, boolean mouseover) {
|
||||||
if (state == 1) {
|
if(state == 1)
|
||||||
GL11.glColor4f(0.65F, 0.65F, 0.65F, 1.0F);
|
GL11.glColor4f(0.65F, 0.65F, 0.65F, 1.0F);
|
||||||
} else {
|
else
|
||||||
GL11.glColor4f(1, 1, 1, 1);
|
GL11.glColor4f(1, 1, 1, 1);
|
||||||
}
|
|
||||||
|
|
||||||
LayoutManager.drawButtonBackground(x, y, w, h, false, state == 0 ? 0 : 1);
|
LayoutManager.drawButtonBackground(x, y, w, h, false, state == 0 ? 0 : 1);
|
||||||
|
if(text != null)
|
||||||
if (text != null) {
|
drawStringC(text, x, y, w, h, state == 2 ? 0xFFE0E0E0 : 0xFFA0A0A0);
|
||||||
drawStringC(text, x, y, w, h, mouseover ? 0xFFFFFFA0 : (state == 2 ? 0xFFE0E0E0 : 0xFFA0A0A0));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,40 +5,47 @@ import java.util.HashSet;
|
|||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class NEIActions {
|
public class NEIActions
|
||||||
|
{
|
||||||
public static final int protocol = 0;
|
public static final int protocol = 0;
|
||||||
|
|
||||||
public static HashMap<String, NEIActions> nameActionMap = new HashMap<>();
|
public static HashMap<String, NEIActions> nameActionMap = new HashMap<>();
|
||||||
public static HashSet<String> canDisable = new HashSet<>();
|
public static HashSet<String> canDisable = new HashSet<>();
|
||||||
|
|
||||||
public static void addAction(String name, String base, boolean smpreq) {
|
public static void addAction(String name, String base, boolean smpreq)
|
||||||
|
{
|
||||||
NEIActions action = new NEIActions(name, base, smpreq);
|
NEIActions action = new NEIActions(name, base, smpreq);
|
||||||
nameActionMap.put(name, action);
|
nameActionMap.put(name, action);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void addAction(String name, String base) {
|
private static void addAction(String name, String base)
|
||||||
|
{
|
||||||
addAction(name, base, false);
|
addAction(name, base, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void addAction(String name) {
|
public static void addAction(String name)
|
||||||
|
{
|
||||||
addAction(name, name);
|
addAction(name, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void addAction(String name, boolean smpreq) {
|
private static void addAction(String name, boolean smpreq)
|
||||||
|
{
|
||||||
addAction(name, name, smpreq);
|
addAction(name, name, smpreq);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String base(String name) {
|
public static String base(String name)
|
||||||
|
{
|
||||||
NEIActions action = nameActionMap.get(name);
|
NEIActions action = nameActionMap.get(name);
|
||||||
return action == null ? name : action.base;
|
return action == null ? name : action.base;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean smpRequired(String name) {
|
public static boolean smpRequired(String name)
|
||||||
|
{
|
||||||
return nameActionMap.get(name).smpreq;
|
return nameActionMap.get(name).smpreq;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void init() {
|
public static void init()
|
||||||
|
{
|
||||||
addAction("time");
|
addAction("time");
|
||||||
addAction("dawn", "time");
|
addAction("dawn", "time");
|
||||||
addAction("noon", "time");
|
addAction("noon", "time");
|
||||||
@@ -54,7 +61,6 @@ public class NEIActions {
|
|||||||
addAction("magnet", true);
|
addAction("magnet", true);
|
||||||
addAction("enchant", true);
|
addAction("enchant", true);
|
||||||
addAction("potion", true);
|
addAction("potion", true);
|
||||||
addAction("autocraft");
|
|
||||||
|
|
||||||
canDisable.add("dawn");
|
canDisable.add("dawn");
|
||||||
canDisable.add("noon");
|
canDisable.add("noon");
|
||||||
@@ -62,23 +68,27 @@ public class NEIActions {
|
|||||||
canDisable.add("midnight");
|
canDisable.add("midnight");
|
||||||
canDisable.add("rain");
|
canDisable.add("rain");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String[] timeZones = new String[] { "dawn", "noon", "dusk", "midnight" };
|
public static final String[] timeZones = new String[]{"dawn", "noon", "dusk", "midnight"};
|
||||||
public static final String[] gameModes = new String[] { "survival", "creative", "creative+", "adventure" };
|
public static final String[] gameModes = new String[]{"survival", "creative", "creative+", "adventure"};
|
||||||
|
|
||||||
public String name;
|
public String name;
|
||||||
public String base;
|
public String base;
|
||||||
public boolean smpreq;
|
public boolean smpreq;
|
||||||
|
|
||||||
public NEIActions(String name, String base, boolean smpreq) {
|
public NEIActions(String name, String base, boolean smpreq)
|
||||||
|
{
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.base = base;
|
this.base = base;
|
||||||
this.smpreq = smpreq;
|
this.smpreq = smpreq;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<String> baseActions() {
|
public static List<String> baseActions()
|
||||||
|
{
|
||||||
List<String> list = new LinkedList<>();
|
List<String> list = new LinkedList<>();
|
||||||
for (NEIActions a : nameActionMap.values()) if (a.base.equals(a.name)) list.add(a.name);
|
for(NEIActions a : nameActionMap.values())
|
||||||
|
if(a.base.equals(a.name))
|
||||||
|
list.add(a.name);
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,78 +1,54 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.nei.PacketIDs.C2S;
|
|
||||||
import static codechicken.nei.PacketIDs.S2C;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiInventory;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.network.play.INetHandlerPlayClient;
|
|
||||||
import net.minecraft.util.ChatComponentTranslation;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import codechicken.core.ClientUtils;
|
import codechicken.core.ClientUtils;
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
import codechicken.lib.packet.PacketCustom;
|
import codechicken.lib.packet.PacketCustom;
|
||||||
import codechicken.lib.packet.PacketCustom.IClientPacketHandler;
|
import codechicken.lib.packet.PacketCustom.IClientPacketHandler;
|
||||||
import codechicken.nei.commands.CommandBookmarkAdd;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiInventory;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.network.play.INetHandlerPlayClient;
|
||||||
|
import net.minecraft.util.ChatComponentTranslation;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
public class NEICPH implements IClientPacketHandler {
|
public class NEICPH implements IClientPacketHandler
|
||||||
|
{
|
||||||
public static final String channel = "NEI";
|
public static final String channel = "NEI";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handlePacket(PacketCustom packet, Minecraft mc, INetHandlerPlayClient netHandler) {
|
public void handlePacket(PacketCustom packet, Minecraft mc, INetHandlerPlayClient netHandler) {
|
||||||
switch (packet.getType()) {
|
switch (packet.getType()) {
|
||||||
case S2C.SEND_SERVER_SIDE_CHECK:
|
case 1:
|
||||||
handleSMPCheck(packet.readUByte(), packet.readString(), mc.theWorld);
|
handleSMPCheck(packet.readUByte(), packet.readString(), mc.theWorld);
|
||||||
break;
|
break;
|
||||||
case S2C.SEND_LOGIN_STATE:
|
case 10:
|
||||||
handleLoginState(packet);
|
handleLoginState(packet);
|
||||||
break;
|
break;
|
||||||
case S2C.SEND_ACTION_DISABLED:
|
case 11:
|
||||||
handleActionDisabled(packet);
|
handleActionDisabled(packet);
|
||||||
break;
|
break;
|
||||||
case S2C.SEND_ACTION_ENABLED:
|
case 12:
|
||||||
handleActionEnabled(packet);
|
handleActionEnabled(packet);
|
||||||
break;
|
break;
|
||||||
case S2C.SEND_MAGNETIC_ITEM:
|
case 13:
|
||||||
ClientHandler.instance().addSMPMagneticItem(packet.readInt(), mc.theWorld);
|
ClientHandler.instance().addSMPMagneticItem(packet.readInt(), mc.theWorld);
|
||||||
break;
|
break;
|
||||||
case S2C.SEND_GAME_MODE:
|
case 14:
|
||||||
handleGamemode(mc, packet.readUByte());
|
handleGamemode(mc, packet.readUByte());
|
||||||
break;
|
break;
|
||||||
case S2C.OPEN_ENCHANTMENT_GUI:
|
case 21:
|
||||||
ClientUtils.openSMPGui(
|
ClientUtils.openSMPGui(packet.readUByte(), new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0));
|
||||||
packet.readUByte(),
|
|
||||||
new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0));
|
|
||||||
break;
|
break;
|
||||||
case S2C.SET_CREATIVE_PLUS_MODE:
|
case 23:
|
||||||
if (packet.readBoolean()) ClientUtils.openSMPGui(
|
if (packet.readBoolean())
|
||||||
packet.readUByte(),
|
ClientUtils.openSMPGui(packet.readUByte(), new GuiExtendedCreativeInv(new ContainerCreativeInv(mc.thePlayer, new ExtendedCreativeInv(null, Side.CLIENT))));
|
||||||
new GuiExtendedCreativeInv(
|
else
|
||||||
new ContainerCreativeInv(mc.thePlayer, new ExtendedCreativeInv(null, Side.CLIENT))));
|
mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
|
||||||
else mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
|
|
||||||
break;
|
break;
|
||||||
case S2C.OPEN_POTION_GUI:
|
case 24:
|
||||||
ClientUtils.openSMPGui(packet.readUByte(), new GuiPotionCreator(mc.thePlayer.inventory));
|
ClientUtils.openSMPGui(packet.readUByte(), new GuiPotionCreator(mc.thePlayer.inventory));
|
||||||
break;
|
break;
|
||||||
case S2C.CACHE_BOOKMARK_DATA:
|
|
||||||
handleCacheBookmarkData(packet);
|
|
||||||
break;
|
|
||||||
case S2C.SYNC:
|
|
||||||
ServerSync.onReply(packet.readInt());
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleCacheBookmarkData(PacketCustom packet) {
|
|
||||||
final String payloadId = packet.readString();
|
|
||||||
final NBTTagCompound payloadTag = packet.readNBTTagCompound();
|
|
||||||
|
|
||||||
if (payloadTag != null) {
|
|
||||||
CommandBookmarkAdd.cachePayload(payloadId, payloadTag);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,32 +58,40 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
|
|
||||||
private void handleActionEnabled(PacketCustom packet) {
|
private void handleActionEnabled(PacketCustom packet) {
|
||||||
String name = packet.readString();
|
String name = packet.readString();
|
||||||
if (packet.readBoolean()) NEIClientConfig.enabledActions.add(name);
|
if (packet.readBoolean())
|
||||||
else NEIClientConfig.enabledActions.remove(name);
|
NEIClientConfig.enabledActions.add(name);
|
||||||
|
else
|
||||||
|
NEIClientConfig.enabledActions.remove(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleActionDisabled(PacketCustom packet) {
|
private void handleActionDisabled(PacketCustom packet) {
|
||||||
String name = packet.readString();
|
String name = packet.readString();
|
||||||
if (packet.readBoolean()) NEIClientConfig.disabledActions.add(name);
|
if (packet.readBoolean())
|
||||||
else NEIClientConfig.disabledActions.remove(name);
|
NEIClientConfig.disabledActions.add(name);
|
||||||
|
else
|
||||||
|
NEIClientConfig.disabledActions.remove(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleLoginState(PacketCustom packet) {
|
private void handleLoginState(PacketCustom packet) {
|
||||||
NEIClientConfig.permissableActions.clear();
|
NEIClientConfig.permissableActions.clear();
|
||||||
int num = packet.readUByte();
|
int num = packet.readUByte();
|
||||||
for (int i = 0; i < num; i++) NEIClientConfig.permissableActions.add(packet.readString());
|
for (int i = 0; i < num; i++)
|
||||||
|
NEIClientConfig.permissableActions.add(packet.readString());
|
||||||
|
|
||||||
NEIClientConfig.disabledActions.clear();
|
NEIClientConfig.disabledActions.clear();
|
||||||
num = packet.readUByte();
|
num = packet.readUByte();
|
||||||
for (int i = 0; i < num; i++) NEIClientConfig.disabledActions.add(packet.readString());
|
for (int i = 0; i < num; i++)
|
||||||
|
NEIClientConfig.disabledActions.add(packet.readString());
|
||||||
|
|
||||||
NEIClientConfig.enabledActions.clear();
|
NEIClientConfig.enabledActions.clear();
|
||||||
num = packet.readUByte();
|
num = packet.readUByte();
|
||||||
for (int i = 0; i < num; i++) NEIClientConfig.enabledActions.add(packet.readString());
|
for (int i = 0; i < num; i++)
|
||||||
|
NEIClientConfig.enabledActions.add(packet.readString());
|
||||||
|
|
||||||
NEIClientConfig.bannedBlocks.clear();
|
NEIClientConfig.bannedBlocks.clear();
|
||||||
num = packet.readInt();
|
num = packet.readInt();
|
||||||
for (int i = 0; i < num; i++) NEIClientConfig.bannedBlocks.add(packet.readItemStack());
|
for(int i = 0; i < num; i++)
|
||||||
|
NEIClientConfig.bannedBlocks.add(packet.readItemStack());
|
||||||
|
|
||||||
if (NEIClientUtils.getGuiContainer() != null)
|
if (NEIClientUtils.getGuiContainer() != null)
|
||||||
LayoutManager.instance().refresh(NEIClientUtils.getGuiContainer());
|
LayoutManager.instance().refresh(NEIClientUtils.getGuiContainer());
|
||||||
@@ -122,7 +106,7 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
try {
|
try {
|
||||||
ClientHandler.instance().loadWorld(world, true);
|
ClientHandler.instance().loadWorld(world, true);
|
||||||
NEIClientConfig.setHasSMPCounterPart(true);
|
NEIClientConfig.setHasSMPCounterPart(true);
|
||||||
NEIClientConfig.loadWorld(getSaveName());
|
NEIClientConfig.loadWorld(getSaveName(worldName));
|
||||||
sendRequestLoginInfo();
|
sendRequestLoginInfo();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
NEIClientConfig.logger.error("Error handling SMP Check", e);
|
NEIClientConfig.logger.error("Error handling SMP Check", e);
|
||||||
@@ -130,14 +114,15 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getSaveName() {
|
private static String getSaveName(String worldName) {
|
||||||
if (Minecraft.getMinecraft().isSingleplayer()) return "local/" + ClientUtils.getWorldSaveName();
|
if (Minecraft.getMinecraft().isSingleplayer())
|
||||||
|
return "local/" + ClientUtils.getWorldSaveName();
|
||||||
|
|
||||||
return "remote/" + ClientUtils.getServerIP().replace(':', '~');
|
return "remote/" + ClientUtils.getServerIP().replace(':', '~') + "/" + worldName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendGiveItem(ItemStack spawnstack, boolean infinite, boolean doSpawn) {
|
public static void sendGiveItem(ItemStack spawnstack, boolean infinite, boolean doSpawn) {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.GIVE_ITEM);
|
PacketCustom packet = new PacketCustom(channel, 1);
|
||||||
packet.writeItemStack(spawnstack, true);
|
packet.writeItemStack(spawnstack, true);
|
||||||
packet.writeBoolean(infinite);
|
packet.writeBoolean(infinite);
|
||||||
packet.writeBoolean(doSpawn);
|
packet.writeBoolean(doSpawn);
|
||||||
@@ -145,7 +130,7 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void sendDeleteAllItems() {
|
public static void sendDeleteAllItems() {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.DELETE_ALL_ITEMS);
|
PacketCustom packet = new PacketCustom(channel, 4);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,18 +144,12 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
sendSetSlot(slot, item, false);
|
sendSetSlot(slot, item, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_CONTAINER_CONTENTS);
|
PacketCustom packet = new PacketCustom(channel, 11);
|
||||||
packet.sendToServer();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void sendRequestContainer() {
|
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_CONTAINER);
|
|
||||||
packet.writeInt(Minecraft.getMinecraft().thePlayer.openContainer.getInventory().size());
|
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendSetSlot(int slot, ItemStack stack, boolean container) {
|
public static void sendSetSlot(int slot, ItemStack stack, boolean container) {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.SET_SLOT);
|
PacketCustom packet = new PacketCustom(channel, 5);
|
||||||
packet.writeBoolean(container);
|
packet.writeBoolean(container);
|
||||||
packet.writeShort(slot);
|
packet.writeShort(slot);
|
||||||
packet.writeItemStack(stack);
|
packet.writeItemStack(stack);
|
||||||
@@ -178,44 +157,38 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void sendRequestLoginInfo() {
|
private static void sendRequestLoginInfo() {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_LOGIN_INFO);
|
PacketCustom packet = new PacketCustom(channel, 10);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendToggleMagnetMode() {
|
public static void sendToggleMagnetMode() {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.TOGGLE_MAGNET);
|
PacketCustom packet = new PacketCustom(channel, 6);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendSetTime(int hour) {
|
public static void sendSetTime(int hour) {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.SET_TIME);
|
PacketCustom packet = new PacketCustom(channel, 7);
|
||||||
packet.writeByte(hour);
|
packet.writeByte(hour);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendHeal() {
|
public static void sendHeal() {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.HEAL);
|
PacketCustom packet = new PacketCustom(channel, 8);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendToggleRain() {
|
public static void sendToggleRain() {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.TOGGLE_RAIN);
|
PacketCustom packet = new PacketCustom(channel, 9);
|
||||||
packet.sendToServer();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void sendChatLink(NBTTagCompound payloadTag) {
|
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.SEND_CHAT_ITEM_LINK);
|
|
||||||
packet.writeNBTTagCompound(payloadTag);
|
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendOpenEnchantmentWindow() {
|
public static void sendOpenEnchantmentWindow() {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_ENCHANTMENT_GUI);
|
PacketCustom packet = new PacketCustom(channel, 21);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendModifyEnchantment(int enchID, int level, boolean add) {
|
public static void sendModifyEnchantment(int enchID, int level, boolean add) {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.MODIFY_ENCHANTMENT);
|
PacketCustom packet = new PacketCustom(channel, 22);
|
||||||
packet.writeByte(enchID);
|
packet.writeByte(enchID);
|
||||||
packet.writeByte(level);
|
packet.writeByte(level);
|
||||||
packet.writeBoolean(add);
|
packet.writeBoolean(add);
|
||||||
@@ -223,30 +196,32 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void sendSetPropertyDisabled(String name, boolean enable) {
|
public static void sendSetPropertyDisabled(String name, boolean enable) {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.CHANGE_PROPERTY);
|
PacketCustom packet = new PacketCustom(channel, 12);
|
||||||
packet.writeString(name);
|
packet.writeString(name);
|
||||||
packet.writeBoolean(enable);
|
packet.writeBoolean(enable);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendGamemode(int mode) {
|
public static void sendGamemode(int mode) {
|
||||||
new PacketCustom(channel, C2S.SET_GAME_MODE).writeByte(mode).sendToServer();
|
new PacketCustom(channel, 13)
|
||||||
|
.writeByte(mode)
|
||||||
|
.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendCreativeInv(boolean open) {
|
public static void sendCreativeInv(boolean open) {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.SET_CREATIVE_PLUS_MODE);
|
PacketCustom packet = new PacketCustom(channel, 23);
|
||||||
packet.writeBoolean(open);
|
packet.writeBoolean(open);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendCreativeScroll(int steps) {
|
public static void sendCreativeScroll(int steps) {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.CYCLE_CREATIVE_INV);
|
PacketCustom packet = new PacketCustom(channel, 14);
|
||||||
packet.writeInt(steps);
|
packet.writeInt(steps);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendMobSpawnerID(int x, int y, int z, String mobtype) {
|
public static void sendMobSpawnerID(int x, int y, int z, String mobtype) {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.SEND_MOB_SPAWNER_ID);
|
PacketCustom packet = new PacketCustom(channel, 15);
|
||||||
packet.writeCoord(x, y, z);
|
packet.writeCoord(x, y, z);
|
||||||
packet.writeString(mobtype);
|
packet.writeString(mobtype);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
@@ -254,16 +229,15 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
|
|
||||||
public static void sendOpenPotionWindow() {
|
public static void sendOpenPotionWindow() {
|
||||||
ItemStack[] potionStore = new ItemStack[9];
|
ItemStack[] potionStore = new ItemStack[9];
|
||||||
InventoryUtils.readItemStacksFromTag(
|
InventoryUtils.readItemStacksFromTag(potionStore, NEIClientConfig.global.nbt.getCompoundTag("potionStore").getTagList("items", 10));
|
||||||
potionStore,
|
PacketCustom packet = new PacketCustom(channel, 24);
|
||||||
NEIClientConfig.global.nbt.getCompoundTag("potionStore").getTagList("items", 10));
|
for (ItemStack stack : potionStore)
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_POTION_GUI);
|
packet.writeItemStack(stack);
|
||||||
for (ItemStack stack : potionStore) packet.writeItemStack(stack);
|
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendDummySlotSet(int slotNumber, ItemStack stack) {
|
public static void sendDummySlotSet(int slotNumber, ItemStack stack) {
|
||||||
PacketCustom packet = new PacketCustom(channel, C2S.SET_DUMMY_SLOT);
|
PacketCustom packet = new PacketCustom(channel, 25);
|
||||||
packet.writeShort(slotNumber);
|
packet.writeShort(slotNumber);
|
||||||
packet.writeItemStack(stack, true);
|
packet.writeItemStack(stack, true);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
|
|||||||
@@ -1,18 +1,17 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.util.Collections;
|
import codechicken.nei.api.INEIGuiAdapter;
|
||||||
import java.util.List;
|
import codechicken.nei.api.TaggedInventoryArea;
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiChest;
|
import net.minecraft.client.gui.inventory.GuiChest;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.inventory.ContainerChest;
|
import net.minecraft.inventory.ContainerChest;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import codechicken.nei.api.INEIGuiAdapter;
|
import java.util.Collections;
|
||||||
import codechicken.nei.api.TaggedInventoryArea;
|
import java.util.List;
|
||||||
|
|
||||||
public class NEIChestGuiHandler extends INEIGuiAdapter {
|
|
||||||
|
|
||||||
|
public class NEIChestGuiHandler extends INEIGuiAdapter
|
||||||
|
{
|
||||||
public int chestSize(GuiContainer gui) {
|
public int chestSize(GuiContainer gui) {
|
||||||
return ((ContainerChest) gui.inventorySlots).getLowerChestInventory().getSizeInventory();
|
return ((ContainerChest) gui.inventorySlots).getLowerChestInventory().getSizeInventory();
|
||||||
}
|
}
|
||||||
@@ -24,8 +23,6 @@ public class NEIChestGuiHandler extends INEIGuiAdapter {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
|
public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
|
||||||
return gui instanceof GuiChest
|
return gui instanceof GuiChest ? Collections.singletonList(new TaggedInventoryArea("Chest", 0, chestSize(gui), gui.inventorySlots)) : null;
|
||||||
? Collections.singletonList(new TaggedInventoryArea("Chest", 0, chestSize(gui), gui.inventorySlots))
|
|
||||||
: null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,115 +1,47 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import codechicken.lib.inventory.InventoryRange;
|
||||||
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
|
import codechicken.lib.util.LangProxy;
|
||||||
|
import codechicken.nei.api.GuiInfo;
|
||||||
|
import codechicken.nei.api.IInfiniteItemHandler;
|
||||||
|
import codechicken.nei.api.INEIGuiHandler;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import com.google.common.collect.Iterables;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.audio.PositionedSoundRecord;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.inventory.Container;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.IChatComponent;
|
||||||
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
import org.lwjgl.input.Keyboard;
|
||||||
|
|
||||||
|
import java.text.MessageFormat;
|
||||||
|
import java.text.NumberFormat;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static codechicken.nei.NEIClientConfig.canCheatItem;
|
import static codechicken.nei.NEIClientConfig.canCheatItem;
|
||||||
import static codechicken.nei.NEIClientConfig.canPerformAction;
|
import static codechicken.nei.NEIClientConfig.canPerformAction;
|
||||||
|
import static codechicken.nei.NEIClientConfig.getItemQuantity;
|
||||||
import static codechicken.nei.NEIClientConfig.getStringArrSetting;
|
import static codechicken.nei.NEIClientConfig.getStringArrSetting;
|
||||||
import static codechicken.nei.NEIClientConfig.getStringSetting;
|
import static codechicken.nei.NEIClientConfig.getStringSetting;
|
||||||
import static codechicken.nei.NEIClientConfig.hasSMPCounterPart;
|
import static codechicken.nei.NEIClientConfig.hasSMPCounterPart;
|
||||||
import static codechicken.nei.NEIClientConfig.invCreativeMode;
|
import static codechicken.nei.NEIClientConfig.invCreativeMode;
|
||||||
import static codechicken.nei.NEIClientConfig.world;
|
import static codechicken.nei.NEIClientConfig.world;
|
||||||
|
|
||||||
import java.awt.Color;
|
public class NEIClientUtils extends NEIServerUtils
|
||||||
import java.io.File;
|
{
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.PrintWriter;
|
|
||||||
import java.io.StringWriter;
|
|
||||||
import java.math.RoundingMode;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.text.DecimalFormat;
|
|
||||||
import java.text.DecimalFormatSymbols;
|
|
||||||
import java.text.MessageFormat;
|
|
||||||
import java.text.NumberFormat;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.IdentityHashMap;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.audio.PositionedSoundRecord;
|
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.client.renderer.OpenGlHelper;
|
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.inventory.Container;
|
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.util.IChatComponent;
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
|
||||||
import net.minecraftforge.fluids.FluidStack;
|
|
||||||
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import com.google.common.collect.Iterables;
|
|
||||||
import com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil;
|
|
||||||
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
|
||||||
import codechicken.lib.inventory.InventoryRange;
|
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
|
||||||
import codechicken.lib.util.LangProxy;
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.api.GuiInfo;
|
|
||||||
import codechicken.nei.api.IInfiniteItemHandler;
|
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import codechicken.nei.recipe.GuiOverlayButton.ItemOverlayState;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
import codechicken.nei.util.NEIKeyboardUtils;
|
|
||||||
|
|
||||||
public class NEIClientUtils extends NEIServerUtils {
|
|
||||||
|
|
||||||
private static final Set<String> REPORTED = ConcurrentHashMap.newKeySet();
|
|
||||||
|
|
||||||
public static class Alignment {
|
|
||||||
|
|
||||||
public final int x, y;
|
|
||||||
|
|
||||||
public static final Alignment TopLeft = new Alignment(-1, -1);
|
|
||||||
public static final Alignment TopCenter = new Alignment(0, -1);
|
|
||||||
public static final Alignment TopRight = new Alignment(1, -1);
|
|
||||||
public static final Alignment CenterLeft = new Alignment(-1, 0);
|
|
||||||
public static final Alignment Center = new Alignment(0, 0);
|
|
||||||
public static final Alignment CenterRight = new Alignment(1, 0);
|
|
||||||
public static final Alignment BottomLeft = new Alignment(-1, 1);
|
|
||||||
public static final Alignment BottomCenter = new Alignment(0, 1);
|
|
||||||
public static final Alignment BottomRight = new Alignment(1, 1);
|
|
||||||
|
|
||||||
public Alignment(int x, int y) {
|
|
||||||
this.x = x;
|
|
||||||
this.y = y;
|
|
||||||
}
|
|
||||||
|
|
||||||
public float getX(float parentWidth, float childWidth) {
|
|
||||||
final float x = (this.x + 1) / 2f;
|
|
||||||
return parentWidth * x - childWidth * x;
|
|
||||||
}
|
|
||||||
|
|
||||||
public float getY(float parentHeight, float childHeight) {
|
|
||||||
final float y = (this.y + 1) / 2f;
|
|
||||||
return parentHeight * y - childHeight * y;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static LangProxy lang = new LangProxy("nei");
|
public static LangProxy lang = new LangProxy("nei");
|
||||||
|
|
||||||
/** Formats a number with group separator and at most 2 fraction digits. */
|
|
||||||
private static final Map<Locale, DecimalFormat> decimalFormatters = new HashMap<>();
|
|
||||||
private static final DecimalFormat CHANCE_FORMAT = new DecimalFormat("##0.##%");
|
|
||||||
|
|
||||||
public static final int ALT_HASH = NEIKeyboardUtils.ALT_HASH;
|
|
||||||
public static final int SHIFT_HASH = NEIKeyboardUtils.SHIFT_HASH;
|
|
||||||
public static final int CTRL_HASH = NEIKeyboardUtils.CTRL_HASH;
|
|
||||||
|
|
||||||
public static Minecraft mc() {
|
public static Minecraft mc() {
|
||||||
return Minecraft.getMinecraft();
|
return Minecraft.getMinecraft();
|
||||||
}
|
}
|
||||||
@@ -119,43 +51,8 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void printChatMessage(IChatComponent msg) {
|
public static void printChatMessage(IChatComponent msg) {
|
||||||
if (mc().ingameGUI != null) mc().ingameGUI.getChatGUI().printChatMessage(msg);
|
if (mc().ingameGUI != null)
|
||||||
}
|
mc().ingameGUI.getChatGUI().printChatMessage(msg);
|
||||||
|
|
||||||
private static DecimalFormat getDecimalFormat() {
|
|
||||||
return decimalFormatters.computeIfAbsent(Locale.getDefault(Locale.Category.FORMAT), locale -> {
|
|
||||||
DecimalFormat numberFormat = new DecimalFormat(); // uses the necessary locale inside anyway
|
|
||||||
numberFormat.setGroupingUsed(true);
|
|
||||||
numberFormat.setMaximumFractionDigits(2);
|
|
||||||
numberFormat.setRoundingMode(RoundingMode.HALF_UP);
|
|
||||||
DecimalFormatSymbols decimalFormatSymbols = numberFormat.getDecimalFormatSymbols();
|
|
||||||
decimalFormatSymbols.setGroupingSeparator(','); // Use sensible separator for best clarity.
|
|
||||||
numberFormat.setDecimalFormatSymbols(decimalFormatSymbols);
|
|
||||||
|
|
||||||
return numberFormat;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String formatNumber(Number aNumber) {
|
|
||||||
|
|
||||||
if (NEIModContainer.isGTNHLibLoaded()) {
|
|
||||||
return NumberFormatUtil.formatNumber(aNumber);
|
|
||||||
}
|
|
||||||
|
|
||||||
return getDecimalFormat().format(aNumber);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String formatFluid(Number aNumber) {
|
|
||||||
|
|
||||||
if (NEIModContainer.isGTNHLibLoaded()) {
|
|
||||||
return NumberFormatUtil.formatFluid(aNumber);
|
|
||||||
}
|
|
||||||
|
|
||||||
return getDecimalFormat().format(aNumber) + " L";
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String formatChance(float chance) {
|
|
||||||
return CHANCE_FORMAT.format(chance);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void deleteHeldItem() {
|
public static void deleteHeldItem() {
|
||||||
@@ -163,8 +60,7 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void dropHeldItem() {
|
public static void dropHeldItem() {
|
||||||
mc().playerController
|
mc().playerController.windowClick(((GuiContainer) mc().currentScreen).inventorySlots.windowId, -999, 0, 0, mc().thePlayer);
|
||||||
.windowClick(((GuiContainer) mc().currentScreen).inventorySlots.windowId, -999, 0, 0, mc().thePlayer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void deleteSlotStack(int slotNumber) {
|
public static void deleteSlotStack(int slotNumber) {
|
||||||
@@ -172,11 +68,12 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void decreaseSlotStack(int slotNumber) {
|
public static void decreaseSlotStack(int slotNumber) {
|
||||||
ItemStack stack = slotNumber == -999 ? getHeldItem()
|
ItemStack stack = slotNumber == -999 ? getHeldItem() : mc().thePlayer.openContainer.getSlot(slotNumber).getStack();
|
||||||
: mc().thePlayer.openContainer.getSlot(slotNumber).getStack();
|
if (stack == null)
|
||||||
if (stack == null) return;
|
return;
|
||||||
|
|
||||||
if (stack.stackSize == 1) deleteSlotStack(slotNumber);
|
if (stack.stackSize == 1)
|
||||||
|
deleteSlotStack(slotNumber);
|
||||||
else {
|
else {
|
||||||
stack = stack.copy();
|
stack = stack.copy();
|
||||||
stack.stackSize--;
|
stack.stackSize--;
|
||||||
@@ -192,7 +89,8 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
Container c = getGuiContainer().inventorySlots;
|
Container c = getGuiContainer().inventorySlots;
|
||||||
for (int i = 0; i < c.inventorySlots.size(); i++) {
|
for (int i = 0; i < c.inventorySlots.size(); i++) {
|
||||||
Slot slot = c.getSlot(i);
|
Slot slot = c.getSlot(i);
|
||||||
if (slot == null) continue;
|
if (slot == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
ItemStack stack = slot.getStack();
|
ItemStack stack = slot.getStack();
|
||||||
if (stack != null && stack.getItem() == type.getItem() && stack.getItemDamage() == type.getItemDamage()) {
|
if (stack != null && stack.getItem() == type.getItem() && stack.getItemDamage() == type.getItemDamage()) {
|
||||||
@@ -209,18 +107,21 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
public static void setSlotContents(int slot, ItemStack item, boolean containerInv) {
|
public static void setSlotContents(int slot, ItemStack item, boolean containerInv) {
|
||||||
NEICPH.sendSetSlot(slot, item, containerInv);
|
NEICPH.sendSetSlot(slot, item, containerInv);
|
||||||
|
|
||||||
if (slot == -999) mc().thePlayer.inventory.setItemStack(item);
|
if (slot == -999)
|
||||||
|
mc().thePlayer.inventory.setItemStack(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mode -1 = normal cheats, 0 = no infinites, 1 = replenish stack
|
* @param mode -1 = normal cheats, 0 = no infinites, 1 = replenish stack
|
||||||
*/
|
*/
|
||||||
public static void cheatItem(ItemStack stack, int button, int mode) {
|
public static void cheatItem(ItemStack stack, int button, int mode) {
|
||||||
if (!canCheatItem(stack)) return;
|
if (!canCheatItem(stack))
|
||||||
|
return;
|
||||||
|
|
||||||
if (mode == -1 && button == 0 && controlKey() && NEIClientConfig.hasSMPCounterPart()) {
|
if (mode == -1 && button == 0 && shiftKey() && NEIClientConfig.hasSMPCounterPart()) {
|
||||||
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
|
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
|
||||||
if (!handler.canHandleItem(stack)) continue;
|
if (!handler.canHandleItem(stack))
|
||||||
|
continue;
|
||||||
|
|
||||||
ItemStack inf = handler.getInfiniteItem(stack);
|
ItemStack inf = handler.getInfiniteItem(stack);
|
||||||
if (inf != null) {
|
if (inf != null) {
|
||||||
@@ -235,7 +136,10 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
if (mode == 1 && stack.stackSize < stack.getMaxStackSize()) {
|
if (mode == 1 && stack.stackSize < stack.getMaxStackSize()) {
|
||||||
giveStack(stack, stack.getMaxStackSize() - stack.stackSize);
|
giveStack(stack, stack.getMaxStackSize() - stack.stackSize);
|
||||||
} else {
|
} else {
|
||||||
giveStack(stack);
|
int amount = getItemQuantity();
|
||||||
|
if (amount == 0)
|
||||||
|
amount = stack.getMaxStackSize();
|
||||||
|
giveStack(stack, amount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -252,24 +156,22 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
ItemStack stack = copyStack(base, i);
|
ItemStack stack = copyStack(base, i);
|
||||||
if (hasSMPCounterPart()) {
|
if (hasSMPCounterPart()) {
|
||||||
ItemStack typestack = copyStack(stack, 1);
|
ItemStack typestack = copyStack(stack, 1);
|
||||||
if (!infinite && !canItemFitInInventory(mc().thePlayer, stack)
|
if (!infinite && !canItemFitInInventory(mc().thePlayer, stack) && (mc().currentScreen instanceof GuiContainer)) {
|
||||||
&& (mc().currentScreen instanceof GuiContainer)) {
|
|
||||||
GuiContainer gui = getGuiContainer();
|
GuiContainer gui = getGuiContainer();
|
||||||
final List<Iterable<Integer>> handlerSlots;
|
final List<Iterable<Integer>> handlerSlots;
|
||||||
try {
|
try {
|
||||||
GuiInfo.readLock.lock();
|
GuiInfo.readLock.lock();
|
||||||
handlerSlots = GuiInfo.guiHandlers.stream()
|
handlerSlots = GuiInfo.guiHandlers.stream().map(handler -> handler.getItemSpawnSlots(gui, typestack)).collect(Collectors.toCollection(LinkedList::new));
|
||||||
.map(handler -> handler.getItemSpawnSlots(gui, typestack)).filter(x -> x != null)
|
|
||||||
.collect(Collectors.toCollection(LinkedList::new));
|
|
||||||
} finally {
|
} finally {
|
||||||
GuiInfo.readLock.unlock();
|
GuiInfo.readLock.unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
int increment = typestack.getMaxStackSize();
|
int increment = typestack.getMaxStackSize();
|
||||||
int given = 0;
|
int given = 0;
|
||||||
for (int slotNo : Iterables.concat(handlerSlots)) {
|
for(int slotNo : Iterables.concat(handlerSlots)) {
|
||||||
Slot slot = gui.inventorySlots.getSlot(slotNo);
|
Slot slot = gui.inventorySlots.getSlot(slotNo);
|
||||||
if (!slot.isItemValid(typestack) || !InventoryUtils.canStack(slot.getStack(), typestack)) continue;
|
if(!slot.isItemValid(typestack) || !InventoryUtils.canStack(slot.getStack(), typestack))
|
||||||
|
continue;
|
||||||
|
|
||||||
int qty = Math.min(stack.stackSize - given, increment);
|
int qty = Math.min(stack.stackSize - given, increment);
|
||||||
int current = slot.getHasStack() ? slot.getStack().stackSize : 0;
|
int current = slot.getHasStack() ? slot.getStack().stackSize : 0;
|
||||||
@@ -279,15 +181,17 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
slot.putStack(newStack);
|
slot.putStack(newStack);
|
||||||
setSlotContents(slotNo, newStack, true);
|
setSlotContents(slotNo, newStack, true);
|
||||||
given += qty;
|
given += qty;
|
||||||
if (given >= stack.stackSize) break;
|
if(given >= stack.stackSize)
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
if (given > 0) NEICPH.sendGiveItem(copyStack(typestack, given), false, false);
|
if(given > 0)
|
||||||
} else NEICPH.sendGiveItem(stack, infinite, true);
|
NEICPH.sendGiveItem(copyStack(typestack, given), false, false);
|
||||||
|
} else
|
||||||
|
NEICPH.sendGiveItem(stack, infinite, true);
|
||||||
} else {
|
} else {
|
||||||
for (int given = 0; given < stack.stackSize;) {
|
for (int given = 0; given < stack.stackSize; ) {
|
||||||
int qty = Math.min(stack.stackSize - given, stack.getMaxStackSize());
|
int qty = Math.min(stack.stackSize - given, stack.getMaxStackSize());
|
||||||
sendCommand(
|
sendCommand(getStringSetting("command.item"),
|
||||||
getStringSetting("command.item"),
|
|
||||||
mc().thePlayer.getCommandSenderName(),
|
mc().thePlayer.getCommandSenderName(),
|
||||||
Item.getIdFromItem(stack.getItem()),
|
Item.getIdFromItem(stack.getItem()),
|
||||||
qty,
|
qty,
|
||||||
@@ -303,104 +207,29 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
return InventoryUtils.getInsertibleQuantity(new InventoryRange(player.inventory, 0, 36), itemstack) > 0;
|
return InventoryUtils.getInsertibleQuantity(new InventoryRange(player.inventory, 0, 36), itemstack) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ItemOverlayState> presenceOverlay(List<PositionedStack> ingredients, List<ItemStack> invStacks) {
|
|
||||||
final List<ItemOverlayState> states = new ArrayList<>();
|
|
||||||
final Map<ItemStack, Long> remainingFluid = new IdentityHashMap<>();
|
|
||||||
|
|
||||||
for (PositionedStack stack : ingredients) {
|
|
||||||
boolean found;
|
|
||||||
|
|
||||||
if (StackInfo.isFluidDisplayItem(stack.item)) {
|
|
||||||
final FluidStack requiredFluid = StackInfo.getFluid(stack.item);
|
|
||||||
found = requiredFluid != null && consumeFluid(invStacks, remainingFluid, requiredFluid);
|
|
||||||
} else {
|
|
||||||
found = false;
|
|
||||||
|
|
||||||
for (ItemStack is : invStacks) {
|
|
||||||
if (is.stackSize > 0 && stack.contains(is)) {
|
|
||||||
is.stackSize--;
|
|
||||||
found = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
states.add(new ItemOverlayState(stack, found));
|
|
||||||
}
|
|
||||||
|
|
||||||
return states;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean consumeFluid(List<ItemStack> invStacks, Map<ItemStack, Long> remainingFluid,
|
|
||||||
FluidStack requiredFluid) {
|
|
||||||
long need = requiredFluid.amount;
|
|
||||||
final List<ItemStack> matched = new ArrayList<>();
|
|
||||||
|
|
||||||
for (ItemStack is : invStacks) {
|
|
||||||
if (need <= 0) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is.stackSize <= 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
final FluidStack invFluid = StackInfo.getFluid(is);
|
|
||||||
|
|
||||||
if (invFluid == null || !invFluid.isFluidEqual(requiredFluid)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
final long available = remainingFluid.computeIfAbsent(is, k -> (long) invFluid.amount * is.stackSize);
|
|
||||||
if (available <= 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
matched.add(is);
|
|
||||||
need -= available;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (need > 0) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
long remainingNeed = requiredFluid.amount;
|
|
||||||
for (ItemStack is : matched) {
|
|
||||||
final long available = remainingFluid.get(is);
|
|
||||||
final long consumed = Math.min(available, remainingNeed);
|
|
||||||
|
|
||||||
remainingFluid.put(is, available - consumed);
|
|
||||||
remainingNeed -= consumed;
|
|
||||||
|
|
||||||
if (remainingNeed <= 0) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean shiftKey() {
|
public static boolean shiftKey() {
|
||||||
return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
|
return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean controlKey() {
|
public static boolean controlKey() {
|
||||||
if (Minecraft.isRunningOnMac) {
|
|
||||||
return Keyboard.isKeyDown(Keyboard.KEY_LMETA) || Keyboard.isKeyDown(Keyboard.KEY_RMETA);
|
|
||||||
}
|
|
||||||
return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
|
return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getGamemode() {
|
public static int getGamemode() {
|
||||||
if (invCreativeMode()) return 2;
|
if (invCreativeMode())
|
||||||
else if (mc().playerController.isInCreativeMode()) return 1;
|
return 2;
|
||||||
else if (mc().playerController.currentGameType.isAdventure()) return 3;
|
else if (mc().playerController.isInCreativeMode())
|
||||||
else return 0;
|
return 1;
|
||||||
|
else if (mc().playerController.currentGameType.isAdventure())
|
||||||
|
return 3;
|
||||||
|
else
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isValidGamemode(String s) {
|
public static boolean isValidGamemode(String s) {
|
||||||
return s.equals("survival")
|
return s.equals("survival") ||
|
||||||
|| canPerformAction(s) && Arrays.asList(getStringArrSetting("inventory.gamemodes")).contains(s);
|
canPerformAction(s) &&
|
||||||
|
Arrays.asList(getStringArrSetting("inventory.gamemodes")).contains(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getNextGamemode() {
|
public static int getNextGamemode() {
|
||||||
@@ -408,7 +237,8 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
int nmode = mode;
|
int nmode = mode;
|
||||||
while (true) {
|
while (true) {
|
||||||
nmode = (nmode + 1) % NEIActions.gameModes.length;
|
nmode = (nmode + 1) % NEIActions.gameModes.length;
|
||||||
if (nmode == mode || isValidGamemode(NEIActions.gameModes[nmode])) break;
|
if (nmode == mode || isValidGamemode(NEIActions.gameModes[nmode]))
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return nmode;
|
return nmode;
|
||||||
}
|
}
|
||||||
@@ -416,13 +246,13 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
public static void cycleGamemode() {
|
public static void cycleGamemode() {
|
||||||
int mode = getGamemode();
|
int mode = getGamemode();
|
||||||
int nmode = getNextGamemode();
|
int nmode = getNextGamemode();
|
||||||
if (mode == nmode) return;
|
if (mode == nmode)
|
||||||
|
return;
|
||||||
|
|
||||||
if (hasSMPCounterPart()) NEICPH.sendGamemode(nmode);
|
if (hasSMPCounterPart())
|
||||||
else sendCommand(
|
NEICPH.sendGamemode(nmode);
|
||||||
getStringSetting("command.creative"),
|
else
|
||||||
getGameType(nmode),
|
sendCommand(getStringSetting("command.creative"), getGameType(nmode), mc().thePlayer.getCommandSenderName());
|
||||||
mc().thePlayer.getCommandSenderName());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static long getTime() {
|
public static long getTime() {
|
||||||
@@ -437,18 +267,22 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
long day = (getTime() / 24000L) * 24000L;
|
long day = (getTime() / 24000L) * 24000L;
|
||||||
long newTime = day + 24000L + hour * 1000;
|
long newTime = day + 24000L + hour * 1000;
|
||||||
|
|
||||||
if (hasSMPCounterPart()) NEICPH.sendSetTime(hour);
|
if (hasSMPCounterPart())
|
||||||
else sendCommand(getStringSetting("command.time"), newTime);
|
NEICPH.sendSetTime(hour);
|
||||||
|
else
|
||||||
|
sendCommand(getStringSetting("command.time"), newTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendCommand(String command, Object... args) {
|
public static void sendCommand(String command, Object... args) {
|
||||||
if (command.isEmpty()) return;
|
if (command.length() == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
NumberFormat numberformat = NumberFormat.getIntegerInstance();
|
NumberFormat numberformat = NumberFormat.getIntegerInstance();
|
||||||
numberformat.setGroupingUsed(false);
|
numberformat.setGroupingUsed(false);
|
||||||
MessageFormat messageformat = new MessageFormat(command);
|
MessageFormat messageformat = new MessageFormat(command);
|
||||||
for (int i = 0; i < args.length; i++) if (args[i] instanceof Integer || args[i] instanceof Long)
|
for (int i = 0; i < args.length; i++)
|
||||||
messageformat.setFormatByArgumentIndex(i, numberformat);
|
if (args[i] instanceof Integer || args[i] instanceof Long)
|
||||||
|
messageformat.setFormatByArgumentIndex(i, numberformat);
|
||||||
|
|
||||||
mc().thePlayer.sendChatMessage(messageformat.format(args));
|
mc().thePlayer.sendChatMessage(messageformat.format(args));
|
||||||
}
|
}
|
||||||
@@ -458,21 +292,22 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void toggleRaining() {
|
public static void toggleRaining() {
|
||||||
if (hasSMPCounterPart()) NEICPH.sendToggleRain();
|
if (hasSMPCounterPart())
|
||||||
else sendCommand(getStringSetting("command.rain"), isRaining() ? 0 : 1);
|
NEICPH.sendToggleRain();
|
||||||
|
else
|
||||||
|
sendCommand(getStringSetting("command.rain"), isRaining() ? 0 : 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void healPlayer() {
|
public static void healPlayer() {
|
||||||
if (hasSMPCounterPart()) NEICPH.sendHeal();
|
if (hasSMPCounterPart())
|
||||||
else sendCommand(getStringSetting("command.heal"), mc().thePlayer.getCommandSenderName());
|
NEICPH.sendHeal();
|
||||||
}
|
else
|
||||||
|
sendCommand(getStringSetting("command.heal"), mc().thePlayer.getCommandSenderName());
|
||||||
public static void sendChatItemLink(NBTTagCompound payload) {
|
|
||||||
if (hasSMPCounterPart()) NEICPH.sendChatLink(payload);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void toggleMagnetMode() {
|
public static void toggleMagnetMode() {
|
||||||
if (hasSMPCounterPart()) NEICPH.sendToggleMagnetMode();
|
if (hasSMPCounterPart())
|
||||||
|
NEICPH.sendToggleMagnetMode();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ArrayList<int[]> concatIntegersToRanges(List<Integer> damages) {
|
public static ArrayList<int[]> concatIntegersToRanges(List<Integer> damages) {
|
||||||
@@ -488,38 +323,24 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (next + 1 != i) {
|
if (next + 1 != i) {
|
||||||
ranges.add(new int[] { start, next });
|
ranges.add(new int[]{start, next});
|
||||||
start = next = i;
|
start = next = i;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
next = i;
|
next = i;
|
||||||
}
|
}
|
||||||
ranges.add(new int[] { start, next });
|
ranges.add(new int[]{start, next});
|
||||||
return ranges;
|
return ranges;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ArrayList<int[]> addIntegersToRanges(List<int[]> ranges, List<Integer> damages) {
|
public static ArrayList<int[]> addIntegersToRanges(List<int[]> ranges, List<Integer> damages) {
|
||||||
for (int[] range : ranges) for (int integer = range[0]; integer <= range[1]; integer++) damages.add(integer);
|
for (int[] range : ranges)
|
||||||
|
for (int integer = range[0]; integer <= range[1]; integer++)
|
||||||
|
damages.add(integer);
|
||||||
|
|
||||||
return concatIntegersToRanges(damages);
|
return concatIntegersToRanges(damages);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String cropText(FontRenderer fontRenderer, String text, int containerWidth) {
|
|
||||||
int textWidth = fontRenderer.getStringWidth(text);
|
|
||||||
|
|
||||||
if (textWidth > containerWidth) {
|
|
||||||
int dots = fontRenderer.getStringWidth("...");
|
|
||||||
|
|
||||||
if (containerWidth <= dots) {
|
|
||||||
return "...";
|
|
||||||
}
|
|
||||||
|
|
||||||
return fontRenderer.trimStringToWidth(text, containerWidth - dots) + "...";
|
|
||||||
}
|
|
||||||
|
|
||||||
return text;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean safeKeyDown(int keyCode) {
|
public static boolean safeKeyDown(int keyCode) {
|
||||||
try {
|
try {
|
||||||
return Keyboard.isKeyDown(keyCode);
|
return Keyboard.isKeyDown(keyCode);
|
||||||
@@ -530,10 +351,12 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
|
|
||||||
public static void setItemQuantity(int i) {
|
public static void setItemQuantity(int i) {
|
||||||
world.nbt.setInteger("quantity", i);
|
world.nbt.setInteger("quantity", i);
|
||||||
|
world.saveNBT();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static GuiContainer getGuiContainer() {
|
public static GuiContainer getGuiContainer() {
|
||||||
if (mc().currentScreen instanceof GuiContainer) return (GuiContainer) mc().currentScreen;
|
if (mc().currentScreen instanceof GuiContainer)
|
||||||
|
return (GuiContainer) mc().currentScreen;
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -542,132 +365,7 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
return Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU);
|
return Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getKeyName(int keyBind, int mouseBind) {
|
|
||||||
return KeyManager.getKeyName(keyBind, mouseBind);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void playClickSound() {
|
public static void playClickSound() {
|
||||||
mc().getSoundHandler()
|
mc().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
|
||||||
.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void reportErrorBuffered(Throwable e, Set<String> buffer, String cause) {
|
|
||||||
StringWriter sw = new StringWriter();
|
|
||||||
e.printStackTrace(new PrintWriter(sw));
|
|
||||||
String stackTrace = cause + sw;
|
|
||||||
if (buffer.contains(stackTrace)) return;
|
|
||||||
|
|
||||||
System.err.println("Error while rendering: " + cause + " (" + e.getMessage() + ")");
|
|
||||||
e.printStackTrace();
|
|
||||||
buffer.add(stackTrace);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void reportErrorBuffered(Throwable e, Set<String> buffer, ItemStack cause) {
|
|
||||||
if (cause != null) {
|
|
||||||
reportErrorBuffered(e, buffer, cause.toString());
|
|
||||||
} else {
|
|
||||||
reportErrorBuffered(e, buffer, "null");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static long getScrollMultiplier(ItemStack stack) {
|
|
||||||
final long multiplier = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
|
|
||||||
|
|
||||||
if (multiplier != 0) {
|
|
||||||
return multiplier;
|
|
||||||
}
|
|
||||||
|
|
||||||
return StackInfo.isFluidDisplayItem(stack) ? 144 : stack.getMaxStackSize();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawRect(double left, double top, double width, double height, Color color) {
|
|
||||||
final boolean is2DTexture = GL11.glGetBoolean(GL11.GL_TEXTURE_2D);
|
|
||||||
final boolean isBlend = GL11.glGetBoolean(GL11.GL_BLEND);
|
|
||||||
final Tessellator tessellator = Tessellator.instance;
|
|
||||||
|
|
||||||
GL11.glEnable(GL11.GL_BLEND);
|
|
||||||
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
|
||||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
|
||||||
GL11.glColor4f(color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
|
|
||||||
tessellator.startDrawingQuads();
|
|
||||||
tessellator.addVertex(left, top + height, 0.0D);
|
|
||||||
tessellator.addVertex(left + width, top + height, 0.0D);
|
|
||||||
tessellator.addVertex(left + width, top, 0.0D);
|
|
||||||
tessellator.addVertex(left, top, 0.0D);
|
|
||||||
tessellator.draw();
|
|
||||||
GL11.glColor4f(1, 1, 1, 1);
|
|
||||||
if (is2DTexture) GL11.glEnable(GL11.GL_TEXTURE_2D);
|
|
||||||
if (!isBlend) GL11.glDisable(GL11.GL_BLEND);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawNEIOverlayText(String text, Rectangle4i rect, float scale, int color, boolean shadow,
|
|
||||||
Alignment alignment) {
|
|
||||||
final float screenScale = mc().currentScreen.width * 1f / mc().displayWidth;
|
|
||||||
final double smallTextScale = Math
|
|
||||||
.max(screenScale, (Math.max(scale, 1f) * (GuiDraw.fontRenderer.getUnicodeFlag() ? 3F / 4F : 1F / 2F)));
|
|
||||||
|
|
||||||
NEIClientUtils.gl2DRenderContext(() -> {
|
|
||||||
final int width = GuiDraw.fontRenderer.getStringWidth(text);
|
|
||||||
final float partW = rect.w / 2f;
|
|
||||||
final float partH = rect.h / 2f;
|
|
||||||
final double offsetX = Math
|
|
||||||
.ceil(rect.x + partW + partW * alignment.x - (width / 2f * (alignment.x + 1)) * smallTextScale);
|
|
||||||
final double offsetY = Math.ceil(
|
|
||||||
rect.y + partH
|
|
||||||
+ partH * alignment.y
|
|
||||||
- (GuiDraw.fontRenderer.FONT_HEIGHT / 2f * (alignment.y + 1)) * smallTextScale);
|
|
||||||
|
|
||||||
GL11.glTranslated(offsetX, offsetY, 0);
|
|
||||||
GL11.glScaled(smallTextScale, smallTextScale, 1);
|
|
||||||
GuiDraw.fontRenderer.drawString(text, 0, 0, color, shadow);
|
|
||||||
GL11.glScaled(1 / smallTextScale, 1 / smallTextScale, 1);
|
|
||||||
GL11.glTranslated(-1 * offsetX, -1 * offsetY, 0);
|
|
||||||
GL11.glColor4f(1, 1, 1, 1);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawNEIOverlayText(String text, int x, int y) {
|
|
||||||
drawNEIOverlayText(text, new Rectangle4i(x, y, 16, 16), 0.5f, 0xFDD835, false, Alignment.TopLeft);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void gl2DRenderContext(Runnable callback) {
|
|
||||||
boolean isLighting = GL11.glGetBoolean(GL11.GL_LIGHTING);
|
|
||||||
boolean isDepthTest = GL11.glGetBoolean(GL11.GL_DEPTH_TEST);
|
|
||||||
boolean isAlphaTest = GL11.glGetBoolean(GL11.GL_ALPHA_TEST);
|
|
||||||
GL11.glDisable(GL11.GL_LIGHTING);
|
|
||||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
|
||||||
GL11.glDisable(GL11.GL_DEPTH_TEST);
|
|
||||||
|
|
||||||
callback.run();
|
|
||||||
|
|
||||||
if (isLighting) GL11.glEnable(GL11.GL_LIGHTING);
|
|
||||||
if (isDepthTest) GL11.glEnable(GL11.GL_DEPTH_TEST);
|
|
||||||
if (!isAlphaTest) GL11.glDisable(GL11.GL_ALPHA_TEST);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void errorOnce(String key, String message, Throwable error) {
|
|
||||||
if (REPORTED.add(key)) {
|
|
||||||
NEIClientConfig.logger.error(message, error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void warnOnce(String key, String message) {
|
|
||||||
if (REPORTED.add(key)) {
|
|
||||||
NEIClientConfig.logger.warn(message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean backupFile(File file) {
|
|
||||||
final File backup = new File(file.getAbsolutePath() + ".backup-" + System.currentTimeMillis());
|
|
||||||
|
|
||||||
try {
|
|
||||||
Files.copy(file.toPath(), backup.toPath());
|
|
||||||
NEIClientConfig.logger.info("Backed up file {} to {}", file, backup);
|
|
||||||
return true;
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to backup file {} to {}", file, backup, e);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
public class NEICompatibility {
|
public class NEICompatibility
|
||||||
|
{
|
||||||
}
|
}
|
||||||
@@ -1,38 +1,27 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.lib.gui.GuiDraw.getMousePosition;
|
|
||||||
import static codechicken.nei.NEIClientConfig.canCheatItem;
|
|
||||||
|
|
||||||
import java.awt.Point;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainerCreative;
|
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.inventory.SlotCrafting;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraftforge.client.ClientCommandHandler;
|
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
|
||||||
import codechicken.nei.api.API;
|
import codechicken.nei.api.API;
|
||||||
import codechicken.nei.api.GuiInfo;
|
import codechicken.nei.api.GuiInfo;
|
||||||
import codechicken.nei.api.IInfiniteItemHandler;
|
import codechicken.nei.api.IInfiniteItemHandler;
|
||||||
import codechicken.nei.api.INEIGuiHandler;
|
import codechicken.nei.api.INEIGuiHandler;
|
||||||
import codechicken.nei.api.ItemInfo;
|
import codechicken.nei.api.ItemInfo;
|
||||||
import codechicken.nei.commands.CommandBookmarkAdd;
|
|
||||||
import codechicken.nei.commands.CommandRecipeId;
|
|
||||||
import codechicken.nei.commands.CommandUntranslator;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
import codechicken.nei.guihook.IContainerInputHandler;
|
import codechicken.nei.guihook.IContainerInputHandler;
|
||||||
import codechicken.nei.guihook.IContainerSlotClickHandler;
|
import codechicken.nei.guihook.IContainerSlotClickHandler;
|
||||||
import codechicken.nei.util.EmptyContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import net.minecraft.client.gui.inventory.GuiContainerCreative;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
|
import net.minecraft.inventory.SlotCrafting;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler {
|
import java.awt.Point;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
|
||||||
|
import static codechicken.lib.gui.GuiDraw.getMousePosition;
|
||||||
|
|
||||||
|
public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler
|
||||||
|
{
|
||||||
private static final NEIController instance = new NEIController();
|
private static final NEIController instance = new NEIController();
|
||||||
|
|
||||||
public static GuiContainerManager manager;
|
public static GuiContainerManager manager;
|
||||||
@@ -48,8 +37,6 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
public static void load() {
|
public static void load() {
|
||||||
GuiContainerManager.addSlotClickHandler(instance);
|
GuiContainerManager.addSlotClickHandler(instance);
|
||||||
GuiContainerManager.addInputHandler(instance);
|
GuiContainerManager.addInputHandler(instance);
|
||||||
|
|
||||||
if (CommonUtils.isClient()) registerClientCommands();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void load(GuiContainer gui) {
|
public static void load(GuiContainer gui) {
|
||||||
@@ -57,70 +44,57 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
deleteMode = false;
|
deleteMode = false;
|
||||||
GuiInfo.clearGuiHandlers();
|
GuiInfo.clearGuiHandlers();
|
||||||
fastTransferManager = null;
|
fastTransferManager = null;
|
||||||
if (!NEIClientConfig.isEnabled()) return;
|
if (!NEIClientConfig.isEnabled())
|
||||||
|
return;
|
||||||
|
|
||||||
fastTransferManager = new FastTransferManager();
|
fastTransferManager = new FastTransferManager();
|
||||||
if (gui instanceof INEIGuiHandler) API.registerNEIGuiHandler((INEIGuiHandler) gui);
|
if (gui instanceof INEIGuiHandler)
|
||||||
|
API.registerNEIGuiHandler((INEIGuiHandler) gui);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isSpreading(GuiContainer gui) {
|
public static boolean isSpreading(GuiContainer gui) {
|
||||||
return gui.field_147007_t && gui.field_147008_s.size() > 1;
|
return gui.field_147007_t && gui.field_147008_s.size() > 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public static void registerClientCommands() {
|
|
||||||
ClientCommandHandler.instance.registerCommand(new CommandBookmarkAdd());
|
|
||||||
ClientCommandHandler.instance.registerCommand(new CommandRecipeId());
|
|
||||||
ClientCommandHandler.instance.registerCommand(new CommandUntranslator());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void updateUnlimitedItems(InventoryPlayer inventory) {
|
public static void updateUnlimitedItems(InventoryPlayer inventory) {
|
||||||
if (!NEIClientConfig.canPerformAction("item") || !NEIClientConfig.hasSMPCounterPart()) return;
|
if (!NEIClientConfig.canPerformAction("item") || !NEIClientConfig.hasSMPCounterPart())
|
||||||
|
return;
|
||||||
|
|
||||||
int size = inventory.getSizeInventory();
|
LinkedList<ItemStack> beforeStacks = new LinkedList<>();
|
||||||
for (int i = 0; i < size; i++) {
|
for (int i = 0; i < inventory.getSizeInventory(); i++)
|
||||||
|
beforeStacks.add(NEIServerUtils.copyStack(inventory.getStackInSlot(i)));
|
||||||
|
|
||||||
|
for (int i = 0; i < inventory.getSizeInventory(); i++) {
|
||||||
ItemStack stack = inventory.getStackInSlot(i);
|
ItemStack stack = inventory.getStackInSlot(i);
|
||||||
if (stack == null) continue;
|
if (stack == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
|
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers)
|
||||||
if (!handler.canHandleItem(stack) || !handler.isItemInfinite(stack)) continue;
|
if (handler.canHandleItem(stack) && handler.isItemInfinite(stack))
|
||||||
|
handler.replenishInfiniteStack(inventory, i);
|
||||||
|
}
|
||||||
|
|
||||||
long beforeSize = packStackSize(stack.stackSize, stack.getItemDamage());
|
for (int i = 0; i < inventory.getSizeInventory(); i++) {
|
||||||
handler.replenishInfiniteStack(inventory, i);
|
ItemStack newstack = inventory.getStackInSlot(i);
|
||||||
|
|
||||||
ItemStack newstack = inventory.getStackInSlot(i);
|
if (!NEIServerUtils.areStacksIdentical(beforeStacks.get(i), newstack)) {
|
||||||
if (!sameStack(stack, beforeSize, newstack)) {
|
inventory.setInventorySlotContents(i, beforeStacks.get(i));//restore in case of SMP fail
|
||||||
NEIClientUtils.setSlotContents(i, newstack, false); // sends via SMP handler ;)
|
NEIClientUtils.setSlotContents(i, newstack, false);//sends via SMP handler ;)
|
||||||
stack.stackSize = (int) (beforeSize >> 32);
|
|
||||||
stack.setItemDamage((int) beforeSize);
|
|
||||||
inventory.setInventorySlotContents(i, stack); // restore in case of SMP fail
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static long packStackSize(int stackSize, int itemDamage) {
|
|
||||||
return ((long) stackSize << 32) | (itemDamage & 0xFFFFFFFFL);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean sameStack(ItemStack before, long beforeSize, ItemStack stack) {
|
|
||||||
if (stack == null) return before == null;
|
|
||||||
return before != null && Item.getIdFromItem(before.getItem()) == Item.getIdFromItem(stack.getItem())
|
|
||||||
&& beforeSize == packStackSize(stack.stackSize, stack.getItemDamage());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void processCreativeCycling(InventoryPlayer inventory) {
|
public static void processCreativeCycling(InventoryPlayer inventory) {
|
||||||
if (NEIClientConfig.invCreativeMode() && NEIClientUtils.controlKey()) {
|
if (NEIClientConfig.invCreativeMode() && NEIClientUtils.controlKey()) {
|
||||||
if (selectedItem != inventory.currentItem) {
|
if (selectedItem != inventory.currentItem) {
|
||||||
if (inventory.currentItem == selectedItem + 1 || (inventory.currentItem == 0 && selectedItem == 8)) // foward
|
if (inventory.currentItem == selectedItem + 1 || (inventory.currentItem == 0 && selectedItem == 8))//foward
|
||||||
{
|
{
|
||||||
NEICPH.sendCreativeScroll(1);
|
NEICPH.sendCreativeScroll(1);
|
||||||
inventory.currentItem = selectedItem;
|
inventory.currentItem = selectedItem;
|
||||||
} else if (inventory.currentItem == selectedItem - 1
|
} else if (inventory.currentItem == selectedItem - 1 || (inventory.currentItem == 8 && selectedItem == 0)) {
|
||||||
|| (inventory.currentItem == 8 && selectedItem == 0)) {
|
NEICPH.sendCreativeScroll(-1);
|
||||||
NEICPH.sendCreativeScroll(-1);
|
inventory.currentItem = selectedItem;
|
||||||
inventory.currentItem = selectedItem;
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,72 +103,61 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void beforeSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) {
|
public void beforeSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) {
|
||||||
if (!NEIClientConfig.isEnabled()) return;
|
if (!NEIClientConfig.isEnabled())
|
||||||
|
return;
|
||||||
|
|
||||||
firstheld = NEIClientUtils.getHeldItem();
|
firstheld = NEIClientUtils.getHeldItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handleSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier,
|
public boolean handleSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier, boolean eventconsumed) {
|
||||||
boolean eventconsumed) {
|
if (eventconsumed ||
|
||||||
if (eventconsumed || !NEIClientConfig.isEnabled() || isSpreading(gui)) return eventconsumed;
|
!NEIClientConfig.isEnabled() ||
|
||||||
|
isSpreading(gui))
|
||||||
|
return eventconsumed;
|
||||||
|
|
||||||
if (deleteMode && slotIndex >= 0 && slot != null) {
|
if (deleteMode && slotIndex >= 0 && slot != null) {
|
||||||
if (NEIClientUtils.shiftKey() && button == 0) {
|
if (NEIClientUtils.shiftKey() && button == 0) {
|
||||||
ItemStack itemstack1 = slot.getStack();
|
ItemStack itemstack1 = slot.getStack();
|
||||||
if (itemstack1 != null) NEIClientUtils.deleteItemsOfType(itemstack1);
|
if (itemstack1 != null)
|
||||||
|
NEIClientUtils.deleteItemsOfType(itemstack1);
|
||||||
|
|
||||||
} else if (button == 1) NEIClientUtils.decreaseSlotStack(slot.slotNumber);
|
} else if (button == 1)
|
||||||
else NEIClientUtils.deleteSlotStack(slot.slotNumber);
|
NEIClientUtils.decreaseSlotStack(slot.slotNumber);
|
||||||
|
else
|
||||||
|
NEIClientUtils.deleteSlotStack(slot.slotNumber);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (button == 1 && modifier != 2 && slot instanceof SlotCrafting) // right click
|
if (button == 1 && slot instanceof SlotCrafting)//right click
|
||||||
{
|
{
|
||||||
for (int i1 = 0; i1 < 64; i1++) // click this slot 64 times
|
for (int i1 = 0; i1 < 64; i1++)//click this slot 64 times
|
||||||
manager.handleSlotClick(slot.slotNumber, button, 0);
|
manager.handleSlotClick(slot.slotNumber, button, 0);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NEIClientUtils.controlKey() && modifier != 4 // Drop key pressed:
|
if (NEIClientUtils.controlKey()
|
||||||
// net.minecraft.client.gui.inventory.GuiContainer.keyTyped
|
&& slot != null && slot.getStack() != null
|
||||||
&& slot != null
|
|
||||||
&& slot.getStack() != null
|
|
||||||
&& slot.isItemValid(slot.getStack())) {
|
&& slot.isItemValid(slot.getStack())) {
|
||||||
if (!canCheatItem(slot.getStack())) return false;
|
|
||||||
|
|
||||||
NEIClientUtils.cheatItem(slot.getStack(), button, 1);
|
NEIClientUtils.cheatItem(slot.getStack(), button, 1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GuiInfo.hasCustomSlots(gui)) return false;
|
if(GuiInfo.hasCustomSlots(gui))
|
||||||
|
return false;
|
||||||
|
|
||||||
if (NEIClientUtils.shiftKey() && button != 2) { // MMB is used by other mods when an itemstack is picked.
|
if (slotIndex >= 0 && NEIClientUtils.shiftKey() && NEIClientUtils.getHeldItem() != null && !slot.getHasStack()) {
|
||||||
// fix small mouse movement while clicking causing slotIndex to be -999
|
ItemStack held = NEIClientUtils.getHeldItem();
|
||||||
if (slotIndex == -999) {
|
manager.handleSlotClick(slot.slotNumber, button, 0);
|
||||||
final Point mouse = GuiDraw.getMousePosition();
|
if (slot.isItemValid(held) && !ItemInfo.fastTransferExemptions.contains(slot.getClass()))
|
||||||
slot = gui.getSlotAtPosition(mouse.x, mouse.y);
|
fastTransferManager.performMassTransfer(gui, pickedUpFromSlot, slotIndex, held);
|
||||||
|
|
||||||
if (slot != null) {
|
return true;
|
||||||
slotIndex = slot.slotNumber;
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (slotIndex >= 0 && NEIClientUtils.getHeldItem() != null && !slot.getHasStack()) {
|
if (slotIndex == -999 && NEIClientUtils.shiftKey() && button == 0) {
|
||||||
final ItemStack held = NEIClientUtils.getHeldItem();
|
fastTransferManager.throwAll(gui, pickedUpFromSlot);
|
||||||
manager.handleSlotClick(slot.slotNumber, button, 0);
|
return true;
|
||||||
|
|
||||||
if (slot.isItemValid(held) && !ItemInfo.fastTransferExemptions.contains(slot.getClass())) {
|
|
||||||
fastTransferManager.performMassTransfer(gui, pickedUpFromSlot, slotIndex, held);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (slotIndex == -999 && button == 0) {
|
|
||||||
fastTransferManager.throwAll(gui, pickedUpFromSlot);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -202,15 +165,16 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void afterSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) {
|
public void afterSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) {
|
||||||
if (!NEIClientConfig.isEnabled()) return;
|
if (!NEIClientConfig.isEnabled())
|
||||||
|
return;
|
||||||
|
|
||||||
ItemStack nowHeld = NEIClientUtils.getHeldItem();
|
ItemStack nowHeld = NEIClientUtils.getHeldItem();
|
||||||
|
|
||||||
if (firstheld != nowHeld) pickedUpFromSlot = slotIndex;
|
if (firstheld != nowHeld)
|
||||||
|
pickedUpFromSlot = slotIndex;
|
||||||
|
|
||||||
if (NEIClientConfig.canPerformAction("item") && NEIClientConfig.hasSMPCounterPart()) {
|
if (NEIClientConfig.canPerformAction("item") && NEIClientConfig.hasSMPCounterPart()) {
|
||||||
if (heldStackInfinite != null && slot != null
|
if (heldStackInfinite != null && slot != null && slot.inventory == NEIClientUtils.mc().thePlayer.inventory) {
|
||||||
&& slot.inventory == NEIClientUtils.mc().thePlayer.inventory) {
|
|
||||||
ItemStack stack = slot.getStack();
|
ItemStack stack = slot.getStack();
|
||||||
if (stack != null) {
|
if (stack != null) {
|
||||||
heldStackInfinite.onPlaceInfinite(stack);
|
heldStackInfinite.onPlaceInfinite(stack);
|
||||||
@@ -218,7 +182,8 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
NEIClientUtils.setSlotContents(slotIndex, stack, true);
|
NEIClientUtils.setSlotContents(slotIndex, stack, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (firstheld != nowHeld) heldStackInfinite = null;
|
if (firstheld != nowHeld)
|
||||||
|
heldStackInfinite = null;
|
||||||
|
|
||||||
if (firstheld != nowHeld && nowHeld != null) {
|
if (firstheld != nowHeld && nowHeld != null) {
|
||||||
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
|
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
|
||||||
@@ -235,10 +200,14 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
||||||
if (!NEIClientConfig.isEnabled() || GuiInfo.hasCustomSlots(gui) || isSpreading(gui)) return false;
|
if (!NEIClientConfig.isEnabled() ||
|
||||||
|
GuiInfo.hasCustomSlots(gui) ||
|
||||||
|
isSpreading(gui))
|
||||||
|
return false;
|
||||||
|
|
||||||
Slot slot = GuiContainerManager.getSlotMouseOver(gui);
|
Slot slot = GuiContainerManager.getSlotMouseOver(gui);
|
||||||
if (slot == null) return false;
|
if (slot == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
int slotIndex = slot.slotNumber;
|
int slotIndex = slot.slotNumber;
|
||||||
|
|
||||||
@@ -255,22 +224,19 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||||
if (!NEIClientConfig.isEnabled() || GuiInfo.hasCustomSlots(gui)
|
if (!NEIClientConfig.isEnabled() || GuiInfo.hasCustomSlots(gui) || !NEIClientConfig.isMouseScrollTransferEnabled())
|
||||||
|| !NEIClientConfig.isMouseScrollTransferEnabled())
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// slot in GuiRecipe does not contain actual stack
|
|
||||||
// and scroll should be handled by GuiRecipe, not here
|
|
||||||
if (gui.inventorySlots instanceof EmptyContainer) return false;
|
|
||||||
|
|
||||||
Point mousePos = getMousePosition();
|
Point mousePos = getMousePosition();
|
||||||
Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y);
|
Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y);
|
||||||
if (mouseover != null && mouseover.getHasStack()) {
|
if (mouseover != null && mouseover.getHasStack()) {
|
||||||
if (NEIClientConfig.shouldInvertMouseScrollTransfer()) {
|
if(NEIClientConfig.shouldInvertMouseScrollTransfer()) {
|
||||||
scrolled = -scrolled;
|
scrolled = -scrolled;
|
||||||
}
|
}
|
||||||
if (scrolled > 0) fastTransferManager.transferItem(manager.window, mouseover.slotNumber);
|
if (scrolled > 0)
|
||||||
else fastTransferManager.retrieveItem(manager.window, mouseover.slotNumber);
|
fastTransferManager.transferItem(manager.window, mouseover.slotNumber);
|
||||||
|
else
|
||||||
|
fastTransferManager.retrieveItem(manager.window, mouseover.slotNumber);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@@ -287,26 +253,32 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
|
public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {}
|
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {}
|
public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {}
|
public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {}
|
public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean canUseDeleteMode() {
|
public static boolean canUseDeleteMode() {
|
||||||
return !(NEIClientUtils.getGuiContainer() instanceof GuiContainerCreative);
|
return !(NEIClientUtils.getGuiContainer() instanceof GuiContainerCreative);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void toggleDeleteMode() {
|
public static void toggleDeleteMode() {
|
||||||
if (canUseDeleteMode()) deleteMode = !deleteMode;
|
if(canUseDeleteMode())
|
||||||
|
deleteMode = !deleteMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean getDeleteMode() {
|
public static boolean getDeleteMode() {
|
||||||
|
|||||||
@@ -1,20 +1,22 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import codechicken.nei.api.INEIGuiAdapter;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainerCreative;
|
import net.minecraft.client.gui.inventory.GuiContainerCreative;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
|
|
||||||
import codechicken.nei.api.INEIGuiAdapter;
|
public class NEICreativeGuiHandler extends INEIGuiAdapter
|
||||||
|
{
|
||||||
public class NEICreativeGuiHandler extends INEIGuiAdapter {
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
|
public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility)
|
||||||
if (!(gui instanceof GuiContainerCreative)) return currentVisibility;
|
{
|
||||||
|
if(!(gui instanceof GuiContainerCreative))
|
||||||
if (((GuiContainerCreative) gui).func_147056_g() != CreativeTabs.tabInventory.getTabIndex())
|
return currentVisibility;
|
||||||
|
|
||||||
|
if(((GuiContainerCreative)gui).func_147056_g() != CreativeTabs.tabInventory.getTabIndex())
|
||||||
currentVisibility.showItemSection = currentVisibility.enableDeleteMode = false;
|
currentVisibility.showItemSection = currentVisibility.enableDeleteMode = false;
|
||||||
|
|
||||||
return currentVisibility;
|
return currentVisibility;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,21 +1,21 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import codechicken.lib.inventory.ContainerExtended;
|
import codechicken.lib.inventory.ContainerExtended;
|
||||||
import codechicken.lib.inventory.SlotDummy;
|
import codechicken.lib.inventory.SlotDummy;
|
||||||
import codechicken.nei.api.INEIGuiAdapter;
|
import codechicken.nei.api.INEIGuiAdapter;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class NEIDummySlotHandler extends INEIGuiAdapter {
|
public class NEIDummySlotHandler extends INEIGuiAdapter
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) {
|
public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button)
|
||||||
|
{
|
||||||
Slot slot = gui.getSlotAtPosition(mousex, mousey);
|
Slot slot = gui.getSlotAtPosition(mousex, mousey);
|
||||||
if (slot instanceof SlotDummy && slot.isItemValid(draggedStack)
|
if(slot instanceof SlotDummy && slot.isItemValid(draggedStack) && gui.inventorySlots instanceof ContainerExtended)
|
||||||
&& gui.inventorySlots instanceof ContainerExtended) {
|
{
|
||||||
((SlotDummy) slot).slotClick(draggedStack, button, NEIClientUtils.shiftKey());
|
((SlotDummy)slot).slotClick(draggedStack, button, NEIClientUtils.shiftKey());
|
||||||
NEICPH.sendDummySlotSet(slot.slotNumber, slot.getStack());
|
NEICPH.sendDummySlotSet(slot.slotNumber, slot.getStack());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,95 +1,88 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
|
||||||
|
|
||||||
import com.google.common.eventbus.EventBus;
|
|
||||||
import com.google.common.eventbus.Subscribe;
|
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
import codechicken.core.CommonUtils;
|
||||||
import codechicken.core.launch.CodeChickenCorePlugin;
|
import codechicken.core.launch.CodeChickenCorePlugin;
|
||||||
import codechicken.nei.api.IConfigureNEI;
|
import codechicken.nei.api.IConfigureNEI;
|
||||||
import codechicken.nei.asm.NEICorePlugin;
|
import codechicken.nei.asm.NEICorePlugin;
|
||||||
import codechicken.nei.config.IMCHandler;
|
import codechicken.nei.config.IMCHandler;
|
||||||
import codechicken.nei.guihook.HideousLinkedList;
|
|
||||||
import codechicken.nei.recipe.GuiRecipeTab;
|
import codechicken.nei.recipe.GuiRecipeTab;
|
||||||
|
import com.google.common.eventbus.EventBus;
|
||||||
|
import com.google.common.eventbus.Subscribe;
|
||||||
import cpw.mods.fml.client.FMLFileResourcePack;
|
import cpw.mods.fml.client.FMLFileResourcePack;
|
||||||
import cpw.mods.fml.client.FMLFolderResourcePack;
|
import cpw.mods.fml.client.FMLFolderResourcePack;
|
||||||
import cpw.mods.fml.common.DummyModContainer;
|
import cpw.mods.fml.common.DummyModContainer;
|
||||||
import cpw.mods.fml.common.LoadController;
|
import cpw.mods.fml.common.LoadController;
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.MetadataCollection;
|
||||||
import cpw.mods.fml.common.ModMetadata;
|
import cpw.mods.fml.common.ModMetadata;
|
||||||
import cpw.mods.fml.common.discovery.ASMDataTable;
|
|
||||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||||
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
|
|
||||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||||
import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
|
|
||||||
import cpw.mods.fml.common.versioning.ArtifactVersion;
|
import cpw.mods.fml.common.versioning.ArtifactVersion;
|
||||||
import cpw.mods.fml.common.versioning.VersionParser;
|
import cpw.mods.fml.common.versioning.VersionParser;
|
||||||
import cpw.mods.fml.common.versioning.VersionRange;
|
import cpw.mods.fml.common.versioning.VersionRange;
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
|
||||||
@SuppressWarnings("UnstableApiUsage")
|
import java.io.File;
|
||||||
public class NEIModContainer extends DummyModContainer {
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
public static final LinkedList<IConfigureNEI> plugins = new HideousLinkedList<>(new CopyOnWriteArrayList<>());
|
public class NEIModContainer extends DummyModContainer
|
||||||
|
{
|
||||||
private static boolean gregTech5Loaded;
|
public static LinkedList<IConfigureNEI> plugins = new LinkedList<>();
|
||||||
private static boolean gtnhLibLoaded;
|
|
||||||
private static boolean cubicChunksLoaded;
|
|
||||||
|
|
||||||
private static ASMDataTable asmDataTable;
|
|
||||||
|
|
||||||
public NEIModContainer() {
|
public NEIModContainer() {
|
||||||
super(getModMetadata());
|
super(getModMetadata());
|
||||||
|
loadMetadata();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ModMetadata getModMetadata() {
|
private static ModMetadata getModMetadata() {
|
||||||
final ModMetadata modMetadata = new ModMetadata();
|
final ModMetadata modMetadata = new ModMetadata();
|
||||||
modMetadata.name = "NotEnoughItems";
|
modMetadata.name = "GRADLETOKEN_MODNAME";
|
||||||
modMetadata.modId = "NotEnoughItems";
|
modMetadata.modId = "GRADLETOKEN_MODID";
|
||||||
modMetadata.version = Tags.VERSION;
|
modMetadata.version = "GRADLETOKEN_VERSION";
|
||||||
modMetadata.authorList = Arrays.asList("ChickenBones", "mitchej123", "SLPrime");
|
|
||||||
modMetadata.url = "https://github.com/GTNewHorizons/NotEnoughItems";
|
|
||||||
modMetadata.description = "Recipe Viewer, Inventory Manager, Item Spawner, Cheats and more; GTNH Version includes many enhancements.";
|
|
||||||
return modMetadata;
|
return modMetadata;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isGT5Loaded() {
|
|
||||||
return gregTech5Loaded;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isGTNHLibLoaded() {
|
|
||||||
return gtnhLibLoaded;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isCCLoaded() {
|
|
||||||
return cubicChunksLoaded;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<ArtifactVersion> getRequirements() {
|
public Set<ArtifactVersion> getRequirements() {
|
||||||
Set<ArtifactVersion> deps = new HashSet<>();
|
Set<ArtifactVersion> deps = new HashSet<>();
|
||||||
deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)"));
|
deps.add(VersionParser.parseVersionReference("CodeChickenCore@["+CodeChickenCorePlugin.version+",)"));
|
||||||
return deps;
|
return deps;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ArtifactVersion> getDependencies() {
|
public List<ArtifactVersion> getDependencies() {
|
||||||
List<ArtifactVersion> deps = new ArrayList<>();
|
return new LinkedList<>(getRequirements());
|
||||||
deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)"));
|
|
||||||
deps.add(VersionParser.parseVersionReference("gtnhlib@[0.9.6,)"));
|
|
||||||
return deps;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String description;
|
private String description;
|
||||||
|
private void loadMetadata() {
|
||||||
|
description = super.getMetadata().description.replace("Supporters:", EnumChatFormatting.AQUA+"Supporters:");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ModMetadata getMetadata() {
|
||||||
|
StringBuilder s_plugins = new StringBuilder();
|
||||||
|
if (plugins.size() == 0) {
|
||||||
|
s_plugins.append(EnumChatFormatting.RED).append("No installed plugins.");
|
||||||
|
} else {
|
||||||
|
s_plugins.append(EnumChatFormatting.GREEN).append("Installed plugins: ");
|
||||||
|
for (int i = 0; i < plugins.size(); i++) {
|
||||||
|
if (i > 0)
|
||||||
|
s_plugins.append(", ");
|
||||||
|
IConfigureNEI plugin = plugins.get(i);
|
||||||
|
s_plugins.append(plugin.getName()).append(" ").append(plugin.getVersion());
|
||||||
|
}
|
||||||
|
s_plugins.append(".");
|
||||||
|
}
|
||||||
|
|
||||||
|
ModMetadata meta = super.getMetadata();
|
||||||
|
meta.description = description.replace("<plugins>", s_plugins.toString());
|
||||||
|
return meta;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean registerBus(EventBus bus, LoadController controller) {
|
public boolean registerBus(EventBus bus, LoadController controller) {
|
||||||
@@ -99,45 +92,25 @@ public class NEIModContainer extends DummyModContainer {
|
|||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
public void preInit(FMLPreInitializationEvent event) {
|
public void preInit(FMLPreInitializationEvent event) {
|
||||||
gregTech5Loaded = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post");
|
if (CommonUtils.isClient())
|
||||||
gtnhLibLoaded = Loader.isModLoaded("gtnhlib");
|
ClientHandler.preInit();
|
||||||
cubicChunksLoaded = Loader.isModLoaded("cubicchunks");
|
|
||||||
ServerHandler.preInit();
|
|
||||||
if (CommonUtils.isClient()) ClientHandler.preInit();
|
|
||||||
asmDataTable = event.getAsmData();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
public void init(FMLInitializationEvent event) {
|
public void init(FMLInitializationEvent event) {
|
||||||
if (CommonUtils.isClient()) {
|
if (CommonUtils.isClient())
|
||||||
ClientHandler.load();
|
ClientHandler.load();
|
||||||
IMCForNEI.IMCSender();
|
|
||||||
}
|
|
||||||
ServerHandler.load();
|
ServerHandler.load();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
public void postInit(FMLPostInitializationEvent event) {
|
public void postInit(FMLPostInitializationEvent event) {
|
||||||
if (CommonUtils.isClient()) {
|
if (CommonUtils.isClient()) {
|
||||||
|
GuiRecipeTab.loadHandlerInfo();
|
||||||
ClientHandler.postInit();
|
ClientHandler.postInit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Subscribe
|
|
||||||
public void loadComplete(FMLLoadCompleteEvent event) {
|
|
||||||
if (CommonUtils.isClient()) {
|
|
||||||
GuiRecipeTab.loadHandlerInfo();
|
|
||||||
ClientHandler.loadPluginsList();
|
|
||||||
ClientHandler.loadHandlerOrdering();
|
|
||||||
asmDataTable = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Subscribe
|
|
||||||
public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
|
|
||||||
NEIServerConfig.resetFirstLoad();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
public void handleIMCMessages(FMLInterModComms.IMCEvent event) {
|
public void handleIMCMessages(FMLInterModComms.IMCEvent event) {
|
||||||
IMCHandler.processIMC(event.getMessages());
|
IMCHandler.processIMC(event.getMessages());
|
||||||
@@ -157,8 +130,4 @@ public class NEIModContainer extends DummyModContainer {
|
|||||||
public Class<?> getCustomResourcePackClass() {
|
public Class<?> getCustomResourcePackClass() {
|
||||||
return getSource().isDirectory() ? FMLFolderResourcePack.class : FMLFileResourcePack.class;
|
return getSource().isDirectory() ? FMLFolderResourcePack.class : FMLFileResourcePack.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ASMDataTable getAsmDataTable() {
|
|
||||||
return asmDataTable;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.entity.EntityPlayerSP;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.client.renderer.InventoryEffectRenderer;
|
|
||||||
|
|
||||||
import codechicken.nei.api.INEIGuiAdapter;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inspired by InventoryEffectRendererGuiHandler.java in JEI
|
|
||||||
*/
|
|
||||||
public class NEIPotionGuiHandler extends INEIGuiAdapter {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hideItemPanelSlot(GuiContainer guiContainer, int slotX, int slotY, int slotW, int slotH) {
|
|
||||||
if (!(guiContainer instanceof InventoryEffectRenderer)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
int x = guiContainer.guiLeft - 124;
|
|
||||||
if (slotX + slotW <= x || slotX >= x + 140) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Minecraft minecraft = guiContainer.mc;
|
|
||||||
if (minecraft == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
EntityPlayerSP player = minecraft.thePlayer;
|
|
||||||
if (player == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
int potionCount = player.getActivePotionEffects().size();
|
|
||||||
if (potionCount == 0 || NEIClientConfig.ignorePotionOverlap()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
int height = 33;
|
|
||||||
if (potionCount > 5) {
|
|
||||||
height = 132 / (potionCount - 1);
|
|
||||||
}
|
|
||||||
return intersectsPotionEffects(slotY, slotH, guiContainer.guiTop, potionCount, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean intersectsPotionEffects(int slotY, int slotH, int effectY, int potionCount, int height) {
|
|
||||||
for (int i = 0; i < potionCount; i++, effectY += height) {
|
|
||||||
if (slotY + slotH > effectY && slotY < effectY + 32) return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +1,5 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.nei.PacketIDs.C2S;
|
|
||||||
import static codechicken.nei.PacketIDs.S2C;
|
|
||||||
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import net.minecraft.entity.item.EntityItem;
|
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
|
||||||
import net.minecraft.inventory.InventoryBasic;
|
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.network.play.INetHandlerPlayServer;
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraft.tileentity.TileEntityMobSpawner;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
import codechicken.core.CommonUtils;
|
||||||
import codechicken.core.ServerUtils;
|
import codechicken.core.ServerUtils;
|
||||||
import codechicken.lib.inventory.SlotDummy;
|
import codechicken.lib.inventory.SlotDummy;
|
||||||
@@ -24,96 +7,91 @@ import codechicken.lib.packet.PacketCustom;
|
|||||||
import codechicken.lib.packet.PacketCustom.IServerPacketHandler;
|
import codechicken.lib.packet.PacketCustom.IServerPacketHandler;
|
||||||
import codechicken.lib.vec.BlockCoord;
|
import codechicken.lib.vec.BlockCoord;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import net.minecraft.entity.item.EntityItem;
|
||||||
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
|
import net.minecraft.inventory.InventoryBasic;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.network.play.INetHandlerPlayServer;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.tileentity.TileEntityMobSpawner;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
public class NEISPH implements IServerPacketHandler {
|
import java.util.LinkedList;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
public class NEISPH implements IServerPacketHandler
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public void handlePacket(PacketCustom packet, EntityPlayerMP sender, INetHandlerPlayServer netHandler) {
|
public void handlePacket(PacketCustom packet, EntityPlayerMP sender, INetHandlerPlayServer netHandler) {
|
||||||
if (!NEIServerConfig.authenticatePacket(sender, packet)) return;
|
if (!NEIServerConfig.authenticatePacket(sender, packet))
|
||||||
|
return;
|
||||||
|
|
||||||
switch (packet.getType()) {
|
switch (packet.getType()) {
|
||||||
case C2S.GIVE_ITEM:
|
case 1:
|
||||||
handleGiveItem(sender, packet);
|
handleGiveItem(sender, packet);
|
||||||
break;
|
break;
|
||||||
case C2S.DELETE_ALL_ITEMS:
|
case 4:
|
||||||
NEIServerUtils.deleteAllItems(sender);
|
NEIServerUtils.deleteAllItems(sender);
|
||||||
break;
|
break;
|
||||||
case C2S.SET_SLOT:
|
case 5:
|
||||||
setInventorySlot(sender, packet);
|
setInventorySlot(sender, packet);
|
||||||
break;
|
break;
|
||||||
case C2S.TOGGLE_MAGNET:
|
case 6:
|
||||||
NEIServerUtils.toggleMagnetMode(sender);
|
NEIServerUtils.toggleMagnetMode(sender);
|
||||||
break;
|
break;
|
||||||
case C2S.SET_TIME:
|
case 7:
|
||||||
NEIServerUtils.setHourForward(sender.worldObj, packet.readUByte(), true);
|
NEIServerUtils.setHourForward(sender.worldObj, packet.readUByte(), true);
|
||||||
break;
|
break;
|
||||||
case C2S.HEAL:
|
case 8:
|
||||||
NEIServerUtils.healPlayer(sender);
|
NEIServerUtils.healPlayer(sender);
|
||||||
break;
|
break;
|
||||||
case C2S.TOGGLE_RAIN:
|
case 9:
|
||||||
NEIServerUtils.toggleRaining(sender.worldObj, true);
|
NEIServerUtils.toggleRaining(sender.worldObj, true);
|
||||||
break;
|
break;
|
||||||
case C2S.REQUEST_LOGIN_INFO:
|
case 10:
|
||||||
sendLoginState(sender);
|
sendLoginState(sender);
|
||||||
break;
|
break;
|
||||||
case C2S.REQUEST_CONTAINER_CONTENTS:
|
case 11:
|
||||||
sender.sendContainerAndContentsToPlayer(sender.openContainer, sender.openContainer.getInventory());
|
sender.sendContainerAndContentsToPlayer(sender.openContainer, sender.openContainer.getInventory());
|
||||||
break;
|
break;
|
||||||
case C2S.CHANGE_PROPERTY:
|
case 12:
|
||||||
handlePropertyChange(sender, packet);
|
handlePropertyChange(sender, packet);
|
||||||
break;
|
break;
|
||||||
case C2S.SET_GAME_MODE:
|
case 13:
|
||||||
NEIServerUtils.setGamemode(sender, packet.readUByte());
|
NEIServerUtils.setGamemode(sender, packet.readUByte());
|
||||||
break;
|
break;
|
||||||
case C2S.CYCLE_CREATIVE_INV:
|
case 14:
|
||||||
NEIServerUtils.cycleCreativeInv(sender, packet.readInt());
|
NEIServerUtils.cycleCreativeInv(sender, packet.readInt());
|
||||||
break;
|
break;
|
||||||
case C2S.SEND_MOB_SPAWNER_ID:
|
case 15:
|
||||||
handleMobSpawnerID(sender.worldObj, packet.readCoord(), packet.readString());
|
handleMobSpawnerID(sender.worldObj, packet.readCoord(), packet.readString());
|
||||||
break;
|
break;
|
||||||
case C2S.REQUEST_CONTAINER:
|
case 21:
|
||||||
handleRequestContainer(sender, packet.readInt());
|
|
||||||
break;
|
|
||||||
case C2S.REQUEST_ENCHANTMENT_GUI:
|
|
||||||
openEnchantmentGui(sender);
|
openEnchantmentGui(sender);
|
||||||
break;
|
break;
|
||||||
case C2S.MODIFY_ENCHANTMENT:
|
case 22:
|
||||||
modifyEnchantment(sender, packet.readUByte(), packet.readUByte(), packet.readBoolean());
|
modifyEnchantment(sender, packet.readUByte(), packet.readUByte(), packet.readBoolean());
|
||||||
break;
|
break;
|
||||||
case C2S.SET_CREATIVE_PLUS_MODE:
|
case 23:
|
||||||
processCreativeInv(sender, packet.readBoolean());
|
processCreativeInv(sender, packet.readBoolean());
|
||||||
break;
|
break;
|
||||||
case C2S.REQUEST_POTION_GUI:
|
case 24:
|
||||||
openPotionGui(sender, packet);
|
openPotionGui(sender, packet);
|
||||||
break;
|
break;
|
||||||
case C2S.SET_DUMMY_SLOT:
|
case 25:
|
||||||
handleDummySlotSet(sender, packet);
|
handleDummySlotSet(sender, packet);
|
||||||
break;
|
break;
|
||||||
case C2S.SEND_CHAT_ITEM_LINK:
|
|
||||||
handleSendChatItemLink(sender, packet);
|
|
||||||
break;
|
|
||||||
case C2S.SYNC:
|
|
||||||
handleSync(sender, packet.readInt());
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleSync(EntityPlayerMP sender, int id) {
|
|
||||||
sender.sendContainerAndContentsToPlayer(sender.openContainer, sender.openContainer.getInventory());
|
|
||||||
new PacketCustom(channel, S2C.SYNC).writeInt(id).sendToPlayer(sender);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleSendChatItemLink(EntityPlayerMP sender, PacketCustom packet) {
|
|
||||||
final NBTTagCompound payloadTag = packet.readNBTTagCompound();
|
|
||||||
NEIServerUtils.sendChatItemLink(sender, payloadTag);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleDummySlotSet(EntityPlayerMP sender, PacketCustom packet) {
|
private void handleDummySlotSet(EntityPlayerMP sender, PacketCustom packet) {
|
||||||
int slotNumber = packet.readShort();
|
int slotNumber = packet.readShort();
|
||||||
ItemStack stack = packet.readItemStack(true);
|
ItemStack stack = packet.readItemStack(true);
|
||||||
|
|
||||||
Slot slot = sender.openContainer.getSlot(slotNumber);
|
Slot slot = sender.openContainer.getSlot(slotNumber);
|
||||||
if (slot instanceof SlotDummy) slot.putStack(stack);
|
if (slot instanceof SlotDummy)
|
||||||
|
slot.putStack(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleMobSpawnerID(World world, BlockCoord coord, String mobtype) {
|
private void handleMobSpawnerID(World world, BlockCoord coord, String mobtype) {
|
||||||
@@ -125,11 +103,6 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleRequestContainer(EntityPlayerMP sender, int containerSize) {
|
|
||||||
if (sender.openContainer.getInventory().size() != containerSize) return;
|
|
||||||
sender.sendContainerToPlayer(sender.openContainer);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handlePropertyChange(EntityPlayerMP sender, PacketCustom packet) {
|
private void handlePropertyChange(EntityPlayerMP sender, PacketCustom packet) {
|
||||||
String name = packet.readString();
|
String name = packet.readString();
|
||||||
if (NEIServerConfig.canPlayerPerformAction(sender.getCommandSenderName(), name))
|
if (NEIServerConfig.canPlayerPerformAction(sender.getCommandSenderName(), name))
|
||||||
@@ -138,22 +111,15 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
|
|
||||||
public static void processCreativeInv(EntityPlayerMP sender, boolean open) {
|
public static void processCreativeInv(EntityPlayerMP sender, boolean open) {
|
||||||
if (open) {
|
if (open) {
|
||||||
ServerUtils.openSMPContainer(
|
ServerUtils.openSMPContainer(sender, new ContainerCreativeInv(sender, new ExtendedCreativeInv(NEIServerConfig.forPlayer(sender.getCommandSenderName()), Side.SERVER)), (player, windowId) -> {
|
||||||
sender,
|
PacketCustom packet = new PacketCustom(channel, 23);
|
||||||
new ContainerCreativeInv(
|
packet.writeBoolean(true);
|
||||||
sender,
|
packet.writeByte(windowId);
|
||||||
new ExtendedCreativeInv(
|
packet.sendToPlayer(player);
|
||||||
NEIServerConfig.forPlayer(sender.getCommandSenderName()),
|
});
|
||||||
Side.SERVER)),
|
|
||||||
(player, windowId) -> {
|
|
||||||
PacketCustom packet = new PacketCustom(channel, S2C.SET_CREATIVE_PLUS_MODE);
|
|
||||||
packet.writeBoolean(true);
|
|
||||||
packet.writeByte(windowId);
|
|
||||||
packet.sendToPlayer(player);
|
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
sender.closeContainer();
|
sender.closeContainer();
|
||||||
PacketCustom packet = new PacketCustom(channel, S2C.SET_CREATIVE_PLUS_MODE);
|
PacketCustom packet = new PacketCustom(channel, 23);
|
||||||
packet.writeBoolean(false);
|
packet.writeBoolean(false);
|
||||||
packet.sendToPlayer(sender);
|
packet.sendToPlayer(sender);
|
||||||
}
|
}
|
||||||
@@ -169,8 +135,7 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
ItemStack item = packet.readItemStack();
|
ItemStack item = packet.readItemStack();
|
||||||
|
|
||||||
ItemStack old = NEIServerUtils.getSlotContents(player, slot, container);
|
ItemStack old = NEIServerUtils.getSlotContents(player, slot, container);
|
||||||
boolean deleting = item == null
|
boolean deleting = item == null || old != null && NEIServerUtils.areStacksSameType(item, old) && item.stackSize < old.stackSize;
|
||||||
|| old != null && NEIServerUtils.areStacksSameType(item, old) && item.stackSize < old.stackSize;
|
|
||||||
if (NEIServerConfig.canPlayerPerformAction(player.getCommandSenderName(), deleting ? "delete" : "item"))
|
if (NEIServerConfig.canPlayerPerformAction(player.getCommandSenderName(), deleting ? "delete" : "item"))
|
||||||
NEIServerUtils.setSlotContents(player, slot, item, container);
|
NEIServerUtils.setSlotContents(player, slot, item, container);
|
||||||
}
|
}
|
||||||
@@ -185,33 +150,36 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void openEnchantmentGui(EntityPlayerMP player) {
|
private void openEnchantmentGui(EntityPlayerMP player) {
|
||||||
ServerUtils.openSMPContainer(
|
ServerUtils.openSMPContainer(player, new ContainerEnchantmentModifier(player.inventory, player.worldObj, 0, 0, 0), (player1, windowId) -> {
|
||||||
player,
|
PacketCustom packet = new PacketCustom(channel, 21);
|
||||||
new ContainerEnchantmentModifier(player.inventory, player.worldObj, 0, 0, 0),
|
packet.writeByte(windowId);
|
||||||
(player1, windowId) -> {
|
packet.sendToPlayer(player1);
|
||||||
PacketCustom packet = new PacketCustom(channel, S2C.OPEN_ENCHANTMENT_GUI);
|
});
|
||||||
packet.writeByte(windowId);
|
|
||||||
packet.sendToPlayer(player1);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void openPotionGui(EntityPlayerMP player, PacketCustom packet) {
|
private void openPotionGui(EntityPlayerMP player, PacketCustom packet) {
|
||||||
InventoryBasic b = new InventoryBasic("potionStore", true, 9);
|
InventoryBasic b = new InventoryBasic("potionStore", true, 9);
|
||||||
for (int i = 0; i < b.getSizeInventory(); i++) b.setInventorySlotContents(i, packet.readItemStack());
|
for (int i = 0; i < b.getSizeInventory(); i++)
|
||||||
|
b.setInventorySlotContents(i, packet.readItemStack());
|
||||||
ServerUtils.openSMPContainer(player, new ContainerPotionCreator(player.inventory, b), (player1, windowId) -> {
|
ServerUtils.openSMPContainer(player, new ContainerPotionCreator(player.inventory, b), (player1, windowId) -> {
|
||||||
PacketCustom packet1 = new PacketCustom(channel, S2C.OPEN_POTION_GUI);
|
PacketCustom packet1 = new PacketCustom(channel, 24);
|
||||||
packet1.writeByte(windowId);
|
packet1.writeByte(windowId);
|
||||||
packet1.sendToPlayer(player1);
|
packet1.sendToPlayer(player1);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendActionDisabled(int dim, String name, boolean disable) {
|
public static void sendActionDisabled(int dim, String name, boolean disable) {
|
||||||
new PacketCustom(channel, S2C.SEND_ACTION_DISABLED).writeString(name).writeBoolean(disable)
|
new PacketCustom(channel, 11)
|
||||||
|
.writeString(name)
|
||||||
|
.writeBoolean(disable)
|
||||||
.sendToDimension(dim);
|
.sendToDimension(dim);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendActionEnabled(EntityPlayerMP player, String name, boolean enable) {
|
public static void sendActionEnabled(EntityPlayerMP player, String name, boolean enable) {
|
||||||
new PacketCustom(channel, S2C.SEND_ACTION_ENABLED).writeString(name).writeBoolean(enable).sendToPlayer(player);
|
new PacketCustom(channel, 12)
|
||||||
|
.writeString(name)
|
||||||
|
.writeBoolean(enable)
|
||||||
|
.sendToPlayer(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sendLoginState(EntityPlayerMP player) {
|
private void sendLoginState(EntityPlayerMP player) {
|
||||||
@@ -222,34 +190,41 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
PlayerSave playerSave = NEIServerConfig.forPlayer(player.getCommandSenderName());
|
PlayerSave playerSave = NEIServerConfig.forPlayer(player.getCommandSenderName());
|
||||||
|
|
||||||
for (String name : NEIActions.nameActionMap.keySet()) {
|
for (String name : NEIActions.nameActionMap.keySet()) {
|
||||||
if (NEIServerConfig.canPlayerPerformAction(player.getCommandSenderName(), name)) actions.add(name);
|
if (NEIServerConfig.canPlayerPerformAction(player.getCommandSenderName(), name))
|
||||||
if (NEIServerConfig.isActionDisabled(player.dimension, name)) disabled.add(name);
|
actions.add(name);
|
||||||
if (playerSave.isActionEnabled(name)) enabled.add(name);
|
if (NEIServerConfig.isActionDisabled(player.dimension, name))
|
||||||
|
disabled.add(name);
|
||||||
|
if (playerSave.isActionEnabled(name))
|
||||||
|
enabled.add(name);
|
||||||
}
|
}
|
||||||
for (ItemStackMap.Entry<Set<String>> entry : NEIServerConfig.bannedItems.entries())
|
for (ItemStackMap.Entry<Set<String>> entry : NEIServerConfig.bannedItems.entries())
|
||||||
if (!NEIServerConfig.isPlayerInList(player.getCommandSenderName(), entry.value, true))
|
if (!NEIServerConfig.isPlayerInList(player.getCommandSenderName(), entry.value, true))
|
||||||
bannedItems.add(entry.key);
|
bannedItems.add(entry.key);
|
||||||
|
|
||||||
PacketCustom packet = new PacketCustom(channel, S2C.SEND_LOGIN_STATE);
|
PacketCustom packet = new PacketCustom(channel, 10);
|
||||||
|
|
||||||
packet.writeByte(actions.size());
|
packet.writeByte(actions.size());
|
||||||
for (String s : actions) packet.writeString(s);
|
for (String s : actions)
|
||||||
|
packet.writeString(s);
|
||||||
|
|
||||||
packet.writeByte(disabled.size());
|
packet.writeByte(disabled.size());
|
||||||
for (String s : disabled) packet.writeString(s);
|
for (String s : disabled)
|
||||||
|
packet.writeString(s);
|
||||||
|
|
||||||
packet.writeByte(enabled.size());
|
packet.writeByte(enabled.size());
|
||||||
for (String s : enabled) packet.writeString(s);
|
for (String s : enabled)
|
||||||
|
packet.writeString(s);
|
||||||
|
|
||||||
packet.writeInt(bannedItems.size());
|
packet.writeInt(bannedItems.size());
|
||||||
for (ItemStack stack : bannedItems) packet.writeItemStack(stack);
|
for (ItemStack stack : bannedItems)
|
||||||
|
packet.writeItemStack(stack);
|
||||||
|
|
||||||
packet.sendToPlayer(player);
|
packet.sendToPlayer(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendHasServerSideTo(EntityPlayerMP player) {
|
public static void sendHasServerSideTo(EntityPlayerMP player) {
|
||||||
NEIServerConfig.logger.debug("Sending serverside check to: " + player.getCommandSenderName());
|
NEIServerConfig.logger.debug("Sending serverside check to: " + player.getCommandSenderName());
|
||||||
PacketCustom packet = new PacketCustom(channel, S2C.SEND_SERVER_SIDE_CHECK);
|
PacketCustom packet = new PacketCustom(channel, 1);
|
||||||
packet.writeByte(NEIActions.protocol);
|
packet.writeByte(NEIActions.protocol);
|
||||||
packet.writeString(CommonUtils.getWorldName(player.worldObj));
|
packet.writeString(CommonUtils.getWorldName(player.worldObj));
|
||||||
|
|
||||||
@@ -257,7 +232,7 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void sendAddMagneticItemTo(EntityPlayerMP player, EntityItem item) {
|
public static void sendAddMagneticItemTo(EntityPlayerMP player, EntityItem item) {
|
||||||
PacketCustom packet = new PacketCustom(channel, S2C.SEND_MAGNETIC_ITEM);
|
PacketCustom packet = new PacketCustom(channel, 13);
|
||||||
packet.writeInt(item.getEntityId());
|
packet.writeInt(item.getEntityId());
|
||||||
|
|
||||||
packet.sendToPlayer(player);
|
packet.sendToPlayer(player);
|
||||||
|
|||||||
@@ -1,5 +1,23 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import codechicken.core.CommonUtils;
|
||||||
|
import codechicken.core.ServerUtils;
|
||||||
|
import codechicken.lib.config.ConfigFile;
|
||||||
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
|
import codechicken.lib.packet.PacketCustom;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
|
import net.minecraft.init.Blocks;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.JsonToNBT;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.common.DimensionManager;
|
||||||
|
import org.apache.commons.io.IOUtils;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
@@ -12,62 +30,26 @@ import java.util.Iterator;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
public class NEIServerConfig
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
{
|
||||||
import net.minecraft.init.Blocks;
|
private static MinecraftServer server;
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.JsonToNBT;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
import net.minecraftforge.common.DimensionManager;
|
|
||||||
import net.minecraftforge.permission.PermissionLevel;
|
|
||||||
import net.minecraftforge.permission.PermissionManager;
|
|
||||||
|
|
||||||
import org.apache.commons.io.FileUtils;
|
|
||||||
import org.apache.commons.io.IOUtils;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
|
||||||
import codechicken.core.ServerUtils;
|
|
||||||
import codechicken.lib.config.ConfigFile;
|
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
|
||||||
import codechicken.lib.packet.PacketCustom;
|
|
||||||
|
|
||||||
public class NEIServerConfig {
|
|
||||||
|
|
||||||
private static boolean firstLoad;
|
|
||||||
public static Logger logger = LogManager.getLogger("NotEnoughItems");
|
public static Logger logger = LogManager.getLogger("NotEnoughItems");
|
||||||
public static File saveDir;
|
public static File saveDir;
|
||||||
public static ConfigFile serverConfig;
|
public static ConfigFile serverConfig;
|
||||||
public static Map<Integer, NBTTagCompound> dimTags = new HashMap<>();
|
public static Map<Integer, NBTTagCompound> dimTags = new HashMap<>();
|
||||||
public static HashMap<String, PlayerSave> playerSaves = new HashMap<>();
|
public static HashMap<String, PlayerSave> playerSaves = new HashMap<>();
|
||||||
public static ItemStackMap<Set<String>> bannedItems = new ItemStackMap<>();
|
public static ItemStackMap<Set<String>> bannedItems = new ItemStackMap<>();
|
||||||
private static boolean doesPermAPIExist = false;
|
|
||||||
|
|
||||||
public static void resetFirstLoad() {
|
|
||||||
firstLoad = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void load(World world) {
|
public static void load(World world) {
|
||||||
if (firstLoad) {
|
if (MinecraftServer.getServer() != server) {
|
||||||
firstLoad = false;
|
|
||||||
logger.debug("Loading NEI Server");
|
logger.debug("Loading NEI Server");
|
||||||
|
server = MinecraftServer.getServer();
|
||||||
saveDir = new File(DimensionManager.getCurrentSaveRootDirectory(), "NEI");
|
saveDir = new File(DimensionManager.getCurrentSaveRootDirectory(), "NEI");
|
||||||
|
|
||||||
dimTags.clear();
|
dimTags.clear();
|
||||||
loadConfig();
|
loadConfig();
|
||||||
loadBannedItems();
|
loadBannedItems();
|
||||||
|
|
||||||
try {
|
|
||||||
Class.forName("net.minecraftforge.permission.PermissionManager");
|
|
||||||
doesPermAPIExist = true;
|
|
||||||
|
|
||||||
NEIActions.baseActions().forEach(
|
|
||||||
action -> {
|
|
||||||
PermissionManager.registerPermission("nei.permissions." + action, PermissionLevel.OP);
|
|
||||||
});
|
|
||||||
} catch (ClassNotFoundException ignored) {}
|
|
||||||
}
|
}
|
||||||
loadWorld(world);
|
loadWorld(world);
|
||||||
}
|
}
|
||||||
@@ -80,7 +62,7 @@ public class NEIServerConfig {
|
|||||||
try {
|
try {
|
||||||
File file = new File(getSaveDir(world), "world.dat");
|
File file = new File(getSaveDir(world), "world.dat");
|
||||||
NBTTagCompound tag = NEIServerUtils.readNBT(file);
|
NBTTagCompound tag = NEIServerUtils.readNBT(file);
|
||||||
if (tag == null) tag = new NBTTagCompound();
|
if(tag == null) tag = new NBTTagCompound();
|
||||||
dimTags.put(CommonUtils.getDimension(world), tag);
|
dimTags.put(CommonUtils.getDimension(world), tag);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
@@ -93,8 +75,7 @@ public class NEIServerConfig {
|
|||||||
|
|
||||||
serverConfig.setNewLineMode(1);
|
serverConfig.setNewLineMode(1);
|
||||||
serverConfig.getTag("permissions").useBraces();
|
serverConfig.getTag("permissions").useBraces();
|
||||||
serverConfig.getTag("permissions")
|
serverConfig.getTag("permissions").setComment("List of players who can use these features.\nEg. time=CodeChicken, Friend1");
|
||||||
.setComment("List of players who can use these features.\nEg. time=CodeChicken, Friend1");
|
|
||||||
|
|
||||||
setDefaultFeature("time");
|
setDefaultFeature("time");
|
||||||
setDefaultFeature("rain");
|
setDefaultFeature("rain");
|
||||||
@@ -108,16 +89,17 @@ public class NEIServerConfig {
|
|||||||
setDefaultFeature("save-state");
|
setDefaultFeature("save-state");
|
||||||
setDefaultFeature("item");
|
setDefaultFeature("item");
|
||||||
setDefaultFeature("delete");
|
setDefaultFeature("delete");
|
||||||
setDefaultFeature("autocraft", "ALL");
|
|
||||||
setDefaultFeature("notify-item", "CONSOLE, OP");
|
setDefaultFeature("notify-item", "CONSOLE, OP");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void setDefaultFeature(String featurename, String... names) {
|
private static void setDefaultFeature(String featurename, String... names) {
|
||||||
if (names.length == 0) names = new String[] { "OP" };
|
if (names.length == 0)
|
||||||
|
names = new String[]{"OP"};
|
||||||
|
|
||||||
StringBuilder list = new StringBuilder();
|
StringBuilder list = new StringBuilder();
|
||||||
for (int i = 0; i < names.length; i++) {
|
for (int i = 0; i < names.length; i++) {
|
||||||
if (i >= 1) list.append(", ");
|
if (i >= 1)
|
||||||
|
list.append(", ");
|
||||||
list.append(names[i]);
|
list.append(names[i]);
|
||||||
}
|
}
|
||||||
serverConfig.getTag("permissions." + featurename).setDefaultValue(list.toString());
|
serverConfig.getTag("permissions." + featurename).setDefaultValue(list.toString());
|
||||||
@@ -125,11 +107,7 @@ public class NEIServerConfig {
|
|||||||
|
|
||||||
private static void saveWorld(int dim) {
|
private static void saveWorld(int dim) {
|
||||||
try {
|
try {
|
||||||
final File saveDir = getSaveDir(DimensionManager.getWorld(dim));
|
File file = new File(getSaveDir(DimensionManager.getWorld(dim)), "world.dat");
|
||||||
if (!saveDir.isDirectory()) {
|
|
||||||
FileUtils.forceMkdir(saveDir);
|
|
||||||
}
|
|
||||||
File file = new File(saveDir, "world.dat");
|
|
||||||
NEIServerUtils.writeNBT(dimTags.get(dim), file);
|
NEIServerUtils.writeNBT(dimTags.get(dim), file);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
@@ -137,21 +115,18 @@ public class NEIServerConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean canPlayerPerformAction(String playername, String name) {
|
public static boolean canPlayerPerformAction(String playername, String name) {
|
||||||
String node = "permissions." + NEIActions.base(name);
|
return isPlayerInList(playername, getPlayerList("permissions." + NEIActions.base(name)), true);
|
||||||
boolean hasPerm = doesPermAPIExist
|
|
||||||
? PermissionManager.checkPermission(ServerUtils.getPlayer(playername), "nei." + node)
|
|
||||||
: false;
|
|
||||||
|
|
||||||
return hasPerm || isPlayerInList(playername, getPlayerList(node), true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isPlayerInList(String playername, Set<String> list, boolean allowCards) {
|
public static boolean isPlayerInList(String playername, Set<String> list, boolean allowCards) {
|
||||||
if (playername.equals("CONSOLE")) return list.contains(playername);
|
if (playername.equals("CONSOLE"))
|
||||||
|
return list.contains(playername);
|
||||||
|
|
||||||
playername = playername.toLowerCase();
|
playername = playername.toLowerCase();
|
||||||
|
|
||||||
if (allowCards) {
|
if (allowCards) {
|
||||||
if (list.contains("ALL")) return true;
|
if (list.contains("ALL"))
|
||||||
|
return true;
|
||||||
if ((ServerUtils.isPlayerOP(playername) || ServerUtils.isPlayerOwner(playername)) && list.contains("OP"))
|
if ((ServerUtils.isPlayerOP(playername) || ServerUtils.isPlayerOwner(playername)) && list.contains("OP"))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -198,7 +173,8 @@ public class NEIServerConfig {
|
|||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (Iterator<String> iterator = list.iterator(); iterator.hasNext(); i++) {
|
for (Iterator<String> iterator = list.iterator(); iterator.hasNext(); i++) {
|
||||||
if (i != 0) sb.append(", ");
|
if (i != 0)
|
||||||
|
sb.append(", ");
|
||||||
|
|
||||||
sb.append(iterator.next());
|
sb.append(iterator.next());
|
||||||
}
|
}
|
||||||
@@ -209,7 +185,7 @@ public class NEIServerConfig {
|
|||||||
private static void loadBannedItems() {
|
private static void loadBannedItems() {
|
||||||
bannedItems.clear();
|
bannedItems.clear();
|
||||||
File file = new File(saveDir, "banneditems.cfg");
|
File file = new File(saveDir, "banneditems.cfg");
|
||||||
if (!file.exists()) {
|
if(!file.exists()) {
|
||||||
bannedItems.put(new ItemStack(Blocks.command_block), new HashSet<>(Collections.singletonList("NONE")));
|
bannedItems.put(new ItemStack(Blocks.command_block), new HashSet<>(Collections.singletonList("NONE")));
|
||||||
saveBannedItems();
|
saveBannedItems();
|
||||||
return;
|
return;
|
||||||
@@ -217,20 +193,22 @@ public class NEIServerConfig {
|
|||||||
try {
|
try {
|
||||||
FileReader r = new FileReader(file);
|
FileReader r = new FileReader(file);
|
||||||
int line = 0;
|
int line = 0;
|
||||||
for (String s : IOUtils.readLines(r)) {
|
for(String s : IOUtils.readLines(r)) {
|
||||||
if (s.charAt(0) == '#' || s.trim().isEmpty()) continue;
|
if(s.charAt(0) == '#' || s.trim().length() == 0)
|
||||||
|
continue;
|
||||||
int delim = s.lastIndexOf('=');
|
int delim = s.lastIndexOf('=');
|
||||||
if (delim < 0) {
|
if(delim < 0) {
|
||||||
logger.error("line " + line + ": Missing =");
|
logger.error("line "+line+": Missing =");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
NBTTagCompound key = (NBTTagCompound) JsonToNBT.func_150315_a(s.substring(0, delim));
|
NBTTagCompound key = (NBTTagCompound) JsonToNBT.func_150315_a(s.substring(0, delim));
|
||||||
Set<String> values = new HashSet<>();
|
Set<String> values = new HashSet<>();
|
||||||
for (String s2 : s.substring(delim + 1).split(",")) values.add(s2.trim());
|
for(String s2 : s.substring(delim+1).split(","))
|
||||||
|
values.add(s2.trim());
|
||||||
bannedItems.put(InventoryUtils.loadPersistant(key), values);
|
bannedItems.put(InventoryUtils.loadPersistant(key), values);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error("line " + line + ": " + e.getMessage());
|
logger.error("line "+line+": "+e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
r.close();
|
r.close();
|
||||||
@@ -242,22 +220,22 @@ public class NEIServerConfig {
|
|||||||
public static void saveBannedItems() {
|
public static void saveBannedItems() {
|
||||||
File file = new File(saveDir, "banneditems.cfg");
|
File file = new File(saveDir, "banneditems.cfg");
|
||||||
try {
|
try {
|
||||||
if (!file.exists()) file.createNewFile();
|
if(!file.exists())
|
||||||
|
file.createNewFile();
|
||||||
|
|
||||||
PrintWriter p = new PrintWriter(file);
|
PrintWriter p = new PrintWriter(file);
|
||||||
p.println(
|
p.println("#Saved in this format for external editing. The format isn't that hard to figure out. If you think you're up to it, modify it here!");
|
||||||
"#Saved in this format for external editing. The format isn't that hard to figure out. If you think you're up to it, modify it here!");
|
|
||||||
|
|
||||||
for (ItemStackMap.Entry<Set<String>> entry : bannedItems.entries()) {
|
for (ItemStackMap.Entry<Set<String>> entry : bannedItems.entries()) {
|
||||||
NBTTagCompound key = InventoryUtils.savePersistant(entry.key, new NBTTagCompound());
|
NBTTagCompound key = InventoryUtils.savePersistant(entry.key, new NBTTagCompound());
|
||||||
key.removeTag("Count");
|
key.removeTag("Count");
|
||||||
if (key.getByte("Damage") == 0) key.removeTag("Damage");
|
if(key.getByte("Damage") == 0) key.removeTag("Damage");
|
||||||
|
|
||||||
p.print(key.toString());
|
p.print(key.toString());
|
||||||
p.print("=[");
|
p.print("=[");
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (String s : entry.value) {
|
for (String s : entry.value) {
|
||||||
if (i++ != 0) p.print(", ");
|
if(i++ != 0) p.print(", ");
|
||||||
p.print(s);
|
p.print(s);
|
||||||
}
|
}
|
||||||
p.println("]");
|
p.println("]");
|
||||||
@@ -274,15 +252,14 @@ public class NEIServerConfig {
|
|||||||
|
|
||||||
public static void loadPlayer(EntityPlayer player) {
|
public static void loadPlayer(EntityPlayer player) {
|
||||||
logger.debug("Loading Player: " + player.getGameProfile().getName());
|
logger.debug("Loading Player: " + player.getGameProfile().getName());
|
||||||
playerSaves.put(
|
playerSaves.put(player.getCommandSenderName(), new PlayerSave(player.getCommandSenderName(), new File(saveDir, "players")));
|
||||||
player.getCommandSenderName(),
|
|
||||||
new PlayerSave(player.getCommandSenderName(), new File(saveDir, "players")));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void unloadPlayer(EntityPlayer player) {
|
public static void unloadPlayer(EntityPlayer player) {
|
||||||
logger.debug("Unloading Player: " + player.getCommandSenderName());
|
logger.debug("Unloading Player: " + player.getCommandSenderName());
|
||||||
PlayerSave playerSave = playerSaves.remove(player.getCommandSenderName());
|
PlayerSave playerSave = playerSaves.remove(player.getCommandSenderName());
|
||||||
if (playerSave != null) playerSave.save();
|
if (playerSave != null)
|
||||||
|
playerSave.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean authenticatePacket(EntityPlayerMP sender, PacketCustom packet) {
|
public static boolean authenticatePacket(EntityPlayerMP sender, PacketCustom packet) {
|
||||||
|
|||||||
@@ -1,81 +1,54 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.AbstractList;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.zip.ZipException;
|
|
||||||
|
|
||||||
import net.minecraft.command.ICommandSender;
|
|
||||||
import net.minecraft.enchantment.Enchantment;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
|
||||||
import net.minecraft.event.ClickEvent;
|
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.CompressedStreamTools;
|
|
||||||
import net.minecraft.nbt.JsonToNBT;
|
|
||||||
import net.minecraft.nbt.NBTBase;
|
|
||||||
import net.minecraft.nbt.NBTException;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.nbt.NBTTagList;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.util.ChatComponentText;
|
|
||||||
import net.minecraft.util.ChatComponentTranslation;
|
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
|
||||||
import net.minecraft.util.IChatComponent;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
import net.minecraft.world.WorldSettings.GameType;
|
|
||||||
import net.minecraftforge.fluids.FluidStack;
|
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
|
||||||
|
|
||||||
import org.apache.logging.log4j.Level;
|
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
import codechicken.core.CommonUtils;
|
||||||
import codechicken.core.ServerUtils;
|
import codechicken.core.ServerUtils;
|
||||||
import codechicken.lib.inventory.InventoryRange;
|
import codechicken.lib.inventory.InventoryRange;
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
import codechicken.lib.packet.PacketCustom;
|
import codechicken.lib.packet.PacketCustom;
|
||||||
import codechicken.nei.PacketIDs.S2C;
|
import net.minecraft.command.ICommandSender;
|
||||||
import codechicken.nei.item.ItemFluidDisplay;
|
import net.minecraft.enchantment.Enchantment;
|
||||||
import codechicken.nei.recipe.StackInfo;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import codechicken.nei.util.NBTHelper;
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
import cpw.mods.fml.common.FMLLog;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import net.minecraft.inventory.Slot;
|
||||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.CompressedStreamTools;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.nbt.NBTTagList;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.util.ChatComponentTranslation;
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
import net.minecraft.util.IChatComponent;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraft.world.WorldServer;
|
||||||
|
import net.minecraft.world.WorldSettings.GameType;
|
||||||
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
|
|
||||||
public class NEIServerUtils {
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
private static class GTMetaBaseItemHolder {
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
private static final Class<?> gtMetaBaseItem = loadMetaBaseItem();
|
import java.io.PrintWriter;
|
||||||
|
import java.io.StringWriter;
|
||||||
private static Class<?> loadMetaBaseItem() {
|
import java.util.AbstractList;
|
||||||
try {
|
import java.util.ArrayList;
|
||||||
final ClassLoader loader = NEIServerUtils.class.getClassLoader();
|
import java.util.List;
|
||||||
return ReflectionHelper
|
import java.util.Set;
|
||||||
.getClass(loader, "gregtech.api.items.MetaBaseItem", "gregtech.api.items.GT_MetaBase_Item");
|
import java.util.zip.ZipException;
|
||||||
} catch (Exception ignored) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public class NEIServerUtils
|
||||||
|
{
|
||||||
public static boolean isRaining(World world) {
|
public static boolean isRaining(World world) {
|
||||||
return world.getWorldInfo().isRaining();
|
return world.getWorldInfo().isRaining();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void toggleRaining(World world, boolean notify) {
|
public static void toggleRaining(World world, boolean notify) {
|
||||||
boolean raining = !world.isRaining();
|
boolean raining = !world.isRaining();
|
||||||
if (!raining) // turn off
|
if (!raining)//turn off
|
||||||
world.provider.resetRainAndThunder();
|
((WorldServer) world).provider.resetRainAndThunder();
|
||||||
else world.getWorldInfo().setRaining(!isRaining(world));
|
else
|
||||||
|
world.getWorldInfo().setRaining(!isRaining(world));
|
||||||
|
|
||||||
if (notify)
|
if (notify)
|
||||||
ServerUtils.sendChatToAll(new ChatComponentTranslation("nei.chat.rain." + (raining ? "on" : "off")));
|
ServerUtils.sendChatToAll(new ChatComponentTranslation("nei.chat.rain." + (raining ? "on" : "off")));
|
||||||
@@ -87,48 +60,6 @@ public class NEIServerUtils {
|
|||||||
player.extinguish();
|
player.extinguish();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendChatItemLink(EntityPlayerMP sender, NBTTagCompound payload) {
|
|
||||||
if (payload == null) {
|
|
||||||
sender.addChatMessage(new ChatComponentText("Invalid bookmark payload"));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final String linkType = payload.getString("linkType");
|
|
||||||
final String payloadId = UUID.randomUUID().toString().substring(0, 8);
|
|
||||||
final PacketCustom packet = new PacketCustom(NEISPH.channel, S2C.CACHE_BOOKMARK_DATA).writeString(payloadId)
|
|
||||||
.writeNBTTagCompound((NBTTagCompound) payload.copy());
|
|
||||||
|
|
||||||
for (EntityPlayer player : ServerUtils.getPlayers()) {
|
|
||||||
if (player instanceof EntityPlayerMP playerMP) {
|
|
||||||
packet.sendToPlayer(playerMP);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
final IChatComponent clickable;
|
|
||||||
|
|
||||||
if (payload.hasKey("item")) {
|
|
||||||
clickable = StackInfo.loadFromNBT(payload.getCompoundTag("item")).func_151000_E();
|
|
||||||
} else {
|
|
||||||
clickable = new ChatComponentText("[")
|
|
||||||
.appendSibling(new ChatComponentTranslation("nei.chat.item_link." + linkType + ".text"))
|
|
||||||
.appendText("]");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (clickable == null) {
|
|
||||||
throw new Exception("Invalid ItemStack NBT");
|
|
||||||
}
|
|
||||||
|
|
||||||
clickable.getChatStyle()
|
|
||||||
.setChatClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/nei_bookmark " + payloadId));
|
|
||||||
ServerUtils.sendChatToAll(
|
|
||||||
new ChatComponentTranslation("nei.chat.item_link.text", sender.getDisplayName(), clickable));
|
|
||||||
} catch (Exception e) {
|
|
||||||
sender.addChatMessage(new ChatComponentText(e.toString()));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static long getTime(World world) {
|
public static long getTime(World world) {
|
||||||
return world.getWorldInfo().getWorldTime();
|
return world.getWorldInfo().getWorldTime();
|
||||||
}
|
}
|
||||||
@@ -138,19 +69,27 @@ public class NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void setSlotContents(EntityPlayer player, int slot, ItemStack item, boolean containerInv) {
|
public static void setSlotContents(EntityPlayer player, int slot, ItemStack item, boolean containerInv) {
|
||||||
if (slot == -999) player.inventory.setItemStack(item);
|
if (slot == -999)
|
||||||
else if (containerInv) player.openContainer.putStackInSlot(slot, item);
|
player.inventory.setItemStack(item);
|
||||||
else player.inventory.setInventorySlotContents(slot, item);
|
else if (containerInv)
|
||||||
|
player.openContainer.putStackInSlot(slot, item);
|
||||||
|
else
|
||||||
|
player.inventory.setInventorySlotContents(slot, item);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack getSlotContents(EntityPlayer player, int slot, boolean containerInv) {
|
public static ItemStack getSlotContents(EntityPlayer player, int slot, boolean containerInv) {
|
||||||
if (slot == -999) return player.inventory.getItemStack();
|
if (slot == -999)
|
||||||
else if (containerInv) return player.openContainer.getSlot(slot).getStack();
|
return player.inventory.getItemStack();
|
||||||
else return player.inventory.getStackInSlot(slot);
|
else if (containerInv)
|
||||||
|
return player.openContainer.getSlot(slot).getStack();
|
||||||
|
else
|
||||||
|
return player.inventory.getStackInSlot(slot);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
public static void deleteAllItems(EntityPlayerMP player) {
|
public static void deleteAllItems(EntityPlayerMP player) {
|
||||||
for (Slot slot : player.openContainer.inventorySlots) slot.putStack(null);
|
for (Slot slot : (List<Slot>) player.openContainer.inventorySlots)
|
||||||
|
slot.putStack(null);
|
||||||
|
|
||||||
player.sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory());
|
player.sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory());
|
||||||
}
|
}
|
||||||
@@ -170,7 +109,8 @@ public class NEIServerUtils {
|
|||||||
while (NEIServerConfig.isActionDisabled(dim, NEIActions.timeZones[newhour / 6]))
|
while (NEIServerConfig.isActionDisabled(dim, NEIActions.timeZones[newhour / 6]))
|
||||||
newhour = ((newhour / 6 + 1) % 4) * 6;
|
newhour = ((newhour / 6 + 1) % 4) * 6;
|
||||||
|
|
||||||
if (newhour != hour) setHourForward(world, newhour, false);
|
if (newhour != hour)
|
||||||
|
setHourForward(world, newhour, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean canItemFitInInventory(EntityPlayer player, ItemStack itemstack) {
|
public static boolean canItemFitInInventory(EntityPlayer player, ItemStack itemstack) {
|
||||||
@@ -178,18 +118,17 @@ public class NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void sendNotice(ICommandSender sender, IChatComponent msg, String permission) {
|
public static void sendNotice(ICommandSender sender, IChatComponent msg, String permission) {
|
||||||
ChatComponentTranslation notice = new ChatComponentTranslation(
|
ChatComponentTranslation notice = new ChatComponentTranslation("chat.type.admin", sender.getCommandSenderName(), msg.createCopy());
|
||||||
"chat.type.admin",
|
|
||||||
sender.getCommandSenderName(),
|
|
||||||
msg.createCopy());
|
|
||||||
notice.getChatStyle().setColor(EnumChatFormatting.GRAY).setItalic(true);
|
notice.getChatStyle().setColor(EnumChatFormatting.GRAY).setItalic(true);
|
||||||
|
|
||||||
if (NEIServerConfig.canPlayerPerformAction("CONSOLE", permission))
|
if (NEIServerConfig.canPlayerPerformAction("CONSOLE", permission))
|
||||||
MinecraftServer.getServer().addChatMessage(notice);
|
MinecraftServer.getServer().addChatMessage(notice);
|
||||||
|
|
||||||
for (EntityPlayer p : ServerUtils.getPlayers()) if (p == sender) p.addChatComponentMessage(msg);
|
for (EntityPlayer p : ServerUtils.getPlayers())
|
||||||
else if (NEIServerConfig.canPlayerPerformAction(p.getCommandSenderName(), permission))
|
if(p == sender)
|
||||||
p.addChatComponentMessage(notice);
|
p.addChatComponentMessage(msg);
|
||||||
|
else if (NEIServerConfig.canPlayerPerformAction(p.getCommandSenderName(), permission))
|
||||||
|
p.addChatComponentMessage(notice);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -198,72 +137,23 @@ public class NEIServerUtils {
|
|||||||
* @return whether the two items are the same in terms of damage and itemID.
|
* @return whether the two items are the same in terms of damage and itemID.
|
||||||
*/
|
*/
|
||||||
public static boolean areStacksSameType(ItemStack stack1, ItemStack stack2) {
|
public static boolean areStacksSameType(ItemStack stack1, ItemStack stack2) {
|
||||||
return stack1 != null && stack2 != null
|
return stack1 != null && stack2 != null &&
|
||||||
&& (stack1.getItem() == stack2.getItem()
|
(stack1.getItem() == stack2.getItem() &&
|
||||||
&& (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage())
|
(!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage()) &&
|
||||||
&& ItemStack.areItemStackTagsEqual(stack2, stack1));
|
ItemStack.areItemStackTagsEqual(stack2, stack1));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* NBT-friendly version of {@link #areStacksSameType(ItemStack, ItemStack)}
|
* {@link ItemStack}s with damage -1 are wildcards allowing all damages. Eg all colours of wool are allowed to create Beds.
|
||||||
*
|
|
||||||
* @param stack1 The {@link ItemStack} being compared.
|
|
||||||
* @param stack2 The {@link ItemStack} to compare to.
|
|
||||||
* @return whether the two items are the same in terms of itemID, damage and NBT.
|
|
||||||
*/
|
|
||||||
public static boolean areStacksSameTypeWithNBT(ItemStack stack1, ItemStack stack2) {
|
|
||||||
return stack1 != null && stack2 != null
|
|
||||||
&& stack1.getItem() == stack2.getItem()
|
|
||||||
&& (stack2.isItemStackDamageable() || stack2.getItemDamage() == stack1.getItemDamage())
|
|
||||||
&& NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@link ItemStack}s with damage -1 are wildcards allowing all damages. Eg all colours of wool are allowed to
|
|
||||||
* create Beds.
|
|
||||||
*
|
*
|
||||||
* @param stack1 The {@link ItemStack} being compared.
|
* @param stack1 The {@link ItemStack} being compared.
|
||||||
* @param stack2 The {@link ItemStack} to compare to.
|
* @param stack2 The {@link ItemStack} to compare to.
|
||||||
* @return whether the two items are the same from the perspective of a crafting inventory.
|
* @return whether the two items are the same from the perspective of a crafting inventory.
|
||||||
*/
|
*/
|
||||||
public static boolean areStacksSameTypeCrafting(ItemStack stack1, ItemStack stack2) {
|
public static boolean areStacksSameTypeCrafting(ItemStack stack1, ItemStack stack2) {
|
||||||
return stack1 != null && stack2 != null
|
return stack1 != null && stack2 != null &&
|
||||||
&& stack1.getItem() == stack2.getItem()
|
stack1.getItem() == stack2.getItem() &&
|
||||||
&& (stack1.getItemDamage() == stack2.getItemDamage()
|
(stack1.getItemDamage() == stack2.getItemDamage() || stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack1.getItem().isDamageable());
|
||||||
|| stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE
|
|
||||||
|| stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE
|
|
||||||
|| stack1.getItem().isDamageable());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* NBT-friendly version of {@link #areStacksSameTypeCrafting(ItemStack, ItemStack)}
|
|
||||||
*
|
|
||||||
* @param stack1 The {@link ItemStack} being compared.
|
|
||||||
* @param stack2 The {@link ItemStack} to compare to.
|
|
||||||
* @return whether the two items are the same from the perspective of a crafting inventory.
|
|
||||||
*/
|
|
||||||
public static boolean areStacksSameTypeCraftingWithNBT(ItemStack stack1, ItemStack stack2) {
|
|
||||||
|
|
||||||
if (NEIServerUtils.areStacksSameTypeCrafting(stack2, stack1)) {
|
|
||||||
if (NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound())) return true;
|
|
||||||
if (isItemTool(stack1)
|
|
||||||
&& (stack1.stackTagCompound == null || stack1.stackTagCompound.hasKey("GT.ToolStats"))
|
|
||||||
&& (stack2.stackTagCompound == null || stack2.stackTagCompound.hasKey("GT.ToolStats")))
|
|
||||||
return true;
|
|
||||||
return stack1.getMaxStackSize() == 1 && stack2.getMaxStackSize() == 1
|
|
||||||
&& (stack1.stackTagCompound == null ^ stack2.stackTagCompound == null);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GT Items don't have any NBT set for the recipe, so if either of the stacks has a NULL nbt, and the other doesn't,
|
|
||||||
* pretend they stack
|
|
||||||
*/
|
|
||||||
public static boolean isItemTool(ItemStack stack) {
|
|
||||||
return GTMetaBaseItemHolder.gtMetaBaseItem != null
|
|
||||||
&& GTMetaBaseItemHolder.gtMetaBaseItem.isInstance(stack.getItem());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -274,10 +164,9 @@ public class NEIServerUtils {
|
|||||||
* @return The ordering of stack1 relative to stack2.
|
* @return The ordering of stack1 relative to stack2.
|
||||||
*/
|
*/
|
||||||
public static int compareStacks(ItemStack stack1, ItemStack stack2) {
|
public static int compareStacks(ItemStack stack1, ItemStack stack2) {
|
||||||
if (stack1 == stack2) return 0; // catches both null
|
if (stack1 == stack2) return 0;//catches both null
|
||||||
if (stack1 == null || stack2 == null) return stack1 == null ? -1 : 1; // null stack goes first
|
if (stack1 == null || stack2 == null) return stack1 == null ? -1 : 1;//null stack goes first
|
||||||
if (stack1.getItem() != stack2.getItem())
|
if (stack1.getItem() != stack2.getItem()) return Item.getIdFromItem(stack1.getItem()) - Item.getIdFromItem(stack2.getItem());
|
||||||
return Item.getIdFromItem(stack1.getItem()) - Item.getIdFromItem(stack2.getItem());
|
|
||||||
if (stack1.stackSize != stack2.stackSize) return stack1.stackSize - stack2.stackSize;
|
if (stack1.stackSize != stack2.stackSize) return stack1.stackSize - stack2.stackSize;
|
||||||
return stack1.getItemDamage() - stack2.getItemDamage();
|
return stack1.getItemDamage() - stack2.getItemDamage();
|
||||||
}
|
}
|
||||||
@@ -293,37 +182,33 @@ public class NEIServerUtils {
|
|||||||
|
|
||||||
public static void givePlayerItem(EntityPlayerMP player, ItemStack stack, boolean infinite, boolean doGive) {
|
public static void givePlayerItem(EntityPlayerMP player, ItemStack stack, boolean infinite, boolean doGive) {
|
||||||
if (stack.getItem() == null) {
|
if (stack.getItem() == null) {
|
||||||
player.addChatComponentMessage(
|
player.addChatComponentMessage(setColour(new ChatComponentTranslation("nei.chat.give.noitem"), EnumChatFormatting.WHITE));
|
||||||
setColour(new ChatComponentTranslation("nei.chat.give.noitem"), EnumChatFormatting.WHITE));
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
int given = stack.stackSize;
|
int given = stack.stackSize;
|
||||||
if (doGive) {
|
if(doGive) {
|
||||||
if (infinite) player.inventory.addItemStackToInventory(stack);
|
if (infinite)
|
||||||
else given -= InventoryUtils.insertItem(player.inventory, stack, false);
|
player.inventory.addItemStackToInventory(stack);
|
||||||
|
else
|
||||||
|
given -= InventoryUtils.insertItem(player.inventory, stack, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
sendNotice(
|
sendNotice(player, new ChatComponentTranslation("commands.give.success", stack.func_151000_E(), infinite ? "\u221E" : Integer.toString(given), player.getCommandSenderName()), "notify-item");
|
||||||
player,
|
|
||||||
new ChatComponentTranslation(
|
|
||||||
"commands.give.success",
|
|
||||||
stack.func_151000_E(),
|
|
||||||
infinite ? "\u221E" : Integer.toString(given),
|
|
||||||
player.getCommandSenderName()),
|
|
||||||
"notify-item");
|
|
||||||
player.openContainer.detectAndSendChanges();
|
player.openContainer.detectAndSendChanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack copyStack(ItemStack itemstack, int i) {
|
public static ItemStack copyStack(ItemStack itemstack, int i) {
|
||||||
if (itemstack == null) return null;
|
if (itemstack == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
itemstack.stackSize += i;
|
itemstack.stackSize += i;
|
||||||
return itemstack.splitStack(i);
|
return itemstack.splitStack(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack copyStack(ItemStack itemstack) {
|
public static ItemStack copyStack(ItemStack itemstack) {
|
||||||
if (itemstack == null) return null;
|
if (itemstack == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
return copyStack(itemstack, itemstack.stackSize);
|
return copyStack(itemstack, itemstack.stackSize);
|
||||||
}
|
}
|
||||||
@@ -334,10 +219,14 @@ public class NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static int getCreativeMode(EntityPlayerMP player) {
|
public static int getCreativeMode(EntityPlayerMP player) {
|
||||||
if (NEIServerConfig.forPlayer(player.getCommandSenderName()).isActionEnabled("creative+")) return 2;
|
if (NEIServerConfig.forPlayer(player.getCommandSenderName()).isActionEnabled("creative+"))
|
||||||
else if (player.theItemInWorldManager.isCreative()) return 1;
|
return 2;
|
||||||
else if (player.theItemInWorldManager.getGameType().isAdventure()) return 3;
|
else if (player.theItemInWorldManager.isCreative())
|
||||||
else return 0;
|
return 1;
|
||||||
|
else if (player.theItemInWorldManager.getGameType().isAdventure())
|
||||||
|
return 3;
|
||||||
|
else
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static GameType getGameType(int mode) {
|
public static GameType getGameType(int mode) {
|
||||||
@@ -354,51 +243,53 @@ public class NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void setGamemode(EntityPlayerMP player, int mode) {
|
public static void setGamemode(EntityPlayerMP player, int mode) {
|
||||||
if (mode < 0 || mode >= NEIActions.gameModes.length
|
if (mode < 0 || mode >= NEIActions.gameModes.length ||
|
||||||
|| NEIActions.nameActionMap.containsKey(NEIActions.gameModes[mode]) && !NEIServerConfig
|
NEIActions.nameActionMap.containsKey(NEIActions.gameModes[mode]) &&
|
||||||
.canPlayerPerformAction(player.getCommandSenderName(), NEIActions.gameModes[mode]))
|
!NEIServerConfig.canPlayerPerformAction(player.getCommandSenderName(), NEIActions.gameModes[mode]))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// creative+
|
//creative+
|
||||||
NEIServerConfig.forPlayer(player.getCommandSenderName()).enableAction("creative+", mode == 2);
|
NEIServerConfig.forPlayer(player.getCommandSenderName()).enableAction("creative+", mode == 2);
|
||||||
if (mode == 2 && !(player.openContainer instanceof ContainerCreativeInv)) // open the container immediately for
|
if(mode == 2 && !(player.openContainer instanceof ContainerCreativeInv))//open the container immediately for the client
|
||||||
// the client
|
|
||||||
NEISPH.processCreativeInv(player, true);
|
NEISPH.processCreativeInv(player, true);
|
||||||
|
|
||||||
// change it on the server
|
//change it on the server
|
||||||
player.theItemInWorldManager.setGameType(getGameType(mode));
|
player.theItemInWorldManager.setGameType(getGameType(mode));
|
||||||
|
|
||||||
// tell the client to change it
|
//tell the client to change it
|
||||||
new PacketCustom(NEISPH.channel, S2C.SEND_GAME_MODE).writeByte(mode).sendToPlayer(player);
|
new PacketCustom(NEISPH.channel, 14).writeByte(mode).sendToPlayer(player);
|
||||||
player.addChatMessage(new ChatComponentTranslation("nei.chat.gamemode." + mode));
|
player.addChatMessage(new ChatComponentTranslation("nei.chat.gamemode." + mode));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void cycleCreativeInv(EntityPlayerMP player, int steps) {
|
public static void cycleCreativeInv(EntityPlayerMP player, int steps) {
|
||||||
InventoryPlayer inventory = player.inventory;
|
InventoryPlayer inventory = player.inventory;
|
||||||
|
|
||||||
// top down [row][col]
|
//top down [row][col]
|
||||||
ItemStack[][] slots = new ItemStack[10][9];
|
ItemStack[][] slots = new ItemStack[10][9];
|
||||||
PlayerSave playerSave = NEIServerConfig.forPlayer(player.getCommandSenderName());
|
PlayerSave playerSave = NEIServerConfig.forPlayer(player.getCommandSenderName());
|
||||||
|
|
||||||
// get
|
//get
|
||||||
System.arraycopy(inventory.mainInventory, 0, slots[9], 0, 9);
|
System.arraycopy(inventory.mainInventory, 0, slots[9], 0, 9);
|
||||||
|
|
||||||
for (int row = 0; row < 3; row++)
|
for (int row = 0; row < 3; row++)
|
||||||
System.arraycopy(inventory.mainInventory, (row + 1) * 9, slots[row + 6], 0, 9);
|
System.arraycopy(inventory.mainInventory, (row + 1) * 9, slots[row + 6], 0, 9);
|
||||||
|
|
||||||
for (int row = 0; row < 6; row++) System.arraycopy(playerSave.creativeInv, row * 9, slots[row], 0, 9);
|
for (int row = 0; row < 6; row++)
|
||||||
|
System.arraycopy(playerSave.creativeInv, row * 9, slots[row], 0, 9);
|
||||||
|
|
||||||
ItemStack[][] newslots = new ItemStack[10][];
|
ItemStack[][] newslots = new ItemStack[10][];
|
||||||
|
|
||||||
// put back
|
//put back
|
||||||
for (int row = 0; row < 10; row++) newslots[(row + steps + 10) % 10] = slots[row];
|
for (int row = 0; row < 10; row++)
|
||||||
|
newslots[(row + steps + 10) % 10] = slots[row];
|
||||||
|
|
||||||
System.arraycopy(newslots[9], 0, inventory.mainInventory, 0, 9);
|
System.arraycopy(newslots[9], 0, inventory.mainInventory, 0, 9);
|
||||||
|
|
||||||
for (int row = 0; row < 3; row++)
|
for (int row = 0; row < 3; row++)
|
||||||
System.arraycopy(newslots[row + 6], 0, inventory.mainInventory, (row + 1) * 9, 9);
|
System.arraycopy(newslots[row + 6], 0, inventory.mainInventory, (row + 1) * 9, 9);
|
||||||
|
|
||||||
for (int row = 0; row < 6; row++) System.arraycopy(newslots[row], 0, playerSave.creativeInv, row * 9, 9);
|
for (int row = 0; row < 6; row++)
|
||||||
|
System.arraycopy(newslots[row], 0, playerSave.creativeInv, row * 9, 9);
|
||||||
|
|
||||||
playerSave.setDirty();
|
playerSave.setDirty();
|
||||||
}
|
}
|
||||||
@@ -407,159 +298,106 @@ public class NEIServerUtils {
|
|||||||
ArrayList<int[]> arraylist = new ArrayList<>();
|
ArrayList<int[]> arraylist = new ArrayList<>();
|
||||||
if (itemstack != null) {
|
if (itemstack != null) {
|
||||||
NBTTagList nbttaglist = itemstack.getEnchantmentTagList();
|
NBTTagList nbttaglist = itemstack.getEnchantmentTagList();
|
||||||
if (nbttaglist != null) for (int i = 0; i < nbttaglist.tagCount(); i++) {
|
if (nbttaglist != null)
|
||||||
NBTTagCompound tag = nbttaglist.getCompoundTagAt(i);
|
for (int i = 0; i < nbttaglist.tagCount(); i++) {
|
||||||
arraylist.add(new int[] { tag.getShort("id"), tag.getShort("lvl") });
|
NBTTagCompound tag = nbttaglist.getCompoundTagAt(i);
|
||||||
}
|
arraylist.add(new int[]{tag.getShort("id"), tag.getShort("lvl")});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return arraylist;
|
return arraylist;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean stackHasEnchantment(ItemStack itemstack, int e) {
|
public static boolean stackHasEnchantment(ItemStack itemstack, int e) {
|
||||||
List<int[]> allenchantments = getEnchantments(itemstack);
|
List<int[]> allenchantments = getEnchantments(itemstack);
|
||||||
for (int[] ai : allenchantments) if (ai[0] == e) return true;
|
for (int[] ai : allenchantments)
|
||||||
|
if (ai[0] == e)
|
||||||
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getEnchantmentLevel(ItemStack itemstack, int e) {
|
public static int getEnchantmentLevel(ItemStack itemstack, int e) {
|
||||||
List<int[]> allenchantments = getEnchantments(itemstack);
|
List<int[]> allenchantments = getEnchantments(itemstack);
|
||||||
for (int[] ai : allenchantments) if (ai[0] == e) return ai[1];
|
for (int[] ai : allenchantments)
|
||||||
|
if (ai[0] == e)
|
||||||
|
return ai[1];
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean doesEnchantmentConflict(List<int[]> enchantments, Enchantment e) {
|
public static boolean doesEnchantmentConflict(List<int[]> enchantments, Enchantment e) {
|
||||||
for (int[] ai : enchantments) if (!e.canApplyTogether(Enchantment.enchantmentsList[ai[0]])) return true;
|
for (int[] ai : enchantments)
|
||||||
|
if (!e.canApplyTogether(Enchantment.enchantmentsList[ai[0]]))
|
||||||
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RuntimeException throwCME(String msg) {
|
public static RuntimeException throwCME(String msg) {
|
||||||
if (CommonUtils.isClient()) return ClientHandler.throwCME(msg);
|
if (CommonUtils.isClient())
|
||||||
|
return ClientHandler.throwCME(msg);
|
||||||
|
|
||||||
throw new RuntimeException(msg);
|
throw new RuntimeException(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
public static ItemStack[] extractRecipeItems(Object obj) {
|
public static ItemStack[] extractRecipeItems(Object obj) {
|
||||||
|
if (obj instanceof ItemStack)
|
||||||
|
return new ItemStack[]{(ItemStack) obj};
|
||||||
|
if (obj instanceof ItemStack[])
|
||||||
|
return (ItemStack[]) obj;
|
||||||
|
if (obj instanceof List)
|
||||||
|
return ((List<ItemStack>) obj).toArray(new ItemStack[0]);
|
||||||
|
|
||||||
if (obj instanceof ItemStack item) {
|
throw new ClassCastException(obj+" not an ItemStack, ItemStack[] or List<ItemStack?");
|
||||||
return new ItemStack[] { item };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (obj instanceof ItemStack[]arr) {
|
|
||||||
return arr;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (obj instanceof FluidStack fluid) {
|
|
||||||
return new ItemStack[] { ItemFluidDisplay.createStack(fluid) };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (obj instanceof FluidStack[]arr) {
|
|
||||||
final ItemStack[] items = new ItemStack[arr.length];
|
|
||||||
|
|
||||||
for (int i = 0; i < items.length; i++) {
|
|
||||||
items[i] = ItemFluidDisplay.createStack(arr[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return items;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (obj instanceof List list) {
|
|
||||||
final ItemStack[] items = new ItemStack[list.size()];
|
|
||||||
|
|
||||||
for (int i = 0; i < items.length; i++) {
|
|
||||||
items[i] = extractRecipeItem(list.get(i));
|
|
||||||
}
|
|
||||||
|
|
||||||
return items;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new ClassCastException(
|
|
||||||
obj + " not an ItemStack, ItemStack[], FluidStack, FluidStack[] or a List of them");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ItemStack extractRecipeItem(Object obj) {
|
|
||||||
if (obj == null) return null;
|
|
||||||
if (obj instanceof ItemStack item) return item;
|
|
||||||
if (obj instanceof FluidStack fluid) return ItemFluidDisplay.createStack(fluid);
|
|
||||||
throw new ClassCastException(obj + " not an ItemStack or FluidStack");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<Integer> getRange(final int start, final int end) {
|
public static List<Integer> getRange(final int start, final int end) {
|
||||||
return new AbstractList<>() {
|
return new AbstractList<Integer>()
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public Integer get(int index) {
|
public Integer get(int index) {
|
||||||
return start + index;
|
return start+index;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int size() {
|
public int size() {
|
||||||
return end - start;
|
return end-start;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public static StringBuilder fixTrailingCommaList(StringBuilder sb) {
|
public static StringBuilder fixTrailingCommaList(StringBuilder sb) {
|
||||||
if (sb.charAt(sb.length() - 1) == ',') sb.deleteCharAt(sb.length() - 1);
|
if(sb.charAt(sb.length()-1) == ',')
|
||||||
|
sb.deleteCharAt(sb.length()-1);
|
||||||
return sb;
|
return sb;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack getModdedItem(String itemId, String nbtString) {
|
public static void logOnce(Throwable t, Set<String> stackTraces, String message) {
|
||||||
int meta = -1;
|
logOnce(t, stackTraces, message, "");
|
||||||
ItemStack itemStack;
|
}
|
||||||
|
|
||||||
if (!itemId.contains(":")) {
|
public static void logOnce(Throwable t, Set<String> stackTraces, String message, String identifier) {
|
||||||
NEIClientConfig.logger.info(String.format("Item ID %s is missing colon", itemId));
|
StringWriter sw = new StringWriter();
|
||||||
return null;
|
t.printStackTrace(new PrintWriter(sw));
|
||||||
|
String stackTrace = identifier + sw.toString();
|
||||||
|
if (!stackTraces.contains(stackTrace)) {
|
||||||
|
NEIServerConfig.logger.error(message, t);
|
||||||
|
stackTraces.add(stackTrace);
|
||||||
}
|
}
|
||||||
final String[] split = itemId.split(":");
|
|
||||||
// ModID:ItemID
|
|
||||||
String itemLookupId = split[0] + ":" + split[1];
|
|
||||||
|
|
||||||
if (split.length >= 3) {
|
|
||||||
int mIdx = -1;
|
|
||||||
if (split[2].matches("\\d+")) {
|
|
||||||
mIdx = 2;
|
|
||||||
} else {
|
|
||||||
itemLookupId += ":" + split[2];
|
|
||||||
if (split.length >= 4) mIdx = 3;
|
|
||||||
}
|
|
||||||
if (mIdx != -1) meta = Integer.parseInt(split[mIdx]);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (meta != -1) {
|
|
||||||
itemStack = GameRegistry.makeItemStack(itemLookupId, meta, 1, nbtString == null ? "" : nbtString);
|
|
||||||
} else {
|
|
||||||
itemStack = GameRegistry.findItemStack(split[0], split[1], 1);
|
|
||||||
if (nbtString != null && !nbtString.isEmpty()) {
|
|
||||||
try {
|
|
||||||
final NBTBase nbttag = JsonToNBT.func_150315_a(nbtString);
|
|
||||||
if (!(nbttag instanceof NBTTagCompound)) {
|
|
||||||
NEIClientConfig.logger.info("Unexpected NBT string - multiple values {}", nbtString);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
itemStack.setTagCompound((NBTTagCompound) nbttag);
|
|
||||||
} catch (NBTException e) {
|
|
||||||
FMLLog.getLogger()
|
|
||||||
.log(Level.WARN, "Encountered an exception parsing ItemStack NBT string {}", nbtString, e);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return itemStack;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static NBTTagCompound readNBT(File file) throws IOException {
|
public static NBTTagCompound readNBT(File file) throws IOException {
|
||||||
if (!file.exists()) return null;
|
if(!file.exists()) return null;
|
||||||
FileInputStream in = new FileInputStream(file);
|
FileInputStream in = new FileInputStream(file);
|
||||||
NBTTagCompound tag;
|
NBTTagCompound tag;
|
||||||
try {
|
try {
|
||||||
tag = CompressedStreamTools.readCompressed(in);
|
tag = CompressedStreamTools.readCompressed(in);
|
||||||
} catch (ZipException e) {
|
} catch(ZipException e) {
|
||||||
if (e.getMessage().equals("Not in GZIP format")) tag = CompressedStreamTools.read(file);
|
if(e.getMessage().equals("Not in GZIP format"))
|
||||||
else throw e;
|
tag = CompressedStreamTools.read(file);
|
||||||
|
else
|
||||||
|
throw e;
|
||||||
}
|
}
|
||||||
in.close();
|
in.close();
|
||||||
return tag;
|
return tag;
|
||||||
@@ -570,8 +408,4 @@ public class NEIServerUtils {
|
|||||||
CompressedStreamTools.writeCompressed(tag, out);
|
CompressedStreamTools.writeCompressed(tag, out);
|
||||||
out.close();
|
out.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int divideCeil(int numerator, int denominator) {
|
|
||||||
return (int) Math.ceil((float) numerator / denominator);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,25 +1,28 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import codechicken.nei.api.IStackPositioner;
|
import codechicken.nei.api.IStackPositioner;
|
||||||
|
|
||||||
public class OffsetPositioner implements IStackPositioner {
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public OffsetPositioner(int x, int y) {
|
public class OffsetPositioner implements IStackPositioner
|
||||||
|
{
|
||||||
|
public OffsetPositioner(int x, int y)
|
||||||
|
{
|
||||||
offsetx = x;
|
offsetx = x;
|
||||||
offsety = y;
|
offsety = y;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ArrayList<PositionedStack> positionStacks(ArrayList<PositionedStack> ai) {
|
public ArrayList<PositionedStack> positionStacks(ArrayList<PositionedStack> ai)
|
||||||
for (PositionedStack stack : ai) {
|
{
|
||||||
stack.relx += offsetx;
|
for(PositionedStack stack : ai)
|
||||||
stack.rely += offsety;
|
{
|
||||||
|
stack.relx+=offsetx;
|
||||||
|
stack.rely+=offsety;
|
||||||
}
|
}
|
||||||
return ai;
|
return ai;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int offsetx;
|
public int offsetx;
|
||||||
public int offsety;
|
public int offsety;
|
||||||
}
|
}
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
public final class PacketIDs {
|
|
||||||
|
|
||||||
public static final class C2S {
|
|
||||||
|
|
||||||
public static final int GIVE_ITEM = 1;
|
|
||||||
public static final int DELETE_ALL_ITEMS = 4;
|
|
||||||
public static final int SET_SLOT = 5;
|
|
||||||
public static final int TOGGLE_MAGNET = 6;
|
|
||||||
public static final int SET_TIME = 7;
|
|
||||||
public static final int HEAL = 8;
|
|
||||||
public static final int TOGGLE_RAIN = 9;
|
|
||||||
public static final int REQUEST_LOGIN_INFO = 10;
|
|
||||||
public static final int REQUEST_CONTAINER_CONTENTS = 11;
|
|
||||||
public static final int CHANGE_PROPERTY = 12;
|
|
||||||
public static final int SET_GAME_MODE = 13;
|
|
||||||
public static final int CYCLE_CREATIVE_INV = 14;
|
|
||||||
public static final int SEND_MOB_SPAWNER_ID = 15;
|
|
||||||
public static final int REQUEST_CONTAINER = 16;
|
|
||||||
public static final int REQUEST_ENCHANTMENT_GUI = 21;
|
|
||||||
public static final int MODIFY_ENCHANTMENT = 22;
|
|
||||||
public static final int SET_CREATIVE_PLUS_MODE = 23;
|
|
||||||
public static final int REQUEST_POTION_GUI = 24;
|
|
||||||
public static final int SET_DUMMY_SLOT = 25;
|
|
||||||
public static final int SEND_CHAT_ITEM_LINK = 26;
|
|
||||||
public static final int SYNC = 27;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final class S2C {
|
|
||||||
|
|
||||||
public static final int SEND_SERVER_SIDE_CHECK = 1;
|
|
||||||
public static final int SEND_LOGIN_STATE = 10;
|
|
||||||
public static final int SEND_ACTION_DISABLED = 11;
|
|
||||||
public static final int SEND_ACTION_ENABLED = 12;
|
|
||||||
public static final int SEND_MAGNETIC_ITEM = 13;
|
|
||||||
public static final int SEND_GAME_MODE = 14;
|
|
||||||
public static final int OPEN_ENCHANTMENT_GUI = 21;
|
|
||||||
public static final int SET_CREATIVE_PLUS_MODE = 23;
|
|
||||||
public static final int OPEN_POTION_GUI = 24;
|
|
||||||
public static final int CACHE_BOOKMARK_DATA = 25;
|
|
||||||
public static final int SYNC = 26;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,362 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import java.awt.Point;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.ItemsGrid.ItemsGridSlot;
|
|
||||||
import codechicken.nei.api.GuiInfo;
|
|
||||||
import codechicken.nei.api.INEIGuiHandler;
|
|
||||||
import codechicken.nei.api.ShortcutInputHandler;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.recipe.GuiRecipe;
|
|
||||||
|
|
||||||
public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ? extends ItemsGrid.MouseContext>>
|
|
||||||
extends Widget {
|
|
||||||
|
|
||||||
protected static final int PADDING = 2;
|
|
||||||
|
|
||||||
public ItemStack draggedStack;
|
|
||||||
public int mouseDownSlot = -1;
|
|
||||||
|
|
||||||
public Button pagePrev;
|
|
||||||
public Button pageNext;
|
|
||||||
public Label pageLabel;
|
|
||||||
|
|
||||||
protected T grid;
|
|
||||||
|
|
||||||
private int headerPaddingLeft;
|
|
||||||
private int headerPaddingRight;
|
|
||||||
|
|
||||||
public ArrayList<ItemStack> getItems() {
|
|
||||||
return this.grid.getItems();
|
|
||||||
}
|
|
||||||
|
|
||||||
public T getGrid() {
|
|
||||||
return this.grid;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void init() {
|
|
||||||
pageLabel = new Label("0/0", true);
|
|
||||||
|
|
||||||
pagePrev = new Button("<") {
|
|
||||||
|
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
|
||||||
|
|
||||||
if (rightclick) {
|
|
||||||
grid.setPage(0);
|
|
||||||
} else {
|
|
||||||
grid.shiftPage(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int mousex, int mousey) {
|
|
||||||
this.state = grid.getNumPages() <= 1 ? 2 : 0;
|
|
||||||
super.draw(mousex, mousey);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
pageNext = new Button(">") {
|
|
||||||
|
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
|
||||||
|
|
||||||
if (rightclick) {
|
|
||||||
grid.setPage(grid.getNumPages() - 1);
|
|
||||||
} else {
|
|
||||||
grid.shiftPage(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int mousex, int mousey) {
|
|
||||||
this.state = grid.getNumPages() <= 1 ? 2 : 0;
|
|
||||||
super.draw(mousex, mousey);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract String getLabelText();
|
|
||||||
|
|
||||||
public abstract Rectangle4i calculateBounds(GuiContainer gui);
|
|
||||||
|
|
||||||
protected static int snapDownToMultiple(int value, int multiple) {
|
|
||||||
return (value / multiple) * multiple;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void resize(GuiContainer gui) {
|
|
||||||
final Rectangle4i bounds = calculateBounds(gui);
|
|
||||||
|
|
||||||
x = bounds.x;
|
|
||||||
y = bounds.y;
|
|
||||||
w = bounds.w;
|
|
||||||
h = bounds.h;
|
|
||||||
|
|
||||||
final int header = resizeHeader(gui);
|
|
||||||
final int footer = resizeFooter(gui);
|
|
||||||
|
|
||||||
this.grid.setGridSize(x, y + header, w, h - header - footer);
|
|
||||||
this.grid.refresh(gui);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int resizeHeader(GuiContainer gui) {
|
|
||||||
final int BUTTON_SIZE = 16;
|
|
||||||
|
|
||||||
if (GridOverlapScanner.isScanFrame()) {
|
|
||||||
updateHeaderPadding(gui);
|
|
||||||
}
|
|
||||||
|
|
||||||
final int paddingLeft = this.headerPaddingLeft;
|
|
||||||
final int paddingRight = this.headerPaddingRight;
|
|
||||||
|
|
||||||
if (paddingLeft + paddingRight >= this.w) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
pagePrev.w = pageNext.w = BUTTON_SIZE;
|
|
||||||
pagePrev.h = pageNext.h = BUTTON_SIZE;
|
|
||||||
pagePrev.y = pageNext.y = y;
|
|
||||||
|
|
||||||
pagePrev.x = this.x + paddingLeft;
|
|
||||||
pageNext.x = this.x + this.w - pageNext.w - paddingRight;
|
|
||||||
|
|
||||||
pageLabel.x = this.x + paddingLeft + (this.w - paddingLeft - paddingRight) / 2;
|
|
||||||
pageLabel.y = this.y + 5;
|
|
||||||
pageLabel.text = getLabelText();
|
|
||||||
|
|
||||||
return BUTTON_SIZE + 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateHeaderPadding(GuiContainer gui) {
|
|
||||||
final INEIGuiHandler[] handlers = GuiInfo.getGuiHandlersSnapshot();
|
|
||||||
final Rectangle4i slot = new Rectangle4i(this.x, this.y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE);
|
|
||||||
this.headerPaddingLeft = 0;
|
|
||||||
this.headerPaddingRight = 0;
|
|
||||||
|
|
||||||
while (this.headerPaddingLeft < this.w && GuiInfo.hideItemPanelSlot(gui, slot, handlers)) {
|
|
||||||
this.headerPaddingLeft += ItemsGrid.SLOT_SIZE;
|
|
||||||
slot.x += ItemsGrid.SLOT_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
slot.x = this.x + this.w - ItemsGrid.SLOT_SIZE;
|
|
||||||
|
|
||||||
while (this.headerPaddingRight < this.w && GuiInfo.hideItemPanelSlot(gui, slot, handlers)) {
|
|
||||||
this.headerPaddingRight += ItemsGrid.SLOT_SIZE;
|
|
||||||
slot.x -= ItemsGrid.SLOT_SIZE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected abstract int resizeFooter(GuiContainer gui);
|
|
||||||
|
|
||||||
public void setVisible() {
|
|
||||||
if (this.grid.getPerPage() > 0 && !this.grid.isEmpty()) {
|
|
||||||
LayoutManager.addWidget(pagePrev);
|
|
||||||
LayoutManager.addWidget(pageNext);
|
|
||||||
LayoutManager.addWidget(pageLabel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
this.grid.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int mousex, int mousey) {
|
|
||||||
this.grid.draw(mousex, mousey);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void postDraw(int mousex, int mousey) {
|
|
||||||
if (draggedStack != null) {
|
|
||||||
GuiContainerManager.drawItems.zLevel += 100;
|
|
||||||
GuiContainerManager.drawItem(mousex - 8, mousey - 8, draggedStack);
|
|
||||||
GuiContainerManager.drawItems.zLevel -= 100;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
|
|
||||||
if (this.grid.getSlotBySlotIndex(mouseDownSlot) == null) {
|
|
||||||
mouseDownSlot = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mouseDownSlot >= 0 && draggedStack == null
|
|
||||||
&& NEIClientUtils.getHeldItem() == null
|
|
||||||
&& NEIClientConfig.hasSMPCounterPart()) {
|
|
||||||
ItemsGridSlot mouseOverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
|
||||||
|
|
||||||
if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
|
|
||||||
draggedStack = getDraggedStackWithQuantity(this.grid.getSlotBySlotIndex(mouseDownSlot).getItemStack());
|
|
||||||
mouseDownSlot = -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected abstract ItemStack getDraggedStackWithQuantity(ItemStack itemStack);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean handleClick(int mousex, int mousey, int button) {
|
|
||||||
if (handleClickExt(mousex, mousey, button)) return true;
|
|
||||||
|
|
||||||
ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
|
||||||
if (hoverSlot != null) {
|
|
||||||
|
|
||||||
if (button == 2) {
|
|
||||||
draggedStack = getDraggedStackWithQuantity(hoverSlot.getItemStack());
|
|
||||||
} else {
|
|
||||||
mouseDownSlot = hoverSlot.slotIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean handleClickExt(int mouseX, int mouseY, int button) {
|
|
||||||
|
|
||||||
if (ItemPanels.itemPanel.draggedStack != null && ItemPanels.bookmarkPanel.contains(mouseX, mouseY)) {
|
|
||||||
ItemPanels.bookmarkPanel.addItem(ItemPanels.itemPanel.draggedStack);
|
|
||||||
ItemPanels.itemPanel.draggedStack = null;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ItemPanels.itemPanel.draggedStack != null) {
|
|
||||||
return ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ItemPanels.bookmarkPanel.draggedStack != null) {
|
|
||||||
return ItemPanels.bookmarkPanel.handleDraggedClick(mouseX, mouseY, button);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientUtils.getHeldItem() != null) {
|
|
||||||
final ItemStack draggedStack = NEIClientUtils.getHeldItem().copy();
|
|
||||||
return handleGUIContainerClick(draggedStack, mouseX, mouseY, button);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected boolean handleDraggedClick(int mouseX, int mouseY, int button) {
|
|
||||||
if (draggedStack == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (handleGUIContainerClick(draggedStack, mouseX, mouseY, button)) {
|
|
||||||
|
|
||||||
if (draggedStack.stackSize == 0) {
|
|
||||||
draggedStack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
final GuiContainer gui = NEIClientUtils.getGuiContainer();
|
|
||||||
if (mouseX < gui.guiLeft || mouseY < gui.guiTop
|
|
||||||
|| mouseX >= gui.guiLeft + gui.xSize
|
|
||||||
|| mouseY >= gui.guiTop + gui.ySize) {
|
|
||||||
draggedStack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected boolean handleGUIContainerClick(final ItemStack draggedStack, int mouseX, int mouseY, int button) {
|
|
||||||
final GuiContainer gui = NEIClientUtils.getGuiContainer();
|
|
||||||
boolean handled = false;
|
|
||||||
|
|
||||||
try {
|
|
||||||
GuiInfo.readLock.lock();
|
|
||||||
for (INEIGuiHandler handler : GuiInfo.guiHandlers) {
|
|
||||||
if (handler.handleDragNDrop(gui, mouseX, mouseY, draggedStack, button)) {
|
|
||||||
handled = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
GuiInfo.readLock.unlock();
|
|
||||||
}
|
|
||||||
|
|
||||||
return handled;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseUp(int mousex, int mousey, int button) {
|
|
||||||
final ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
|
||||||
|
|
||||||
if (hoverSlot != null && hoverSlot.slotIndex == mouseDownSlot && draggedStack == null) {
|
|
||||||
|
|
||||||
if (NEIController.manager.window instanceof GuiRecipe || NEIClientUtils.shiftKey()
|
|
||||||
|| !NEIClientConfig.canCheatItem(hoverSlot.getItemStack())) {
|
|
||||||
ShortcutInputHandler.handleMouseClick(hoverSlot.getItemStack());
|
|
||||||
} else {
|
|
||||||
NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.getItemStack()), button, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
mouseDownSlot = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onMouseWheel(int i, int mousex, int mousey) {
|
|
||||||
if (!contains(mousex, mousey)) return false;
|
|
||||||
|
|
||||||
this.grid.shiftPage(-i);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onHotkeyPressed() {
|
|
||||||
final Point mouse = GuiDraw.getMousePosition();
|
|
||||||
if (!contains(mouse.x, mouse.y)) return false;
|
|
||||||
|
|
||||||
if (KeyManager.isKeyDown("gui.next")) {
|
|
||||||
this.grid.shiftPage(1);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (KeyManager.isKeyDown("gui.prev")) {
|
|
||||||
this.grid.shiftPage(-1);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack getStackMouseOver(int mousex, int mousey) {
|
|
||||||
final ItemsGridSlot slot = this.grid.getSlotMouseOver(mousex, mousey);
|
|
||||||
return slot == null ? null : slot.getItemStack();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack getStackMouseOverWithQuantity(int mousex, int mousey) {
|
|
||||||
final ItemStack hoverSlot = getStackMouseOver(mousex, mousey);
|
|
||||||
return hoverSlot != null ? getDraggedStackWithQuantity(hoverSlot) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract ItemsGridSlot getSlotMouseOver(int mousex, int mousey);
|
|
||||||
|
|
||||||
public int getPage() {
|
|
||||||
return this.grid.getPage();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getNumPages() {
|
|
||||||
return this.grid.getNumPages();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean contains(int px, int py) {
|
|
||||||
return this.grid.contains(px, py);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,17 +1,16 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.io.File;
|
import codechicken.core.ServerUtils;
|
||||||
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.nbt.NBTTagList;
|
import net.minecraft.nbt.NBTTagList;
|
||||||
|
|
||||||
import codechicken.core.ServerUtils;
|
import java.io.File;
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
|
||||||
|
|
||||||
public class PlayerSave {
|
|
||||||
|
|
||||||
|
public class PlayerSave
|
||||||
|
{
|
||||||
public String username;
|
public String username;
|
||||||
|
|
||||||
private File saveFile;
|
private File saveFile;
|
||||||
@@ -28,17 +27,20 @@ public class PlayerSave {
|
|||||||
wasOp = ServerUtils.isPlayerOP(playername);
|
wasOp = ServerUtils.isPlayerOP(playername);
|
||||||
|
|
||||||
saveFile = new File(saveLocation, username + ".dat");
|
saveFile = new File(saveLocation, username + ".dat");
|
||||||
if (!saveFile.getParentFile().exists()) saveFile.getParentFile().mkdirs();
|
if (!saveFile.getParentFile().exists())
|
||||||
|
saveFile.getParentFile().mkdirs();
|
||||||
load();
|
load();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void load() {
|
private void load() {
|
||||||
nbt = new NBTTagCompound();
|
nbt = new NBTTagCompound();
|
||||||
try {
|
try {
|
||||||
if (!saveFile.exists()) saveFile.createNewFile();
|
if (!saveFile.exists())
|
||||||
if (saveFile.length() > 0) nbt = NEIServerUtils.readNBT(saveFile);
|
saveFile.createNewFile();
|
||||||
|
if (saveFile.length() > 0)
|
||||||
|
nbt = NEIServerUtils.readNBT(saveFile);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
NEIClientConfig.logger.error("Error loading player save: " + username, e);
|
NEIClientConfig.logger.error("Error loading player save: "+username, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
loadCreativeInv();
|
loadCreativeInv();
|
||||||
@@ -47,19 +49,22 @@ public class PlayerSave {
|
|||||||
private void loadCreativeInv() {
|
private void loadCreativeInv() {
|
||||||
creativeInv = new ItemStack[54];
|
creativeInv = new ItemStack[54];
|
||||||
NBTTagList itemList = nbt.getTagList("creativeitems", 10);
|
NBTTagList itemList = nbt.getTagList("creativeitems", 10);
|
||||||
if (itemList != null) InventoryUtils.readItemStacksFromTag(creativeInv, itemList);
|
if (itemList != null)
|
||||||
|
InventoryUtils.readItemStacksFromTag(creativeInv, itemList);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void save() {
|
public void save() {
|
||||||
if (!isDirty) return;
|
if (!isDirty)
|
||||||
|
return;
|
||||||
|
|
||||||
if (creativeInvDirty) saveCreativeInv();
|
if (creativeInvDirty)
|
||||||
|
saveCreativeInv();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
NEIServerUtils.writeNBT(nbt, saveFile);
|
NEIServerUtils.writeNBT(nbt, saveFile);
|
||||||
isDirty = false;
|
isDirty = false;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
NEIClientConfig.logger.error("Error saving player: " + username, e);
|
NEIClientConfig.logger.error("Error saving player: "+username, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -92,7 +97,8 @@ public class PlayerSave {
|
|||||||
|
|
||||||
private NBTTagCompound getEnabledActions() {
|
private NBTTagCompound getEnabledActions() {
|
||||||
NBTTagCompound tag = nbt.getCompoundTag("enabledActions");
|
NBTTagCompound tag = nbt.getCompoundTag("enabledActions");
|
||||||
if (!nbt.hasKey("enabledActions")) nbt.setTag("enabledActions", tag);
|
if (!nbt.hasKey("enabledActions"))
|
||||||
|
nbt.setTag("enabledActions", tag);
|
||||||
return tag;
|
return tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loaded 100 of 387 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user