mirror of
https://github.com/GTNewHorizons/CodeChickenCore.git
synced 2026-11-16 18:54:51 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b999279656 | ||
|
|
1879ba2071 | ||
|
|
9d600169ac | ||
|
|
4e7eb37f3f | ||
|
|
22dfc1360e | ||
|
|
7bf5935f69 | ||
|
|
162de447d5 | ||
|
|
39ed6607a6 | ||
|
|
99b815c12e | ||
|
|
0f37937ada | ||
|
|
c9d29a5c8e | ||
|
|
ea4f68d163 | ||
|
|
549f769747 | ||
|
|
cba2e0f642 |
No files matched your search
@@ -0,0 +1,62 @@
|
|||||||
|
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 9
|
||||||
|
- Java 11
|
||||||
|
- Java 17
|
||||||
|
- Java 19
|
||||||
|
- Java 20
|
||||||
|
- Java 21
|
||||||
|
- 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
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
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
|
||||||
+12
-1
@@ -79,6 +79,11 @@ accessTransformersFile =
|
|||||||
# 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
|
||||||
|
|
||||||
|
# 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.
|
# Adds some debug arguments like verbose output and class export.
|
||||||
usesMixinDebug = false
|
usesMixinDebug = false
|
||||||
|
|
||||||
@@ -111,9 +116,15 @@ minimizeShadowedDependencies = true
|
|||||||
# If disabled, won't rename the shadowed classes.
|
# If disabled, won't rename the shadowed classes.
|
||||||
relocateShadowedDependencies = true
|
relocateShadowedDependencies = true
|
||||||
|
|
||||||
# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
|
# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
|
||||||
includeWellKnownRepositories = true
|
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.
|
# 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.
|
# 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.
|
# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
# 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
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -55,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -84,7 +86,8 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||||
|
' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
|
|||||||
Vendored
+2
@@ -13,6 +13,8 @@
|
|||||||
@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 ##########################################################################
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
// Add any additional repositiroes for your dependencies here
|
// Add any additional repositiroes for your dependencies here
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
mavenLocal()
|
||||||
}
|
}
|
||||||
+1
-1
@@ -17,7 +17,7 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
|
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
package codechicken.core;
|
package codechicken.core;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Enumeration;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.zip.ZipEntry;
|
import java.util.zip.ZipEntry;
|
||||||
import java.util.zip.ZipInputStream;
|
import java.util.zip.ZipFile;
|
||||||
|
|
||||||
import net.minecraft.launchwrapper.Launch;
|
import net.minecraft.launchwrapper.Launch;
|
||||||
|
|
||||||
@@ -114,21 +114,18 @@ public class ClassDiscoverer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void readFromZipFile(File file) throws IOException {
|
private void readFromZipFile(File file) throws IOException {
|
||||||
FileInputStream fileinputstream = new FileInputStream(file);
|
try (ZipFile zipFile = new ZipFile(file)) {
|
||||||
ZipInputStream zipinputstream = new ZipInputStream(fileinputstream);
|
Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
|
||||||
do {
|
while (zipEntries.hasMoreElements()) {
|
||||||
ZipEntry zipentry = zipinputstream.getNextEntry();
|
ZipEntry zipentry = zipEntries.nextElement();
|
||||||
if (zipentry == null) {
|
String fullname = zipentry.getName().replace('\\', '/');
|
||||||
break;
|
int pos = fullname.lastIndexOf('/');
|
||||||
|
String name = pos == -1 ? fullname : fullname.substring(pos + 1);
|
||||||
|
if (!zipentry.isDirectory() && matcher.matches(name)) {
|
||||||
|
checkAddClass(fullname);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
String fullname = zipentry.getName().replace('\\', '/');
|
}
|
||||||
int pos = fullname.lastIndexOf('/');
|
|
||||||
String name = pos == -1 ? fullname : fullname.substring(pos + 1);
|
|
||||||
if (!zipentry.isDirectory() && matcher.matches(name)) {
|
|
||||||
checkAddClass(fullname);
|
|
||||||
}
|
|
||||||
} while (true);
|
|
||||||
fileinputstream.close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void readFromDirectory(File directory, File basedirectory) {
|
private void readFromDirectory(File directory, File basedirectory) {
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ public class ClassConstantPoolParser {
|
|||||||
if (strLen == bytes.length) {
|
if (strLen == bytes.length) {
|
||||||
for (int j = index + 3; j < index + 3 + strLen; j++) {
|
for (int j = index + 3; j < index + 3 + strLen; j++) {
|
||||||
if (basicClass[j] != bytes[j - (index + 3)]) {
|
if (basicClass[j] != bytes[j - (index + 3)]) {
|
||||||
break label;
|
continue label;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -23,11 +23,12 @@ import org.objectweb.asm.tree.InsnList;
|
|||||||
import org.objectweb.asm.tree.InsnNode;
|
import org.objectweb.asm.tree.InsnNode;
|
||||||
import org.objectweb.asm.tree.MethodInsnNode;
|
import org.objectweb.asm.tree.MethodInsnNode;
|
||||||
import org.objectweb.asm.tree.MethodNode;
|
import org.objectweb.asm.tree.MethodNode;
|
||||||
import org.objectweb.asm.util.ASMifier;
|
|
||||||
import org.objectweb.asm.util.Textifier;
|
import org.objectweb.asm.util.Textifier;
|
||||||
import org.objectweb.asm.util.TraceClassVisitor;
|
import org.objectweb.asm.util.TraceClassVisitor;
|
||||||
|
|
||||||
public class RedirectorTransformer implements IClassTransformer {
|
import codechicken.core.launch.CodeChickenCorePlugin;
|
||||||
|
|
||||||
|
public class RedirectorTransformer implements IClassTransformer, Opcodes {
|
||||||
|
|
||||||
private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("ccl.dumpClass", "false"));
|
private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("ccl.dumpClass", "false"));
|
||||||
private static final String RenderStateClass = "codechicken/lib/render/CCRenderState";
|
private static final String RenderStateClass = "codechicken/lib/render/CCRenderState";
|
||||||
@@ -58,7 +59,12 @@ public class RedirectorTransformer implements IClassTransformer {
|
|||||||
"hasBrightness",
|
"hasBrightness",
|
||||||
"brightness",
|
"brightness",
|
||||||
"side",
|
"side",
|
||||||
"lc"
|
"lc",
|
||||||
|
"normalAttrib",
|
||||||
|
"colourAttrib",
|
||||||
|
"lightCoordAttrib",
|
||||||
|
"sideAttrib",
|
||||||
|
"lightingAttrib"
|
||||||
|
|
||||||
);
|
);
|
||||||
Collections.addAll(redirectedSimpleMethods, "reset", "pullLightmap", "pushLightmap", "setDynamic", "draw");
|
Collections.addAll(redirectedSimpleMethods, "reset", "pullLightmap", "pushLightmap", "setDynamic", "draw");
|
||||||
@@ -90,66 +96,63 @@ public class RedirectorTransformer implements IClassTransformer {
|
|||||||
cr.accept(cn, 0);
|
cr.accept(cn, 0);
|
||||||
boolean changed = false;
|
boolean changed = false;
|
||||||
|
|
||||||
|
// spotless:off
|
||||||
for (MethodNode mn : cn.methods) {
|
for (MethodNode mn : cn.methods) {
|
||||||
for (AbstractInsnNode node : mn.instructions.toArray()) {
|
for (AbstractInsnNode node : mn.instructions.toArray()) {
|
||||||
if (node instanceof FieldInsnNode fNode) {
|
if (node instanceof FieldInsnNode fNode) {
|
||||||
if (node.getOpcode() == Opcodes.GETSTATIC && redirectedFields.contains(fNode.name)
|
if (node.getOpcode() == GETSTATIC && RenderStateClass.equals(fNode.owner) && redirectedFields.contains(fNode.name)) {
|
||||||
&& fNode.owner.equals(RenderStateClass)) {
|
mn.instructions.insertBefore(fNode,
|
||||||
mn.instructions.insertBefore(
|
new MethodInsnNode(
|
||||||
fNode,
|
INVOKESTATIC,
|
||||||
new MethodInsnNode(
|
fNode.owner,
|
||||||
Opcodes.INVOKESTATIC,
|
"instance",
|
||||||
fNode.owner,
|
"()Lcodechicken/lib/render/CCRenderState;",
|
||||||
"instance",
|
false));
|
||||||
"()Lcodechicken/lib/render/CCRenderState;"));
|
fNode.setOpcode(GETFIELD);
|
||||||
fNode.setOpcode(Opcodes.GETFIELD);
|
|
||||||
changed = true;
|
changed = true;
|
||||||
} else if (node.getOpcode() == Opcodes.PUTSTATIC
|
} else if (node.getOpcode() == PUTSTATIC && RenderStateClass.equals(fNode.owner) && redirectedFields.contains(fNode.name)) {
|
||||||
&& (redirectedFields.contains(fNode.name) && fNode.owner.equals(RenderStateClass))) {
|
InsnList list = new InsnList();
|
||||||
InsnList beforePut = new InsnList();
|
list.add(new MethodInsnNode(
|
||||||
beforePut.add(
|
INVOKESTATIC,
|
||||||
new MethodInsnNode(
|
fNode.owner,
|
||||||
Opcodes.INVOKESTATIC,
|
"instance",
|
||||||
fNode.owner,
|
"()Lcodechicken/lib/render/CCRenderState;",
|
||||||
"instance",
|
false));
|
||||||
"()Lcodechicken/lib/render/CCRenderState;"));
|
list.add(new InsnNode(SWAP));
|
||||||
beforePut.add(new InsnNode(Opcodes.SWAP));
|
mn.instructions.insertBefore(fNode, list);
|
||||||
mn.instructions.insertBefore(fNode, beforePut);
|
fNode.setOpcode(PUTFIELD);
|
||||||
fNode.setOpcode(Opcodes.PUTFIELD);
|
changed = true;
|
||||||
changed = true;
|
}
|
||||||
|
|
||||||
}
|
|
||||||
} else if (node instanceof MethodInsnNode mNode) {
|
} else if (node instanceof MethodInsnNode mNode) {
|
||||||
if (node.getOpcode() == Opcodes.INVOKESTATIC && redirectedSimpleMethods.contains(mNode.name)
|
if (node.getOpcode() == INVOKESTATIC && RenderStateClass.equals(mNode.owner) && redirectedSimpleMethods.contains(mNode.name)) {
|
||||||
&& mNode.owner.equals(RenderStateClass)) {
|
mn.instructions.insertBefore(mNode,
|
||||||
mn.instructions.insertBefore(
|
new MethodInsnNode(
|
||||||
mNode,
|
INVOKESTATIC,
|
||||||
new MethodInsnNode(
|
mNode.owner,
|
||||||
Opcodes.INVOKESTATIC,
|
"instance",
|
||||||
mNode.owner,
|
"()Lcodechicken/lib/render/CCRenderState;",
|
||||||
"instance",
|
false));
|
||||||
"()Lcodechicken/lib/render/CCRenderState;"));
|
mNode.setOpcode(INVOKEVIRTUAL);
|
||||||
mNode.setOpcode(Opcodes.INVOKEVIRTUAL);
|
|
||||||
mNode.name = mNode.name + "Instance";
|
mNode.name = mNode.name + "Instance";
|
||||||
changed = true;
|
changed = true;
|
||||||
} else if (node.getOpcode() == Opcodes.INVOKEVIRTUAL && mNode.owner.equals(RenderStateClass)
|
} else if (node.getOpcode() == INVOKEVIRTUAL && RenderStateClass.equals(mNode.owner)
|
||||||
&& (redirectedSimpleMethods.contains(mNode.name)
|
&& (redirectedSimpleMethods.contains(mNode.name) || redirectedMethods.contains(mNode.name))) {
|
||||||
|| redirectedMethods.contains(mNode.name))) {
|
// Handle mods that updated to previously new API
|
||||||
// Handle mods that updated to previously new API
|
mNode.name = mNode.name + "Instance";
|
||||||
mNode.name = mNode.name + "Instance";
|
changed = true;
|
||||||
changed = true;
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// spotless:on
|
||||||
|
|
||||||
if (changed) {
|
if (changed) {
|
||||||
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||||
cn.accept(cw);
|
cn.accept(cw);
|
||||||
final byte[] bytes = cw.toByteArray();
|
final byte[] bytes = cw.toByteArray();
|
||||||
if (DUMP_CLASSES) {
|
if (DUMP_CLASSES) {
|
||||||
saveTransformedClass(bytes, transformedName);
|
saveTransformedClass(basicClass, transformedName + "_PRE");
|
||||||
saveTransformedClass(basicClass, transformedName + "_original");
|
saveTransformedClass(bytes, transformedName + "_POST");
|
||||||
}
|
}
|
||||||
return bytes;
|
return bytes;
|
||||||
}
|
}
|
||||||
@@ -158,13 +161,9 @@ public class RedirectorTransformer implements IClassTransformer {
|
|||||||
|
|
||||||
private File outputDir = null;
|
private File outputDir = null;
|
||||||
|
|
||||||
private void saveTransformedClass(final byte[] data, final String transformedName) {
|
private void saveTransformedClass(final byte[] data, final String classname) {
|
||||||
if (!DUMP_CLASSES) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (outputDir == null) {
|
if (outputDir == null) {
|
||||||
outputDir = new File(Launch.minecraftHome, "ASM_REDIRECTOR");
|
outputDir = new File(Launch.minecraftHome, "ASM_CCL" + File.separatorChar + "REDIRECTOR");
|
||||||
try {
|
try {
|
||||||
FileUtils.deleteDirectory(outputDir);
|
FileUtils.deleteDirectory(outputDir);
|
||||||
} catch (IOException ignored) {}
|
} catch (IOException ignored) {}
|
||||||
@@ -173,40 +172,34 @@ public class RedirectorTransformer implements IClassTransformer {
|
|||||||
outputDir.mkdirs();
|
outputDir.mkdirs();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
final String fileName = classname.replace('.', File.separatorChar);
|
||||||
final String fileName = transformedName.replace('.', File.separatorChar);
|
|
||||||
final File classFile = new File(outputDir, fileName + ".class");
|
final File classFile = new File(outputDir, fileName + ".class");
|
||||||
final File bytecodeFile = new File(outputDir, fileName + "_BYTE.txt");
|
final File bytecodeFile = new File(outputDir, fileName + "_BYTE.txt");
|
||||||
final File asmifiedFile = new File(outputDir, fileName + "_ASM.txt");
|
|
||||||
final File outDir = classFile.getParentFile();
|
final File outDir = classFile.getParentFile();
|
||||||
if (!outDir.exists()) {
|
if (!outDir.exists()) {
|
||||||
|
// noinspection ResultOfMethodCallIgnored
|
||||||
outDir.mkdirs();
|
outDir.mkdirs();
|
||||||
}
|
}
|
||||||
if (classFile.exists()) {
|
if (classFile.exists()) {
|
||||||
|
// noinspection ResultOfMethodCallIgnored
|
||||||
classFile.delete();
|
classFile.delete();
|
||||||
}
|
}
|
||||||
try (final OutputStream output = Files.newOutputStream(classFile.toPath())) {
|
try (final OutputStream output = Files.newOutputStream(classFile.toPath())) {
|
||||||
output.write(data);
|
output.write(data);
|
||||||
|
CodeChickenCorePlugin.logger.info("Saved class (byte[]) to " + classFile.toPath());
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
CodeChickenCorePlugin.logger.error("Could not save class (byte[]) " + classname);
|
||||||
}
|
}
|
||||||
if (bytecodeFile.exists()) {
|
if (bytecodeFile.exists()) {
|
||||||
|
// noinspection ResultOfMethodCallIgnored
|
||||||
bytecodeFile.delete();
|
bytecodeFile.delete();
|
||||||
}
|
}
|
||||||
try (final OutputStream output = Files.newOutputStream(bytecodeFile.toPath())) {
|
try (final OutputStream output = Files.newOutputStream(bytecodeFile.toPath())) {
|
||||||
final ClassReader classReader = new ClassReader(data);
|
final ClassReader classReader = new ClassReader(data);
|
||||||
classReader.accept(new TraceClassVisitor(null, new Textifier(), new PrintWriter(output)), 0);
|
classReader.accept(new TraceClassVisitor(null, new Textifier(), new PrintWriter(output)), 0);
|
||||||
|
CodeChickenCorePlugin.logger.info("Saved class (bytecode) to " + bytecodeFile.toPath());
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
CodeChickenCorePlugin.logger.error("Could not save class (bytecode) " + classname);
|
||||||
}
|
|
||||||
if (asmifiedFile.exists()) {
|
|
||||||
asmifiedFile.delete();
|
|
||||||
}
|
|
||||||
try (final OutputStream output = Files.newOutputStream(asmifiedFile.toPath())) {
|
|
||||||
final ClassReader classReader = new ClassReader(data);
|
|
||||||
classReader.accept(new TraceClassVisitor(null, new ASMifier(), new PrintWriter(output)), 0);
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,8 +6,10 @@ import java.io.PrintWriter;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
|
|
||||||
public abstract class ConfigTagParent {
|
public abstract class ConfigTagParent {
|
||||||
@@ -21,25 +23,30 @@ public abstract class ConfigTagParent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int compare(ConfigTag o1, ConfigTag o2) {
|
public int compare(ConfigTag o1, ConfigTag o2) {
|
||||||
if (o1.position != o2.position) return compareInt(o1.position, o2.position);
|
if (o1.position != o2.position) return Integer.compare(o1.position, o2.position);
|
||||||
if (o1.brace != o2.brace) return o1.brace ? 1 : -1; // braced one goes after
|
if (o1.brace != o2.brace) return o1.brace ? 1 : -1; // braced one goes after
|
||||||
switch (sortMode) {
|
|
||||||
case 1:
|
if (sortMode == 1) {
|
||||||
if (o1.value == o2.value) return 0;
|
if (Objects.equals(o1.value, o2.value)) return 0;
|
||||||
if (o1.value == null) return 1;
|
if (o1.value == null) return 1;
|
||||||
if (o2.value == null) return -1;
|
if (o2.value == null) return -1;
|
||||||
return o1.value.compareTo(o2.value);
|
return o1.value.compareTo(o2.value);
|
||||||
default:
|
} else {
|
||||||
return o1.name.compareTo(o2.name);
|
return o1.name.compareTo(o2.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private int compareInt(int a, int b) {
|
|
||||||
return a == b ? 0 : a < b ? -1 : 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private TreeMap<String, ConfigTag> childtags = new TreeMap<String, ConfigTag>();
|
/**
|
||||||
|
* The immediate child tags of this tag
|
||||||
|
*/
|
||||||
|
private final TreeMap<String, ConfigTag> childtags = new TreeMap<>();
|
||||||
|
/**
|
||||||
|
* A map of all tags in the tree, meaning all tags in this tag and all tags in child tags (recursively). Allows for
|
||||||
|
* quick access to any tag in the tree, without the need to traverse the tree part by part.
|
||||||
|
*/
|
||||||
|
private final Map<String, ConfigTag> allTagsInTree = new HashMap<>();
|
||||||
public String comment;
|
public String comment;
|
||||||
/**
|
/**
|
||||||
* 0 = name, 1 = value
|
* 0 = name, 1 = value
|
||||||
@@ -88,7 +95,7 @@ public abstract class ConfigTagParent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean containsTag(String tagname) {
|
public boolean containsTag(String tagname) {
|
||||||
return getTag(tagname, false) != null;
|
return allTagsInTree.get(tagname) != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConfigTag getNewTag(String tagname) {
|
public ConfigTag getNewTag(String tagname) {
|
||||||
@@ -96,6 +103,12 @@ public abstract class ConfigTagParent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public ConfigTag getTag(String tagname, boolean create) {
|
public ConfigTag getTag(String tagname, boolean create) {
|
||||||
|
ConfigTag tag = allTagsInTree.get(tagname);
|
||||||
|
if (tag == null && create) return getTagRecursive(tagname, create);
|
||||||
|
return tag;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ConfigTag getTagRecursive(String tagname, boolean create) {
|
||||||
int dotpos = tagname.indexOf(".");
|
int dotpos = tagname.indexOf(".");
|
||||||
String basetagname = dotpos == -1 ? tagname : tagname.substring(0, dotpos);
|
String basetagname = dotpos == -1 ? tagname : tagname.substring(0, dotpos);
|
||||||
ConfigTag basetag = childtags.get(basetagname);
|
ConfigTag basetag = childtags.get(basetagname);
|
||||||
@@ -115,6 +128,8 @@ public abstract class ConfigTagParent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean removeTag(String tagname) {
|
public boolean removeTag(String tagname) {
|
||||||
|
removeChildFromFlatMap(tagname);
|
||||||
|
|
||||||
ConfigTag tag = getTag(tagname, false);
|
ConfigTag tag = getTag(tagname, false);
|
||||||
if (tag == null) return false;
|
if (tag == null) return false;
|
||||||
|
|
||||||
@@ -131,6 +146,22 @@ public abstract class ConfigTagParent {
|
|||||||
|
|
||||||
public void addChild(ConfigTag tag) {
|
public void addChild(ConfigTag tag) {
|
||||||
childtags.put(tag.name, tag);
|
childtags.put(tag.name, tag);
|
||||||
|
|
||||||
|
addChildToFlatMap(tag.name, tag);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addChildToFlatMap(String path, ConfigTag tag) {
|
||||||
|
allTagsInTree.put(path, tag);
|
||||||
|
|
||||||
|
// Stupid cast but these two garbage classes are interlinked anyway
|
||||||
|
if ((this instanceof ConfigTag t) && t.parent != null) t.parent.addChildToFlatMap(t.name + "." + path, tag);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void removeChildFromFlatMap(String path) {
|
||||||
|
allTagsInTree.remove(path);
|
||||||
|
|
||||||
|
// Stupid cast but these two garbage classes are interlinked anyway
|
||||||
|
if ((this instanceof ConfigTag t) && t.parent != null) t.parent.removeChildFromFlatMap(t.name + "." + path);
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends ConfigTag> ArrayList<T> getSortedTagList() {
|
public <T extends ConfigTag> ArrayList<T> getSortedTagList() {
|
||||||
|
|||||||
@@ -162,6 +162,11 @@ public class GuiDraw {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list) {
|
public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list) {
|
||||||
|
drawMultilineTip(font, x, y, list, 0xf0100010, 0xf0100010, 0x505000ff, 0x5028007F);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list, int bgStart, int bgEnd,
|
||||||
|
int borderStart, int borderEnd) {
|
||||||
if (list.isEmpty()) return;
|
if (list.isEmpty()) return;
|
||||||
|
|
||||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||||
@@ -189,7 +194,7 @@ public class GuiDraw {
|
|||||||
y = (int) MathHelper.clip(y, 8, displaySize().height - 8 - h);
|
y = (int) MathHelper.clip(y, 8, displaySize().height - 8 - h);
|
||||||
|
|
||||||
gui.incZLevel(300);
|
gui.incZLevel(300);
|
||||||
drawTooltipBox(x - 4, y - 4, w + 7, h + 7);
|
drawTooltipBox(x - 4, y - 4, w + 7, h + 7, bgStart, bgEnd, borderStart, borderEnd);
|
||||||
for (String s : list) {
|
for (String s : list) {
|
||||||
ITooltipLineHandler line = getTipLine(s);
|
ITooltipLineHandler line = getTipLine(s);
|
||||||
if (line != null) {
|
if (line != null) {
|
||||||
@@ -210,18 +215,23 @@ public class GuiDraw {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void drawTooltipBox(int x, int y, int w, int h) {
|
public static void drawTooltipBox(int x, int y, int w, int h) {
|
||||||
int bg = 0xf0100010;
|
drawTooltipBox(x, y, w, h, 0xf0100010, 0xf0100010, 0x505000ff, 0x5028007F);
|
||||||
drawGradientRect(x + 1, y, w - 1, 1, bg, bg);
|
}
|
||||||
drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg);
|
|
||||||
drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg); // center
|
|
||||||
drawGradientRect(x, y + 1, 1, h - 1, bg, bg);
|
|
||||||
drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg);
|
|
||||||
int grad1 = 0x505000ff;
|
|
||||||
int grad2 = 0x5028007F;
|
|
||||||
drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2);
|
|
||||||
drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2);
|
|
||||||
|
|
||||||
drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1);
|
public static void drawTooltipBox(int x, int y, int w, int h, int bgStart, int bgEnd, int borderStart,
|
||||||
drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2);
|
int borderEnd) {
|
||||||
|
// spotless:off
|
||||||
|
// draw background
|
||||||
|
drawGradientRect(x + 1, y, w - 1, 1, bgStart, bgStart); // top
|
||||||
|
drawGradientRect(x + 1, y + h, w - 1, 1, bgEnd, bgEnd); // bottom
|
||||||
|
drawGradientRect(x + 1, y + 1, w - 1, h - 1, bgStart, bgEnd); // center
|
||||||
|
drawGradientRect(x, y + 1, 1, h - 1, bgStart, bgEnd); // left
|
||||||
|
drawGradientRect(x + w, y + 1, 1, h - 1, bgStart, bgEnd); // right
|
||||||
|
// draw inner border
|
||||||
|
drawGradientRect(x + 1, y + 2, 1, h - 3, borderStart, borderEnd); // left
|
||||||
|
drawGradientRect(x + w - 1, y + 2, 1, h - 3, borderStart, borderEnd); // right
|
||||||
|
drawGradientRect(x + 1, y + 1, w - 1, 1, borderStart, borderStart); // top
|
||||||
|
drawGradientRect(x + 1, y + h - 1, w - 1, 1, borderEnd, borderEnd); // bottom
|
||||||
|
// spotless:on
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -81,8 +81,8 @@ public class LightModel implements CCRenderState.IVertexOperation {
|
|||||||
public boolean load(CCRenderState state) {
|
public boolean load(CCRenderState state) {
|
||||||
if (!state.computeLighting) return false;
|
if (!state.computeLighting) return false;
|
||||||
|
|
||||||
state.pipeline.addDependency(CCRenderState.normalAttrib);
|
state.pipeline.addDependency(CCRenderState.normalAttrib());
|
||||||
state.pipeline.addDependency(CCRenderState.colourAttrib);
|
state.pipeline.addDependency(CCRenderState.colourAttrib());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public class PlanarLightMatrix extends PlanarLightModel {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean load(CCRenderState state) {
|
public boolean load(CCRenderState state) {
|
||||||
state.pipeline.addDependency(CCRenderState.sideAttrib);
|
state.pipeline.addDependency(CCRenderState.sideAttrib());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ public class PlanarLightModel implements CCRenderState.IVertexOperation {
|
|||||||
public boolean load(CCRenderState state) {
|
public boolean load(CCRenderState state) {
|
||||||
if (!state.computeLighting) return false;
|
if (!state.computeLighting) return false;
|
||||||
|
|
||||||
state.pipeline.addDependency(CCRenderState.sideAttrib);
|
state.pipeline.addDependency(CCRenderState.sideAttrib());
|
||||||
state.pipeline.addDependency(CCRenderState.colourAttrib);
|
state.pipeline.addDependency(CCRenderState.colourAttrib());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public class SimpleBrightnessModel implements CCRenderState.IVertexOperation {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean load(CCRenderState state) {
|
public boolean load(CCRenderState state) {
|
||||||
state.pipeline.addDependency(CCRenderState.sideAttrib);
|
state.pipeline.addDependency(CCRenderState.sideAttrib());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,12 +20,12 @@ public class BlockRenderer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> T getAttributes(CCRenderState.VertexAttribute<T> attr) {
|
public <T> T getAttributes(CCRenderState.VertexAttribute<T> attr) {
|
||||||
return attr == CCRenderState.lightCoordAttrib && lcComputed ? (T) lightCoords : null;
|
return attr == CCRenderState.lightCoordAttrib() && lcComputed ? (T) lightCoords : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasAttribute(CCRenderState.VertexAttribute<?> attr) {
|
public boolean hasAttribute(CCRenderState.VertexAttribute<?> attr) {
|
||||||
return attr == CCRenderState.sideAttrib || attr == CCRenderState.lightCoordAttrib && lcComputed;
|
return attr == CCRenderState.sideAttrib() || attr == CCRenderState.lightCoordAttrib() && lcComputed;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -136,12 +136,12 @@ public class BlockRenderer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> T getAttributes(VertexAttribute<T> attr) {
|
public <T> T getAttributes(VertexAttribute<T> attr) {
|
||||||
return attr == CCRenderState.lightCoordAttrib ? (T) lightCoords : null;
|
return attr == CCRenderState.lightCoordAttrib() ? (T) lightCoords : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasAttribute(VertexAttribute<?> attr) {
|
public boolean hasAttribute(VertexAttribute<?> attr) {
|
||||||
return attr == CCRenderState.sideAttrib || attr == CCRenderState.lightCoordAttrib;
|
return attr == CCRenderState.sideAttrib() || attr == CCRenderState.lightCoordAttrib();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -164,7 +164,7 @@ public class BlockRenderer {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders faces of a block-like model based on a sideMask. Eg for side 2, verts 8-11 will be rendered
|
* Renders faces of a block-like model based on a sideMask. Eg for side 2, verts 8-11 will be rendered
|
||||||
*
|
*
|
||||||
* @param sideMask A mask of faces not to render
|
* @param sideMask A mask of faces not to render
|
||||||
*/
|
*/
|
||||||
// public static void renderFaces(int sideMask) {
|
// public static void renderFaces(int sideMask) {
|
||||||
@@ -184,7 +184,7 @@ public class BlockRenderer {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders faces of a cuboid with texture coordinates mapped to match a standard minecraft block
|
* Renders faces of a cuboid with texture coordinates mapped to match a standard minecraft block
|
||||||
*
|
*
|
||||||
* @param bounds The bounding cuboid to render
|
* @param bounds The bounding cuboid to render
|
||||||
* @param sideMask A mask of faces not to render
|
* @param sideMask A mask of faces not to render
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Vector3[] normals() {
|
public Vector3[] normals() {
|
||||||
return getAttributes(CCRenderState.normalAttrib);
|
return getAttributes(CCRenderState.normalAttrib());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -102,7 +102,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Each pixel corresponds to one unit of position when generating the model
|
* Each pixel corresponds to one unit of position when generating the model
|
||||||
*
|
*
|
||||||
* @param i Vertex index to start generating at
|
* @param i Vertex index to start generating at
|
||||||
* @param x1 The minX bound of the box
|
* @param x1 The minX bound of the box
|
||||||
* @param y1 The minY bound of the box
|
* @param y1 The minY bound of the box
|
||||||
@@ -195,7 +195,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates a box, uv mapped to be the same as a minecraft block with the same bounds
|
* Generates a box, uv mapped to be the same as a minecraft block with the same bounds
|
||||||
*
|
*
|
||||||
* @param i The vertex index to start generating at
|
* @param i The vertex index to start generating at
|
||||||
* @param bounds The bounds of the block, 0 to 1
|
* @param bounds The bounds of the block, 0 to 1
|
||||||
* @return The generated model. When rendering an icon will need to be supplied for the UV transformation.
|
* @return The generated model. When rendering an icon will need to be supplied for the UV transformation.
|
||||||
@@ -222,7 +222,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates a box, uv mapped to be the same as a minecraft block with the same bounds
|
* Generates a box, uv mapped to be the same as a minecraft block with the same bounds
|
||||||
*
|
*
|
||||||
* @param i The vertex index to start generating at
|
* @param i The vertex index to start generating at
|
||||||
* @param x1 minX
|
* @param x1 minX
|
||||||
* @param y1 minY
|
* @param y1 minY
|
||||||
@@ -311,7 +311,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Computes the normals of all faces in the model. Uses the cross product of the vectors along 2 sides of the face
|
* Computes the normals of all faces in the model. Uses the cross product of the vectors along 2 sides of the face
|
||||||
*
|
*
|
||||||
* @param start The first vertex to generate normals for
|
* @param start The first vertex to generate normals for
|
||||||
* @param length The number of vertices to generate normals for. Note this must be a multiple of 3 for triangles or
|
* @param length The number of vertices to generate normals for. Note this must be a multiple of 3 for triangles or
|
||||||
* 4 for quads
|
* 4 for quads
|
||||||
@@ -321,7 +321,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
if (length % vp != 0 || start % vp != 0)
|
if (length % vp != 0 || start % vp != 0)
|
||||||
throw new IllegalArgumentException("Cannot generate normals across polygons");
|
throw new IllegalArgumentException("Cannot generate normals across polygons");
|
||||||
|
|
||||||
Vector3[] normals = getOrAllocate(CCRenderState.normalAttrib);
|
Vector3[] normals = getOrAllocate(CCRenderState.normalAttrib());
|
||||||
for (int k = 0; k < length; k += vp) {
|
for (int k = 0; k < length; k += vp) {
|
||||||
int i = k + start;
|
int i = k + start;
|
||||||
Vector3 diff1 = verts[i + 1].vec.copy().subtract(verts[i].vec);
|
Vector3 diff1 = verts[i + 1].vec.copy().subtract(verts[i].vec);
|
||||||
@@ -336,14 +336,14 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
/**
|
/**
|
||||||
* Computes lighting using the normals add a light model If the model is rotated, the lighting will no longer be
|
* Computes lighting using the normals add a light model If the model is rotated, the lighting will no longer be
|
||||||
* valid
|
* valid
|
||||||
*
|
*
|
||||||
* @return The model
|
* @return The model
|
||||||
*/
|
*/
|
||||||
public CCModel computeLighting(LightModel light) {
|
public CCModel computeLighting(LightModel light) {
|
||||||
Vector3[] normals = normals();
|
Vector3[] normals = normals();
|
||||||
int[] colours = getAttributes(CCRenderState.lightingAttrib);
|
int[] colours = getAttributes(CCRenderState.lightingAttrib());
|
||||||
if (colours == null) {
|
if (colours == null) {
|
||||||
colours = getOrAllocate(CCRenderState.lightingAttrib);
|
colours = getOrAllocate(CCRenderState.lightingAttrib());
|
||||||
Arrays.fill(colours, -1);
|
Arrays.fill(colours, -1);
|
||||||
}
|
}
|
||||||
for (int k = 0; k < verts.length; k++) colours[k] = light.apply(colours[k], normals[k]);
|
for (int k = 0; k < verts.length; k++) colours[k] = light.apply(colours[k], normals[k]);
|
||||||
@@ -351,18 +351,18 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public CCModel setColour(int c) {
|
public CCModel setColour(int c) {
|
||||||
int[] colours = getOrAllocate(CCRenderState.colourAttrib);
|
int[] colours = getOrAllocate(CCRenderState.colourAttrib());
|
||||||
Arrays.fill(colours, c);
|
Arrays.fill(colours, c);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computes the minecraft lighting coordinates for use with a LightMatrix
|
* Computes the minecraft lighting coordinates for use with a LightMatrix
|
||||||
*
|
*
|
||||||
* @return The model
|
* @return The model
|
||||||
*/
|
*/
|
||||||
public CCModel computeLightCoords() {
|
public CCModel computeLightCoords() {
|
||||||
LC[] lcs = getOrAllocate(CCRenderState.lightCoordAttrib);
|
LC[] lcs = getOrAllocate(CCRenderState.lightCoordAttrib());
|
||||||
Vector3[] normals = normals();
|
Vector3[] normals = normals();
|
||||||
for (int i = 0; i < verts.length; i++) lcs[i] = new LC().compute(verts[i].vec, normals[i]);
|
for (int i = 0; i < verts.length; i++) lcs[i] = new LC().compute(verts[i].vec, normals[i]);
|
||||||
return this;
|
return this;
|
||||||
@@ -370,7 +370,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Averages all normals at the same position to produce a smooth lighting effect.
|
* Averages all normals at the same position to produce a smooth lighting effect.
|
||||||
*
|
*
|
||||||
* @return The model
|
* @return The model
|
||||||
*/
|
*/
|
||||||
public CCModel smoothNormals() {
|
public CCModel smoothNormals() {
|
||||||
@@ -461,7 +461,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders vertices start through start+length-1 of the model
|
* Renders vertices start through start+length-1 of the model
|
||||||
*
|
*
|
||||||
* @param start The first vertex index to render
|
* @param start The first vertex index to render
|
||||||
* @param end The vertex index to render until
|
* @param end The vertex index to render until
|
||||||
* @param ops Operations to apply
|
* @param ops Operations to apply
|
||||||
@@ -520,7 +520,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
|
* Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
|
||||||
*
|
*
|
||||||
* @param input An input stream to a obj file
|
* @param input An input stream to a obj file
|
||||||
* @param vertexMode The vertex mode to create the model for (GL_TRIANGLES or GL_QUADS)
|
* @param vertexMode The vertex mode to create the model for (GL_TRIANGLES or GL_QUADS)
|
||||||
* @param coordSystem The cooridnate system transformation to apply
|
* @param coordSystem The cooridnate system transformation to apply
|
||||||
@@ -624,7 +624,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
|
* Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
|
||||||
*
|
*
|
||||||
* @param res The resource for the obj file
|
* @param res The resource for the obj file
|
||||||
* @return A map of group names to models
|
* @return A map of group names to models
|
||||||
*/
|
*/
|
||||||
@@ -634,7 +634,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
|
* Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
|
||||||
*
|
*
|
||||||
* @param res The resource for the obj file
|
* @param res The resource for the obj file
|
||||||
* @param coordSystem The cooridnate system transformation to apply
|
* @param coordSystem The cooridnate system transformation to apply
|
||||||
* @return A map of group names to models
|
* @return A map of group names to models
|
||||||
@@ -652,7 +652,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
|
* Parses vertices, texture coords, normals and polygons from a WaveFront Obj file
|
||||||
*
|
*
|
||||||
* @param res The resource for the obj file
|
* @param res The resource for the obj file
|
||||||
* @param vertexMode The vertex mode to create the model for (GL_TRIANGLES or GL_QUADS)
|
* @param vertexMode The vertex mode to create the model for (GL_TRIANGLES or GL_QUADS)
|
||||||
* @param coordSystem The cooridnate system transformation to apply
|
* @param coordSystem The cooridnate system transformation to apply
|
||||||
@@ -678,7 +678,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
boolean hasNormals = polys.get(0)[2] > 0;
|
boolean hasNormals = polys.get(0)[2] > 0;
|
||||||
CCModel model = CCModel.newModel(vertexMode, polys.size());
|
CCModel model = CCModel.newModel(vertexMode, polys.size());
|
||||||
if (hasNormals) model.getOrAllocate(CCRenderState.normalAttrib);
|
if (hasNormals) model.getOrAllocate(CCRenderState.normalAttrib());
|
||||||
|
|
||||||
for (int i = 0; i < polys.size(); i++) {
|
for (int i = 0; i < polys.size(); i++) {
|
||||||
int[] ai = polys.get(i);
|
int[] ai = polys.get(i);
|
||||||
@@ -807,7 +807,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate models rotated to the other 5 sides of the block
|
* Generate models rotated to the other 5 sides of the block
|
||||||
*
|
*
|
||||||
* @param models An array of 6 models
|
* @param models An array of 6 models
|
||||||
* @param side The side of this model
|
* @param side The side of this model
|
||||||
* @param point The rotation point
|
* @param point The rotation point
|
||||||
@@ -822,7 +822,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate models rotated to the other 3 horizontal of the block
|
* Generate models rotated to the other 3 horizontal of the block
|
||||||
*
|
*
|
||||||
* @param models An array of 4 models
|
* @param models An array of 4 models
|
||||||
* @param side The side of this model
|
* @param side The side of this model
|
||||||
* @param point The rotation point
|
* @param point The rotation point
|
||||||
@@ -841,7 +841,7 @@ public class CCModel implements CCRenderState.IVertexSource, Copyable<CCModel> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates copies of faces with clockwise vertices
|
* Generates copies of faces with clockwise vertices
|
||||||
*
|
*
|
||||||
* @return The model
|
* @return The model
|
||||||
*/
|
*/
|
||||||
public static CCModel generateBackface(CCModel src, int srcpos, CCModel dst, int destpos, int length) {
|
public static CCModel generateBackface(CCModel src, int srcpos, CCModel dst, int destpos, int length) {
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import static codechicken.lib.math.MathHelper.phi;
|
|||||||
import codechicken.lib.vec.Matrix4;
|
import codechicken.lib.vec.Matrix4;
|
||||||
import codechicken.lib.vec.Quat;
|
import codechicken.lib.vec.Quat;
|
||||||
import codechicken.lib.vec.Rotation;
|
import codechicken.lib.vec.Rotation;
|
||||||
import codechicken.lib.vec.Scale;
|
|
||||||
import codechicken.lib.vec.Vector3;
|
import codechicken.lib.vec.Vector3;
|
||||||
|
|
||||||
public class CCModelLibrary {
|
public class CCModelLibrary {
|
||||||
@@ -82,7 +81,12 @@ public class CCModelLibrary {
|
|||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
public static Matrix4 getRenderMatrix(Vector3 position, Rotation rotation, double scale) {
|
public static Matrix4 getRenderMatrix(Vector3 position, Rotation rotation, double scale) {
|
||||||
return new Matrix4().translate(position).apply(new Scale(scale)).apply(rotation);
|
return new Matrix4().translate(position).scale(scale).apply(rotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Matrix4 getRenderMatrix(double posX, double posY, double posZ, Rotation rotation, double scale) {
|
||||||
|
return new Matrix4().translate(posX, posY, posZ).scale(scale).apply(rotation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -169,7 +169,27 @@ public class CCRenderState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static VertexAttribute<Vector3[]> normalAttrib = new VertexAttribute<>() {
|
public static VertexAttribute<Vector3[]> normalAttrib() {
|
||||||
|
return instances.get().normalAttrib;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static VertexAttribute<int[]> colourAttrib() {
|
||||||
|
return instances.get().colourAttrib;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static VertexAttribute<LC[]> lightCoordAttrib() {
|
||||||
|
return instances.get().lightCoordAttrib;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static VertexAttribute<int[]> sideAttrib() {
|
||||||
|
return instances.get().sideAttrib;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static VertexAttribute<int[]> lightingAttrib() {
|
||||||
|
return instances.get().lightingAttrib;
|
||||||
|
}
|
||||||
|
|
||||||
|
public VertexAttribute<Vector3[]> normalAttrib = new VertexAttribute<>() {
|
||||||
|
|
||||||
private Vector3[] normalRef;
|
private Vector3[] normalRef;
|
||||||
|
|
||||||
@@ -197,7 +217,7 @@ public class CCRenderState {
|
|||||||
else state.setNormalInstance(Rotation.axes[state.side]);
|
else state.setNormalInstance(Rotation.axes[state.side]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
public static VertexAttribute<int[]> colourAttrib = new VertexAttribute<>() {
|
public VertexAttribute<int[]> colourAttrib = new VertexAttribute<>() {
|
||||||
|
|
||||||
private int[] colourRef;
|
private int[] colourRef;
|
||||||
|
|
||||||
@@ -219,7 +239,7 @@ public class CCRenderState {
|
|||||||
else state.setColourInstance(state.baseColour);
|
else state.setColourInstance(state.baseColour);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
public static VertexAttribute<int[]> lightingAttrib = new VertexAttribute<>() {
|
public VertexAttribute<int[]> lightingAttrib = new VertexAttribute<>() {
|
||||||
|
|
||||||
private int[] colourRef;
|
private int[] colourRef;
|
||||||
|
|
||||||
@@ -245,7 +265,7 @@ public class CCRenderState {
|
|||||||
state.setColourInstance(ColourRGBA.multiply(state.colour, colourRef[state.vertexIndex]));
|
state.setColourInstance(ColourRGBA.multiply(state.colour, colourRef[state.vertexIndex]));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
public static VertexAttribute<int[]> sideAttrib = new VertexAttribute<>() {
|
public VertexAttribute<int[]> sideAttrib = new VertexAttribute<>() {
|
||||||
|
|
||||||
private int[] sideRef;
|
private int[] sideRef;
|
||||||
|
|
||||||
@@ -272,7 +292,7 @@ public class CCRenderState {
|
|||||||
/**
|
/**
|
||||||
* Uses the position of the lightmatrix to compute LC if not provided
|
* Uses the position of the lightmatrix to compute LC if not provided
|
||||||
*/
|
*/
|
||||||
public static VertexAttribute<LC[]> lightCoordAttrib = new VertexAttribute<>() {
|
public VertexAttribute<LC[]> lightCoordAttrib = new VertexAttribute<>() {
|
||||||
|
|
||||||
private LC[] lcRef;
|
private LC[] lcRef;
|
||||||
private final Vector3 vec = new Vector3(); // for computation
|
private final Vector3 vec = new Vector3(); // for computation
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import net.minecraft.entity.item.EntityItem;
|
|||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
|
import net.minecraft.util.MathHelper;
|
||||||
import net.minecraftforge.client.IItemRenderer;
|
import net.minecraftforge.client.IItemRenderer;
|
||||||
import net.minecraftforge.client.MinecraftForgeClient;
|
import net.minecraftforge.client.MinecraftForgeClient;
|
||||||
import net.minecraftforge.fluids.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
@@ -26,87 +27,130 @@ import codechicken.lib.vec.Vector3;
|
|||||||
|
|
||||||
public class RenderUtils {
|
public class RenderUtils {
|
||||||
|
|
||||||
static Vector3[] vectors = new Vector3[8];
|
static RenderItem uniformRenderItem;
|
||||||
static RenderItem uniformRenderItem = new RenderItem() {
|
|
||||||
|
|
||||||
public boolean shouldBob() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
static EntityItem entityItem;
|
static EntityItem entityItem;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
for (int i = 0; i < vectors.length; i++) vectors[i] = new Vector3();
|
uniformRenderItem = new RenderItem() {
|
||||||
|
|
||||||
|
public boolean shouldBob() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
uniformRenderItem.setRenderManager(RenderManager.instance);
|
uniformRenderItem.setRenderManager(RenderManager.instance);
|
||||||
|
|
||||||
entityItem = new EntityItem(null);
|
entityItem = new EntityItem(null);
|
||||||
entityItem.hoverStart = 0;
|
entityItem.hoverStart = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
public static void renderFluidQuad(Vector3 point1, Vector3 point2, Vector3 point3, Vector3 point4, IIcon icon,
|
public static void renderFluidQuad(Vector3 point1, Vector3 point2, Vector3 point3, Vector3 point4, IIcon icon,
|
||||||
double res) {
|
double res) {
|
||||||
|
// spotless:off
|
||||||
renderFluidQuad(
|
renderFluidQuad(
|
||||||
point2,
|
point2.x, point2.y, point2.z,
|
||||||
vectors[0].set(point4).subtract(point1),
|
point4.x - point1.x, point4.y - point1.y, point4.z - point1.z,
|
||||||
vectors[1].set(point1).subtract(point2),
|
point1.x - point2.x, point1.y - point2.y, point1.z - point2.z,
|
||||||
icon,
|
icon, res);
|
||||||
res);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Draws a tessellated quadrilateral bottom to top, left to right
|
* Draws a tessellated quadrilateral bottom to top, left to right
|
||||||
*
|
*
|
||||||
* @param base The bottom left corner of the quad
|
* @param base The bottom left corner of the quad
|
||||||
* @param wide The bottom of the quad
|
* @param wide The bottom of the quad
|
||||||
* @param high The left side of the quad
|
* @param high The left side of the quad
|
||||||
* @param res Units per icon
|
* @param res Units per icon
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public static void renderFluidQuad(Vector3 base, Vector3 wide, Vector3 high, IIcon icon, double res) {
|
public static void renderFluidQuad(Vector3 base, Vector3 wide, Vector3 high, IIcon icon, double res) {
|
||||||
Tessellator t = Tessellator.instance;
|
renderFluidQuad(
|
||||||
|
base.x, base.y, base.z,
|
||||||
|
wide.x, wide.y, wide.z,
|
||||||
|
wide.x, wide.y, wide.z,
|
||||||
|
icon, res);
|
||||||
|
}
|
||||||
|
|
||||||
double u1 = icon.getMinU();
|
/**
|
||||||
|
* Draws a tessellated quadrilateral bottom to top, left to right
|
||||||
|
* <p>
|
||||||
|
* base : The bottom left corner of the quad
|
||||||
|
* <p>
|
||||||
|
* wide : The bottom of the quad
|
||||||
|
* <p>
|
||||||
|
* high : The left side of the quad
|
||||||
|
* <p>
|
||||||
|
* res : Units per icon
|
||||||
|
*/
|
||||||
|
public static void renderFluidQuad(
|
||||||
|
double baseX, double baseY, double baseZ,
|
||||||
|
double wideX, double wideY, double wideZ,
|
||||||
|
double highX, double highY, double highZ,
|
||||||
|
IIcon icon, double res) {
|
||||||
|
|
||||||
|
Tessellator tessellator = Tessellator.instance;
|
||||||
|
|
||||||
|
double u = icon.getMinU();
|
||||||
double du = icon.getMaxU() - icon.getMinU();
|
double du = icon.getMaxU() - icon.getMinU();
|
||||||
double v2 = icon.getMaxV();
|
double v = icon.getMinV();
|
||||||
double dv = icon.getMaxV() - icon.getMinV();
|
double dv = icon.getMaxV() - icon.getMinV();
|
||||||
|
|
||||||
double wlen = wide.mag();
|
double wideLen = Math.sqrt(wideX * wideX + wideY * wideY + wideZ * wideZ);
|
||||||
double hlen = high.mag();
|
double highLen = Math.sqrt(highX * highX + highY * highY + highZ * highZ);
|
||||||
|
|
||||||
double x = 0;
|
double x = 0;
|
||||||
while (x < wlen) {
|
while (x < wideLen) {
|
||||||
double rx = wlen - x;
|
double rx = wideLen - x;
|
||||||
if (rx > res) rx = res;
|
if (rx > res) rx = res;
|
||||||
|
|
||||||
double y = 0;
|
double y = 0;
|
||||||
while (y < hlen) {
|
while (y < highLen) {
|
||||||
double ry = hlen - y;
|
double ry = highLen - y;
|
||||||
if (ry > res) ry = res;
|
if (ry > res) ry = res;
|
||||||
|
|
||||||
Vector3 dx1 = vectors[2].set(wide).multiply(x / wlen);
|
final double mult1 = x / wideLen;
|
||||||
Vector3 dx2 = vectors[3].set(wide).multiply((x + rx) / wlen);
|
double dx1X = wideX * mult1;
|
||||||
Vector3 dy1 = vectors[4].set(high).multiply(y / hlen);
|
double dx1Y = wideY * mult1;
|
||||||
Vector3 dy2 = vectors[5].set(high).multiply((y + ry) / hlen);
|
double dx1Z = wideZ * mult1;
|
||||||
|
|
||||||
t.addVertexWithUV(
|
final double mult2 = (x + rx) / wideLen;
|
||||||
base.x + dx1.x + dy2.x,
|
double dx2X = wideX * mult2;
|
||||||
base.y + dx1.y + dy2.y,
|
double dx2Y = wideY * mult2;
|
||||||
base.z + dx1.z + dy2.z,
|
double dx2Z = wideZ * mult2;
|
||||||
u1,
|
|
||||||
v2 - ry / res * dv);
|
final double mult3 = y / highLen;
|
||||||
t.addVertexWithUV(base.x + dx1.x + dy1.x, base.y + dx1.y + dy1.y, base.z + dx1.z + dy1.z, u1, v2);
|
double dy1X = highX * mult3;
|
||||||
t.addVertexWithUV(
|
double dy1Y = highY * mult3;
|
||||||
base.x + dx2.x + dy1.x,
|
double dy1Z = highZ * mult3;
|
||||||
base.y + dx2.y + dy1.y,
|
|
||||||
base.z + dx2.z + dy1.z,
|
final double mult4 = (y + ry) / highLen;
|
||||||
u1 + rx / res * du,
|
double dy2X = highX * mult4;
|
||||||
v2);
|
double dy2Y = highY * mult4;
|
||||||
t.addVertexWithUV(
|
double dy2Z = highZ * mult4;
|
||||||
base.x + dx2.x + dy2.x,
|
|
||||||
base.y + dx2.y + dy2.y,
|
tessellator.addVertexWithUV(
|
||||||
base.z + dx2.z + dy2.z,
|
baseX + dx1X + dy2X,
|
||||||
u1 + rx / res * du,
|
baseY + dx1Y + dy2Y,
|
||||||
v2 - ry / res * dv);
|
baseZ + dx1Z + dy2Z,
|
||||||
|
u,
|
||||||
|
v + ry / res * dv);
|
||||||
|
tessellator.addVertexWithUV(
|
||||||
|
baseX + dx1X + dy1X,
|
||||||
|
baseY + dx1Y + dy1Y,
|
||||||
|
baseZ + dx1Z + dy1Z,
|
||||||
|
u,
|
||||||
|
v);
|
||||||
|
tessellator.addVertexWithUV(
|
||||||
|
baseX + dx2X + dy1X,
|
||||||
|
baseY + dx2Y + dy1Y,
|
||||||
|
baseZ + dx2Z + dy1Z,
|
||||||
|
u + rx / res * du,
|
||||||
|
v);
|
||||||
|
tessellator.addVertexWithUV(
|
||||||
|
baseX + dx2X + dy2X,
|
||||||
|
baseY + dx2Y + dy2Y,
|
||||||
|
baseZ + dx2Z + dy2Z,
|
||||||
|
u + rx / res * du,
|
||||||
|
v + ry / res * dv);
|
||||||
|
|
||||||
y += ry;
|
y += ry;
|
||||||
}
|
}
|
||||||
@@ -115,132 +159,130 @@ public class RenderUtils {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void translateToWorldCoords(Entity entity, float frame) {
|
public static void translateToWorldCoords(Entity entity, float partialTicks) {
|
||||||
double interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * frame;
|
double interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * partialTicks;
|
||||||
double interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * frame;
|
double interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * partialTicks;
|
||||||
double interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * frame;
|
double interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * partialTicks;
|
||||||
|
|
||||||
GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ);
|
GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void drawCuboidOutline(Cuboid6 c) {
|
public static void drawCuboidOutline(Cuboid6 c) {
|
||||||
Tessellator var2 = Tessellator.instance;
|
Tessellator tess = Tessellator.instance;
|
||||||
var2.startDrawing(3);
|
tess.startDrawing(3);
|
||||||
var2.addVertex(c.min.x, c.min.y, c.min.z);
|
tess.addVertex(c.min.x, c.min.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.min.y, c.min.z);
|
tess.addVertex(c.max.x, c.min.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.min.y, c.max.z);
|
tess.addVertex(c.max.x, c.min.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.min.y, c.max.z);
|
tess.addVertex(c.min.x, c.min.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.min.y, c.min.z);
|
tess.addVertex(c.min.x, c.min.y, c.min.z);
|
||||||
var2.draw();
|
tess.draw();
|
||||||
var2.startDrawing(3);
|
tess.startDrawing(3);
|
||||||
var2.addVertex(c.min.x, c.max.y, c.min.z);
|
tess.addVertex(c.min.x, c.max.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.max.y, c.min.z);
|
tess.addVertex(c.max.x, c.max.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.max.y, c.max.z);
|
tess.addVertex(c.max.x, c.max.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.max.y, c.max.z);
|
tess.addVertex(c.min.x, c.max.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.max.y, c.min.z);
|
tess.addVertex(c.min.x, c.max.y, c.min.z);
|
||||||
var2.draw();
|
tess.draw();
|
||||||
var2.startDrawing(1);
|
tess.startDrawing(1);
|
||||||
var2.addVertex(c.min.x, c.min.y, c.min.z);
|
tess.addVertex(c.min.x, c.min.y, c.min.z);
|
||||||
var2.addVertex(c.min.x, c.max.y, c.min.z);
|
tess.addVertex(c.min.x, c.max.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.min.y, c.min.z);
|
tess.addVertex(c.max.x, c.min.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.max.y, c.min.z);
|
tess.addVertex(c.max.x, c.max.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.min.y, c.max.z);
|
tess.addVertex(c.max.x, c.min.y, c.max.z);
|
||||||
var2.addVertex(c.max.x, c.max.y, c.max.z);
|
tess.addVertex(c.max.x, c.max.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.min.y, c.max.z);
|
tess.addVertex(c.min.x, c.min.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.max.y, c.max.z);
|
tess.addVertex(c.min.x, c.max.y, c.max.z);
|
||||||
var2.draw();
|
tess.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFluidCuboid(CCRenderState state, Cuboid6 bound, IIcon tex, double res) {
|
public static void renderFluidCuboid(CCRenderState state, Cuboid6 bound, IIcon tex, double res) {
|
||||||
renderFluidQuad( // bottom
|
renderFluidCuboid(bound, tex, res);
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.max.z),
|
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.max.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
renderFluidQuad( // top
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.min.z),
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.min.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
renderFluidQuad( // -x
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.min.z),
|
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.max.z),
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.max.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
renderFluidQuad( // +x
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.min.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
renderFluidQuad( // -z
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.min.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.min.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
renderFluidQuad( // +z
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.max.z),
|
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.max.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFluidCuboid(Cuboid6 bound, IIcon tex, double res) {
|
public static void renderFluidCuboid(Cuboid6 bound, IIcon tex, double res) {
|
||||||
renderFluidCuboid(CCRenderState.instance(), bound, tex, res);
|
final double minX = bound.min.x;
|
||||||
|
final double minY = bound.min.y;
|
||||||
|
final double minZ = bound.min.z;
|
||||||
|
final double maxX = bound.max.x;
|
||||||
|
final double maxY = bound.max.y;
|
||||||
|
final double maxZ = bound.max.z;
|
||||||
|
renderFluidQuad( // bottom
|
||||||
|
minX, minY, minZ,
|
||||||
|
maxX - minX, 0, 0,
|
||||||
|
0, 0, maxZ - minZ,
|
||||||
|
tex, res);
|
||||||
|
renderFluidQuad( // top
|
||||||
|
minX, maxY, minZ,
|
||||||
|
0, 0, maxZ - minZ,
|
||||||
|
maxX - minX, 0, 0,
|
||||||
|
tex, res);
|
||||||
|
renderFluidQuad( // -x
|
||||||
|
minX, maxY, minZ,
|
||||||
|
0, minY - maxY, 0,
|
||||||
|
0, 0, maxZ - minZ,
|
||||||
|
tex, res);
|
||||||
|
renderFluidQuad( // +x
|
||||||
|
maxX, maxY, maxZ,
|
||||||
|
0, minY - maxY, 0,
|
||||||
|
0, 0, minZ - maxZ,
|
||||||
|
tex, res);
|
||||||
|
renderFluidQuad( // -z
|
||||||
|
maxX, maxY, minZ,
|
||||||
|
0, minY - maxY, 0,
|
||||||
|
minX - maxX, 0, 0,
|
||||||
|
tex, res);
|
||||||
|
renderFluidQuad( // +z
|
||||||
|
minX, maxY, maxZ,
|
||||||
|
0, minY - maxY, 0,
|
||||||
|
maxX - minX, 0, 0,
|
||||||
|
tex, res);
|
||||||
}
|
}
|
||||||
|
// spotless:on
|
||||||
|
|
||||||
public static void renderBlockOverlaySide(int x, int y, int z, int side, double tx1, double tx2, double ty1,
|
public static void renderBlockOverlaySide(int x, int y, int z, int side, double tx1, double tx2, double ty1,
|
||||||
double ty2) {
|
double ty2) {
|
||||||
double[] points = new double[] { x - 0.009, x + 1.009, y - 0.009, y + 1.009, z - 0.009, z + 1.009 };
|
|
||||||
|
|
||||||
Tessellator tessellator = Tessellator.instance;
|
Tessellator tessellator = Tessellator.instance;
|
||||||
|
final double minX = x - 0.009;
|
||||||
|
final double maxX = x + 1.009;
|
||||||
|
final double minY = y - 0.009;
|
||||||
|
final double maxY = y + 1.009;
|
||||||
|
final double minZ = z - 0.009;
|
||||||
|
final double maxZ = z + 1.009;
|
||||||
switch (side) {
|
switch (side) {
|
||||||
case 0:
|
case 0:
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[4], tx1, ty1);
|
tessellator.addVertexWithUV(minX, minY, minZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[4], tx2, ty1);
|
tessellator.addVertexWithUV(maxX, minY, minZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[5], tx2, ty2);
|
tessellator.addVertexWithUV(maxX, minY, maxZ, tx2, ty2);
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[5], tx1, ty2);
|
tessellator.addVertexWithUV(minX, minY, maxZ, tx1, ty2);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[4], tx2, ty1);
|
tessellator.addVertexWithUV(maxX, maxY, minZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[4], tx1, ty1);
|
tessellator.addVertexWithUV(minX, maxY, minZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[5], tx1, ty2);
|
tessellator.addVertexWithUV(minX, maxY, maxZ, tx1, ty2);
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[5], tx2, ty2);
|
tessellator.addVertexWithUV(maxX, maxY, maxZ, tx2, ty2);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[4], tx2, ty1);
|
tessellator.addVertexWithUV(minX, maxY, minZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[4], tx1, ty1);
|
tessellator.addVertexWithUV(maxX, maxY, minZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[4], tx1, ty2);
|
tessellator.addVertexWithUV(maxX, minY, minZ, tx1, ty2);
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[4], tx2, ty2);
|
tessellator.addVertexWithUV(minX, minY, minZ, tx2, ty2);
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[5], tx2, ty1);
|
tessellator.addVertexWithUV(maxX, maxY, maxZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[5], tx1, ty1);
|
tessellator.addVertexWithUV(minX, maxY, maxZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[5], tx1, ty2);
|
tessellator.addVertexWithUV(minX, minY, maxZ, tx1, ty2);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[5], tx2, ty2);
|
tessellator.addVertexWithUV(maxX, minY, maxZ, tx2, ty2);
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[5], tx2, ty1);
|
tessellator.addVertexWithUV(minX, maxY, maxZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[4], tx1, ty1);
|
tessellator.addVertexWithUV(minX, maxY, minZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[4], tx1, ty2);
|
tessellator.addVertexWithUV(minX, minY, minZ, tx1, ty2);
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[5], tx2, ty2);
|
tessellator.addVertexWithUV(minX, minY, maxZ, tx2, ty2);
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[4], tx2, ty1);
|
tessellator.addVertexWithUV(maxX, maxY, minZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[5], tx1, ty1);
|
tessellator.addVertexWithUV(maxX, maxY, maxZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[5], tx1, ty2);
|
tessellator.addVertexWithUV(maxX, minY, maxZ, tx1, ty2);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[4], tx2, ty2);
|
tessellator.addVertexWithUV(maxX, minY, minZ, tx2, ty2);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -276,66 +318,76 @@ public class RenderUtils {
|
|||||||
GL11.glDisable(GL11.GL_BLEND);
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double fluidDensityToAlpha(double density) {
|
public static double fluidDensityToAlpha(double d) {
|
||||||
return Math.pow(density, 0.4);
|
return Math.pow(d, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders a fluid within a bounding box. If the fluid is a liquid it will render as a normal tank with height equal
|
* Renders a fluid within a bounding box. If the fluid is a liquid it will render as a normal tank with height equal
|
||||||
* to density/bound.height. If the fluid is a gas, it will render the full box with an alpha equal to density.
|
* to fillRate/bound.height. If the fluid is a gas, it will render the full box with an alpha equal to fillRate.
|
||||||
* Warning, bound will be mutated if the fluid is a liquid
|
* Warning, bound will be mutated if the fluid is a liquid
|
||||||
*
|
*
|
||||||
* @param stack The fluid to render.
|
* @param stack The fluid to render.
|
||||||
* @param bound The box within which the fluid is contained.
|
* @param bound The bounding box within which the fluid is contained.
|
||||||
* @param density The volume of fluid / the capacity of the tank. For gases this determines the alpha, for liquids
|
* @param fillRate The volume of fluid / the capacity of the tank. This is a double between 0 and 1.
|
||||||
* this determines the height.
|
* @param res The resolution to render at.
|
||||||
* @param res The resolution to render at.
|
|
||||||
*/
|
*/
|
||||||
public static void renderFluidCuboid(CCRenderState state, FluidStack stack, Cuboid6 bound, double density,
|
public static void renderFluidCuboid(CCRenderState state, FluidStack stack, Cuboid6 bound, double fillRate,
|
||||||
double res) {
|
double res) {
|
||||||
if (!shouldRenderFluid(stack)) return;
|
if (!shouldRenderFluid(stack)) return;
|
||||||
|
|
||||||
|
fillRate = MathHelper.clamp_double(fillRate, 0d, 1d);
|
||||||
int alpha = 255;
|
int alpha = 255;
|
||||||
if (stack.getFluid().isGaseous()) alpha = (int) (fluidDensityToAlpha(density) * 255);
|
if (stack.getFluid().isGaseous()) {
|
||||||
else bound.max.y = bound.min.y + (bound.max.y - bound.min.y) * density;
|
alpha = (int) (fluidDensityToAlpha(fillRate) * 255);
|
||||||
|
} else {
|
||||||
|
bound.max.y = bound.min.y + (bound.max.y - bound.min.y) * fillRate;
|
||||||
|
}
|
||||||
|
|
||||||
IIcon tex = prepareFluidRender(state, stack, alpha);
|
IIcon tex = prepareFluidRender(state, stack, alpha);
|
||||||
state.startDrawingInstance();
|
state.startDrawingInstance();
|
||||||
renderFluidCuboid(state, bound, tex, res);
|
renderFluidCuboid(bound, tex, res);
|
||||||
state.drawInstance();
|
state.drawInstance();
|
||||||
postFluidRender();
|
postFluidRender();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFluidCuboid(FluidStack stack, Cuboid6 bound, double density, double res) {
|
/**
|
||||||
renderFluidCuboid(CCRenderState.instance(), stack, bound, density, res);
|
* Renders a fluid within a bounding box. If the fluid is a liquid it will render as a normal tank with height equal
|
||||||
|
* to fillRate/bound.height. If the fluid is a gas, it will render the full box with an alpha equal to fillRate.
|
||||||
|
* Warning, bound will be mutated if the fluid is a liquid
|
||||||
|
*
|
||||||
|
* @param stack The fluid to render.
|
||||||
|
* @param bound The bounding box within which the fluid is contained.
|
||||||
|
* @param fillRate The volume of fluid / the capacity of the tank. This is a double between 0 and 1.
|
||||||
|
* @param res The resolution to render at.
|
||||||
|
*/
|
||||||
|
public static void renderFluidCuboid(FluidStack stack, Cuboid6 bound, double fillRate, double res) {
|
||||||
|
renderFluidCuboid(CCRenderState.instance(), stack, bound, fillRate, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFluidGauge(CCRenderState state, FluidStack stack, Rectangle4i rect, double density,
|
public static void renderFluidGauge(CCRenderState state, FluidStack stack, Rectangle4i rect, double fillRate,
|
||||||
double res) {
|
double res) {
|
||||||
if (!shouldRenderFluid(stack)) return;
|
if (!shouldRenderFluid(stack)) return;
|
||||||
|
|
||||||
|
fillRate = MathHelper.clamp_double(fillRate, 0d, 1d);
|
||||||
int alpha = 255;
|
int alpha = 255;
|
||||||
if (stack.getFluid().isGaseous()) alpha = (int) (fluidDensityToAlpha(density) * 255);
|
if (stack.getFluid().isGaseous()) {
|
||||||
else {
|
alpha = (int) (fluidDensityToAlpha(fillRate) * 255);
|
||||||
int height = (int) (rect.h * density);
|
} else {
|
||||||
|
int height = (int) (rect.h * fillRate);
|
||||||
rect.y += rect.h - height;
|
rect.y += rect.h - height;
|
||||||
rect.h = height;
|
rect.h = height;
|
||||||
}
|
}
|
||||||
|
|
||||||
IIcon tex = prepareFluidRender(state, stack, alpha);
|
IIcon tex = prepareFluidRender(state, stack, alpha);
|
||||||
state.startDrawingInstance();
|
state.startDrawingInstance();
|
||||||
renderFluidQuad(
|
renderFluidQuad(rect.x, rect.y + rect.h, 0, rect.w, 0, 0, 0, -rect.h, 0, tex, res);
|
||||||
new Vector3(rect.x, rect.y + rect.h, 0),
|
|
||||||
new Vector3(rect.w, 0, 0),
|
|
||||||
new Vector3(0, -rect.h, 0),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
state.drawInstance();
|
state.drawInstance();
|
||||||
postFluidRender();
|
postFluidRender();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFluidGauge(FluidStack stack, Rectangle4i rect, double density, double res) {
|
public static void renderFluidGauge(FluidStack stack, Rectangle4i rect, double fillRate, double res) {
|
||||||
renderFluidGauge(CCRenderState.instance(), stack, rect, density, res);
|
renderFluidGauge(CCRenderState.instance(), stack, rect, fillRate, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -347,7 +399,7 @@ public class RenderUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders items and blocks in the world at 0,0,0 with transformations that size them appropriately
|
* Renders items and blocks in the world at 0,0,0 with transformations that size them appropriately
|
||||||
*
|
*
|
||||||
* @param spin The spin angle of the item around the y axis in degrees
|
* @param spin The spin angle of the item around the y axis in degrees
|
||||||
*/
|
*/
|
||||||
public static void renderItemUniform(ItemStack item, double spin) {
|
public static void renderItemUniform(ItemStack item, double spin) {
|
||||||
|
|||||||
@@ -19,7 +19,10 @@ public class Matrix4 extends Transformation implements Copyable<Matrix4> {
|
|||||||
.asDoubleBuffer();
|
.asDoubleBuffer();
|
||||||
|
|
||||||
// m<row><column>
|
// m<row><column>
|
||||||
public double m00, m01, m02, m03, m10, m11, m12, m13, m20, m21, m22, m23, m30, m31, m32, m33;
|
public double m00, m01, m02, m03;
|
||||||
|
public double m10, m11, m12, m13;
|
||||||
|
public double m20, m21, m22, m23;
|
||||||
|
public double m30, m31, m32, m33;
|
||||||
|
|
||||||
public Matrix4() {
|
public Matrix4() {
|
||||||
m00 = m11 = m22 = m33 = 1;
|
m00 = m11 = m22 = m33 = 1;
|
||||||
@@ -65,6 +68,15 @@ public class Matrix4 extends Transformation implements Copyable<Matrix4> {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Matrix4 translate(double x, double y, double z) {
|
||||||
|
m03 += m00 * x + m01 * y + m02 * z;
|
||||||
|
m13 += m10 * x + m11 * y + m12 * z;
|
||||||
|
m23 += m20 * x + m21 * y + m22 * z;
|
||||||
|
m33 += m30 * x + m31 * y + m32 * z;
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public Matrix4 scale(Vector3 vec) {
|
public Matrix4 scale(Vector3 vec) {
|
||||||
m00 *= vec.x;
|
m00 *= vec.x;
|
||||||
m10 *= vec.x;
|
m10 *= vec.x;
|
||||||
@@ -82,6 +94,22 @@ public class Matrix4 extends Transformation implements Copyable<Matrix4> {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Matrix4 scale(double scale) {
|
||||||
|
m00 *= scale;
|
||||||
|
m10 *= scale;
|
||||||
|
m20 *= scale;
|
||||||
|
m30 *= scale;
|
||||||
|
m01 *= scale;
|
||||||
|
m11 *= scale;
|
||||||
|
m21 *= scale;
|
||||||
|
m31 *= scale;
|
||||||
|
m02 *= scale;
|
||||||
|
m12 *= scale;
|
||||||
|
m22 *= scale;
|
||||||
|
m32 *= scale;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public Matrix4 rotate(double angle, Vector3 axis) {
|
public Matrix4 rotate(double angle, Vector3 axis) {
|
||||||
double c = Math.cos(angle);
|
double c = Math.cos(angle);
|
||||||
double s = Math.sin(angle);
|
double s = Math.sin(angle);
|
||||||
|
|||||||
@@ -14,14 +14,14 @@ public abstract class Transformation extends ITransformation<Vector3, Transforma
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Applies this transformation to a normal (doesn't translate)
|
* Applies this transformation to a normal (doesn't translate)
|
||||||
*
|
*
|
||||||
* @param normal The normal to transform
|
* @param normal The normal to transform
|
||||||
*/
|
*/
|
||||||
public abstract void applyN(Vector3 normal);
|
public abstract void applyN(Vector3 normal);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Applies this transformation to a matrix as a multiplication on the right hand side.
|
* Applies this transformation to a matrix as a multiplication on the right hand side.
|
||||||
*
|
*
|
||||||
* @param mat The matrix to combine this transformation with
|
* @param mat The matrix to combine this transformation with
|
||||||
*/
|
*/
|
||||||
public abstract void apply(Matrix4 mat);
|
public abstract void apply(Matrix4 mat);
|
||||||
@@ -39,14 +39,14 @@ public abstract class Transformation extends ITransformation<Vector3, Transforma
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean load(CCRenderState state) {
|
public boolean load(CCRenderState state) {
|
||||||
state.pipeline.addRequirement(CCRenderState.normalAttrib.operationID());
|
state.pipeline.addRequirement(CCRenderState.normalAttrib().operationID());
|
||||||
return !isRedundant();
|
return !isRedundant();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void operate(CCRenderState state) {
|
public void operate(CCRenderState state) {
|
||||||
apply(state.vert.vec);
|
apply(state.vert.vec);
|
||||||
if (CCRenderState.normalAttrib.active) applyN(state.normal);
|
if (CCRenderState.normalAttrib().active) applyN(state.normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -29,10 +29,10 @@ public class Vector3 implements Copyable<Vector3> {
|
|||||||
|
|
||||||
public Vector3() {}
|
public Vector3() {}
|
||||||
|
|
||||||
public Vector3(double d, double d1, double d2) {
|
public Vector3(double x, double y, double z) {
|
||||||
x = d;
|
this.x = x;
|
||||||
y = d1;
|
this.y = y;
|
||||||
z = d2;
|
this.z = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Vector3(Vector3 vec) {
|
public Vector3(Vector3 vec) {
|
||||||
@@ -398,7 +398,7 @@ public class Vector3 implements Copyable<Vector3> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Equals method with tolerance
|
* Equals method with tolerance
|
||||||
*
|
*
|
||||||
* @return true if this is equal to v within +-1E-5
|
* @return true if this is equal to v within +-1E-5
|
||||||
*/
|
*/
|
||||||
public boolean equalsT(Vector3 v) {
|
public boolean equalsT(Vector3 v) {
|
||||||
|
|||||||
@@ -79,17 +79,25 @@ public class WorldExtensionManager {
|
|||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onChunkWatch(Watch event) {
|
public void onChunkWatch(Watch event) {
|
||||||
Chunk chunk = event.player.worldObj.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
|
WorldExtension[] extensions = worldMap.get(event.player.worldObj);
|
||||||
for (WorldExtension extension : worldMap.get(event.player.worldObj))
|
|
||||||
extension.watchChunk(chunk, event.player);
|
if (extensions != null) {
|
||||||
|
Chunk chunk = event.player.worldObj
|
||||||
|
.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
|
||||||
|
for (WorldExtension extension : extensions) extension.watchChunk(chunk, event.player);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public void onChunkUnWatch(UnWatch event) {
|
public void onChunkUnWatch(UnWatch event) {
|
||||||
Chunk chunk = event.player.worldObj.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
|
WorldExtension[] extensions = worldMap.get(event.player.worldObj);
|
||||||
for (WorldExtension extension : worldMap.get(event.player.worldObj))
|
|
||||||
extension.unwatchChunk(chunk, event.player);
|
if (extensions != null) {
|
||||||
|
Chunk chunk = event.player.worldObj
|
||||||
|
.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
|
||||||
|
for (WorldExtension extension : extensions) extension.unwatchChunk(chunk, event.player);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
@@ -110,7 +118,7 @@ public class WorldExtensionManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static boolean initialised;
|
private static boolean initialised;
|
||||||
private static ArrayList<WorldExtensionInstantiator> extensionIntialisers = new ArrayList<WorldExtensionInstantiator>();
|
private static ArrayList<WorldExtensionInstantiator> extensionIntialisers = new ArrayList<>();
|
||||||
|
|
||||||
public static void registerWorldExtension(WorldExtensionInstantiator init) {
|
public static void registerWorldExtension(WorldExtensionInstantiator init) {
|
||||||
if (!initialised) init();
|
if (!initialised) init();
|
||||||
@@ -125,7 +133,7 @@ public class WorldExtensionManager {
|
|||||||
FMLCommonHandler.instance().bus().register(new WorldExtensionEventHandler());
|
FMLCommonHandler.instance().bus().register(new WorldExtensionEventHandler());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static HashMap<World, WorldExtension[]> worldMap = new HashMap<World, WorldExtension[]>();
|
private static HashMap<World, WorldExtension[]> worldMap = new HashMap<>();
|
||||||
|
|
||||||
private static void onWorldLoad(World world) {
|
private static void onWorldLoad(World world) {
|
||||||
WorldExtension[] extensions = new WorldExtension[extensionIntialisers.size()];
|
WorldExtension[] extensions = new WorldExtension[extensionIntialisers.size()];
|
||||||
|
|||||||
Reference in new issue
Block a user