Compare commits

..
Author SHA1 Message Date
Mist475 869f843e3e turn sortAndRender redirect into WrapOperation 2024-01-07 09:56:29 -08:00
Jason Mitchell ad533bcae9 Don't remap, and throw early 2024-01-06 20:50:49 -08:00
Jason Mitchell b100652a7d Fix VBO crash (#151)
* Fix VBO crash
* Use integer.min_value for VBOized display list IDs, and prevent a NPE when trying to delete a VBOized display list
* Offset when accessing the vertexBuffers list
* DragonAPI compat - Only run checkSettings when the world is loaded
2024-01-07 03:30:28 +00:00
Darren Eberly d497c301c9 Fix for GUI lighting states (#148)
* Fix for GUI lighting states

* Lighting fix after RenderTickEvent because mods love to abuse it

* Remove unnecessary glEnable

* Remove unused import
2024-01-06 17:47:58 -08:00
embeddedt 17dddb6691 Rebuild chunk graph if fog distance changes 2024-01-06 17:47:16 -08:00
embeddedt 818f4d3cca Reload renderer if view distance changes
Backport from Sodium 0.3
2024-01-06 17:47:16 -08:00
embeddedt 9141137606 Avoid constructing ChunkMeshData for unused passes 2024-01-06 17:47:16 -08:00
embeddedt 9b6e781a7c Propagate exceptions on meshing thread to main thread for unimportant builds 2024-01-06 17:47:16 -08:00
embeddedt 8229ed9aa0 Prevent sorts from replacing rebuilds for a section 2024-01-06 17:47:16 -08:00
embeddedt 71ea27ee3a Apply epsilons to block face culling checks
Inspired by https://github.com/CaffeineMC/sodium-fabric/commit/c344269368d6ea04d8f9affd1d6aec287aec09c2

The change also makes sense, because block geometry can extend
some distance out of a chunk's strict bounds
2024-01-06 17:47:16 -08:00
Jason Mitchell f760a3e011 Store state changes generated during a display list, and apply them after calling the display list 2024-01-06 17:46:08 -08:00
embeddedt 14c09770eb Integrate Sodium animation system with Angelica's (#147) 2024-01-06 18:46:59 -05:00
Jason Mitchell a0646456d3 So binding a texture in a display list compile won't change it, but it'll capture the change..... (#146)
* So binding a texture in a display list compile won't change it, but it'll capture the change.....
2024-01-06 22:43:53 +00:00
Jason Mitchell 7a783b9d45 Only officially released versions please... 2024-01-06 13:48:36 -08:00
Jason Mitchell b0828fb96a Make sure the correct discard/reset is being called (#144)
* Make sure the correct discard/reset is being called
2024-01-06 12:16:35 -08:00
Jason Mitchell 369893cfa3 Set the hasXXX flags so quads get generated properly (#139)
* Set the hasXXX flags so quads get generated properly
* Add forge to credits
* Change remapping for MixinRenderGlobal
2024-01-06 01:52:25 -05:00
embeddedt a96a973d44 More TESR fixes, make VBO mixins toggleable 2024-01-05 19:45:53 -08:00
embeddedt 2c767f2970 Use ConcurrentHashMap to store tile entity renderers 2024-01-05 19:45:53 -08:00
Jason Mitchell 2839e892e0 Update README.MD
Add links for required updates
2024-01-05 19:38:03 -08:00
makamys a16ed9460a Fix Camera#blockPos rounding and apply third person offset (#137)
Fixes translucent chunk sorting being off near chunk boundaries.
2024-01-05 19:24:23 -05:00
Jason Mitchell 921545ca1f Add archaicfix version requirement, if present (#136) 2024-01-05 22:42:10 +00:00
Jason Mitchell 717c918bd4 VBO Clouds (#135)
* Backport VBO Clouds from Forge 1.12
* Add a 1.12+ style tessellator/buffer builder API to CapturingTessellator
* Update VBOManager to handle adding items out of order, and switch to ObjectArrayList
2024-01-05 14:38:51 -08:00
mist475 98b707e3e3 MCPF config/mixins cleanup (#130)
* cleanup ctm/ cc mixins

* use @Share more

* migrate to forge based config
2024-01-04 19:25:57 -08:00
MrSlimeDude 73c7ca94e1 Fix drawString returing wrong value with 0 length string 2024-01-04 19:25:06 -08:00
Jason Mitchell cf3cfd806f VBO Manager
* Add a VBO manager
* Stop allocating display lists for the vanilla chunk renderer when sodium is enabled
* Move RenderGlobal * ModelRenderer to VBO Manager
* Stop preventing display list allocation for displayListEntities
2024-01-04 19:24:00 -08:00
Jason Mitchell c58870fdeb DisplayList -> VBO for stars, skies, and ModelRenderer (#129) 2024-01-04 10:49:27 -05:00
embeddedt a8ccc8903a Performance & allocation rate optimizations (#128) 2024-01-03 22:35:05 -05:00
embeddedt adb582cd1e Fix chunk updates not unparking main thread upon completion (#127) 2024-01-03 17:20:06 -05:00
Jason Mitchell 364f3a9c00 meh - fix silly (this or do math) 2024-01-03 13:45:16 -08:00
Jason Mitchell c19c812c10 Remove tessellator to buffer (#123)
* Update buildscript
* Swap out uploading a tesselator and tesselatorToBuffer with a Capturing Tesselator
2024-01-03 13:22:52 -08:00
makamys 0460f6dbcd Quad cleanup (#124)
* Remove useless code from Quad

* Remove unnecessary resetting

* Reorder fields to follow tessellator layout

* Fix flags getting ored instead of assigned
2024-01-03 12:57:13 -08:00
Jason Mitchell 4fabe45ae7 CapturingTessellator and VBO support (#120)
* Adds a CapturingTessellator
* VBO support
* Remove some silly badly translated Iris vertex implementation from HFPModelVertexType
* Support Normals
* Move normal rendering to the CapturingTessellator, and remove off thread non-capturing tessellators
* Add quad writer support to VertexFormat
2024-01-03 11:34:11 -08:00
mist475 ab54359f03 fix sodium fluid renderer not using biome colors (#122)
* fix sodium fluid renderer not using biome colors
2024-01-03 16:11:46 +01:00
Jason Mitchell 0c9ec5b23a Defer chunk updates by default
* At least until we can figure out the cause of the stuttering with them enabled
2023-12-30 15:56:56 -08:00
Darren Eberly 20ae68aa62 Re-enable lighting after rendering Thaumcraft aspects 2023-12-30 15:02:29 -08:00
Jason Mitchell 46164ebac7 Normalize Rotation vector
Also add cache bypass to matrix caching
2023-12-30 14:12:45 -08:00
Jason Mitchell de0a600163 Only enable threaded block transformations when sodium is enabled 2023-12-30 13:24:40 -08:00
Jason Mitchell 956f9e344e Update the tesselator checks to allow for non main instance tesselators while still on the main thread (#106) 2023-12-30 13:00:59 -08:00
Darren Eberly acc1f58778 Round texture coordinates instead of truncating (#105)
Backported fix from embeddium: https://github.com/embeddedt/embeddium/commit/a82950cf8e77ce78d9c3dacbfa509900f3a224ca
2023-12-30 12:25:33 -08:00
Caedis 1a38bd1a00 Move mod checks to their own static class (#103) 2023-12-30 13:21:58 -06:00
Jason Mitchell cfc19bb35e Repo cleanup
* Remove (currently) unused covers maven
* Limit FP maven to com.falsepattern to limit requests going that way
2023-12-30 10:51:54 -08:00
mist475 446c8e74ee replace lotr blockrendering hashmap with concurrent version (#98) 2023-12-30 10:39:34 -08:00
FalsePatternandDarren Eberly 74cdc561e6 Preliminary ChunkAPI/EndlessIDs compatibility (#94)
* Preliminary ChunkAPI compatibility
* endlessids biome array crash fix
* Ensure skylight array is not null when hasSky is set

---------

Co-authored-by: Darren Eberly <[email protected]>
2023-12-30 10:26:03 -08:00
Caedis 67fbcc8ff0 Add debug logging option (#97)
* add debug logging option

* remove the deobf check
2023-12-29 01:54:58 -06:00
Jason Mitchell d19b8d5302 Handle bad matrix modes (#93)
* Handle common incorrect modes for glMatrixMode
* Handle matrix stack over/under flow
2023-12-28 21:05:11 -05:00
163 changed files with 2878 additions and 1412 deletions

No files matched your search

+3 -1
View File
@@ -14,7 +14,7 @@ body:
id: version
attributes:
label: Mod Version
description: "What version of the Mod are you using? (Note: None have been officially released yet)"
description: "What version of the Mod are you using?"
placeholder: "Example: 1.0.0-alpha1"
validations:
required: true
@@ -60,6 +60,8 @@ body:
required: true
- label: "I have read the known incompatibilities and this is not related to one of those."
required: true
- label: "I am running an officially released version. (Or, if I've compiled it myself I plan to fix the issue)"
required: true
- label: "This issue is not shader related (they aren't ready yet for testing)"
required: true
+4 -2
View File
@@ -18,8 +18,8 @@
* Fastcraft [Disable, won't fix]
* LWJGL3ify 1.5.4 and below - Use the latest version available, 1.5.7+
* ArchaicFix 0.6.2 and below - Use 0.7.0 or above
* Hodgepodge 2.4.3 and below - Use 2.4.4 or above
* CodeChickenCore/Lib <1.2.0 - Threading issues, use 1.2.0+
* Hodgepodge 2.4.3 and below - [Use 2.4.4 or above](https://github.com/GTNewHorizons/Hodgepodge/releases)
* CodeChicken[Core](https://github.com/GTNewHorizons/CodeChickenCore/releases)/[Lib](https://github.com/GTNewHorizons/CodeChickenLib/releases) <1.2.0 - Threading issues, use 1.2.0+
* Neodymium - Untested, but unlikely to be compatible. (Chunk Meshing is definitely incompatible, other features might work depending on config)
# Credits
@@ -48,3 +48,5 @@
* Angelica
* mitchej123, Omni, Makamys, Embeddedt, NanoLive, Caedis, Cardinalstar, Alexdoru, Eigenraven, mist475, Clepto for helping get Angelica up and running!
* IMS, jss2a98aj, || dbp ||, roadhog360 for advice and moral support
* Forge 1.12+
* Some files have been taken from Minecraft Forge under the LGPL 2.1 license and are marked as such
+21 -30
View File
@@ -1,4 +1,4 @@
//version: 1699290261
//version: 1704135167
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -28,27 +28,11 @@ import java.util.concurrent.TimeUnit
buildscript {
repositories {
mavenCentral()
maven {
name 'forge'
url 'https://maven.minecraftforge.net'
}
maven {
// GTNH RetroFuturaGradle and ASM Fork
name "GTNH Maven"
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
allowInsecureProtocol = true
url "https://nexus.gtnewhorizons.com/repository/public/"
}
maven {
name 'sonatype'
url 'https://oss.sonatype.org/content/repositories/snapshots/'
}
maven {
name 'Scala CI dependencies'
url 'https://repo1.maven.org/maven2/'
}
mavenLocal()
}
}
@@ -64,12 +48,12 @@ plugins {
id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id 'com.palantir.git-version' version '3.0.0' apply false
id 'de.undercouch.download' version '5.4.0'
id 'de.undercouch.download' version '5.5.0'
id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle
id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
id 'com.modrinth.minotaur' version '2.+' apply false
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26'
}
print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -133,7 +117,7 @@ propertyDefaultIfUnset("forceEnableMixins", false)
propertyDefaultIfUnset("channel", "stable")
propertyDefaultIfUnset("mappingsVersion", "12")
propertyDefaultIfUnset("usesMavenPublishing", true)
propertyDefaultIfUnset("mavenPublishUrl", "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases")
propertyDefaultIfUnset("mavenPublishUrl", "https://nexus.gtnewhorizons.com/repository/releases/")
propertyDefaultIfUnset("modrinthProjectId", "")
propertyDefaultIfUnset("modrinthRelations", "")
propertyDefaultIfUnset("curseForgeProjectId", "")
@@ -588,13 +572,15 @@ afterEvaluate {
repositories {
maven {
name 'Overmind forge repo mirror'
url 'https://gregtech.overminddl1.com/'
name = "GTNH Maven"
url = "https://nexus.gtnewhorizons.com/repository/public/"
// Links for convenience:
// Simple HTML browsing: https://nexus.gtnewhorizons.com/service/rest/repository/browse/releases/
// Rich web UI browsing: https://nexus.gtnewhorizons.com/#browse/browse:releases
}
maven {
name = "GTNH Maven"
url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
allowInsecureProtocol = true
name 'Overmind forge repo mirror'
url 'https://gregtech.overminddl1.com/'
}
maven {
name 'sonatype'
@@ -687,6 +673,8 @@ configurations.all {
substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets')
}
}
@@ -793,12 +781,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
}
dependencies {
def lwjgl3ifyVersion = '1.5.4'
def lwjgl3ifyVersion = '1.5.7'
if (modId != 'lwjgl3ify') {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.4.3')
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.4.4')
}
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
@@ -972,6 +960,9 @@ if (usesShadowedDependencies.toBoolean()) {
configurations.apiElements.outgoing.artifacts.clear()
configurations.runtimeElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar))
configurations.apiElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar))
tasks.named("jar", Jar) {
archiveClassifier.set('dev-preshadow')
}
tasks.named("reobfJar", ReobfuscatedJar) {
inputJar.set(tasks.named("shadowJar", ShadowJar).flatMap({it.archiveFile}))
}
@@ -1182,7 +1173,7 @@ publishing {
if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
maven {
url = mavenPublishUrl
allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
allowInsecureProtocol = mavenPublishUrl.startsWith("http://")
credentials {
username = System.getenv("MAVEN_USER") ?: "NONE"
password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
@@ -1301,7 +1292,7 @@ def addCurseForgeRelation(String type, String name) {
// Updating
def buildscriptGradleVersion = "8.2.1"
def buildscriptGradleVersion = "8.5"
tasks.named('wrapper', Wrapper).configure {
gradleVersion = buildscriptGradleVersion
+2
View File
@@ -75,6 +75,8 @@ dependencies {
compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") {transitive = false }
compileOnly(rfg.deobf('curse.maven:witchery-69673:2234410'))
compileOnly("com.falsepattern:chunkapi-mc1.7.10:0.5.0:api")
compileOnly("com.falsepattern:endlessids-mc1.7.10:1.5-beta0002:dev")
compileOnly(rfg.deobf("curse.maven:extrautils-225561:2264383"))
compileOnly(rfg.deobf("curse.maven:dynamiclights-227874:2337326"))
+4 -5
View File
@@ -2,11 +2,10 @@
repositories {
maven {
name = 'covers1624 maven'
url = 'https://nexus.covers1624.net/repository/maven-hosted/'
metadataSources {
mavenPom()
artifact()
name = 'mavenpattern'
url = 'https://mvn.falsepattern.com/releases'
content {
includeGroup "com.falsepattern"
}
}
mavenLocal()
@@ -1,9 +1,9 @@
package com.gtnewhorizons.angelica;
import com.gtnewhorizons.angelica.compat.ModStatus;
import com.gtnewhorizons.angelica.proxy.CommonProxy;
import com.gtnewhorizons.angelica.utils.AnimationMode;
import com.gtnewhorizons.angelica.utils.ManagedEnum;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -14,24 +14,21 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
modid = "angelica",
name = "Angelica",
version = Tags.VERSION,
dependencies = " before:lwjgl3ify@[1.5.3,);" + " after:hodgepodge@[2.4.4,);" + " after:CodeChickenCore@[1.2.0,);",
dependencies = " before:lwjgl3ify@[1.5.3,);" + " after:hodgepodge@[2.4.4,);" + " after:CodeChickenCore@[1.2.0,);"
+ " after:archaicfix@[0.7.0,);",
acceptedMinecraftVersions = "[1.7.10]",
acceptableRemoteVersions = "*")
public class AngelicaMod {
@SidedProxy(clientSide = "com.gtnewhorizons.angelica.proxy.ClientProxy", serverSide = "com.gtnewhorizons.angelica.proxy.CommonProxy")
public static CommonProxy proxy;
/** Mixin Version */
public static boolean isNEIDLoaded;
/** ASM Version */
public static boolean isOldNEIDLoaded;
public static final boolean lwjglDebug = Boolean.parseBoolean(System.getProperty("org.lwjgl.util.Debug", "false"));
public static final ManagedEnum<AnimationMode> animationsMode = new ManagedEnum<>(AnimationMode.VISIBLE_ONLY);
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
isNEIDLoaded = Loader.isModLoaded("neid");
isOldNEIDLoaded = Loader.isModLoaded("notenoughIDs");
ModStatus.preInit();
proxy.preInit(event);
}
@@ -319,7 +319,7 @@ public class BatchingFontRenderer {
final boolean unicodeFlag, final CharSequence string, int stringOffset, int stringLength) {
// noinspection SizeReplaceableByIsEmpty
if (string == null || string.length() == 0) {
return 0.0f;
return anchorX + (enableShadow ? 1.0f : 0.0f);
}
final int shadowColor = (color & 0xfcfcfc) >> 2 | color & 0xff000000;
@@ -571,7 +571,7 @@ public class BatchingFontRenderer {
} finally {
this.endBatch();
}
return curX;
return curX + (enableShadow ? 1.0f : 0.0f);
}
}
@@ -0,0 +1,235 @@
package com.gtnewhorizons.angelica.client.renderer;
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
import com.gtnewhorizons.angelica.compat.mojang.VertexFormat;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import com.gtnewhorizons.angelica.mixins.interfaces.ITessellatorInstance;
import com.gtnewhorizons.angelica.utils.ObjectPooler;
import cpw.mods.fml.relauncher.ReflectionHelper;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import me.jellysquid.mods.sodium.client.render.pipeline.BlockRenderer;
import net.minecraft.client.renderer.Tessellator;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Arrays;
import java.util.List;
import static net.minecraft.util.MathHelper.clamp_int;
/*
* To be used in conjunction with the TessellatorManager
*
* Used to capture the quads generated by the Tessellator across multiple draw calls and make the quad
* list available for usage.
*
* NOTE: This will _not_ (currently) capture, integrate, or stop any GL calls made around the tessellator draw calls.
*
*/
@SuppressWarnings("unused")
public class CapturingTessellator extends Tessellator implements ITessellatorInstance {
// Access Transformers don't work on Forge Fields :rage:
private static final MethodHandle sRawBufferSize;
private static final MethodHandle gRawBufferSize;
private final BlockRenderer.Flags FLAGS = new BlockRenderer.Flags(true, true, true, true);
private final ObjectPooler<Quad> quadBuf = new ObjectPooler<>(Quad::new);
private final List<Quad> collectedQuads = new ObjectArrayList<>();
// Any offset we need to the Tesselator's offset!
private final BlockPos offset = new BlockPos();
public void setOffset(BlockPos pos) {
this.offset.set(pos);
}
static {
Field rbs = ReflectionHelper.findField(Tessellator.class, "rawBufferSize");
rbs.setAccessible(true);
try {
sRawBufferSize = MethodHandles.lookup().unreflectSetter(rbs);
gRawBufferSize = MethodHandles.lookup().unreflectGetter(rbs);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
}
public void setRawBufferSize(int size) {
try {
sRawBufferSize.invokeExact((Tessellator)this, size);
} catch (Throwable throwable) {
throw new RuntimeException(throwable);
}
}
public int getRawBufferSize() {
try {
return (int) gRawBufferSize.invokeExact((Tessellator)this);
} catch (Throwable throwable) {
throw new RuntimeException(throwable);
}
}
@Override
public int draw() {
// Adapted from Neodymium
FLAGS.hasBrightness = this.hasBrightness;
FLAGS.hasColor = this.hasColor;
FLAGS.hasNormals = this.hasNormals;
// TODO: Support GL_TRIANGLES
if(this.drawMode != GL11.GL_QUADS) {
throw new IllegalStateException("Currently only supports GL_QUADS");
}
final int verticesPerPrimitive = this.drawMode == GL11.GL_QUADS ? 4 : 3;
for(int quadI = 0; quadI < this.vertexCount / verticesPerPrimitive; quadI++) {
final Quad quad = quadBuf.getInstance();
quad.setState(this.rawBuffer, quadI * (verticesPerPrimitive * 8), FLAGS, this.drawMode, -offset.x, -offset.y, -offset.z);
if(quad.deleted) {
quadBuf.releaseInstance(quad);
} else {
this.collectedQuads.add(quad);
}
}
final int i = this.rawBufferIndex * 4;
this.discard();
return i;
}
@Override
public void reset() {
super.reset();
this.offset.zero();
}
@Override
public void discard() {
isDrawing = false;
reset();
}
public List<Quad> getQuads() {
return collectedQuads;
}
public void clearQuads() {
//noinspection ForLoopReplaceableByForEach
for(int i = 0; i < this.collectedQuads.size(); i++) {
this.quadBuf.releaseInstance(this.collectedQuads.get(i));
}
this.collectedQuads.clear();
}
public static ByteBuffer quadsToBuffer(List<Quad> quads, VertexFormat format) {
if(!format.canWriteQuads()) {
throw new IllegalStateException("Vertex format has no quad writer: " + format);
}
final ByteBuffer byteBuffer = BufferUtils.createByteBuffer(format.getVertexSize() * quads.size() * 4);
// noinspection ForLoopReplaceableByForEach
for (int i = 0, quadsSize = quads.size(); i < quadsSize; i++) {
format.writeQuad(quads.get(i), byteBuffer);
}
byteBuffer.rewind();
return byteBuffer;
}
public static int createBrightness(int sky, int block) {
return sky << 20 | block << 4;
}
// API from newer MC
public CapturingTessellator pos(double x, double y, double z) {
ensureBuffer();
this.rawBuffer[this.rawBufferIndex + 0] = Float.floatToRawIntBits((float)(x + this.xOffset));
this.rawBuffer[this.rawBufferIndex + 1] = Float.floatToRawIntBits((float)(y + this.yOffset));
this.rawBuffer[this.rawBufferIndex + 2] = Float.floatToRawIntBits((float)(z + this.zOffset));
return this;
}
public CapturingTessellator tex(double u, double v) {
this.rawBuffer[this.rawBufferIndex + 3] = Float.floatToRawIntBits((float)u);
this.rawBuffer[this.rawBufferIndex + 4] = Float.floatToRawIntBits((float)v);
this.hasTexture = true;
return this;
}
public CapturingTessellator color(float red, float green, float blue, float alpha) {
return this.color((int)(red * 255.0F), (int)(green * 255.0F), (int)(blue * 255.0F), (int)(alpha * 255.0F));
}
public CapturingTessellator color(int red, int green, int blue, int alpha) {
if(this.isColorDisabled) return this;
red = clamp_int(red, 0, 255);
green = clamp_int(green, 0, 255);
blue = clamp_int(blue, 0, 255);
alpha = clamp_int(alpha, 0, 255);
final int color;
if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) {
color = alpha << 24 | blue << 16 | green << 8 | red;
} else {
color = red << 24 | green << 16 | blue << 8 | alpha;
}
this.rawBuffer[this.rawBufferIndex + 5] = color;
this.hasColor = true;
return this;
}
public CapturingTessellator normal(float x, float y, float z) {
final byte b0 = (byte)((int)(x * 127.0F));
final byte b1 = (byte)((int)(y * 127.0F));
final byte b2 = (byte)((int)(z * 127.0F));
this.rawBuffer[this.rawBufferIndex + 6] = b0 & 255 | (b1 & 255) << 8 | (b2 & 255) << 16;
this.hasNormals = true;
return this;
}
public CapturingTessellator lightmap(int skyLight, int blockLight) {
return brightness(createBrightness(skyLight, blockLight));
}
public CapturingTessellator brightness(int brightness) {
this.rawBuffer[this.rawBufferIndex + 7] = brightness;
this.hasBrightness = true;
return this;
}
public CapturingTessellator endVertex() {
this.rawBufferIndex += 8;
++this.vertexCount;
return this;
}
public void ensureBuffer() {
int rawBufferSize = getRawBufferSize();
if (rawBufferIndex >= rawBufferSize - 32) {
if (rawBufferSize == 0) {
rawBufferSize = 0x10000;
setRawBufferSize(rawBufferSize);
rawBuffer = new int[rawBufferSize];
} else {
rawBufferSize *= 2;
setRawBufferSize(rawBufferSize);
rawBuffer = Arrays.copyOf(rawBuffer, rawBufferSize);
}
}
}
}
@@ -1,9 +1,11 @@
package com.gtnewhorizons.angelica.compat;
import com.gtnewhorizons.angelica.AngelicaMod;
import com.falsepattern.chunk.api.DataRegistry;
import com.gtnewhorizons.angelica.mixins.early.sodium.MixinExtendedBlockStorage;
import com.gtnewhorizons.angelica.mixins.interfaces.ExtendedNibbleArray;
import com.gtnewhorizons.neid.mixins.interfaces.IExtendedBlockStorageMixin;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.NibbleArray;
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
import ru.fewizz.idextender.Hooks;
@@ -16,44 +18,51 @@ public class ExtendedBlockStorageExt extends ExtendedBlockStorage {
this.hasSky = hasSky;
}
public ExtendedBlockStorageExt(ExtendedBlockStorage storage) {
public ExtendedBlockStorageExt(Chunk chunk, ExtendedBlockStorage storage) {
super(((MixinExtendedBlockStorage) storage).getYBase(), storage.getSkylightArray() != null);
int arrayLen;
if (AngelicaMod.isNEIDLoaded){
final short[] block16BArray = ((IExtendedBlockStorageMixin)(Object)this).getBlock16BArray();
System.arraycopy(((IExtendedBlockStorageMixin)(Object)storage).getBlock16BArray(), 0, block16BArray, 0, block16BArray.length);
if(storage.getBlockMSBArray() != null) {
this.setBlockMSBArray(new NibbleArray(block16BArray.length, 4));
copyNibbleArray((ExtendedNibbleArray) storage.getBlockMSBArray(), (ExtendedNibbleArray) this.getBlockMSBArray());
if (ModStatus.isChunkAPILoaded) {
if (storage.getSkylightArray() != null) {
hasSky = true;
}
arrayLen = block16BArray.length;
}
else if (AngelicaMod.isOldNEIDLoaded){
final short[] blockLSBArray = Hooks.get(this);
System.arraycopy(Hooks.get(storage), 0, blockLSBArray, 0, blockLSBArray.length);
// getBlockMSBArray is nuked in asm version
arrayLen = blockLSBArray.length;
}
else {
final byte[] blockLSBArray = this.getBlockLSBArray();
System.arraycopy(storage.getBlockLSBArray(), 0, blockLSBArray, 0, blockLSBArray.length);
if(storage.getBlockMSBArray() != null) {
this.setBlockMSBArray(new NibbleArray(blockLSBArray.length, 4));
copyNibbleArray((ExtendedNibbleArray) storage.getBlockMSBArray(), (ExtendedNibbleArray) this.getBlockMSBArray());
DataRegistry.cloneSubChunk(chunk, storage, this);
} else {
int arrayLen;
if (ModStatus.isNEIDLoaded){
final short[] block16BArray = ((IExtendedBlockStorageMixin)(Object)this).getBlock16BArray();
System.arraycopy(((IExtendedBlockStorageMixin)(Object)storage).getBlock16BArray(), 0, block16BArray, 0, block16BArray.length);
if(storage.getBlockMSBArray() != null) {
this.setBlockMSBArray(new NibbleArray(block16BArray.length, 4));
copyNibbleArray((ExtendedNibbleArray) storage.getBlockMSBArray(), (ExtendedNibbleArray) this.getBlockMSBArray());
}
arrayLen = block16BArray.length;
}
else if (ModStatus.isOldNEIDLoaded){
final short[] blockLSBArray = Hooks.get(this);
System.arraycopy(Hooks.get(storage), 0, blockLSBArray, 0, blockLSBArray.length);
// getBlockMSBArray is nuked in asm version
arrayLen = blockLSBArray.length;
}
else {
final byte[] blockLSBArray = this.getBlockLSBArray();
System.arraycopy(storage.getBlockLSBArray(), 0, blockLSBArray, 0, blockLSBArray.length);
if(storage.getBlockMSBArray() != null) {
this.setBlockMSBArray(new NibbleArray(blockLSBArray.length, 4));
copyNibbleArray((ExtendedNibbleArray) storage.getBlockMSBArray(), (ExtendedNibbleArray) this.getBlockMSBArray());
}
arrayLen = blockLSBArray.length;
}
arrayLen = blockLSBArray.length;
}
copyNibbleArray((ExtendedNibbleArray) storage.getMetadataArray(), (ExtendedNibbleArray)this.getMetadataArray());
copyNibbleArray((ExtendedNibbleArray) storage.getBlocklightArray(), (ExtendedNibbleArray)this.getBlocklightArray());
if(storage.getSkylightArray() != null) {
hasSky = true;
if(this.getSkylightArray() == null) {
this.setSkylightArray(new NibbleArray(arrayLen, 4));
copyNibbleArray((ExtendedNibbleArray) storage.getMetadataArray(), (ExtendedNibbleArray)this.getMetadataArray());
copyNibbleArray((ExtendedNibbleArray) storage.getBlocklightArray(), (ExtendedNibbleArray)this.getBlocklightArray());
if(storage.getSkylightArray() != null) {
hasSky = true;
if(this.getSkylightArray() == null) {
this.setSkylightArray(new NibbleArray(arrayLen, 4));
}
copyNibbleArray((ExtendedNibbleArray) storage.getSkylightArray(), (ExtendedNibbleArray) this.getSkylightArray());
}
copyNibbleArray((ExtendedNibbleArray) storage.getSkylightArray(), (ExtendedNibbleArray) this.getSkylightArray());
}
((MixinExtendedBlockStorage) this).setBlockRefCount(((MixinExtendedBlockStorage) storage).getBlockRefCount());
}
@@ -0,0 +1,25 @@
package com.gtnewhorizons.angelica.compat;
import cpw.mods.fml.common.Loader;
public class ModStatus {
/**
* Mixin Version
*/
public static boolean isNEIDLoaded;
/**
* ASM Version
*/
public static boolean isOldNEIDLoaded;
public static boolean isLotrLoaded;
public static boolean isChunkAPILoaded;
public static boolean isEIDBiomeLoaded;
public static void preInit(){
isNEIDLoaded = Loader.isModLoaded("neid");
isOldNEIDLoaded = Loader.isModLoaded("notenoughIDs");
isLotrLoaded = Loader.isModLoaded("lotr");
isChunkAPILoaded = Loader.isModLoaded("chunkapi");
isEIDBiomeLoaded = Loader.isModLoaded("endlessids_biome");
}
}
@@ -4,6 +4,8 @@ import com.gtnewhorizons.angelica.rendering.RenderingState;
import lombok.Getter;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.MathHelper;
import org.joml.Matrix4f;
import org.joml.Vector3d;
import org.joml.Vector4f;
@@ -30,7 +32,7 @@ public class Camera {
this.entity = entity;
pos.set(camX, camY, camZ);
blockPos.set((int)entity.posX, (int)entity.posY, (int)entity.posZ);
blockPos.set(MathHelper.floor_double(camX), MathHelper.floor_double(camY), MathHelper.floor_double(camZ));
pitch = entity.cameraPitch;
yaw = entity.rotationYaw;
thirdPerson = Minecraft.getMinecraft().gameSettings.thirdPersonView == 1;
@@ -1,32 +1,37 @@
package com.gtnewhorizons.angelica.compat.toremove;
package com.gtnewhorizons.angelica.compat.mojang;
import com.google.common.collect.ImmutableList;
import com.gtnewhorizons.angelica.compat.mojang.VertexFormatElement;
import com.gtnewhorizons.angelica.compat.mojang.VertexFormatElement.Type;
import com.gtnewhorizons.angelica.compat.mojang.VertexFormatElement.Usage;
import com.gtnewhorizons.angelica.compat.nd.writers.ItemVBOQuadWriter;
import com.gtnewhorizons.angelica.compat.nd.writers.PositionColorTextureQuadWriter;
import com.gtnewhorizons.angelica.compat.nd.writers.PositionQuadWriter;
import com.gtnewhorizons.angelica.compat.nd.writers.PositionTextureColorQuadWriter;
import com.gtnewhorizons.angelica.compat.nd.writers.PositionTextureQuadWriter;
public class DefaultVertexFormat {
public static final VertexFormatElement POSITION_ELEMENT = new VertexFormatElement(0, Type.FLOAT, Usage.POSITION, 3);
public static final VertexFormatElement COLOR_ELEMENT = new VertexFormatElement(0, Type.UBYTE, Usage.COLOR, 4);
public static final VertexFormatElement TEXTURE_0_ELEMENT = new VertexFormatElement(0, Type.FLOAT, Usage.UV, 2);
public static final VertexFormatElement TEXTURE_ELEMENT = new VertexFormatElement(0, Type.FLOAT, Usage.UV, 2);
public static final VertexFormatElement LIGHT_ELEMENT = new VertexFormatElement(1, Type.SHORT, Usage.UV, 2);
// TODO: The overlay element index is wrong, need to find a 1.7.10 equivalent
public static final VertexFormatElement OVERLAY_ELEMENT = new VertexFormatElement(1, Type.SHORT, Usage.UV, 2);
public static final VertexFormatElement LIGHT_ELEMENT = new VertexFormatElement(2, Type.SHORT, Usage.UV, 2);
public static final VertexFormatElement NORMAL_ELEMENT = new VertexFormatElement(0, Type.BYTE, Usage.NORMAL, 3);
public static final VertexFormatElement PADDING_ELEMENT = new VertexFormatElement(0, Type.BYTE, Usage.PADDING, 1);
public static final VertexFormat POSITION_COLOR_TEXTURE_LIGHT_NORMAL = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(COLOR_ELEMENT).add(TEXTURE_0_ELEMENT).add(LIGHT_ELEMENT).add(NORMAL_ELEMENT).add(PADDING_ELEMENT).build());
public static final VertexFormat POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(COLOR_ELEMENT).add(TEXTURE_0_ELEMENT).add(OVERLAY_ELEMENT).add(LIGHT_ELEMENT).add(NORMAL_ELEMENT).add(PADDING_ELEMENT).build());
public static final VertexFormat POSITION_TEXTURE_COLOR_LIGHT = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_0_ELEMENT).add(COLOR_ELEMENT).add(LIGHT_ELEMENT).build());
public static final VertexFormat POSITION = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).build());
public static final VertexFormat POSITION_TEXTURE_NORMAL = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_ELEMENT).add(NORMAL_ELEMENT).add(PADDING_ELEMENT).build(), new ItemVBOQuadWriter());
public static final VertexFormat POSITION_COLOR_TEXTURE_LIGHT_NORMAL = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(COLOR_ELEMENT).add(TEXTURE_ELEMENT).add(LIGHT_ELEMENT).add(NORMAL_ELEMENT).add(PADDING_ELEMENT).build());
public static final VertexFormat POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(COLOR_ELEMENT).add(TEXTURE_ELEMENT).add(OVERLAY_ELEMENT).add(LIGHT_ELEMENT).add(NORMAL_ELEMENT).add(PADDING_ELEMENT).build());
public static final VertexFormat POSITION_TEXTURE_COLOR_LIGHT = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_ELEMENT).add(COLOR_ELEMENT).add(LIGHT_ELEMENT).build());
public static final VertexFormat POSITION = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).build(), new PositionQuadWriter());
public static final VertexFormat POSITION_COLOR = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(COLOR_ELEMENT).build());
public static final VertexFormat POSITION_COLOR_LIGHT = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(COLOR_ELEMENT).add(LIGHT_ELEMENT).build());
public static final VertexFormat POSITION_TEXTURE = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_0_ELEMENT).build());
public static final VertexFormat POSITION_COLOR_TEXTURE = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(COLOR_ELEMENT).add(TEXTURE_0_ELEMENT).build());
public static final VertexFormat POSITION_TEXTURE_COLOR = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_0_ELEMENT).add(COLOR_ELEMENT).build());
public static final VertexFormat POSITION_COLOR_TEX_LIGHTMAP = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(COLOR_ELEMENT).add(TEXTURE_0_ELEMENT).add(LIGHT_ELEMENT).build());
public static final VertexFormat POSITION_TEXTURE_LIGHT_COLOR = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_0_ELEMENT).add(LIGHT_ELEMENT).add(COLOR_ELEMENT).build());
public static final VertexFormat POSITION_TEXTURE_COLOR_NORMAL = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_0_ELEMENT).add(COLOR_ELEMENT).add(NORMAL_ELEMENT).add(PADDING_ELEMENT).build());
public static final VertexFormat POSITION_TEXTURE = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_ELEMENT).build(), new PositionTextureQuadWriter());
public static final VertexFormat POSITION_COLOR_TEXTURE = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(COLOR_ELEMENT).add(TEXTURE_ELEMENT).build(), new PositionColorTextureQuadWriter());
public static final VertexFormat POSITION_TEXTURE_COLOR = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_ELEMENT).add(COLOR_ELEMENT).build(), new PositionTextureColorQuadWriter());
public static final VertexFormat POSITION_COLOR_TEX_LIGHTMAP = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(COLOR_ELEMENT).add(TEXTURE_ELEMENT).add(LIGHT_ELEMENT).build());
public static final VertexFormat POSITION_TEXTURE_LIGHT_COLOR = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_ELEMENT).add(LIGHT_ELEMENT).add(COLOR_ELEMENT).build());
public static final VertexFormat POSITION_TEXTURE_COLOR_NORMAL = new VertexFormat(new ImmutableList.Builder<VertexFormatElement>().add(POSITION_ELEMENT).add(TEXTURE_ELEMENT).add(COLOR_ELEMENT).add(NORMAL_ELEMENT).add(PADDING_ELEMENT).build());
}
@@ -10,11 +10,17 @@ import java.nio.FloatBuffer;
public class VertexBuffer implements AutoCloseable {
private int id;
private int vertexCount;
private VertexFormat format;
public VertexBuffer() {
this.id = GL15.glGenBuffers();
}
public VertexBuffer(VertexFormat format) {
this();
this.format = format;
}
public void bind() {
GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, this.id);
}
@@ -31,6 +37,12 @@ public class VertexBuffer implements AutoCloseable {
this.unbind();
}
public VertexBuffer upload(ByteBuffer buffer) {
if(format == null) throw new IllegalStateException("No format specified for VBO upload");
upload(buffer, buffer.capacity() / format.getVertexSize());
return this;
}
public void close() {
if (this.id >= 0) {
GL15.glDeleteBuffers(this.id);
@@ -42,7 +54,30 @@ public class VertexBuffer implements AutoCloseable {
GL11.glPushMatrix();
GL11.glLoadIdentity();
GL11.glMultMatrix(floatBuffer);
GL11.glDrawArrays(mode, 0, this.vertexCount);
draw(mode);
GL11.glPopMatrix();
}
public void draw(int mode) {
GL11.glDrawArrays(mode, 0, this.vertexCount);
}
public void setupState() {
if(format == null) throw new IllegalStateException("No format specified for VBO setup");
bind();
format.setupBufferState(0L);
}
public void cleanupState() {
format.clearBufferState();
unbind();
}
public void render(int mode) {
if(format == null) throw new IllegalStateException("No format specified for VBO render");
bind();
format.setupBufferState(0L);
draw(mode);
format.clearBufferState();
unbind();
}
}
@@ -1,7 +1,8 @@
package com.gtnewhorizons.angelica.compat.toremove;
package com.gtnewhorizons.angelica.compat.mojang;
import com.google.common.collect.ImmutableList;
import com.gtnewhorizons.angelica.compat.mojang.VertexFormatElement;
import com.gtnewhorizons.angelica.compat.nd.IWriteQuads;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import lombok.Getter;
@@ -9,6 +10,7 @@ import net.coderbot.iris.block_rendering.BlockRenderingSettings;
import net.coderbot.iris.vertices.ImmediateState;
import net.coderbot.iris.vertices.IrisVertexFormats;
import java.nio.ByteBuffer;
import java.util.List;
public class VertexFormat {
@@ -18,7 +20,13 @@ public class VertexFormat {
@Getter
protected final int vertexSize;
protected IWriteQuads quadWriter;
public VertexFormat(ImmutableList<VertexFormatElement> elements) {
this(elements, null);
}
public VertexFormat(ImmutableList<VertexFormatElement> elements, IWriteQuads quadWriter) {
this.elements = elements;
int i = 0;
for (VertexFormatElement element : elements) {
@@ -26,9 +34,9 @@ public class VertexFormat {
i += element.getByteSize();
}
vertexSize = i;
this.quadWriter = quadWriter;
}
@Deprecated
public void setupBufferState(long l) {
if (BlockRenderingSettings.INSTANCE.shouldUseExtendedVertexFormat() && ImmediateState.renderWithExtendedVertexFormat) {
if (this == DefaultVertexFormat.POSITION_COLOR_TEXTURE_LIGHT_NORMAL || this == DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP) {
@@ -44,11 +52,10 @@ public class VertexFormat {
final List<VertexFormatElement> list = this.getElements();
for(int j = 0; j < list.size(); ++j) {
((VertexFormatElement)list.get(j)).setupBufferState(l + (long)this.offsets.getInt(j), i);
list.get(j).setupBufferState(l + this.offsets.getInt(j), i);
}
}
@Deprecated
public void clearBufferState() {
if (BlockRenderingSettings.INSTANCE.shouldUseExtendedVertexFormat() && ImmediateState.renderWithExtendedVertexFormat) {
if (this == DefaultVertexFormat.POSITION_COLOR_TEXTURE_LIGHT_NORMAL || this == DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP) {
@@ -64,4 +71,14 @@ public class VertexFormat {
}
}
public boolean canWriteQuads() {
return quadWriter != null;
}
public void writeQuad(Quad quad, ByteBuffer byteBuffer) {
if(quadWriter == null) {
throw new IllegalStateException("No quad writer set");
}
quadWriter.writeQuad(quad, byteBuffer);
}
}
@@ -0,0 +1,7 @@
package com.gtnewhorizons.angelica.compat.nd;
import java.nio.ByteBuffer;
public interface IWriteQuads {
void writeQuad(Quad quad, ByteBuffer buf);
}
@@ -8,8 +8,6 @@ import net.minecraftforge.common.util.ForgeDirection;
import org.joml.Vector3f;
import org.lwjgl.opengl.GL11;
import java.io.IOException;
import java.util.Arrays;
import java.util.Locale;
public class Quad implements ModelQuadView {
@@ -21,36 +19,21 @@ public class Quad implements ModelQuadView {
public float[] xs = new float[4];
public float[] ys = new float[4];
public float[] zs = new float[4];
public float minX = Float.POSITIVE_INFINITY;
public float minY = Float.POSITIVE_INFINITY;
public float minZ = Float.POSITIVE_INFINITY;
public float maxX = Float.NEGATIVE_INFINITY;
public float maxY = Float.NEGATIVE_INFINITY;
public float maxZ = Float.NEGATIVE_INFINITY;
public float[] us = new float[4];
public float[] vs = new float[4];
public int[] bs = new int[4];
public int[] cs = new int[4];
// TODO normals?
public int[] ns = new int[4];
public int[] bs = new int[4];
public boolean deleted;
public ModelQuadFacing normal;
public int offset;
public BlockRenderer.Flags flags;
// Is positive U direction parallel to edge 0-1?
public boolean uDirectionIs01;
public boolean isRectangle;
// 0: quads glued together on edge 1-2 or 3-0 ("megaquad row length")
// 1: quads glued together on edge 0-1 or 2-3 ("megaquad column length")
private final int[] quadCountByDirection = {1, 1};
private final Vector3f vectorA = new Vector3f(), vectorB = new Vector3f(), vectorC = new Vector3f();
private boolean hasColor;
private boolean hasShade;
private boolean hasNormals;
public boolean hasColor() {
return this.hasColor;
@@ -64,6 +47,10 @@ public class Quad implements ModelQuadView {
return this.hasShade;
}
public boolean hasNormals() {
return this.hasNormals;
}
public ForgeDirection getFace() {
// TODO: Sodium/Quad Facing
return ForgeDirection.UP;
@@ -111,7 +98,7 @@ public class Quad implements ModelQuadView {
@Override
public int getNormal(int idx) {
return 0;
return ns[idx];
}
@Override
@@ -136,10 +123,14 @@ public class Quad implements ModelQuadView {
us[vi] = Float.intBitsToFloat(rawBuffer[i + 3]);
vs[vi] = Float.intBitsToFloat(rawBuffer[i + 4]);
bs[vi] = flags.hasBrightness ? rawBuffer[i + 7] : DEFAULT_BRIGHTNESS;
cs[vi] = flags.hasColor ? rawBuffer[i + 5] : DEFAULT_COLOR;
this.hasColor |= flags.hasColor;
this.hasShade |= flags.hasBrightness;
ns[vi] = flags.hasNormals ? rawBuffer[i + 6] : 0;
bs[vi] = flags.hasBrightness ? rawBuffer[i + 7] : DEFAULT_BRIGHTNESS;
this.hasColor = flags.hasColor;
this.hasShade = flags.hasBrightness;
this.hasNormals = flags.hasNormals;
i += 8;
}
@@ -155,11 +146,12 @@ public class Quad implements ModelQuadView {
bs[3] = bs[2];
cs[3] = cs[2];
ns[3] = ns[2];
}
}
public void setState(int[] rawBuffer, int offset, BlockRenderer.Flags flags, int drawMode, float offsetX, float offsetY, float offsetZ) {
resetState();
deleted = false;
read(rawBuffer, offset, offsetX, offsetY, offsetZ, drawMode, flags);
@@ -169,11 +161,6 @@ public class Quad implements ModelQuadView {
return;
}
uDirectionIs01 = us[0] != us[1];
updateMinMaxXYZ();
updateIsRectangle();
vectorA.set(xs[1] - xs[0], ys[1] - ys[0], zs[1] - zs[0]);
vectorB.set(xs[2] - xs[1], ys[2] - ys[1], zs[2] - zs[1]);
vectorA.cross(vectorB, vectorC);
@@ -181,157 +168,12 @@ public class Quad implements ModelQuadView {
normal = ModelQuadFacing.fromVector(vectorC);
}
private void resetState() {
Arrays.fill(xs, 0);
Arrays.fill(ys, 0);
Arrays.fill(zs, 0);
Arrays.fill(us, 0);
Arrays.fill(vs, 0);
Arrays.fill(bs, 0);
Arrays.fill(cs, 0);
minX = Float.POSITIVE_INFINITY;
minY = Float.POSITIVE_INFINITY;
minZ = Float.POSITIVE_INFINITY;
maxX = Float.NEGATIVE_INFINITY;
maxY = Float.NEGATIVE_INFINITY;
maxZ = Float.NEGATIVE_INFINITY;
deleted = false;
normal = null;
offset = 0;
flags = null;
uDirectionIs01 = false;
Arrays.fill(quadCountByDirection, 1);
}
public void writeToBuffer(BufferWriter out) throws IOException {
for(int vertexI = 0; vertexI < 4; vertexI++) {
int vi = vertexI;
int provokingI = 3;
float x = xs[vi];
float y = ys[vi];
float z = zs[vi];
out.writeFloat(x);
out.writeFloat(y);
out.writeFloat(z);
float u = us[vi];
float v = vs[vi];
out.writeFloat(u);
out.writeFloat(v);
int b = bs[vi];
out.writeInt(b);
int c = cs[vi];
out.writeInt(c);
assert out.position() % getStride() == 0;
//System.out.println("[" + vertexI + "] x: " + x + ", y: " + y + " z: " + z + ", u: " + u + ", v: " + v + ", b: " + b + ", c: " + c);
}
}
public int quadCountByUVDirection(boolean v) {
if(v) {
return quadCountByDirection[uDirectionIs01 ? 0 : 1];
} else {
return quadCountByDirection[uDirectionIs01 ? 1 : 0];
}
}
public static int getStride() {
return
3 * 4 // XYZ (float)
+ 2 * (/*Config.shortUV*/false ? 2 : 4) // UV (float)
+ 4 // B (int)
+ 4 // C (int)
;
}
private boolean isTranslatedCopyOf(Quad o, boolean checkValid) {
if((!isValid(this) && checkValid) || !isValid(o) || normal != o.normal) return false;
for(int i = 1; i < 4; i++) {
double relX = xs[i] - xs[0];
double relY = ys[i] - ys[0];
double relZ = zs[i] - zs[0];
if(o.xs[i] != o.xs[0] + relX || o.ys[i] != o.ys[0] + relY || o.zs[i] != o.zs[0] + relZ) {
return false;
}
}
for(int i = 0; i < 4; i++) {
if(us[i] != o.us[i] || vs[i] != o.vs[i] || bs[i] != o.bs[i] || cs[i] != o.cs[i]) {
return false;
}
}
return true;
}
private void copyVertexFrom(Quad o, int src, int dest) {
xs[dest] = o.xs[src];
ys[dest] = o.ys[src];
zs[dest] = o.zs[src];
us[dest] = o.us[src];
vs[dest] = o.vs[src];
bs[dest] = o.bs[src];
cs[dest] = o.cs[src];
updateMinMaxXYZ(); // TODO isn't doing this a waste? I should get rid of the min/maxXYZ variables entirely.
}
private void updateMinMaxXYZ() {
for(int i = 0; i < 4; i++) {
minX = Math.min(minX, xs[i]);
minY = Math.min(minY, ys[i]);
minZ = Math.min(minZ, zs[i]);
maxX = Math.max(maxX, xs[i]);
maxY = Math.max(maxY, ys[i]);
maxZ = Math.max(maxZ, zs[i]);
}
}
private void updateIsRectangle() {
isRectangle =
vertexExists(minX, minY, minZ) &&
vertexExists(minX, minY, maxZ) &&
vertexExists(minX, maxY, minZ) &&
vertexExists(minX, maxY, maxZ) &&
vertexExists(maxX, minY, minZ) &&
vertexExists(maxX, minY, maxZ) &&
vertexExists(maxX, maxY, minZ) &&
vertexExists(maxX, maxY, maxZ);
}
private boolean vertexExists(float x, float y, float z) {
for(int i = 0; i < 4; i++) {
if(xs[i] == x && ys[i] == y && zs[i] == z) {
return true;
}
}
return false;
}
public static boolean isValid(Quad q) {
return q != null && !q.deleted;
}
public boolean isClockwiseXZ() {
return (xs[1] - xs[0]) * (zs[2] - zs[0]) - (xs[2] - xs[0]) * (zs[1] - zs[0]) < 0;
}
@Override
public String toString() {
return String.format(Locale.ENGLISH, "%s(%.1f, %.1f, %.1f -- %.1f, %.1f, %.1f)", deleted ? "XXX " : "", minX, minY, minZ, maxX, maxY, maxZ);
//return String.format(Locale.ENGLISH, "%s[(%.1f, %.1f, %.1f), (%.1f, %.1f, %.1f), (%.1f, %.1f, %.1f), (%.1f, %.1f, %.1f)]", deleted ? "XXX " : "", xs[0], ys[0], zs[0], xs[1], ys[1], zs[1], xs[2], ys[2], zs[2], xs[3], ys[3], zs[3]);
return String.format(Locale.ENGLISH, "%s[(%.1f, %.1f, %.1f), (%.1f, %.1f, %.1f), (%.1f, %.1f, %.1f), (%.1f, %.1f, %.1f)]", deleted ? "XXX " : "", xs[0], ys[0], zs[0], xs[1], ys[1], zs[1], xs[2], ys[2], zs[2], xs[3], ys[3], zs[3]);
}
}
@@ -1,49 +0,0 @@
package com.gtnewhorizons.angelica.compat.nd;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Supplier;
public class RecyclingList<T> {
// Adapted from Neodymium
private Supplier<T> constructor;
int nextIndex;
private final List<T> list;
public RecyclingList(Supplier<T> constructor) {
this.constructor = constructor;
this.list = new ArrayList<>();
}
public T get(int i) {
while(list.size() <= i) {
list.add(constructor.get());
}
return list.get(i);
}
public T next() {
return get(nextIndex++);
}
public void remove() {
if(nextIndex == 0) {
throw new IllegalStateException("Tried to remove from empty list");
}
nextIndex--;
}
public boolean isEmpty() {
return nextIndex == 0;
}
public void reset() {
nextIndex = 0;
}
public List<T> getAsList() {
return list.subList(0, nextIndex);
}
}
@@ -0,0 +1,47 @@
package com.gtnewhorizons.angelica.compat.nd.writers;
import com.gtnewhorizons.angelica.compat.nd.IWriteQuads;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import java.nio.ByteBuffer;
public class ItemVBOQuadWriter implements IWriteQuads {
private boolean direct;
public ItemVBOQuadWriter() {
init(false);
}
public void init(boolean direct) {
// This would need to be re-initialized if the direct vs indirect changes
this.direct = direct;
}
@Override
public void writeQuad(Quad quad, ByteBuffer buf) {
if(direct) {
writeQuadDirect(quad, buf);
} else {
writeQuadIndirect(quad, buf);
}
}
protected void writeQuadDirect(Quad quad, ByteBuffer buf) {
throw new UnsupportedOperationException("Direct mode not supported yet");
}
protected void writeQuadIndirect(Quad quad, ByteBuffer buf) {
for(int idx = 0; idx < 4; ++idx) {
// Position
buf.putFloat(quad.getX(idx));
buf.putFloat(quad.getY(idx));
buf.putFloat(quad.getZ(idx));
// Texture
buf.putFloat(quad.getTexU(idx));
buf.putFloat(quad.getTexV(idx));
// Normals + Padding
buf.putInt(quad.getNormal(idx));
}
}
}
@@ -0,0 +1,47 @@
package com.gtnewhorizons.angelica.compat.nd.writers;
import com.gtnewhorizons.angelica.compat.nd.IWriteQuads;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import java.nio.ByteBuffer;
public class PositionColorTextureQuadWriter implements IWriteQuads {
private boolean direct;
public PositionColorTextureQuadWriter() {
init(false);
}
public void init(boolean direct) {
// This would need to be re-initialized if the direct vs indirect changes
this.direct = direct;
}
@Override
public void writeQuad(Quad quad, ByteBuffer buf) {
if(direct) {
writeQuadDirect(quad, buf);
} else {
writeQuadIndirect(quad, buf);
}
}
protected void writeQuadDirect(Quad quad, ByteBuffer buf) {
throw new UnsupportedOperationException("Direct mode not supported yet");
}
protected void writeQuadIndirect(Quad quad, ByteBuffer buf) {
for(int idx = 0; idx < 4; ++idx) {
// Position
buf.putFloat(quad.getX(idx));
buf.putFloat(quad.getY(idx));
buf.putFloat(quad.getZ(idx));
// Color
buf.putInt(quad.getColor(idx));
// Texture
buf.putFloat(quad.getTexU(idx));
buf.putFloat(quad.getTexV(idx));
}
}
}
@@ -0,0 +1,40 @@
package com.gtnewhorizons.angelica.compat.nd.writers;
import com.gtnewhorizons.angelica.compat.nd.IWriteQuads;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import java.nio.ByteBuffer;
public class PositionQuadWriter implements IWriteQuads {
private boolean direct;
public PositionQuadWriter() {
init(false);
}
public void init(boolean direct) {
// This would need to be re-initialized if the direct vs indirect changes
this.direct = direct;
}
@Override
public void writeQuad(Quad quad, ByteBuffer buf) {
if(direct) {
writeQuadDirect(quad, buf);
} else {
writeQuadIndirect(quad, buf);
}
}
protected void writeQuadDirect(Quad quad, ByteBuffer buf) {
throw new UnsupportedOperationException("Direct mode not supported yet");
}
protected void writeQuadIndirect(Quad quad, ByteBuffer buf) {
for(int idx = 0; idx < 4; ++idx) {
// Position
buf.putFloat(quad.getX(idx));
buf.putFloat(quad.getY(idx));
buf.putFloat(quad.getZ(idx));
}
}
}
@@ -0,0 +1,48 @@
package com.gtnewhorizons.angelica.compat.nd.writers;
import com.gtnewhorizons.angelica.compat.nd.IWriteQuads;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import java.nio.ByteBuffer;
public class PositionTextureColorQuadWriter implements IWriteQuads {
private boolean direct;
public PositionTextureColorQuadWriter() {
init(false);
}
public void init(boolean direct) {
// This would need to be re-initialized if the direct vs indirect changes
this.direct = direct;
}
@Override
public void writeQuad(Quad quad, ByteBuffer buf) {
if(direct) {
writeQuadDirect(quad, buf);
} else {
writeQuadIndirect(quad, buf);
}
}
protected void writeQuadDirect(Quad quad, ByteBuffer buf) {
throw new UnsupportedOperationException("Direct mode not supported yet");
}
protected void writeQuadIndirect(Quad quad, ByteBuffer buf) {
for(int idx = 0; idx < 4; ++idx) {
// Position
buf.putFloat(quad.getX(idx));
buf.putFloat(quad.getY(idx));
buf.putFloat(quad.getZ(idx));
// Texture
buf.putFloat(quad.getTexU(idx));
buf.putFloat(quad.getTexV(idx));
// Color
buf.putInt(quad.getColor(idx));
}
}
}
@@ -0,0 +1,44 @@
package com.gtnewhorizons.angelica.compat.nd.writers;
import com.gtnewhorizons.angelica.compat.nd.IWriteQuads;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import java.nio.ByteBuffer;
public class PositionTextureQuadWriter implements IWriteQuads {
private boolean direct;
public PositionTextureQuadWriter() {
init(false);
}
public void init(boolean direct) {
// This would need to be re-initialized if the direct vs indirect changes
this.direct = direct;
}
@Override
public void writeQuad(Quad quad, ByteBuffer buf) {
if(direct) {
writeQuadDirect(quad, buf);
} else {
writeQuadIndirect(quad, buf);
}
}
protected void writeQuadDirect(Quad quad, ByteBuffer buf) {
throw new UnsupportedOperationException("Direct mode not supported yet");
}
protected void writeQuadIndirect(Quad quad, ByteBuffer buf) {
for(int idx = 0; idx < 4; ++idx) {
// Position
buf.putFloat(quad.getX(idx));
buf.putFloat(quad.getY(idx));
buf.putFloat(quad.getZ(idx));
// Texture
buf.putFloat(quad.getTexU(idx));
buf.putFloat(quad.getTexV(idx));
}
}
}
@@ -1,5 +1,6 @@
package com.gtnewhorizons.angelica.compat.toremove;
import com.gtnewhorizons.angelica.compat.mojang.VertexFormat;
import lombok.Getter;
@Deprecated
@@ -1,6 +1,8 @@
package com.gtnewhorizons.angelica.compat.toremove;
import com.google.common.collect.ImmutableList;
import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat;
import com.gtnewhorizons.angelica.compat.mojang.VertexFormat;
import it.unimi.dsi.fastutil.Hash;
import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
import lombok.Getter;
@@ -27,6 +27,11 @@ public class AngelicaConfig {
@Config.RequiresMcRestart
public static boolean enableNotFineOptimizations;
@Config.Comment("Replace some vanilla render paths with more optimized versions. Disable if you encounter mixin conflicts.")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean enableVBO;
@Config.Comment("Enable NotFine features")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
@@ -78,4 +83,14 @@ public class AngelicaConfig {
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean optimizeJabbaGetInteger;
@Config.Comment("Fix thread-safety in lotrs rendering")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean fixLotrSodiumCompat;
@Config.Comment("Enable Debug Logging")
@Config.DefaultBoolean(false)
@Config.RequiresMcRestart
public static boolean enableDebugLogging;
}
@@ -1,42 +0,0 @@
package com.gtnewhorizons.angelica.glsm;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
public class Dirty {
private Dirty() {}
public static final long
ALPHA_TEST = 1L << 0,
BLEND = 1L << 1,
DEPTH_TEST = 1L << 2,
CULL = 1L << 3,
LIGHTING = 1L << 4,
RESCALE_NORMAL = 1L << 5,
TEXTURE_2D = 1L << 6,
FOG = 1L << 7,
BLEND_STATE = 1L << 8,
DEPTH_FUNC = 1L << 9,
DEPTH_MASK = 1L << 10,
COLOR = 1L << 11,
COLOR_MASK = 1L << 12,
CLEAR_COLOR = 1L << 13,
ACTIVE_TEXTURE = 1L << 14,
BOUND_TEXTURE = 1L << 15,
SHADE_MODEL = 1L << 16,
ALL = ALPHA_TEST | BLEND | DEPTH_TEST | CULL | LIGHTING | RESCALE_NORMAL | TEXTURE_2D | FOG | BLEND_STATE | DEPTH_FUNC | DEPTH_MASK | COLOR | COLOR_MASK | CLEAR_COLOR | ACTIVE_TEXTURE | BOUND_TEXTURE | SHADE_MODEL;
public static long getFlagFromCap(int cap) {
return switch (cap) {
case GL11.GL_ALPHA_TEST -> ALPHA_TEST;
case GL11.GL_BLEND -> BLEND;
case GL11.GL_DEPTH_TEST -> DEPTH_TEST;
case GL11.GL_CULL_FACE -> CULL;
case GL11.GL_LIGHTING -> LIGHTING;
case GL12.GL_RESCALE_NORMAL -> RESCALE_NORMAL;
case GL11.GL_TEXTURE_2D -> TEXTURE_2D;
case GL11.GL_FOG -> FOG;
default -> throw new RuntimeException("Invalid cap: " + cap);
};
}
}
@@ -13,11 +13,17 @@ import com.gtnewhorizons.angelica.glsm.stacks.IStateStack;
import com.gtnewhorizons.angelica.glsm.stacks.MatrixModeStack;
import com.gtnewhorizons.angelica.glsm.stacks.ViewPortStateStack;
import com.gtnewhorizons.angelica.glsm.states.Color4;
import com.gtnewhorizons.angelica.glsm.states.ISettableState;
import com.gtnewhorizons.angelica.glsm.states.TextureBinding;
import com.gtnewhorizons.angelica.glsm.states.TextureUnitArray;
import com.gtnewhorizons.angelica.hudcaching.HUDCaching;
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntStack;
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
import it.unimi.dsi.fastutil.objects.ObjectArraySet;
import lombok.Getter;
import net.coderbot.iris.Iris;
import net.coderbot.iris.gbuffer_overrides.state.StateTracker;
@@ -35,6 +41,7 @@ import org.joml.Matrix4d;
import org.joml.Matrix4f;
import org.joml.Matrix4fStack;
import org.joml.Vector3d;
import org.joml.Vector3f;
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.opengl.ARBMultitexture;
@@ -48,6 +55,8 @@ import java.nio.ByteBuffer;
import java.nio.DoubleBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.Map;
import java.util.Set;
import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
@@ -109,6 +118,9 @@ public class GLStateManager {
private static boolean runningSplash = false;
private static int glListMode = 0;
private static int glListId = -1;
private static final Map<IStateStack<?>, ISettableState<?>> glListStates = new Object2ObjectArrayMap<>();
private static final Int2ObjectMap<Set<Map.Entry<IStateStack<?>, ISettableState<?>>>> glListChanges = new Int2ObjectOpenHashMap<>();
private static boolean hudCaching$blendEnabled;
@@ -159,6 +171,11 @@ public class GLStateManager {
}
public static void glGetFloat(int pname, FloatBuffer params) {
if(GLStateManager.BYPASS_CACHE) {
GL11.glGetFloat(pname, params);
return;
}
switch (pname) {
case GL11.GL_MODELVIEW_MATRIX -> modelViewMatrix.get(params);
case GL11.GL_PROJECTION_MATRIX -> projectionMatrix.get(params);
@@ -442,15 +459,6 @@ public class GLStateManager {
return;
}
if(glListMode == GL11.GL_COMPILE ) {
if(AngelicaMod.lwjglDebug) {
// Binding a texture, while building a list, is not allowed and is a silent noop
final Throwable throwable = new Throwable();
LOGGER.info("Naughty naughty, someone's making a texture binding in a display list!", throwable);
}
return;
}
final TextureBinding textureUnit = textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt());
if (GLStateManager.BYPASS_CACHE || textureUnit.getBinding() != texture || runningSplash) {
@@ -717,33 +725,73 @@ public class GLStateManager {
if(glListMode > 0) {
throw new RuntimeException("glNewList called inside of a display list!");
}
glListId = list;
glListMode = mode;
GL11.glNewList(list, mode);
for(IStateStack<?> stack : Feature.maskToFeatures(GL11.GL_ALL_ATTRIB_BITS)) {
glListStates.put(stack, (ISettableState<?>) ((ISettableState<?>)stack).copy());
}
if(glListMode == GL11.GL_COMPILE) {
pushState(GL11.GL_ALL_ATTRIB_BITS);
}
}
public static void glEndList() {
if(glListMode == 0) {
throw new RuntimeException("glEndList called outside of a display list!");
}
final Set<Map.Entry<IStateStack<?>, ISettableState<?>>> changedStates = new ObjectArraySet<>();
for(Map.Entry<IStateStack<?>, ISettableState<?>> entry : glListStates.entrySet()) {
if(!((ISettableState<?>)entry.getKey()).sameAs(entry.getValue())) {
changedStates.add(entry);
}
}
if(changedStates.size() != 0) {
glListChanges.put(glListId, changedStates);
}
if(glListMode == GL11.GL_COMPILE) {
// GL_COMPILE doesn't actually apply the state, just stores it for replay in glCallList, so we'll
// roll back any changes that we tracked
popState();
}
glListId = -1;
glListStates.clear();
glListMode = 0;
GL11.glEndList();
}
public static void glCallList(int list) {
GL11.glCallList(list);
if(glListChanges.containsKey(list)) {
for(Map.Entry<IStateStack<?>, ISettableState<?>> entry : glListChanges.get(list)) {
((ISettableState<?>)entry.getKey()).set(entry.getValue());
}
}
}
public static void glPushAttrib(int mask) {
public static void pushState(int mask) {
attribs.push(mask);
for(IStateStack<?> stack : Feature.maskToFeatures(mask)) {
stack.push();
}
}
public static void popState() {
final int mask = attribs.popInt();
for(IStateStack<?> stack : Feature.maskToFeatures(mask)) {
stack.pop();
}
}
public static void glPushAttrib(int mask) {
pushState(mask);
GL11.glPushAttrib(mask);
}
public static void glPopAttrib() {
final int mask = attribs.pop();
for(IStateStack<?> stack : Feature.maskToFeatures(mask)) {
stack.pop();
}
popState();
GL11.glPopAttrib();
}
@@ -807,14 +855,17 @@ public class GLStateManager {
getMatrixStack().mul(conersionMatrix4f);
}
private static final Vector3f rotation = new Vector3f();
public static void glRotatef(float angle, float x, float y, float z) {
GL11.glRotatef(angle, x, y, z);
getMatrixStack().rotate((float)Math.toRadians(angle), x, y, z);
rotation.set(x, y, z).normalize();
getMatrixStack().rotate((float)Math.toRadians(angle), rotation);
}
public static void glRotated(double angle, double x, double y, double z) {
GL11.glRotated(angle, x, y, z);
getMatrixStack().rotate((float)Math.toRadians(angle), (float) x, (float) y, (float) z);
rotation.set(x, y, z).normalize();
getMatrixStack().rotate((float)Math.toRadians(angle), rotation);
}
public static void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar) {
@@ -828,12 +879,24 @@ public class GLStateManager {
}
public static void glPushMatrix() {
GL11.glPushMatrix();
getMatrixStack().pushMatrix();
try {
getMatrixStack().pushMatrix();
} catch(IllegalStateException ignored) {
// Ignore
if(AngelicaMod.lwjglDebug)
AngelicaTweaker.LOGGER.warn("Matrix stack overflow ", new Throwable());
}
}
public static void glPopMatrix() {
GL11.glPopMatrix();
getMatrixStack().popMatrix();
try {
getMatrixStack().popMatrix();
} catch(IllegalStateException ignored) {
// Ignore
if(AngelicaMod.lwjglDebug)
AngelicaTweaker.LOGGER.warn("Matrix stack underflow ", new Throwable());
}
}
private static final Matrix4f perspectiveMatrix = new Matrix4f();
@@ -1,15 +1,31 @@
package com.gtnewhorizons.angelica.glsm;
import com.gtnewhorizons.angelica.client.renderer.CapturingTessellator;
import com.gtnewhorizons.angelica.compat.mojang.VertexBuffer;
import com.gtnewhorizons.angelica.compat.mojang.VertexFormat;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import net.minecraft.client.renderer.Tessellator;
import java.nio.ByteBuffer;
import java.util.List;
@SuppressWarnings("unused")
public class TessellatorManager {
private static final ThreadLocal<Tessellator> theTessellator = ThreadLocal.withInitial(Tessellator::new);
private static final ThreadLocal<CapturingTessellator> capturingTessellator = ThreadLocal.withInitial(CapturingTessellator::new);
private static final ThreadLocal<Boolean> currentlyCapturing = ThreadLocal.withInitial(() -> Boolean.FALSE);
private static final Thread mainThread = Thread.currentThread();
public static Tessellator get() {
if(isOnMainThread())
if(currentlyCapturing.get()) {
return capturingTessellator.get();
} else if(isOnMainThread()) {
return Tessellator.instance;
return theTessellator.get();
} else {
// TODO: Verify this works correctly and nothing unexpected is grabbing a tessellator off the main thread
// when not capturing
throw new IllegalStateException("Tried to get the Tessellator off the main thread when not capturing!");
}
}
public static boolean isOnMainThread() {
@@ -17,10 +33,62 @@ public class TessellatorManager {
}
public static boolean isMainInstance(Object instance) {
return instance == Tessellator.instance;
return instance == Tessellator.instance || isOnMainThread();
}
public static void startCapturing() {
if(currentlyCapturing.get()) throw new IllegalStateException("Tried to start capturing when already capturing!");
if(capturingTessellator.get().getQuads().size() > 0) throw new IllegalStateException("Tried to start capturing with existing collected Quads!");
currentlyCapturing.set(true);
}
/*
* Stop the CapturingTessellator and return the pooled quads. The quads are valid until clearQuads() is
* called on the CapturingTesselator, which must be done before starting capturing again.
*/
public static List<Quad> stopCapturingToPooledQuads() {
if(!currentlyCapturing.get()) throw new IllegalStateException("Tried to stop capturing when not capturing!");
currentlyCapturing.set(false);
final CapturingTessellator tess = capturingTessellator.get();
// Be sure we got all the quads
if(tess.isDrawing) tess.draw();
final List<Quad> quads = tess.getQuads();
tess.discard();
return quads;
}
/*
* Stops the CapturingTessellator, stores the quads in a buffer (based on the VertexFormat provided),
* and clears the quads.
*/
public static ByteBuffer stopCapturingToBuffer(VertexFormat format) {
final ByteBuffer buf = CapturingTessellator.quadsToBuffer(stopCapturingToPooledQuads(), format);
capturingTessellator.get().clearQuads();
return buf;
}
/*
* Stops the CapturingTessellator, stores the quads in a buffer (based on the VertexFormat provided),
* uploads the buffer to a new VertexBuffer, and clears the quads.
*/
public static VertexBuffer stopCapturingToVBO(VertexFormat format) {
return new VertexBuffer(format).upload(stopCapturingToBuffer(format));
}
static {
System.out.println("[TessellatorManager] Initialized on thread " + mainThread.getName());
}
public static void cleanup() {
// Ensure we've cleaned everything up
final CapturingTessellator tessellator = capturingTessellator.get();
currentlyCapturing.set(false);
tessellator.discard();
tessellator.clearQuads();
}
}
@@ -0,0 +1,48 @@
package com.gtnewhorizons.angelica.glsm;
import com.gtnewhorizons.angelica.compat.mojang.VertexBuffer;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import it.unimi.dsi.fastutil.objects.ObjectList;
public class VBOManager {
// Not thread safe, only expected to be called from the main thread
private static int nextDisplayList = Integer.MIN_VALUE;
private static int getNextDisplayList() {
return nextDisplayList++;
}
private static ObjectList<VertexBuffer> vertexBuffers = new ObjectArrayList<>(1);
/*
* Allocate a (range) of "display list IDs" that will refer to a VBO in the arraylist of vertex buffers.
*/
public static int generateDisplayLists(int range) {
if(range < 1) throw new IllegalArgumentException("Range must be at least 1!");
final int id = getNextDisplayList();
for (int i = 1; i < range; i++) {
// Reserve, but don't use, the rest in the range
getNextDisplayList();
}
// Return the first in the range
return id;
}
public static VertexBuffer registerVBO(int displayList, VertexBuffer vertexBuffer) {
if(displayList > 0) throw new IllegalArgumentException("Display list must be negative!");
displayList -= Integer.MIN_VALUE;
final int requestedSize = displayList + 1;
if(requestedSize + 1 > vertexBuffers.size()) {
vertexBuffers.size(requestedSize);
}
vertexBuffers.set(displayList, vertexBuffer);
return vertexBuffer;
}
public static VertexBuffer get(int list) {
list -= Integer.MIN_VALUE;
return vertexBuffers.get(list);
}
}
@@ -16,4 +16,15 @@ public class AlphaState implements ISettableState<AlphaState> {
return this;
}
@Override
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof AlphaState alphaState)) return false;
return function == alphaState.function && Float.compare(alphaState.reference, reference) == 0;
}
@Override
public AlphaState copy() {
return new AlphaState().set(this);
}
}
@@ -21,4 +21,15 @@ public class BlendState implements ISettableState<BlendState> {
return this;
}
@Override
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof BlendState blendState)) return false;
return srcRgb == blendState.srcRgb && dstRgb == blendState.dstRgb && srcAlpha == blendState.srcAlpha && dstAlpha == blendState.dstAlpha;
}
@Override
public BlendState copy() {
return new BlendState().set(this);
}
}
@@ -1,6 +1,5 @@
package com.gtnewhorizons.angelica.glsm.states;
import com.gtnewhorizons.angelica.glsm.Dirty;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import lombok.Getter;
import org.lwjgl.opengl.GL11;
@@ -8,14 +7,11 @@ import org.lwjgl.opengl.GL11;
public class BooleanState implements ISettableState<BooleanState> {
private final int glCap;
private final long dirtyFlag;
@Getter
private boolean enabled;
public BooleanState(int glCap) {
this.glCap = glCap;
this.dirtyFlag = Dirty.getFlagFromCap(this.glCap);
}
public void disable() {
@@ -42,4 +38,16 @@ public class BooleanState implements ISettableState<BooleanState> {
this.enabled = state.enabled;
return this;
}
@Override
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof BooleanState booleanState)) return false;
return enabled == booleanState.enabled;
}
@Override
public BooleanState copy() {
return new BooleanState(this.glCap).set(this);
}
}
@@ -29,4 +29,15 @@ public class Color4 implements ISettableState<Color4> {
return this;
}
@Override
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof Color4 color4)) return false;
return Float.compare(color4.red, red) == 0 && Float.compare(color4.green, green) == 0 && Float.compare(color4.blue, blue) == 0 && Float.compare(color4.alpha, alpha) == 0;
}
@Override
public Color4 copy() {
return new Color4().set(this);
}
}
@@ -15,4 +15,15 @@ public class ColorMask implements ISettableState<ColorMask> {
return this;
}
@Override
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof ColorMask colorMask)) return false;
return red == colorMask.red && green == colorMask.green && blue == colorMask.blue && alpha == colorMask.alpha;
}
@Override
public ColorMask copy() {
return new ColorMask().set(this);
}
}
@@ -15,4 +15,16 @@ public class DepthState implements ISettableState<DepthState> {
this.func = state.func;
return this;
}
@Override
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof DepthState depthState)) return false;
return mask == depthState.mask && func == depthState.func;
}
@Override
public DepthState copy() {
return new DepthState().set(this);
}
}
@@ -28,5 +28,15 @@ public class FogState implements ISettableState<FogState> {
this.end = state.end;
return this;
}
@Override
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof FogState fogState)) return false;
return fogMode == fogState.fogMode && Float.compare(fogState.fogAlpha, fogAlpha) == 0 && Float.compare(fogState.density, density) == 0 && Float.compare(fogState.start, start) == 0 && Float.compare(fogState.end, end) == 0 && fogColor.equals(fogState.fogColor);
}
@Override
public FogState copy() {
return new FogState().set(this);
}
}
@@ -1,6 +1,14 @@
package com.gtnewhorizons.angelica.glsm.states;
public interface ISettableState<T> {
public interface ISettableState<T> extends Cloneable {
T set(T state);
default void set(ISettableState<?> value) {
set((T) value);
}
boolean sameAs(Object state);
T copy();
}
@@ -9,6 +9,12 @@ public class MatrixMode implements ISettableState<MatrixMode> {
protected int mode = GL11.GL_MODELVIEW;
public void setMode(int mode) {
if(mode != GL11.GL_MODELVIEW && mode != GL11.GL_PROJECTION && mode != GL11.GL_TEXTURE && mode != GL11.GL_COLOR) {
// Invalid mode, do nothing on the cache, but pass it along to OGL
GL11.glMatrixMode(mode);
return;
}
if(this.mode != mode || GLStateManager.BYPASS_CACHE) {
this.mode = mode;
GL11.glMatrixMode(mode);
@@ -20,4 +26,16 @@ public class MatrixMode implements ISettableState<MatrixMode> {
this.mode = state.mode;
return this;
}
@Override
public boolean sameAs(Object state) {
if(this == state) return true;
if(!(state instanceof MatrixMode matrixMode)) return false;
return mode == matrixMode.mode;
}
@Override
public MatrixMode copy() {
return new MatrixMode().set(this);
}
}
@@ -133,4 +133,12 @@ public class MatrixState {
PROJECTION,
TEXTURE
}
@Override
public boolean equals(Object state) {
if (this == state) return true;
if (!(state instanceof MatrixState matrixState)) return false;
return mode == matrixState.mode && projectionMatrix.equals(matrixState.projectionMatrix) && modelViewMatrix.equals(matrixState.modelViewMatrix);
}
}
@@ -12,4 +12,15 @@ public class TextureBinding implements ISettableState<TextureBinding> {
this.binding = state.binding;
return this;
}
@Override
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof TextureBinding textureBinding)) return false;
return binding == textureBinding.binding;
}
@Override
public TextureBinding copy() {
return new TextureBinding().set(this);
}
}
@@ -25,4 +25,16 @@ public class TextureUnitArray {
public BooleanStateStack getTextureUnitStates(int index) {
return states[index];
}
@Override
public boolean equals(Object state) {
if (this == state) return true;
if (!(state instanceof TextureUnitArray textureUnitArray)) return false;
for (int i = 0; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
if (!bindings[i].sameAs(textureUnitArray.bindings[i])) return false;
if (!states[i].sameAs(textureUnitArray.states[i])) return false;
}
return true;
}
}
@@ -31,4 +31,17 @@ public class ViewportState implements ISettableState<ViewportState> {
return this;
}
@Override
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof ViewportState viewportState)) return false;
return x == viewportState.x && y == viewportState.y && width == viewportState.width && height == viewportState.height;
}
@Override
public ViewportState copy() {
return new ViewportState().set(this);
}
}
@@ -43,7 +43,9 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
Configuration config = ctx.getConfiguration();
LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME);
loggerConfig.setLevel(Level.DEBUG);
if (AngelicaConfig.enableDebugLogging) {
loggerConfig.setLevel(Level.DEBUG);
}
ctx.updateLoggers();
} catch (ConfigException e) {
throw new RuntimeException(e);
@@ -1,5 +1,6 @@
package com.gtnewhorizons.angelica.loading;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.transform.BlockTransformer;
import com.gtnewhorizons.angelica.transform.RedirectorTransformer;
import cpw.mods.fml.common.Loader;
@@ -75,7 +76,9 @@ public class MixinCompatHackTweaker implements ITweaker {
if (FMLLaunchHandler.side().isClient()) {
// Run after Mixins, but before LWJGl3ify
Launch.classLoader.registerTransformer(RedirectorTransformer.class.getName());
Launch.classLoader.registerTransformer(BlockTransformer.class.getName());
if(AngelicaConfig.enableSodium) {
Launch.classLoader.registerTransformer(BlockTransformer.class.getName());
}
}
return new String[0];
@@ -3,9 +3,8 @@ package com.gtnewhorizons.angelica.mixins;
import com.gtnewhorizons.angelica.AngelicaMod;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCPatcherUtils;
import cpw.mods.fml.relauncher.FMLLaunchHandler;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
import java.util.ArrayList;
import java.util.Arrays;
@@ -27,9 +26,18 @@ public enum Mixins {
.setPhase(Phase.EARLY).addMixinClasses(
"angelica.MixinActiveRenderInfo"
,"angelica.MixinEntityRenderer"
,"angelica.MixinMinecraft"
)
),
ANGELICA_VBO(
new Builder("Angelica VBO").addTargetedMod(TargetedMod.VANILLA).setApplyIf(() -> AngelicaConfig.enableVBO).setSide(Side.CLIENT)
.setPhase(Phase.EARLY).addMixinClasses(
"angelica.vbo.MixinGLAllocation"
,"angelica.vbo.MixinModelRenderer"
,"angelica.vbo.MixinRenderGlobal"
,"angelica.vbo.MixinWavefrontObject"
)
),
ANGELICA_FONT_RENDERER(new Builder("Angelica Font Renderer").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableFontRenderer).addMixinClasses(
"angelica.fontrenderer.MixinGuiIngameForge"
@@ -42,6 +50,7 @@ public enum Mixins {
"angelica.debug.MixinSplashProgress"
)
),
// Not compatible with the lwjgl debug callbacks, so disable if that's enabled
ARCHAIC_SPLASH(new Builder("ArchaicFix Splash").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.showSplashMemoryBar && !AngelicaMod.lwjglDebug).addMixinClasses(
@@ -80,8 +89,11 @@ public enum Mixins {
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableSodium).addMixinClasses(
"sodium.MixinChunkProviderClient"
,"sodium.MixinBlock"
,"sodium.AccessorBiomeColorEvent"
,"sodium.MixinBiomeGenBase"
,"sodium.MixinChunk"
,"sodium.MixinChunkProviderServer"
,"sodium.MixinClientRegistry"
,"sodium.MixinEntity"
,"sodium.MixinRenderManager"
,"sodium.MixinExtendedBlockStorage"
@@ -98,10 +110,7 @@ public enum Mixins {
,"sodium.MixinTessellator"
,"sodium.MixinGuiIngameForge"
,"sodium.MixinEffectRenderer"
// TODO Doesn't work correctly
//,"sodium.MixinTextureAtlasSprite"
//,"sodium.MixinTextureMap"
//,"sodium.MixinEntityFX"
,"sodium.MixinTileEntityRendererDispatcher"
,"sodium.MixinLongHashMap"
,"sodium.MixinRender"
)
@@ -205,7 +214,7 @@ public enum Mixins {
NOTFINE_FEATURES_NO_MCPF_CIT(new Builder("NotFine Features which clash with mcpf cit (compat handled in MCPF_NF mixin)").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures &&
!(AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "enabled", true))
!(AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().customItemTexturesEnabled)
).addMixinClasses(
"notfine.glint.MixinItemRenderer",
"notfine.glint.MixinRenderItemGlint"
@@ -230,7 +239,7 @@ public enum Mixins {
MCPATCHERFORGE_NOTFINE_COMPAT(new Builder("Notfine features and MCPF features where the 2 would clash").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures &&
AngelicaConfig.enableMCPatcherForgeFeatures &&
Config.getBoolean(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "enabled", true))
MCPatcherForgeConfig.instance().customItemTexturesEnabled)
.addMixinClasses(addPrefix(
"notfine_mcpf_compat.",
"MixinRenderItem",
@@ -263,7 +272,7 @@ public enum Mixins {
MCPATCHERFORGE_CUSTOM_COLOURS(new Builder("Custom colors").setSide(Mixins.Side.CLIENT)
.setPhase(Mixins.Phase.EARLY)
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "enabled", true))
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().customColorsEnabled)
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses(
addPrefix(
@@ -320,7 +329,7 @@ public enum Mixins {
MCPATCHERFORGE_CUSTOM_ITEM_TEXTURES(new Mixins.Builder("Custom Item Textures").setSide(Mixins.Side.CLIENT)
.setPhase(Phase.EARLY)
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "enabled", true))
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().customItemTexturesEnabled)
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses(
addPrefix(
@@ -337,7 +346,7 @@ public enum Mixins {
MCPATCHERFORGE_CUSTOM_ITEM_TEXTURES_NO_NF(new Mixins.Builder("Custom Item Textures without notfine features").setSide(Mixins.Side.CLIENT)
.setPhase(Phase.EARLY)
.setApplyIf(() -> (AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "enabled", true)) && !AngelicaConfig.enableNotFineFeatures)
.setApplyIf(() -> (AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().customItemTexturesEnabled) && !AngelicaConfig.enableNotFineFeatures)
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses(addPrefix(
"mcpatcherforge.cit.client.renderer.",
@@ -347,20 +356,20 @@ public enum Mixins {
MCPATCHERFORGE_CONNECTED_TEXTURES(new Builder("Connected Textures").setSide(Side.CLIENT)
.setPhase(Mixins.Phase.EARLY)
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.CONNECTED_TEXTURES, "enabled", true))
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().connectedTexturesEnabled)
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses("mcpatcherforge.ctm.MixinRenderBlocks")),
MCPATCHERFORGE_EXTENDED_HD(new Builder("Extended hd").setSide(Side.CLIENT)
.setPhase(Phase.EARLY)
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.EXTENDED_HD, "enabled", true))
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().extendedHDEnabled)
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses(
addPrefix("mcpatcherforge.hd.", "MixinFontRenderer", "MixinTextureClock", "MixinTextureCompass", "MixinTextureManager"))),
MCPATCHERFORGE_RANDOM_MOBS(new Builder("Random Mobs").setSide(Side.CLIENT)
.setPhase(Phase.EARLY)
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.RANDOM_MOBS, "enabled", true))
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().randomMobsEnabled)
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses(
addPrefix(
@@ -378,18 +387,46 @@ public enum Mixins {
MCPATCHERFORGE_SKY(new Builder("Sky").setSide(Side.CLIENT)
.setPhase(Phase.EARLY)
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.BETTER_SKIES, "enabled", true))
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().betterSkiesEnabled)
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses(addPrefix("mcpatcherforge.sky.", "MixinEffectRenderer", "MixinRenderGlobal"
))),
MCPATCHERFORGE_CC_NO_CTM(new Builder("Custom colors, no connected textures").setSide(Side.CLIENT)
.setPhase(Phase.EARLY)
.setApplyIf(
() -> AngelicaConfig.enableMCPatcherForgeFeatures
&& (!MCPatcherForgeConfig.instance().connectedTexturesEnabled
&& MCPatcherForgeConfig.instance().customColorsEnabled))
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocksNoCTM")),
MCPATCHERFORGE_CTM_AND_CC(new Builder("Connected textures and Custom Colors enabled").setSide(Side.CLIENT)
.setPhase(Phase.EARLY)
.setApplyIf(
() -> AngelicaConfig.enableMCPatcherForgeFeatures
&& MCPatcherForgeConfig.instance().connectedTexturesEnabled
&& MCPatcherForgeConfig.instance().customColorsEnabled)
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocks")),
MCPATCHERFORGE_CTM_NO_CC(new Builder("Connected textures, no custom colours").setSide(Side.CLIENT)
.setPhase(Phase.EARLY)
.setApplyIf(
() -> AngelicaConfig.enableMCPatcherForgeFeatures
&& (MCPatcherForgeConfig.instance().connectedTexturesEnabled
&& !MCPatcherForgeConfig.instance().customColorsEnabled))
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocksNoCC")),
MCPATCHERFORGE_CTM_OR_CC(new Builder("Connected textures or Custom Colors enabled").setSide(Side.CLIENT)
.setPhase(Phase.EARLY)
.setApplyIf(
() -> AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "enabled", true)
|| Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "enabled", true))
() -> AngelicaConfig.enableMCPatcherForgeFeatures
&& (MCPatcherForgeConfig.instance().connectedTexturesEnabled
|| MCPatcherForgeConfig.instance().customColorsEnabled))
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses(addPrefix("mcpatcherforge.ctm_cc.", "MixinRenderBlocks", "MixinTextureMap")))
.addMixinClasses("mcpatcherforge.ctm_cc.MixinTextureMap")),
;
@@ -0,0 +1,20 @@
package com.gtnewhorizons.angelica.mixins.early.angelica;
import net.minecraft.client.Minecraft;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(Minecraft.class)
public class MixinMinecraft {
@Inject(
method = "runGameLoop",
at = @At(value = "INVOKE", target = "Lcpw/mods/fml/common/FMLCommonHandler;onRenderTickEnd(F)V", shift = At.Shift.AFTER)
)
private void angelica$injectLightingFixPostRenderTick(CallbackInfo ci) {
GL11.glEnable(GL11.GL_LIGHTING);
}
}
@@ -1,6 +1,8 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.animation;
import com.gtnewhorizons.angelica.mixins.interfaces.ITexturesCache;
import com.gtnewhorizons.angelica.utils.AnimationsRenderUtils;
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFire;
import net.minecraft.client.renderer.RenderBlocks;
@@ -14,8 +16,10 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Set;
@Mixin(RenderBlocks.class)
public class MixinRenderBlocks {
public class MixinRenderBlocks implements ITexturesCache {
@Shadow
public IBlockAccess blockAccess;
@@ -23,6 +27,8 @@ public class MixinRenderBlocks {
@Shadow
public IIcon overrideBlockTexture;
private Set<IIcon> renderedSprites = new ReferenceOpenHashSet<>();
/**
* @author laetansky Here where things get very tricky. We can't just mark blocks textures for update because this
* method gets called only when chunk render cache needs an update (that happens when a state of any block
@@ -39,11 +45,15 @@ public class MixinRenderBlocks {
}
AnimationsRenderUtils.markBlockTextureForUpdate(icon, blockAccess);
this.renderedSprites.add(icon);
}
@Inject(method = "renderBlockFire", at = @At("HEAD"))
public void angelica$markFireBlockAnimationForUpdate(BlockFire instance, int x, int y, int z,
CallbackInfoReturnable<Boolean> cir) {
this.renderedSprites.add(instance.getFireIcon(0));
this.renderedSprites.add(instance.getFireIcon(1));
AnimationsRenderUtils.markBlockTextureForUpdate(instance.getFireIcon(0), blockAccess);
AnimationsRenderUtils.markBlockTextureForUpdate(instance.getFireIcon(1), blockAccess);
}
@@ -52,6 +62,13 @@ public class MixinRenderBlocks {
public IIcon angelica$markFluidAnimationForUpdate(IIcon icon) {
AnimationsRenderUtils.markBlockTextureForUpdate(icon, blockAccess);
this.renderedSprites.add(icon);
return icon;
}
@Override
public Set<IIcon> getRenderedTextures() {
return renderedSprites;
}
}
@@ -0,0 +1,15 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.vbo;
import net.minecraft.client.renderer.GLAllocation;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(GLAllocation.class)
public class MixinGLAllocation {
@Inject(method = "deleteDisplayLists", at = @At("HEAD"), cancellable = true)
private static void deleteDisplayLists(int list, CallbackInfo ci) {
if(list < 0) ci.cancel();
}
}
@@ -0,0 +1,41 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.vbo;
import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat;
import com.gtnewhorizons.angelica.glsm.TessellatorManager;
import com.gtnewhorizons.angelica.glsm.VBOManager;
import net.minecraft.client.model.ModelRenderer;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(ModelRenderer.class)
public class MixinModelRenderer {
@Shadow
public int displayList;
@Redirect(method = "compileDisplayList", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GLAllocation;generateDisplayLists(I)I"))
public int generateDisplayLists(int range) {
return VBOManager.generateDisplayLists(range);
}
@Redirect(method = "compileDisplayList", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glNewList(II)V", remap = false))
public void startCapturingVBO(int list, int mode) {
TessellatorManager.startCapturing();
}
@Redirect(method = "compileDisplayList", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glEndList()V", remap = false))
public void stopCapturingVBO() {
VBOManager.registerVBO(this.displayList, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION_TEXTURE_NORMAL));
}
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glCallList(I)V", remap = false))
public void renderVBO(int list) {
VBOManager.get(list).render(GL11.GL_QUADS);
}
@Redirect(method = "renderWithRotation", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glCallList(I)V", remap = false))
public void renderWithRotationVBO(int list) {
VBOManager.get(list).render(GL11.GL_QUADS);
}
}
@@ -0,0 +1,103 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.vbo;
import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.glsm.TessellatorManager;
import com.gtnewhorizons.angelica.glsm.VBOManager;
import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalVBOCapture;
import com.gtnewhorizons.angelica.render.CloudRenderer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.RenderGlobal;
import net.minecraft.client.renderer.Tessellator;
import net.minecraftforge.client.IRenderHandler;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(value = RenderGlobal.class)
public class MixinRenderGlobal implements IRenderGlobalVBOCapture {
@Shadow public int starGLCallList;
@Shadow private int glSkyList;
@Shadow private int glSkyList2;
@Shadow public WorldClient theWorld;
@Shadow public Minecraft mc;
@Shadow private int cloudTickCounter;
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lnet/minecraft/client/renderer/GLAllocation;generateDisplayLists(I)I", ordinal = 0))
private int generateGLRenderListBaseDisplayLists(int range) {
return AngelicaConfig.enableSodium ? -1 : GLAllocation.generateDisplayLists(range);
}
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lnet/minecraft/client/renderer/GLAllocation;generateDisplayLists(I)I", ordinal = 2), remap = false)
private int generateDisplayLists(int range) {
return VBOManager.generateDisplayLists(range);
}
@Override
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glNewList(II)V", ordinal = 0), remap = false)
public void startStarsVBO(int list, int mode) {
TessellatorManager.startCapturing();
}
@Override
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glEndList()V", ordinal = 0), remap = false)
public void finishStarsVBO() {
VBOManager.registerVBO(starGLCallList, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION));
}
@Redirect(method="<init>", at = @At(value="FIELD", target="Lnet/minecraft/client/renderer/Tessellator;instance:Lnet/minecraft/client/renderer/Tessellator;"))
private Tessellator redirectTessellator() {
TessellatorManager.startCapturing();
return TessellatorManager.get();
}
@Override
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glNewList(II)V", ordinal = 1), remap = false)
public void startSkyVBO(int list, int mode) {
// Do nothing, we'll be making a VBO instead.
}
@Override
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glEndList()V", ordinal = 1), remap = false)
public void finishSkyVBO() {
VBOManager.registerVBO(glSkyList, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION));
}
@Override
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glNewList(II)V", ordinal = 2), remap = false)
public void startSky2VBO(int list, int mode) {
TessellatorManager.startCapturing();
}
@Override
@Redirect(method="<init>", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glEndList()V", ordinal = 2), remap = false)
public void finishSky2VBO() {
VBOManager.registerVBO(glSkyList2, TessellatorManager.stopCapturingToVBO(DefaultVertexFormat.POSITION));
}
@Redirect(method="renderSky(F)V", at = @At(value="INVOKE", target="Lorg/lwjgl/opengl/GL11;glCallList(I)V"), remap = false)
public void renderSky(int list) {
VBOManager.get(list).render(GL11.GL_QUADS);
}
/**
* @author mitchej123
* @reason VBO Clouds
*/
@Overwrite
public void renderClouds(float partialTicks) {
IRenderHandler renderer;
if((renderer = theWorld.provider.getCloudRenderer()) != null) {
renderer.render(partialTicks, theWorld, mc);
return;
}
if(mc.theWorld.provider.isSurfaceWorld()) {
CloudRenderer.getCloudRenderer().render(cloudTickCounter, partialTicks);
}
}
}
@@ -0,0 +1,51 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.vbo;
import com.gtnewhorizons.angelica.client.renderer.CapturingTessellator;
import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat;
import com.gtnewhorizons.angelica.compat.mojang.VertexBuffer;
import com.gtnewhorizons.angelica.compat.mojang.VertexFormat;
import com.gtnewhorizons.angelica.glsm.TessellatorManager;
import com.gtnewhorizons.angelica.mixins.interfaces.IModelCustomExt;
import net.minecraft.client.renderer.Tessellator;
import net.minecraftforge.client.model.obj.GroupObject;
import net.minecraftforge.client.model.obj.WavefrontObject;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
@Mixin(value = WavefrontObject.class, remap = false)
public abstract class MixinWavefrontObject implements IModelCustomExt {
@Unique private VertexBuffer vertexBuffer;
@Shadow private GroupObject currentGroupObject;
@Shadow public abstract void tessellateAll(Tessellator tessellator);
@Unique VertexFormat format = DefaultVertexFormat.POSITION_TEXTURE_NORMAL;
@Override
public void rebuildVBO() {
if(currentGroupObject == null) {
throw new RuntimeException("No group object selected");
}
if (this.vertexBuffer != null) {
this.vertexBuffer.close();
}
TessellatorManager.startCapturing();
final CapturingTessellator tess = (CapturingTessellator) TessellatorManager.get();
tess.startDrawing(currentGroupObject.glDrawingMode);
tessellateAll(tess);
this.vertexBuffer = TessellatorManager.stopCapturingToVBO(format);
}
@Override
public void renderAllVBO() {
if(vertexBuffer == null) {
rebuildVBO();
}
vertexBuffer.render(GL11.GL_QUADS);
}
}
@@ -22,7 +22,6 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.google.common.collect.Multimap;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.cc.Colorizer;
import com.prupe.mcpatcher.cit.CITUtils;
@@ -32,6 +31,8 @@ import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler;
import com.prupe.mcpatcher.mal.tile.TileLoader;
import com.prupe.mcpatcher.mob.MobRandomizer;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
@Mixin(Minecraft.class)
public abstract class MixinMinecraft {
@@ -60,16 +61,17 @@ public abstract class MixinMinecraft {
private void modifyStartGame1(CallbackInfo ci) {
TileLoader.init();
CTMUtils.reset();
if (Config.getBoolean(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "enabled", true)) {
MCPatcherForgeConfig config = MCPatcherForgeConfig.instance();
if (config.customItemTexturesEnabled) {
CITUtils.init();
}
if (Config.getBoolean(MCPatcherUtils.EXTENDED_HD, "enabled", true)) {
if (config.extendedHDEnabled) {
FontUtils.init();
}
if (Config.getBoolean(MCPatcherUtils.RANDOM_MOBS, "enabled", true)) {
if (config.randomMobsEnabled) {
MobRandomizer.init();
}
if (Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "enabled", true)) {
if (config.customColorsEnabled) {
Colorizer.init();
}
}
@@ -22,6 +22,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
import com.llamalad7.mixinextras.injector.WrapWithCondition;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
import com.llamalad7.mixinextras.sugar.ref.LocalFloatRef;
import com.prupe.mcpatcher.cc.ColorizeBlock;
import com.prupe.mcpatcher.cc.Colorizer;
import com.prupe.mcpatcher.mal.block.RenderBlocksUtils;
@@ -64,20 +67,6 @@ public abstract class MixinRenderBlocks {
@Shadow
public abstract boolean hasOverrideBlockTexture();
// Compute values once and reuse later
@Unique
private boolean mcpatcherforge$computeRedstoneWireColor;
@Unique
private float mcpatcherforge$redstoneWireColorRed;
@Unique
private float mcpatcherforge$redstoneWireColorGreen;
@Unique
private float mcpatcherforge$redstoneWireColorBlue;
@Unique
private void mcpatcherforge$setColorAndVertex(Tessellator tessellator, float red, float green, float blue, double x,
double y, double z, double u, double v) {
@@ -112,12 +101,14 @@ public abstract class MixinRenderBlocks {
@Inject(method = "renderBlockRedstoneWire(Lnet/minecraft/block/Block;III)Z", at = @At("HEAD"))
private void calculateComputeRedstoneWireColor(Block block, int x, int y, int z,
CallbackInfoReturnable<Boolean> cir) {
this.mcpatcherforge$computeRedstoneWireColor = ColorizeBlock
.computeRedstoneWireColor(this.blockAccess.getBlockMetadata(x, y, z));
this.mcpatcherforge$redstoneWireColorRed = Math.max(Colorizer.setColor[0], 0.0f);
this.mcpatcherforge$redstoneWireColorGreen = Math.max(Colorizer.setColor[1], 0.0f);
this.mcpatcherforge$redstoneWireColorBlue = Math.max(Colorizer.setColor[2], 0.0f);
CallbackInfoReturnable<Boolean> cir,
@Share("computeRedstoneWireColor") LocalBooleanRef computeRedstoneWireColor, @Share("red") LocalFloatRef red,
@Share("green") LocalFloatRef green, @Share("blue") LocalFloatRef blue) {
computeRedstoneWireColor
.set(ColorizeBlock.computeRedstoneWireColor(this.blockAccess.getBlockMetadata(x, y, z)));
red.set(Math.max(Colorizer.setColor[0], 0.0f));
green.set(Math.max(Colorizer.setColor[1], 0.0f));
blue.set(Math.max(Colorizer.setColor[2], 0.0f));
}
@ModifyArgs(
@@ -126,11 +117,13 @@ public abstract class MixinRenderBlocks {
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
ordinal = 0))
private void modifyColorRedstoneWire1(Args args) {
if (this.mcpatcherforge$computeRedstoneWireColor) {
args.set(0, this.mcpatcherforge$redstoneWireColorRed);
args.set(1, this.mcpatcherforge$redstoneWireColorGreen);
args.set(2, this.mcpatcherforge$redstoneWireColorBlue);
private void modifyColorRedstoneWire1(Args args,
@Share("computeRedstoneWireColor") LocalBooleanRef computeRedstoneWireColor, @Share("red") LocalFloatRef red,
@Share("green") LocalFloatRef green, @Share("blue") LocalFloatRef blue) {
if (computeRedstoneWireColor.get()) {
args.set(0, red.get());
args.set(1, green.get());
args.set(2, blue.get());
}
}
@@ -140,11 +133,13 @@ public abstract class MixinRenderBlocks {
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
ordinal = 4))
private void modifyColorRedstoneWire2(Args args) {
if (this.mcpatcherforge$computeRedstoneWireColor) {
args.set(0, this.mcpatcherforge$redstoneWireColorRed);
args.set(1, this.mcpatcherforge$redstoneWireColorGreen);
args.set(2, this.mcpatcherforge$redstoneWireColorBlue);
private void modifyColorRedstoneWire2(Args args,
@Share("computeRedstoneWireColor") LocalBooleanRef computeRedstoneWireColor, @Share("red") LocalFloatRef red,
@Share("green") LocalFloatRef green, @Share("blue") LocalFloatRef blue) {
if (computeRedstoneWireColor.get()) {
args.set(0, red.get());
args.set(1, green.get());
args.set(2, blue.get());
}
}
@@ -154,11 +149,13 @@ public abstract class MixinRenderBlocks {
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
ordinal = 6))
private void modifyColorRedstoneWire3(Args args) {
if (this.mcpatcherforge$computeRedstoneWireColor) {
args.set(0, this.mcpatcherforge$redstoneWireColorRed);
args.set(1, this.mcpatcherforge$redstoneWireColorGreen);
args.set(2, this.mcpatcherforge$redstoneWireColorBlue);
private void modifyColorRedstoneWire3(Args args,
@Share("computeRedstoneWireColor") LocalBooleanRef computeRedstoneWireColor, @Share("red") LocalFloatRef red,
@Share("green") LocalFloatRef green, @Share("blue") LocalFloatRef blue) {
if (computeRedstoneWireColor.get()) {
args.set(0, red.get());
args.set(1, green.get());
args.set(2, blue.get());
}
}
@@ -168,11 +165,13 @@ public abstract class MixinRenderBlocks {
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
ordinal = 8))
private void modifyColorRedstoneWire4(Args args) {
if (this.mcpatcherforge$computeRedstoneWireColor) {
args.set(0, this.mcpatcherforge$redstoneWireColorRed);
args.set(1, this.mcpatcherforge$redstoneWireColorGreen);
args.set(2, this.mcpatcherforge$redstoneWireColorBlue);
private void modifyColorRedstoneWire4(Args args,
@Share("computeRedstoneWireColor") LocalBooleanRef computeRedstoneWireColor, @Share("red") LocalFloatRef red,
@Share("green") LocalFloatRef green, @Share("blue") LocalFloatRef blue) {
if (computeRedstoneWireColor.get()) {
args.set(0, red.get());
args.set(1, green.get());
args.set(2, blue.get());
}
}
@@ -182,11 +181,13 @@ public abstract class MixinRenderBlocks {
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
ordinal = 10))
private void modifyColorRedstoneWire5(Args args) {
if (this.mcpatcherforge$computeRedstoneWireColor) {
args.set(0, this.mcpatcherforge$redstoneWireColorRed);
args.set(1, this.mcpatcherforge$redstoneWireColorGreen);
args.set(2, this.mcpatcherforge$redstoneWireColorBlue);
private void modifyColorRedstoneWire5(Args args,
@Share("computeRedstoneWireColor") LocalBooleanRef computeRedstoneWireColor, @Share("red") LocalFloatRef red,
@Share("green") LocalFloatRef green, @Share("blue") LocalFloatRef blue) {
if (computeRedstoneWireColor.get()) {
args.set(0, red.get());
args.set(1, green.get());
args.set(2, blue.get());
}
}
@@ -5,27 +5,26 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
import com.prupe.mcpatcher.cc.ColorizeWorld;
import com.prupe.mcpatcher.cc.Colorizer;
@Mixin(World.class)
public abstract class MixinWorld {
@Unique
private boolean mcpatcher_forge$computeSkyColor;
@Inject(
method = "getSkyColorBody(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/util/Vec3;",
at = @At("HEAD"),
remap = false)
private void modifyGetSkyColorBody1(Entity entity, float p_72833_2_, CallbackInfoReturnable<Vec3> cir) {
this.mcpatcher_forge$computeSkyColor = ColorizeWorld.computeSkyColor((World) (Object) this, p_72833_2_);
private void modifyGetSkyColorBody1(Entity entity, float p_72833_2_, CallbackInfoReturnable<Vec3> cir,
@Share("computeSkyColor") LocalBooleanRef computeSkyColor) {
computeSkyColor.set(ColorizeWorld.computeSkyColor((World) (Object) this, p_72833_2_));
}
@Inject(
@@ -45,8 +44,8 @@ public abstract class MixinWorld {
at = @At(value = "STORE", ordinal = 0),
ordinal = 3,
remap = false)
private float modifyGetSkyColorBody3(float input) {
if (this.mcpatcher_forge$computeSkyColor) {
private float modifyGetSkyColorBody3(float input, @Share("computeSkyColor") LocalBooleanRef computeSkyColor) {
if (computeSkyColor.get()) {
return Colorizer.setColor[0];
}
return input;
@@ -58,21 +57,20 @@ public abstract class MixinWorld {
at = @At(value = "STORE", ordinal = 0),
ordinal = 4,
remap = false)
private float modifyGetSkyColorBody4(float input) {
if (this.mcpatcher_forge$computeSkyColor) {
private float modifyGetSkyColorBody4(float input, @Share("computeSkyColor") LocalBooleanRef computeSkyColor) {
if (computeSkyColor.get()) {
return Colorizer.setColor[1];
}
return input;
}
@SuppressWarnings("InvalidInjectorMethodSignature")
@ModifyVariable(
method = "getSkyColorBody(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/util/Vec3;",
at = @At(value = "STORE", ordinal = 0),
ordinal = 5,
remap = false)
private float modifyGetSkyColorBody5(float input) {
if (this.mcpatcher_forge$computeSkyColor) {
private float modifyGetSkyColorBody5(float input, @Share("computeSkyColor") LocalBooleanRef computeSkyColor) {
if (computeSkyColor.get()) {
return Colorizer.setColor[2];
}
return input;
@@ -4,39 +4,37 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.WorldProvider;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyConstant;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
import com.prupe.mcpatcher.cc.ColorizeWorld;
import com.prupe.mcpatcher.cc.Colorizer;
@Mixin(WorldProvider.class)
public abstract class MixinWorldProvider {
@Unique
private boolean mcpatcher_forge$computeFogColor;
@Inject(method = "getFogColor(FF)Lnet/minecraft/util/Vec3;", at = @At("HEAD"))
private void modifyGetFogColor1(float celestialAngle, float renderPartialTicks, CallbackInfoReturnable<Vec3> cir) {
this.mcpatcher_forge$computeFogColor = ColorizeWorld
.computeFogColor((WorldProvider) (Object) this, celestialAngle);
private void modifyGetFogColor1(float celestialAngle, float renderPartialTicks, CallbackInfoReturnable<Vec3> cir,
@Share("computeFogColor") LocalBooleanRef computeFogColor) {
computeFogColor.set(ColorizeWorld.computeFogColor((WorldProvider) (Object) this, celestialAngle));
}
@ModifyConstant(method = "getFogColor(FF)Lnet/minecraft/util/Vec3;", constant = @Constant(floatValue = 0.7529412F))
private float modifyGetFogColor1(float constant) {
if (this.mcpatcher_forge$computeFogColor) {
private float modifyGetFogColor1(float constant, @Share("computeFogColor") LocalBooleanRef computeFogColor) {
if (computeFogColor.get()) {
return Colorizer.setColor[0];
}
return constant;
}
@ModifyConstant(method = "getFogColor(FF)Lnet/minecraft/util/Vec3;", constant = @Constant(floatValue = 0.84705883F))
private float modifyGetFogColor2(float constant) {
if (this.mcpatcher_forge$computeFogColor) {
private float modifyGetFogColor2(float constant, @Share("computeFogColor") LocalBooleanRef computeFogColor) {
if (computeFogColor.get()) {
return Colorizer.setColor[1];
}
return constant;
@@ -45,8 +43,8 @@ public abstract class MixinWorldProvider {
@ModifyConstant(
method = "getFogColor(FF)Lnet/minecraft/util/Vec3;",
constant = @Constant(floatValue = 1.0F, ordinal = 2))
private float modifyGetFogColor3(float constant) {
if (this.mcpatcher_forge$computeFogColor) {
private float modifyGetFogColor3(float constant, @Share("computeFogColor") LocalBooleanRef computeFogColor) {
if (computeFogColor.get()) {
return Colorizer.setColor[2];
}
return constant;
@@ -12,9 +12,13 @@ import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalFloatRef;
import com.llamalad7.mixinextras.sugar.ref.LocalIntRef;
import com.prupe.mcpatcher.cc.ColorizeBlock;
// TODO: split ctm // cc use and migrate to MixinRenderBlocks & MixinRenderBlocksCC
// Only loaded when both cc and ctm are enabled
@Mixin(RenderBlocks.class)
public abstract class MixinRenderBlocks {
@@ -50,11 +54,26 @@ public abstract class MixinRenderBlocks {
target = "Lnet/minecraft/client/renderer/RenderBlocks;getBlockIconFromSideAndMetadata(Lnet/minecraft/block/Block;II)Lnet/minecraft/util/IIcon;",
ordinal = 0))
private IIcon mcpatcherforge$obtainFloatsAndRedirectToGetBlockIcon(RenderBlocks instance, Block block, int side,
int meta, Block specializedBlock, int x, int y, int z) {
int meta, Block specializedBlock, int x, int y, int z, @Share("red") LocalFloatRef red,
@Share("green") LocalFloatRef green, @Share("blue") LocalFloatRef blue) {
int l = block.colorMultiplier(this.blockAccess, x, y, z);
this.mcpatcherforge$neededFloat1 = (float) (l >> 16 & 255) / 255.0F;
this.mcpatcherforge$neededFloat2 = (float) (l >> 8 & 255) / 255.0F;
this.mcpatcherforge$neededFloat3 = (float) (l & 255) / 255.0F;
red.set((float) (l >> 16 & 255) / 255.0F);
blue.set((float) (l >> 8 & 255) / 255.0F);
green.set((float) (l & 255) / 255.0F);
return (this.blockAccess == null) ? this.getBlockIconFromSideAndMetadata(block, side, meta)
: this.getBlockIcon(block, this.blockAccess, x, y, z, side);
}
// Capture needed value
@Redirect(
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/RenderBlocks;getBlockIconFromSideAndMetadata(Lnet/minecraft/block/Block;II)Lnet/minecraft/util/IIcon;",
ordinal = 2))
private IIcon mcpatcherforge$saveSideAndRedirectToGetBlockIcon(RenderBlocks instance, Block block, int side,
int meta, Block specializedBlock, int x, int y, int z, @Share("requiredSide") LocalIntRef requiredSide) {
requiredSide.set(side);
return (this.blockAccess == null) ? this.getBlockIconFromSideAndMetadata(block, side, meta)
: this.getBlockIcon(block, this.blockAccess, x, y, z, side);
}
@@ -66,7 +85,7 @@ public abstract class MixinRenderBlocks {
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
ordinal = 2))
private void mcpatcherforge$redirectColor10(Tessellator tessellator, float red, float green, float blue,
Block block, int x, int y, int z) {
Block block, int x, int y, int z, @Share("requiredSide") LocalIntRef requiredSide) {
if (!(ColorizeBlock.isSmooth = ColorizeBlock.setupBlockSmoothing(
(RenderBlocks) (Object) this,
block,
@@ -74,25 +93,11 @@ public abstract class MixinRenderBlocks {
x,
y,
z,
this.mcpatcherforge$neededSideRenderBlockLiquid + 6))) {
requiredSide.get() + 6))) {
tessellator.setColorOpaque_F(red, green, blue);
}
}
// Capture needed value
@Redirect(
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/RenderBlocks;getBlockIconFromSideAndMetadata(Lnet/minecraft/block/Block;II)Lnet/minecraft/util/IIcon;",
ordinal = 2))
private IIcon mcpatcherforge$saveSideAndRedirectToGetBlockIcon(RenderBlocks instance, Block block, int side,
int meta, Block specializedBlock, int x, int y, int z) {
this.mcpatcherforge$neededSideRenderBlockLiquid = side;
return (this.blockAccess == null) ? this.getBlockIconFromSideAndMetadata(block, side, meta)
: this.getBlockIcon(block, this.blockAccess, x, y, z, side);
}
@Redirect(
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
at = @At(
@@ -100,13 +105,11 @@ public abstract class MixinRenderBlocks {
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
ordinal = 1))
private void mcpatcherforge$redirectColor9(Tessellator tessellator, float red, float green, float blue, Block block,
int x, int y, int z) {
int x, int y, int z, @Share("red") LocalFloatRef redLocal, @Share("green") LocalFloatRef greenLocal,
@Share("blue") LocalFloatRef blueLocal) {
if (!(ColorizeBlock.isSmooth = ColorizeBlock
.setupBlockSmoothing((RenderBlocks) (Object) this, block, this.blockAccess, x, y, z, 6))) {
tessellator.setColorOpaque_F(
red * this.mcpatcherforge$neededFloat1,
green * this.mcpatcherforge$neededFloat2,
blue * this.mcpatcherforge$neededFloat3);
tessellator.setColorOpaque_F(red * redLocal.get(), green * blueLocal.get(), blue * blueLocal.get());
}
if (ColorizeBlock.isSmooth) {
this.enableAO = true;
@@ -0,0 +1,47 @@
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.ctm_cc;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(RenderBlocks.class)
public abstract class MixinRenderBlocksNoCC {
@Shadow
public IBlockAccess blockAccess;
@Shadow
public abstract IIcon getBlockIcon(Block block, IBlockAccess access, int x, int y, int z, int side);
@Shadow
public abstract IIcon getBlockIconFromSideAndMetadata(Block block, int side, int meta);
@Redirect(
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/RenderBlocks;getBlockIconFromSideAndMetadata(Lnet/minecraft/block/Block;II)Lnet/minecraft/util/IIcon;",
ordinal = 0))
private IIcon mcpatcherforge$redirectToGetBlockIcon(RenderBlocks instance, Block block, int side, int meta,
Block specializedBlock, int x, int y, int z) {
return (this.blockAccess == null) ? this.getBlockIconFromSideAndMetadata(block, side, meta)
: this.getBlockIcon(block, this.blockAccess, x, y, z, side);
}
@Redirect(
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/RenderBlocks;getBlockIconFromSideAndMetadata(Lnet/minecraft/block/Block;II)Lnet/minecraft/util/IIcon;",
ordinal = 2))
private IIcon mcpatcherforge$saveSideAndRedirectToGetBlockIcon(RenderBlocks instance, Block block, int side,
int meta, Block specializedBlock, int x, int y, int z) {
return (this.blockAccess == null) ? this.getBlockIconFromSideAndMetadata(block, side, meta)
: this.getBlockIcon(block, this.blockAccess, x, y, z, side);
}
}
@@ -0,0 +1,99 @@
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.ctm_cc;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalFloatRef;
import com.llamalad7.mixinextras.sugar.ref.LocalIntRef;
import com.prupe.mcpatcher.cc.ColorizeBlock;
@Mixin(RenderBlocks.class)
public abstract class MixinRenderBlocksNoCTM {
@Shadow
public IBlockAccess blockAccess;
@Shadow
public boolean enableAO;
@Shadow
public abstract IIcon getBlockIconFromSideAndMetadata(Block block, int side, int meta);
// Redirect calls to this.getBlockIcon when possible
@Redirect(
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/RenderBlocks;getBlockIconFromSideAndMetadata(Lnet/minecraft/block/Block;II)Lnet/minecraft/util/IIcon;",
ordinal = 0))
private IIcon mcpatcherforge$obtainFloatsAndRedirectToGetBlockIcon(RenderBlocks instance, Block block, int side,
int meta, Block specializedBlock, int x, int y, int z, @Share("red") LocalFloatRef red,
@Share("green") LocalFloatRef green, @Share("blue") LocalFloatRef blue) {
int l = block.colorMultiplier(this.blockAccess, x, y, z);
red.set((float) (l >> 16 & 255) / 255.0F);
blue.set((float) (l >> 8 & 255) / 255.0F);
green.set((float) (l & 255) / 255.0F);
return this.getBlockIconFromSideAndMetadata(block, side, meta);
}
// Capture needed value
@Redirect(
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/RenderBlocks;getBlockIconFromSideAndMetadata(Lnet/minecraft/block/Block;II)Lnet/minecraft/util/IIcon;",
ordinal = 2))
private IIcon mcpatcherforge$saveSideAndRedirectToGetBlockIcon(RenderBlocks instance, Block block, int side,
int meta, Block specializedBlock, int x, int y, int z, @Share("requiredSide") LocalIntRef requiredSide) {
requiredSide.set(side);
return this.getBlockIconFromSideAndMetadata(block, side, meta);
}
@Redirect(
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
ordinal = 2))
private void mcpatcherforge$redirectColor10(Tessellator tessellator, float red, float green, float blue,
Block block, int x, int y, int z, @Share("requiredSide") LocalIntRef requiredSide) {
if (!(ColorizeBlock.isSmooth = ColorizeBlock.setupBlockSmoothing(
(RenderBlocks) (Object) this,
block,
this.blockAccess,
x,
y,
z,
requiredSide.get() + 6))) {
tessellator.setColorOpaque_F(red, green, blue);
}
}
@Redirect(
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
ordinal = 1))
private void mcpatcherforge$redirectColor9(Tessellator tessellator, float red, float green, float blue, Block block,
int x, int y, int z, @Share("red") LocalFloatRef redLocal, @Share("green") LocalFloatRef greenLocal,
@Share("blue") LocalFloatRef blueLocal) {
if (!(ColorizeBlock.isSmooth = ColorizeBlock
.setupBlockSmoothing((RenderBlocks) (Object) this, block, this.blockAccess, x, y, z, 6))) {
tessellator.setColorOpaque_F(red * redLocal.get(), green * blueLocal.get(), blue * blueLocal.get());
}
if (ColorizeBlock.isSmooth) {
this.enableAO = true;
}
}
}
@@ -24,6 +24,7 @@ public abstract class MixinTextureMap extends AbstractTexture {
@Shadow
@Final
private Map<String, TextureAtlasSprite> mapRegisteredSprites;
@Shadow
@Final
private String basePath;
@@ -20,6 +20,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalIntRef;
import com.prupe.mcpatcher.cc.ColorizeWorld;
import com.prupe.mcpatcher.hd.FontUtils;
@@ -61,13 +63,6 @@ public abstract class MixinFontRenderer implements FontRendererExpansion {
@Unique
private float mcpatcher_forge$fontAdj;
/**
* for custom text colors the index is required when drawing
* unfortunately capturing locals doesn't work with modifyVariable
*/
@Unique
private int mcpatcher_forge$renderStringAtPosIndex;
public float[] getCharWidthf() {
return mcpatcher_forge$charWidthf;
}
@@ -153,8 +148,9 @@ public abstract class MixinFontRenderer implements FontRendererExpansion {
method = "renderStringAtPos(Ljava/lang/String;Z)V",
locals = LocalCapture.CAPTURE_FAILHARD,
at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/FontRenderer;colorCode:[I"))
private void modifyRenderStringAtPos1(String string, boolean bool, CallbackInfo ci, int i, char c0, int j) {
this.mcpatcher_forge$renderStringAtPosIndex = j;
private void modifyRenderStringAtPos1(String string, boolean bool, CallbackInfo ci, int i, char c0, int j,
@Share("renderStringAtPosIndex") LocalIntRef renderStringAtPosIndex) {
renderStringAtPosIndex.set(j);
}
// IDEA plugin really struggles with this for some reason
@@ -163,8 +159,9 @@ public abstract class MixinFontRenderer implements FontRendererExpansion {
method = "renderStringAtPos(Ljava/lang/String;Z)V",
at = @At(value = "STORE", ordinal = 0),
ordinal = 2)
private int modifyRenderStringAtPos2(int color) {
return ColorizeWorld.colorizeText(color, this.mcpatcher_forge$renderStringAtPosIndex);
private int modifyRenderStringAtPos2(int color,
@Share("renderStringAtPosIndex") LocalIntRef renderStringAtPosIndex) {
return ColorizeWorld.colorizeText(color, renderStringAtPosIndex.get());
}
@ModifyVariable(method = "renderString(Ljava/lang/String;IIIZ)I", at = @At("HEAD"), ordinal = 2, argsOnly = true)
@@ -1,5 +1,7 @@
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.renderpass;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.client.renderer.RenderGlobal;
@@ -9,7 +11,6 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.llamalad7.mixinextras.injector.WrapWithCondition;
@@ -38,14 +39,13 @@ public abstract class MixinEntityRenderer {
return RenderPass.setAmbientOcclusion(this.mc.gameSettings.ambientOcclusion != 0);
}
@Redirect(
method = "renderWorld(FJ)V",
@WrapOperation(method = "renderWorld(FJ)V",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/RenderGlobal;sortAndRender(Lnet/minecraft/entity/EntityLivingBase;ID)I",
ordinal = 0))
private int modifyRenderWorld3(RenderGlobal instance, EntityLivingBase entitylivingbase, int k, double i1) {
int returnValue = instance.sortAndRender(entitylivingbase, k, i1);
private int modifyRenderWorld3(RenderGlobal instance, EntityLivingBase entitylivingbase, int k, double i1, Operation<Integer> original) {
int returnValue = original.call(instance, entitylivingbase, k, i1);
instance.sortAndRender(entitylivingbase, 4, i1);
return returnValue;
}
@@ -11,9 +11,6 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import com.prupe.mcpatcher.renderpass.RenderPass;
/*
* For readability changes to the biggest methods get their own classes
*/
@Mixin(RenderBlocks.class)
public abstract class MixinRenderBlocks {
@@ -11,7 +11,6 @@ import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.Inject;
@@ -20,6 +19,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalIntRef;
import com.prupe.mcpatcher.sky.FireworksHelper;
@SuppressWarnings({ "rawtypes" })
@@ -29,9 +30,6 @@ public abstract class MixinEffectRenderer {
@Shadow
private List[] fxLayers;
@Unique
private int mcpatcher_forge$renderParticlesIndex;
@Inject(
method = "<init>(Lnet/minecraft/world/World;Lnet/minecraft/client/renderer/texture/TextureManager;)V",
at = @At("RETURN"))
@@ -66,23 +64,24 @@ public abstract class MixinEffectRenderer {
at = @At(value = "INVOKE", target = "Ljava/util/List;isEmpty()Z"),
locals = LocalCapture.CAPTURE_FAILHARD)
private void modifyRenderParticles2(Entity player, float partialTickTime, CallbackInfo ci, float f1, float f2,
float f3, float f4, float f5, int k, int i) {
this.mcpatcher_forge$renderParticlesIndex = i;
float f3, float f4, float f5, int k, int i, @Share("renderParticlesIndex") LocalIntRef renderParticlesIndex) {
renderParticlesIndex.set(i);
}
@Redirect(
method = "renderParticles(Lnet/minecraft/entity/Entity;F)V",
at = @At(value = "INVOKE", target = "Ljava/util/List;isEmpty()Z"))
private boolean modifyRenderParticles3(List layer) {
return FireworksHelper.skipThisLayer(
this.fxLayers[mcpatcher_forge$renderParticlesIndex].isEmpty(),
this.mcpatcher_forge$renderParticlesIndex);
private boolean modifyRenderParticles3(List layer,
@Share("renderParticlesIndex") LocalIntRef renderParticlesIndex) {
return FireworksHelper
.skipThisLayer(this.fxLayers[renderParticlesIndex.get()].isEmpty(), renderParticlesIndex.get());
}
@Redirect(
method = "renderParticles(Lnet/minecraft/entity/Entity;F)V",
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glBlendFunc(II)V", remap = false))
private void modifyRenderParticles4(int sfactor, int dfactor) {
FireworksHelper.setParticleBlendMethod(this.mcpatcher_forge$renderParticlesIndex, 0, true);
private void modifyRenderParticles4(int sfactor, int dfactor,
@Share("renderParticlesIndex") LocalIntRef renderParticlesIndex) {
FireworksHelper.setParticleBlendMethod(renderParticlesIndex.get(), 0, true);
}
}
@@ -0,0 +1,11 @@
package com.gtnewhorizons.angelica.mixins.early.sodium;
import net.minecraftforge.event.terraingen.BiomeEvent;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(BiomeEvent.BiomeColor.class)
public interface AccessorBiomeColorEvent {
@Accessor(value = "originalColor", remap = false)
void setOriginalColor(int value);
}
@@ -0,0 +1,45 @@
package com.gtnewhorizons.angelica.mixins.early.sodium;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.event.terraingen.BiomeEvent;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(BiomeGenBase.class)
public class MixinBiomeGenBase {
private final ThreadLocal<BiomeEvent.GetWaterColor> waterColorEventLocal = ThreadLocal.withInitial(() -> new BiomeEvent.GetWaterColor((BiomeGenBase)(Object)this, 0));;
private final ThreadLocal<BiomeEvent.GetGrassColor> grassColorEventLocal = ThreadLocal.withInitial(() -> new BiomeEvent.GetGrassColor((BiomeGenBase)(Object)this, 0));;
private final ThreadLocal<BiomeEvent.GetFoliageColor> foliageColorEventLocal = ThreadLocal.withInitial(() -> new BiomeEvent.GetFoliageColor((BiomeGenBase)(Object)this, 0));
@Unique
private void prepareEvent(BiomeEvent.BiomeColor event, int defaultColor) {
event.newColor = defaultColor;
((AccessorBiomeColorEvent)event).setOriginalColor(defaultColor);
}
@Redirect(method = "getWaterColorMultiplier", at = @At(value = "NEW", target = "(Lnet/minecraft/world/biome/BiomeGenBase;I)Lnet/minecraftforge/event/terraingen/BiomeEvent$GetWaterColor;"))
private BiomeEvent.GetWaterColor memoizeWaterObject(BiomeGenBase biome, int original) {
BiomeEvent.GetWaterColor event = waterColorEventLocal.get();
prepareEvent(event, original);
return event;
}
@Redirect(method = "getModdedBiomeGrassColor", at = @At(value = "NEW", target = "(Lnet/minecraft/world/biome/BiomeGenBase;I)Lnet/minecraftforge/event/terraingen/BiomeEvent$GetGrassColor;"))
private BiomeEvent.GetGrassColor memoizeGrassObject(BiomeGenBase biome, int original) {
BiomeEvent.GetGrassColor event = grassColorEventLocal.get();
prepareEvent(event, original);
return event;
}
@Redirect(method = "getModdedBiomeFoliageColor", at = @At(value = "NEW", target = "(Lnet/minecraft/world/biome/BiomeGenBase;I)Lnet/minecraftforge/event/terraingen/BiomeEvent$GetFoliageColor;"))
private BiomeEvent.GetFoliageColor memoizeFoliageObject(BiomeGenBase biome, int original) {
BiomeEvent.GetFoliageColor event = foliageColorEventLocal.get();
prepareEvent(event, original);
return event;
}
}
@@ -0,0 +1,20 @@
package com.gtnewhorizons.angelica.mixins.early.sodium;
import cpw.mods.fml.client.registry.ClientRegistry;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import java.util.Map;
@Mixin(ClientRegistry.class)
public class MixinClientRegistry {
@Redirect(method = "bindTileEntitySpecialRenderer", at = @At(value = "INVOKE", target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"), remap = false)
private static Object skipPuttingNullRenderer(Map instance, Object key, Object value) {
if(value != null && key != null) {
return instance.put(key, value);
} else {
return null;
}
}
}
@@ -1,35 +0,0 @@
package com.gtnewhorizons.angelica.mixins.early.sodium;
import com.gtnewhorizons.angelica.mixins.interfaces.ISpriteExt;
import me.jellysquid.mods.sodium.client.render.texture.SpriteUtil;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.IIcon;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(EntityFX.class)
public class MixinEntityFX {
@Shadow
protected IIcon particleIcon;
private boolean shouldTickSprite;
@Inject(method = "setParticleIcon", at = @At("RETURN"))
public void afterSetSprite(IIcon icon, CallbackInfo ci) {
this.shouldTickSprite = icon instanceof ISpriteExt atlasSprite && atlasSprite.isAnimation();
}
@Inject(method = "renderParticle", at = @At("HEAD"))
public void renderParticle(Tessellator tessellator, float offset, float x, float y, float z, float u, float v, CallbackInfo ci) {
if (this.shouldTickSprite && this.particleIcon instanceof TextureAtlasSprite atlasSprite) {
SpriteUtil.markSpriteActive(atlasSprite);
}
}
}
@@ -6,9 +6,7 @@ import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalExt;
import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue;
import com.gtnewhorizons.angelica.rendering.RenderingState;
import lombok.Getter;
import me.jellysquid.mods.sodium.client.SodiumClientMod;
import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
@@ -25,12 +23,10 @@ import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.culling.Frustrum;
import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.Blocks;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.lib.Opcodes;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
@@ -301,9 +297,4 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
return e.isInRangeToRender3d(x, y, z) && SodiumWorldRenderer.getInstance().isEntityVisible(e);
}
@Redirect(method = "renderClouds", at = @At(value = "FIELD", target = "Lnet/minecraft/client/settings/GameSettings;fancyGraphics:Z", opcode = Opcodes.GETFIELD, ordinal = 0))
private boolean redirectGetFancyClouds(GameSettings settings) {
return SodiumClientMod.options().quality.cloudQuality.isFancy();
}
}
@@ -53,38 +53,10 @@ public abstract class MixinTessellator implements ITessellatorInstance {
// New methods from ITesselatorInstance
@Override
public float getNormalX() {
return angelica$normalX;
}
@Override
public float getNormalY() {
return angelica$normalY;
}
@Override
public float getNormalZ() {
return angelica$normalZ;
}
@Override
public void discard() {
isDrawing = false;
reset();
}
@Override
public float getMidTextureU() {
return angelica$midTextureU;
}
@Override
public float getMidTextureV() {
return angelica$midTextureV;
}
}
@@ -1,79 +0,0 @@
package com.gtnewhorizons.angelica.mixins.early.sodium;
import me.jellysquid.mods.sodium.client.SodiumClientMod;
import me.jellysquid.mods.sodium.client.render.texture.SpriteExtended;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureUtil;
import net.minecraft.client.resources.data.AnimationMetadataSection;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import java.util.List;
@Mixin(TextureAtlasSprite.class)
public class MixinTextureAtlasSprite implements SpriteExtended {
private boolean forceNextUpdate;
@Shadow
protected List<int[][]> framesTextureData;
@Shadow
private AnimationMetadataSection animationMetadata;
@Shadow
protected int originX;
@Shadow
protected int originY;
@Shadow
protected int width;
@Shadow
protected int height;
@Shadow
protected int frameCounter;
@Shadow
protected int tickCounter;
/**
* @author JellySquid & Asek3
* @reason To optimal solution it's better to overwrite
*/
@Overwrite
public void updateAnimation() {
++this.tickCounter;
boolean onDemand = SodiumClientMod.options().advanced.animateOnlyVisibleTextures;
if (!onDemand || this.forceNextUpdate) {
this.uploadTexture();
}
}
private void uploadTexture() {
if (this.tickCounter >= this.animationMetadata.getFrameTimeSingle(this.frameCounter)) {
int prevFrameIndex = this.animationMetadata.getFrameIndex(this.frameCounter);
int frameCount = this.animationMetadata.getFrameCount() == 0 ? this.framesTextureData.size() : this.animationMetadata.getFrameCount();
this.frameCounter = (this.frameCounter + 1) % frameCount;
this.tickCounter = 0;
int frameIndex = this.animationMetadata.getFrameIndex(this.frameCounter);
if (prevFrameIndex != frameIndex && frameIndex >= 0 && frameIndex < this.framesTextureData.size()) {
TextureUtil.uploadTextureMipmap(this.framesTextureData.get(frameIndex), this.width, this.height, this.originX, this.originY, false, false);
}
}
this.forceNextUpdate = false;
}
@Override
public void markActive() {
this.forceNextUpdate = true;
}
}
@@ -1,24 +0,0 @@
package com.gtnewhorizons.angelica.mixins.early.sodium;
import me.jellysquid.mods.sodium.client.render.texture.SpriteUtil;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(TextureMap.class)
public class MixinTextureMap {
@Inject(method = "getAtlasSprite", at = @At("RETURN"))
private void preReturnSprite(CallbackInfoReturnable<TextureAtlasSprite> cir) {
TextureAtlasSprite sprite = cir.getReturnValue();
if (sprite != null) {
SpriteUtil.markSpriteActive(sprite);
}
}
}
@@ -0,0 +1,42 @@
package com.gtnewhorizons.angelica.mixins.early.sodium;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@Mixin(TileEntityRendererDispatcher.class)
public class MixinTileEntityRendererDispatcher {
@Shadow
public Map<Class<? extends TileEntity>, TileEntitySpecialRenderer> mapSpecialRenderers;
/**
* @author embeddedt
* @reason accessed concurrently by our chunk meshers
*/
@Inject(method = "<init>", at = @At("RETURN"))
private void useConcurrentMap(CallbackInfo ci) {
this.mapSpecialRenderers = new ConcurrentHashMap<>(this.mapSpecialRenderers);
}
/**
* @author embeddedt
* @reason CHM doesn't allow putting null values
*/
@Redirect(method = "getSpecialRendererByClass", at = @At(value = "INVOKE", target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"))
private Object skipPuttingNullRenderer(Map instance, Object key, Object value) {
if(value != null && key != null) {
return instance.put(key, value);
} else {
return null;
}
}
}
@@ -0,0 +1,14 @@
package com.gtnewhorizons.angelica.mixins.interfaces;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.client.model.IModelCustom;
import static cpw.mods.fml.relauncher.Side.CLIENT;
public interface IModelCustomExt extends IModelCustom {
@SideOnly(CLIENT)
void rebuildVBO();
@SideOnly(CLIENT)
void renderAllVBO();
}
@@ -0,0 +1,14 @@
package com.gtnewhorizons.angelica.mixins.interfaces;
public interface IRenderGlobalVBOCapture {
void startStarsVBO(int list, int mode);
void finishStarsVBO();
void startSkyVBO(int list, int mode);
void finishSkyVBO();
void startSky2VBO(int list, int mode);
void finishSky2VBO();
}
@@ -1,13 +1,5 @@
package com.gtnewhorizons.angelica.mixins.interfaces;
public interface ITessellatorInstance {
float getNormalX();
float getNormalY();
float getNormalZ();
float getMidTextureU();
float getMidTextureV();
void discard();
}
@@ -1,49 +0,0 @@
package com.gtnewhorizons.angelica.mixins.interfaces;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.nio.ShortBuffer;
public interface TessellatorAccessor {
ByteBuffer angelica$getByteBuffer();
IntBuffer angelica$getIntBuffer();
FloatBuffer angelica$getFloatBuffer();
ShortBuffer angelica$getShortBuffer();
float[] angelica$getVertexPos();
float angelica$getNormalX();
float angelica$getNormalY();
float angelica$getNormalZ();
float angelica$getMidTextureU();
float angelica$getMidTextureV();
void angelica$setByteBuffer(ByteBuffer angelica$byteBuffer);
void angelica$setIntBuffer(IntBuffer angelica$intBuffer);
void angelica$setFloatBuffer(FloatBuffer angelica$floatBuffer);
void angelica$setShortBuffer(ShortBuffer angelica$shortBuffer);
void angelica$setVertexPos(float[] angelica$vertexPos);
void angelica$setNormalX(float angelica$normalX);
void angelica$setNormalY(float angelica$normalY);
void angelica$setNormalZ(float angelica$normalZ);
void angelica$setMidTextureU(float angelica$midTextureU);
void angelica$setMidTextureV(float angelica$midTextureV);
}
@@ -1,9 +1,11 @@
package com.gtnewhorizons.angelica.proxy;
import com.google.common.base.Objects;
import com.gtnewhorizons.angelica.compat.ModStatus;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.hudcaching.HUDCaching;
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
import com.gtnewhorizons.angelica.render.CloudRenderer;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@@ -11,6 +13,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.relauncher.ReflectionHelper;
import me.jellysquid.mods.sodium.client.SodiumDebugScreenHandler;
import net.coderbot.iris.Iris;
import net.coderbot.iris.client.IrisDebugScreenHandler;
@@ -32,8 +35,10 @@ import net.minecraftforge.common.MinecraftForge;
import java.lang.management.ManagementFactory;
import java.util.Locale;
import java.util.concurrent.ConcurrentHashMap;
public class ClientProxy extends CommonProxy {
final Minecraft mc = Minecraft.getMinecraft();
@Override
public void preInit(FMLPreInitializationEvent event) {
@@ -62,7 +67,17 @@ public class ClientProxy extends CommonProxy {
@Override
public void postInit(FMLPostInitializationEvent event) {
// Nothing to do here (yet)
if (ModStatus.isLotrLoaded && AngelicaConfig.enableSodium && AngelicaConfig.fixLotrSodiumCompat) {
try {
Class<?> lotrRendering = Class.forName("lotr.common.coremod.LOTRReplacedMethods$BlockRendering");
ReflectionHelper.setPrivateValue(lotrRendering,null,new ConcurrentHashMap<>(),"naturalBlockClassTable");
ReflectionHelper.setPrivateValue(lotrRendering,null,new ConcurrentHashMap<>(),"naturalBlockTable");
ReflectionHelper.setPrivateValue(lotrRendering,null,new ConcurrentHashMap<>(),"cachedNaturalBlocks");
}
catch (ClassNotFoundException e) {
AngelicaTweaker.LOGGER.error("Could net replace LOTR handle render code with thread safe version");
}
}
}
float lastIntegratedTickTime;
@@ -175,4 +190,12 @@ public class ClientProxy extends CommonProxy {
event.blue = 0f;
}
@SubscribeEvent
public void onTick(TickEvent.ClientTickEvent event) {
if (event.phase == TickEvent.Phase.END && mc.theWorld != null) {
CloudRenderer.getCloudRenderer().checkSettings();
}
}
}
@@ -0,0 +1,399 @@
/*
* Backported from Minecraft Forge 1.12 under the LGPL 2.1
*
* Minecraft Forge
* Copyright (c) 2016.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package com.gtnewhorizons.angelica.render;
import com.gtnewhorizons.angelica.client.renderer.CapturingTessellator;
import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat;
import com.gtnewhorizons.angelica.compat.mojang.VertexBuffer;
import com.gtnewhorizons.angelica.compat.mojang.VertexFormat;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.TessellatorManager;
import com.gtnewhorizons.angelica.glsm.VBOManager;
import me.jellysquid.mods.sodium.client.SodiumClientMod;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.texture.DynamicTexture;
import net.minecraft.client.resources.IReloadableResourceManager;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.client.resources.IResourceManagerReloadListener;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Vec3;
import org.lwjgl.opengl.GL11;
public class CloudRenderer implements IResourceManagerReloadListener {
// Shared constants.
private static final float PX_SIZE = 1 / 256F;
// Building constants.
private static final VertexFormat FORMAT = DefaultVertexFormat.POSITION_TEXTURE_COLOR;
private static final int TOP_SECTIONS = 12; // Number of slices a top face will span.
private static final int HEIGHT = 4;
private static final float INSET = 0.001F;
private static final float ALPHA = 0.8F;
// Debug
private static final boolean WIREFRAME = false;
// Instance fields
private final Minecraft mc = Minecraft.getMinecraft();
private final ResourceLocation texture = new ResourceLocation("textures/environment/clouds.png");
private int displayList = -1;
private VertexBuffer vbo;
private int cloudMode = -1;
private int renderDistance = -1;
private DynamicTexture COLOR_TEX = null;
private int texW;
private int texH;
public CloudRenderer() {
// Resource manager should always be reloadable.
((IReloadableResourceManager) mc.getResourceManager()).registerReloadListener(this);
}
private static CloudRenderer instance;
public static CloudRenderer getCloudRenderer() {
if (instance == null)
instance = new CloudRenderer();
return instance;
}
private int getScale() {
return cloudMode == 2 ? 12 : 8;
}
private float ceilToScale(float value) {
float scale = getScale();
return (float)Math.ceil(value / scale) * scale;
}
private void vertices(CapturingTessellator tessellator) {
boolean fancy = SodiumClientMod.options().quality.cloudQuality.isFancy();
float scale = getScale();
float CULL_DIST = 2 * scale;
float bCol = fancy ? 0.7F : 1F;
float sectEnd = ceilToScale((renderDistance * 2) * 16);
float sectStart = -sectEnd;
float sectStep = ceilToScale(sectEnd * 2 / TOP_SECTIONS);
float sectPx = PX_SIZE / scale;
tessellator.startDrawingQuads();
float sectX0 = sectStart;
float sectX1 = sectX0;
while (sectX1 < sectEnd) {
sectX1 += sectStep;
if (sectX1 > sectEnd)
sectX1 = sectEnd;
float sectZ0 = sectStart;
float sectZ1 = sectZ0;
while (sectZ1 < sectEnd) {
sectZ1 += sectStep;
if (sectZ1 > sectEnd)
sectZ1 = sectEnd;
float u0 = sectX0 * sectPx;
float u1 = sectX1 * sectPx;
float v0 = sectZ0 * sectPx;
float v1 = sectZ1 * sectPx;
// Bottom
tessellator.pos(sectX0, 0, sectZ0).tex(u0, v0).color(bCol, bCol, bCol, ALPHA).endVertex();
tessellator.pos(sectX1, 0, sectZ0).tex(u1, v0).color(bCol, bCol, bCol, ALPHA).endVertex();
tessellator.pos(sectX1, 0, sectZ1).tex(u1, v1).color(bCol, bCol, bCol, ALPHA).endVertex();
tessellator.pos(sectX0, 0, sectZ1).tex(u0, v1).color(bCol, bCol, bCol, ALPHA).endVertex();
if (fancy) {
// Top
tessellator.pos(sectX0, HEIGHT, sectZ0).tex(u0, v0).color(1, 1, 1, ALPHA).endVertex();
tessellator.pos(sectX0, HEIGHT, sectZ1).tex(u0, v1).color(1, 1, 1, ALPHA).endVertex();
tessellator.pos(sectX1, HEIGHT, sectZ1).tex(u1, v1).color(1, 1, 1, ALPHA).endVertex();
tessellator.pos(sectX1, HEIGHT, sectZ0).tex(u1, v0).color(1, 1, 1, ALPHA).endVertex();
float slice;
float sliceCoord0;
float sliceCoord1;
for (slice = sectX0; slice < sectX1; ) {
sliceCoord0 = slice * sectPx;
sliceCoord1 = sliceCoord0 + PX_SIZE;
// X sides
if (slice > -CULL_DIST) {
slice += INSET;
tessellator.pos(slice, 0, sectZ1).tex(sliceCoord0, v1).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex();
tessellator.pos(slice, HEIGHT, sectZ1).tex(sliceCoord1, v1).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex();
tessellator.pos(slice, HEIGHT, sectZ0).tex(sliceCoord1, v0).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex();
tessellator.pos(slice, 0, sectZ0).tex(sliceCoord0, v0).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex();
slice -= INSET;
}
slice += scale;
if (slice <= CULL_DIST) {
slice -= INSET;
tessellator.pos(slice, 0, sectZ0).tex(sliceCoord0, v0).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex();
tessellator.pos(slice, HEIGHT, sectZ0).tex(sliceCoord1, v0).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex();
tessellator.pos(slice, HEIGHT, sectZ1).tex(sliceCoord1, v1).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex();
tessellator.pos(slice, 0, sectZ1).tex(sliceCoord0, v1).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex();
slice += INSET;
}
}
for (slice = sectZ0; slice < sectZ1; ) {
sliceCoord0 = slice * sectPx;
sliceCoord1 = sliceCoord0 + PX_SIZE;
// Z sides
if (slice > -CULL_DIST) {
slice += INSET;
tessellator.pos(sectX0, 0, slice).tex(u0, sliceCoord0).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex();
tessellator.pos(sectX0, HEIGHT, slice).tex(u0, sliceCoord1).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex();
tessellator.pos(sectX1, HEIGHT, slice).tex(u1, sliceCoord1).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex();
tessellator.pos(sectX1, 0, slice).tex(u1, sliceCoord0).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex();
slice -= INSET;
}
slice += scale;
if (slice <= CULL_DIST) {
slice -= INSET;
tessellator.pos(sectX1, 0, slice).tex(u1, sliceCoord0).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex();
tessellator.pos(sectX1, HEIGHT, slice).tex(u1, sliceCoord1).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex();
tessellator.pos(sectX0, HEIGHT, slice).tex(u0, sliceCoord1).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex();
tessellator.pos(sectX0, 0, slice).tex(u0, sliceCoord0).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex();
slice += INSET;
}
}
}
sectZ0 = sectZ1;
}
sectX0 = sectX1;
}
}
private void dispose() {
if (vbo != null) {
vbo.close();
vbo = null;
}
}
private void build() {
TessellatorManager.startCapturing();
CapturingTessellator tess = (CapturingTessellator) TessellatorManager.get();
vertices(tess);
if(displayList == -1) {
this.displayList = VBOManager.generateDisplayLists(1);
}
this.vbo = VBOManager.registerVBO(this.displayList, TessellatorManager.stopCapturingToVBO(FORMAT));
}
private int fullCoord(double coord, int scale) { // Corrects misalignment of UV offset when on negative coords.
return ((int) coord / scale) - (coord < 0 ? 1 : 0);
}
private boolean isBuilt() {
return vbo != null;
}
public void checkSettings() {
final int cloudQualitySetting = SodiumClientMod.options().quality.cloudQuality.isFancy() ? 2 : 1;
boolean newEnabled = mc.gameSettings.shouldRenderClouds()
&& mc.theWorld != null
&& mc.theWorld.provider.isSurfaceWorld();
if (isBuilt()
&& (!newEnabled
|| cloudQualitySetting != cloudMode
|| mc.gameSettings.renderDistanceChunks != renderDistance)) {
dispose();
}
cloudMode = cloudQualitySetting;
renderDistance = mc.gameSettings.renderDistanceChunks;
if (newEnabled && !isBuilt()) {
build();
}
}
public boolean render(int cloudTicks, float partialTicks) {
if (!isBuilt())
return false;
Entity entity = mc.renderViewEntity;
double totalOffset = cloudTicks + partialTicks;
double x = entity.prevPosX + (entity.posX - entity.prevPosX) * partialTicks + totalOffset * 0.03;
double y = mc.theWorld.provider.getCloudHeight() - (entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * partialTicks) + 0.33;
double z = entity.prevPosZ + (entity.posZ - entity.prevPosZ) * partialTicks;
int scale = getScale();
if (cloudMode == 2)
z += 0.33 * scale;
// Integer UVs to translate the texture matrix by.
int offU = fullCoord(x, scale);
int offV = fullCoord(z, scale);
GLStateManager.glPushMatrix();
// Translate by the remainder after the UV offset.
GLStateManager.glTranslated((offU * scale) - x, y, (offV * scale) - z);
// Modulo to prevent texture samples becoming inaccurate at extreme offsets.
offU = offU % texW;
offV = offV % texH;
// Translate the texture.
GLStateManager.glMatrixMode(GL11.GL_TEXTURE);
GLStateManager.glTranslated(offU * PX_SIZE, offV * PX_SIZE, 0);
GLStateManager.glMatrixMode(GL11.GL_MODELVIEW);
GLStateManager.disableCull();
GLStateManager.enableBlend();
GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
// Color multiplier.
Vec3 color = mc.theWorld.getCloudColour(partialTicks);
float r = (float) color.xCoord;
float g = (float) color.yCoord;
float b = (float) color.zCoord;
if (mc.gameSettings.anaglyph) {
float tempR = r * 0.3F + g * 0.59F + b * 0.11F;
float tempG = r * 0.3F + g * 0.7F;
float tempB = r * 0.3F + b * 0.7F;
r = tempR;
g = tempG;
b = tempB;
}
if (COLOR_TEX == null)
COLOR_TEX = new DynamicTexture(1, 1);
// Apply a color multiplier through a texture upload if shaders aren't supported.
COLOR_TEX.getTextureData()[0] = 255 << 24
| ((int) (r * 255)) << 16
| ((int) (g * 255)) << 8
| (int) (b * 255);
COLOR_TEX.updateDynamicTexture();
GLStateManager.glActiveTexture(OpenGlHelper.lightmapTexUnit);
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, COLOR_TEX.getGlTextureId());
GLStateManager.enableTexture();
// Bind the clouds texture last so the shader's sampler2D is correct.
GLStateManager.glActiveTexture(OpenGlHelper.defaultTexUnit);
mc.renderEngine.bindTexture(texture);
vbo.setupState();
// Depth pass to prevent insides rendering from the outside.
GLStateManager.glColorMask(false, false, false, false);
vbo.draw(GL11.GL_QUADS);
// Full render.
if (!mc.gameSettings.anaglyph) {
GLStateManager.glColorMask(true, true, true, true);
} else {
switch (EntityRenderer.anaglyphField) {
case 0:
GLStateManager.glColorMask(false, true, true, true);
break;
case 1:
GLStateManager.glColorMask(true, false, false, true);
break;
}
}
// Wireframe for debug.
if (WIREFRAME) {
GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE);
GL11.glLineWidth(2.0F);
GLStateManager.disableTexture();
GLStateManager.glDepthMask(false);
GLStateManager.disableFog();
vbo.draw(GL11.GL_QUADS);
GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
GLStateManager.glDepthMask(true);
GLStateManager.enableTexture();
GLStateManager.enableFog();
}
vbo.draw(GL11.GL_QUADS);
vbo.cleanupState(); // Unbind buffer and disable pointers.
// Disable our coloring.
GLStateManager.glActiveTexture(OpenGlHelper.lightmapTexUnit);
GLStateManager.disableTexture();
GLStateManager.glActiveTexture(OpenGlHelper.defaultTexUnit);
// Reset texture matrix.
GLStateManager.glMatrixMode(GL11.GL_TEXTURE);
GLStateManager.glLoadIdentity();
GLStateManager.glMatrixMode(GL11.GL_MODELVIEW);
GLStateManager.disableBlend();
GLStateManager.enableCull();
GLStateManager.glPopMatrix();
return true;
}
private void reloadTextures() {
if (mc.renderEngine != null) {
mc.renderEngine.bindTexture(texture);
texW = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH);
texH = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_HEIGHT);
}
}
@Override
public void onResourceManagerReload(IResourceManager resourceManager) {
reloadTextures();
}
}
@@ -11,7 +11,7 @@ public class AngelicaBlockSafetyRegistry {
private static final StampedLock LOCK = new StampedLock();
public static boolean canBlockRenderOffThread(Block block) {
long stamp = LOCK.readLock();
final long stamp = LOCK.readLock();
boolean isOffThread, shouldPopulate;
try {
isOffThread = SAFETY_MAP.getBoolean(block);
@@ -32,9 +32,9 @@ public class AngelicaBlockSafetyRegistry {
}
private static boolean populateCanRenderOffThread(Block block) {
boolean canBeOffThread = !(block.getClass().getName().startsWith("gregtech."));
final boolean canBeOffThread = !(block.getClass().getName().startsWith("gregtech."));
long stamp = LOCK.writeLock();
final long stamp = LOCK.writeLock();
try {
SAFETY_MAP.put(block, canBeOffThread);
@@ -1,7 +1,7 @@
package com.gtnewhorizons.angelica.transform;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
import net.coderbot.iris.IrisLogging;
import net.minecraft.launchwrapper.IClassTransformer;
@@ -93,6 +93,7 @@ public class RedirectorTransformer implements IClassTransformer {
.add("glAlphaFunc")
.add("glBindTexture")
.add("glBlendFunc")
.add("glCallList")
.add("glClearColor")
.add("glColor3b")
.add("glColor3d")
@@ -261,7 +262,7 @@ public class RedirectorTransformer implements IClassTransformer {
}
}
else if ((node.getOpcode() == Opcodes.GETFIELD || node.getOpcode() == Opcodes.PUTFIELD) && node instanceof FieldInsnNode fNode) {
if(!blockOwnerExclusions.contains(fNode.owner) && blockSubclasses.contains(fNode.owner)) {
if(!blockOwnerExclusions.contains(fNode.owner) && blockSubclasses.contains(fNode.owner) && AngelicaConfig.enableSodium) {
Pair<String, String> fieldToRedirect = null;
for(Pair<String, String> blockPairs : BlockBoundsFields) {
if(fNode.name.equals(blockPairs.getLeft()) || fNode.name.equals(blockPairs.getRight())) {
@@ -0,0 +1,25 @@
package com.gtnewhorizons.angelica.utils;
import java.util.ArrayList;
import java.util.function.Supplier;
public class ObjectPooler<T> {
private final Supplier<T> instanceSupplier;
private final ArrayList<T> availableInstances;
public ObjectPooler(Supplier<T> instanceSupplier) {
this.instanceSupplier = instanceSupplier;
this.availableInstances = new ArrayList<>();
}
public T getInstance() {
if(this.availableInstances.isEmpty()) {
return this.instanceSupplier.get();
}
return this.availableInstances.remove(this.availableInstances.size() - 1);
}
public void releaseInstance(T instance) {
this.availableInstances.add(instance);
}
}
@@ -1,174 +0,0 @@
package com.prupe.mcpatcher;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Reader;
import java.nio.file.Files;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.minecraft.launchwrapper.Launch;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
public class Config {
private static Config instance;
private static final File configFile = new File(Launch.minecraftHome, "config" + File.separator + "mcpatcher.json");
private Map<String, String> logging;
Map<String, Map<String, String>> profile;
public static Config getInstance() {
if (instance == null) {
loadConfig();
}
return instance;
}
static Level getLogLevel(String category) {
Level level = Level.INFO;
String value = getInstance().logging.get(category);
if (value != null) {
try {
level = Level.parse(
value.trim()
.toUpperCase());
} catch (Throwable e) {}
}
setLogLevel(category, level);
return level;
}
static void setLogLevel(String category, Level level) {
getInstance().logging.put(
category,
level.toString()
.toUpperCase());
}
static void loadConfig() {
Gson gson = new Gson();
try (Reader reader = Files.newBufferedReader(configFile.toPath())) {
instance = gson.fromJson(reader, Config.class);
} catch (IOException e) {
Logger.getLogger("mcpatcher")
.warning("Failed to read mcpatcher json config file, using defaults");
instance = new Config();
if (instance.logging == null) {
instance.logging = new LinkedHashMap<>();
}
if (instance.profile == null) {
instance.profile = new LinkedHashMap<>();
}
saveConfig();
}
}
static void saveConfig() {
Gson gsonBuilder = new GsonBuilder().setPrettyPrinting()
.create();
try (FileWriter writer = new FileWriter(configFile)) {
gsonBuilder.toJson(instance, writer);
} catch (IOException e) {
Logger.getLogger("mcpatcher")
.warning("Failed to save mc patcher config, settings not saved");
}
}
/**
* Gets a value from the config
*
* @param tag property name
* @param defaultValue default value if not found in profile
* @return String value
*/
public static String getString(String mod, String tag, Object defaultValue) {
Map<String, String> modConfig = getInstance().getModConfig(mod);
String value = modConfig.get(tag);
if (value == null) {
modConfig.put(tag, defaultValue.toString());
saveConfig();
return defaultValue.toString();
} else {
return value;
}
}
/**
* Gets a value from the config.
*
* @param mod name of mod
* @param tag property name
* @param defaultValue default value if not found in profile
* @return int value or 0
*/
public static int getInt(String mod, String tag, int defaultValue) {
int value;
try {
value = Integer.parseInt(getString(mod, tag, defaultValue));
} catch (NumberFormatException e) {
value = defaultValue;
}
return value;
}
/**
* Gets a value from the config
*
* @param mod name of mod
* @param tag property name
* @param defaultValue default value if not found in profile
* @return boolean value
*/
public static boolean getBoolean(String mod, String tag, boolean defaultValue) {
String value = getString(mod, tag, defaultValue).toLowerCase();
if (value.equals("false")) {
return false;
} else if (value.equals("true")) {
return true;
} else {
return defaultValue;
}
}
/**
* Sets a value in mcpatcher.json.
*
* @param mod name of mod
* @param tag property name
* @param value property value (must support toString())
*/
public static void set(String mod, String tag, Object value) {
if (value == null) {
remove(mod, tag);
return;
}
getInstance().getModConfig(mod)
.put(tag, value.toString());
saveConfig();
}
/**
* Remove a value from mcpatcher.json.
*
* @param mod name of mod
* @param tag property name
*/
private static void remove(String mod, String tag) {
getInstance().getModConfig(mod)
.remove(tag);
}
private Map<String, String> getModConfig(String mod) {
return this.profile.computeIfAbsent(mod, k -> new LinkedHashMap<>());
}
}
@@ -8,6 +8,8 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
public class MCLogger {
private static final Map<String, MCLogger> allLoggers = new HashMap<>();
@@ -26,23 +28,33 @@ public class MCLogger {
private int floodCount;
private long lastMessage = System.currentTimeMillis();
public static MCLogger getLogger(String category) {
return getLogger(category, category);
public static MCLogger getLogger(Category category) {
return getLogger(category, category.name);
}
public static synchronized MCLogger getLogger(String category, String logPrefix) {
MCLogger logger = allLoggers.get(category);
public static synchronized MCLogger getLogger(Category category, String logPrefix) {
MCLogger logger = allLoggers.get(category.name);
if (logger == null) {
logger = new MCLogger(category, logPrefix);
allLoggers.put(category, logger);
allLoggers.put(category.name, logger);
}
return logger;
}
private MCLogger(String category, String logPrefix) {
private MCLogger(Category category, String logPrefix) {
this.logPrefix = logPrefix;
logger = Logger.getLogger(category);
logger.setLevel(Config.getLogLevel(category));
logger = Logger.getLogger(category.name);
MCPatcherForgeConfig config = MCPatcherForgeConfig.instance();
logger.setLevel(Level.parse(switch (category) {
case CUSTOM_COLORS -> config.customColorsLoggingLevel;
case CUSTOM_ITEM_TEXTURES -> config.customItemTexturesLoggingLevel;
case CONNECTED_TEXTURES -> config.connectedTexturesLoggingLevel;
case EXTENDED_HD -> config.extendedHDLoggingLevel;
case RANDOM_MOBS -> config.randomMobsLoggingLevel;
case BETTER_SKIES -> config.betterSkiesLoggingLevel;
default -> Level.INFO.getName();
}));
logger.setUseParentHandlers(false);
logger.addHandler(new Handler() {
@@ -163,4 +175,25 @@ public class MCLogger {
super("ERROR", (Level.WARNING.intValue() + Level.SEVERE.intValue()) / 2);
}
}
public enum Category {
CUSTOM_COLORS(MCPatcherUtils.CUSTOM_COLORS),
CUSTOM_ITEM_TEXTURES(MCPatcherUtils.CUSTOM_ITEM_TEXTURES),
CONNECTED_TEXTURES(MCPatcherUtils.CONNECTED_TEXTURES),
EXTENDED_HD(MCPatcherUtils.EXTENDED_HD),
RANDOM_MOBS(MCPatcherUtils.RANDOM_MOBS),
BETTER_SKIES(MCPatcherUtils.BETTER_SKIES),
TEXTURE_PACK("Texture Pack"),
TILESHEET("Tilesheet"),
BETTER_GLASS(MCPatcherUtils.BETTER_GLASS),
;
public final String name;
Category(String name) {
this.name = name;
}
}
}
@@ -13,7 +13,6 @@ import net.minecraft.world.IBlockAccess;
import org.lwjgl.opengl.GL11;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.biome.BiomeAPI;
@@ -28,19 +27,20 @@ import com.prupe.mcpatcher.mal.resource.PropertiesFile;
import com.prupe.mcpatcher.mal.resource.ResourceList;
import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
public class ColorizeBlock {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CUSTOM_COLORS);
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CUSTOM_COLORS);
private static final boolean useWaterColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "water", true);
private static final boolean useTreeColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "tree", true);
private static final boolean useRedstoneColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "redstone", true);
private static final boolean useStemColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "stem", true);
private static final boolean useBlockColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "otherBlocks", true);
private static final boolean useWaterColors = MCPatcherForgeConfig.instance().ccWater;
private static final boolean useTreeColors = MCPatcherForgeConfig.instance().ccTree;
private static final boolean useRedstoneColors = MCPatcherForgeConfig.instance().ccRedstone;
private static final boolean useStemColors = MCPatcherForgeConfig.instance().ccStem;
private static final boolean useBlockColors = MCPatcherForgeConfig.instance().ccOtherBlocks;
static final boolean enableSmoothBiomes = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "smoothBiomes", true);
static final boolean enableTestColorSmoothing = Config
.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "testColorSmoothing", false);
static final boolean enableSmoothBiomes = MCPatcherForgeConfig.instance().smoothBiomes;
static final boolean enableTestColorSmoothing = MCPatcherForgeConfig.instance().testColorSmoothing;
private static final ResourceLocation REDSTONE_COLORS = TexturePackAPI
.newMCPatcherResourceLocation("colormap/redstone.png");
@@ -74,7 +74,7 @@ public class ColorizeBlock {
private static IColorMap waterColorMap;
private static float[][] redstoneColor; // colormap/redstone.png
private static final int blockBlendRadius = Config.getInt(MCPatcherUtils.CUSTOM_COLORS, "blockBlendRadius2", 4);
private static final int blockBlendRadius = MCPatcherForgeConfig.instance().blockBlendRadius;
public static int blockColor;
public static boolean isSmooth;
@@ -10,7 +10,6 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionHelper;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.resource.PropertiesFile;
import com.gtnewhorizons.angelica.mixins.interfaces.MapColorExpansion;
@@ -18,7 +17,7 @@ import com.gtnewhorizons.angelica.mixins.interfaces.PotionExpansion;
public class ColorizeItem {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CUSTOM_COLORS);
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CUSTOM_COLORS);
private static final Map<Integer, String> entityNamesByID = new HashMap<>();
private static final Map<Integer, Integer> spawnerEggShellColors = new HashMap<>(); // egg.shell.*
@@ -14,8 +14,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.WorldProvider;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.biome.BiomeAPI;
import com.prupe.mcpatcher.mal.biome.ColorMap;
import com.prupe.mcpatcher.mal.biome.ColorMapBase;
@@ -24,9 +22,11 @@ import com.prupe.mcpatcher.mal.biome.IColorMap;
import com.prupe.mcpatcher.mal.resource.PropertiesFile;
import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
public class ColorizeWorld {
private static final int fogBlendRadius = Config.getInt(MCPatcherUtils.CUSTOM_COLORS, "fogBlendRadius", 7);
private static final int fogBlendRadius = MCPatcherForgeConfig.instance().fogBlendRadius;
private static final ResourceLocation UNDERWATERCOLOR = TexturePackAPI
.newMCPatcherResourceLocation("colormap/underwater.png");
@@ -3,7 +3,6 @@ package com.prupe.mcpatcher.cc;
import net.minecraft.potion.Potion;
import net.minecraft.util.ResourceLocation;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.biome.ColorMap;
@@ -12,22 +11,24 @@ import com.prupe.mcpatcher.mal.resource.PropertiesFile;
import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
public class Colorizer {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CUSTOM_COLORS);
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CUSTOM_COLORS);
static final ResourceLocation COLOR_PROPERTIES = TexturePackAPI.newMCPatcherResourceLocation("color.properties");
private static PropertiesFile properties;
static final boolean usePotionColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "potion", true);
static final boolean useParticleColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "particle", true);
static final boolean useFogColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "fog", true);
static final boolean useCloudType = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "clouds", true);
static final boolean useMapColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "map", true);
static final boolean useDyeColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "dye", true);
static final boolean useTextColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "text", true);
static final boolean useXPOrbColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "xporb", true);
static final boolean useEggColors = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "egg", true);
static final boolean usePotionColors = MCPatcherForgeConfig.instance().ccPotion;
static final boolean useParticleColors = MCPatcherForgeConfig.instance().ccParticle;
static final boolean useFogColors = MCPatcherForgeConfig.instance().ccFog;
static final boolean useCloudType = MCPatcherForgeConfig.instance().ccClouds;
static final boolean useMapColors = MCPatcherForgeConfig.instance().ccMap;
static final boolean useDyeColors = MCPatcherForgeConfig.instance().ccDye;
static final boolean useTextColors = MCPatcherForgeConfig.instance().ccText;
static final boolean useXPOrbColors = MCPatcherForgeConfig.instance().ccXPOrb;
static final boolean useEggColors = MCPatcherForgeConfig.instance().ccEgg;
public static final float[] setColor = new float[3];
@@ -10,21 +10,21 @@ import net.minecraft.potion.Potion;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.biome.ColorUtils;
import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
public final class Lightmap {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CUSTOM_COLORS);
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CUSTOM_COLORS);
private static final String LIGHTMAP_FORMAT = "lightmap/world%d.png";
private static final int LIGHTMAP_SIZE = 16;
private static final int HEIGHT_WITHOUT_NIGHTVISION = 2 * LIGHTMAP_SIZE;
private static final int HEIGHT_WITH_NIGHTVISION = 4 * LIGHTMAP_SIZE;
private static final boolean useLightmaps = Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "lightmaps", true);
private static final boolean useLightmaps = MCPatcherForgeConfig.instance().ccLightmaps;
private static final Map<Integer, Lightmap> lightmaps = new HashMap<>();
@@ -18,7 +18,6 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.item.ItemAPI;
@@ -28,11 +27,12 @@ import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler;
import com.prupe.mcpatcher.mal.tile.TileLoader;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
import com.gtnewhorizons.angelica.mixins.interfaces.NBTTagListExpansion;
public class CITUtils {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "CIT");
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CUSTOM_ITEM_TEXTURES, "CIT");
static final String CIT_PROPERTIES = "cit.properties";
private static final ResourceLocation CIT_PROPERTIES1 = TexturePackAPI.newMCPatcherResourceLocation(CIT_PROPERTIES);
@@ -46,10 +46,9 @@ public class CITUtils {
static Item itemCompass;
static Item itemClock;
static final boolean enableItems = Config.getBoolean(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "items", true);
static final boolean enableEnchantments = Config
.getBoolean(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "enchantments", true);
static final boolean enableArmor = Config.getBoolean(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "armor", true);
static final boolean enableItems = MCPatcherForgeConfig.instance().citItems;
static final boolean enableEnchantments = MCPatcherForgeConfig.instance().citEnchantments;
static final boolean enableArmor = MCPatcherForgeConfig.instance().citArmor;
private static TileLoader tileLoader;
private static final Map<Item, List<ItemOverride>> items = new IdentityHashMap<>();
@@ -10,12 +10,11 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.resource.PropertiesFile;
final class EnchantmentList {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "CIT");
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CUSTOM_ITEM_TEXTURES, "CIT");
private static final float PI = (float) Math.PI;
@@ -23,7 +23,7 @@ import com.prupe.mcpatcher.mal.tile.TileLoader;
abstract class OverrideBase implements Comparable<OverrideBase> {
static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "CIT");
static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CUSTOM_ITEM_TEXTURES, "CIT");
private static final int MAX_DAMAGE = 65535;
private static final int MAX_STACK_SIZE = 65535;
@@ -11,13 +11,12 @@ import net.minecraft.potion.PotionHelper;
import net.minecraft.util.ResourceLocation;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.resource.PropertiesFile;
import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
class PotionReplacer {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "CIT");
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CUSTOM_ITEM_TEXTURES, "CIT");
private static final String ITEM_ID_POTION = "minecraft:potion";
private static final String ITEM_ID_GLASS_BOTTLE = "minecraft:glass_bottle";
@@ -14,7 +14,6 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.IBlockAccess;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.block.BlockAPI;
@@ -27,14 +26,14 @@ import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler;
import com.prupe.mcpatcher.mal.tile.TileLoader;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
public class CTMUtils {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CONNECTED_TEXTURES, "CTM");
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CONNECTED_TEXTURES, "CTM");
private static final boolean enableStandard = Config
.getBoolean(MCPatcherUtils.CONNECTED_TEXTURES, "standard", true);
private static final boolean enableNonStandard = Config
.getBoolean(MCPatcherUtils.CONNECTED_TEXTURES, "nonStandard", true);
private static final boolean enableStandard = MCPatcherForgeConfig.instance().ctmStandard;
private static final boolean enableNonStandard = MCPatcherForgeConfig.instance().ctmNonStandard;
private static final List<ITileOverride> allOverrides = new ArrayList<>();
private static final Map<Block, List<BlockStateMatcher>> blockOverrides = new IdentityHashMap<>();
@@ -8,13 +8,13 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.block.BlockAPI;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
public class GlassPaneRenderer {
private static final boolean enable = Config.getBoolean(MCPatcherUtils.CONNECTED_TEXTURES, "glassPane", true);
private static final boolean enable = MCPatcherForgeConfig.instance().ctmGlassPane;
public static boolean skipPaneRendering;
public static boolean skipTopEdgeRendering;
@@ -30,7 +30,7 @@ import com.prupe.mcpatcher.mal.tile.TileLoader;
abstract class TileOverride implements ITileOverride {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CONNECTED_TEXTURES, "CTM");
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CONNECTED_TEXTURES, "CTM");
private static final int META_MASK = 0xffff;
@@ -9,13 +9,13 @@ import java.util.Set;
import net.minecraft.block.Block;
import net.minecraft.util.IIcon;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.block.BlockStateMatcher;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
abstract public class TileOverrideIterator implements Iterator<ITileOverride> {
private static final int MAX_RECURSION = Config.getInt(MCPatcherUtils.CONNECTED_TEXTURES, "maxRecursion", 4);
private static final int MAX_RECURSION = MCPatcherForgeConfig.instance().maxRecursion;
private final Map<Block, List<BlockStateMatcher>> allBlockOverrides;
private final Map<String, List<ITileOverride>> allTileOverrides;
@@ -14,7 +14,6 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import org.lwjgl.util.glu.GLU;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.resource.GLAPI;
@@ -23,11 +22,13 @@ import com.prupe.mcpatcher.mal.resource.ResourceList;
import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
public class CustomAnimation implements Comparable<CustomAnimation> {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CUSTOM_ANIMATIONS, "Animation");
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.EXTENDED_HD, "Animation");
private static final boolean enable = Config.getBoolean(MCPatcherUtils.EXTENDED_HD, "animations", true);
private static final boolean enable = MCPatcherForgeConfig.instance().animations;
private static final Set<PropertiesFile> pending = new HashSet<>();
private static final List<CustomAnimation> animations = new ArrayList<>();
@@ -29,7 +29,6 @@ import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GLContext;
import org.lwjgl.util.glu.GLU;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.resource.BlendMethod;
@@ -38,21 +37,21 @@ import com.prupe.mcpatcher.mal.resource.PropertiesFile;
import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
import com.prupe.mcpatcher.mal.util.InputHandler;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
public class FancyDial {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.CUSTOM_ANIMATIONS, "Animation");
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.EXTENDED_HD, "Animation");
private static final double ANGLE_UNSET = Double.MAX_VALUE;
private static final int NUM_SCRATCH_TEXTURES = 3;
private static final boolean fboSupported = GLContext.getCapabilities().GL_EXT_framebuffer_object;
private static final boolean gl13Supported = GLContext.getCapabilities().OpenGL13;
private static final boolean enableCompass = Config.getBoolean(MCPatcherUtils.EXTENDED_HD, "fancyCompass", true);
private static final boolean enableClock = Config.getBoolean(MCPatcherUtils.EXTENDED_HD, "fancyClock", true);
private static final boolean useGL13 = gl13Supported
&& Config.getBoolean(MCPatcherUtils.EXTENDED_HD, "useGL13", true);
private static final boolean useScratchTexture = Config
.getBoolean(MCPatcherUtils.EXTENDED_HD, "useScratchTexture", true);
private static final boolean enableCompass = MCPatcherForgeConfig.instance().fancyCompass;
private static final boolean enableClock = MCPatcherForgeConfig.instance().fancyClock;
private static final boolean useGL13 = gl13Supported && MCPatcherForgeConfig.instance().useGL13;
private static final boolean useScratchTexture = MCPatcherForgeConfig.instance().useScratchTexture;
private static final int glAttributes;
private static boolean initialized;
private static boolean active;
@@ -8,21 +8,21 @@ import java.util.Set;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.util.ResourceLocation;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.resource.PropertiesFile;
import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererExpansion;
public class FontUtils {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.HD_FONT);
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.EXTENDED_HD);
private static final boolean enable = Config.getBoolean(MCPatcherUtils.EXTENDED_HD, "hdFont", true);
private static final boolean enableNonHD = Config.getBoolean(MCPatcherUtils.EXTENDED_HD, "nonHDFontWidth", false);
private static final boolean enable = MCPatcherForgeConfig.instance().hdFont;
private static final boolean enableNonHD = MCPatcherForgeConfig.instance().nonHDFontWidth;
private static final int ROWS = 16;
private static final int COLS = 16;
@@ -14,16 +14,16 @@ import org.lwjgl.opengl.GL12;
import org.lwjgl.opengl.GLContext;
import org.lwjgl.util.glu.GLU;
import com.prupe.mcpatcher.Config;
import com.prupe.mcpatcher.MCLogger;
import com.prupe.mcpatcher.MCPatcherUtils;
import com.prupe.mcpatcher.mal.resource.GLAPI;
import com.prupe.mcpatcher.mal.resource.PropertiesFile;
import com.prupe.mcpatcher.mal.resource.TexturePackAPI;
import mist475.mcpatcherforge.config.MCPatcherForgeConfig;
public class MipmapHelper {
private static final MCLogger logger = MCLogger.getLogger(MCPatcherUtils.MIPMAP);
private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.EXTENDED_HD);
private static final ResourceLocation MIPMAP_PROPERTIES = TexturePackAPI
.newMCPatcherResourceLocation("mipmap.properties");
@@ -32,8 +32,8 @@ public class MipmapHelper {
static final int TEX_DATA_TYPE = GL12.GL_UNSIGNED_INT_8_8_8_8_REV;
private static final boolean mipmapSupported;
static final boolean mipmapEnabled = Config.getBoolean(MCPatcherUtils.EXTENDED_HD, "mipmap", false);
static final int maxMipmapLevel = Config.getInt(MCPatcherUtils.EXTENDED_HD, "maxMipmapLevel", 3);
static final boolean mipmapEnabled = MCPatcherForgeConfig.instance().mipmap;
static final int maxMipmapLevel = MCPatcherForgeConfig.instance().maxMipMapLevel;
private static final boolean useMipmap;
private static final boolean anisoSupported;
@@ -53,15 +53,14 @@ public class MipmapHelper {
if (anisoSupported) {
anisoMax = (int) GL11.glGetFloat(EXTTextureFilterAnisotropic.GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT);
checkGLError("glGetFloat(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT)");
anisoLevel = Math
.max(Math.min(Config.getInt(MCPatcherUtils.EXTENDED_HD, "anisotropicFiltering", 1), anisoMax), 1);
anisoLevel = Math.max(Math.min(MCPatcherForgeConfig.instance().anisotropicFiltering, anisoMax), 1);
} else {
anisoMax = anisoLevel = 1;
}
lodSupported = GLContext.getCapabilities().GL_EXT_texture_lod_bias;
if (lodSupported) {
lodBias = Config.getInt(MCPatcherUtils.EXTENDED_HD, "lodBias", 0);
lodBias = MCPatcherForgeConfig.instance().lodBias;
} else {
lodBias = 0;
}
Loaded 100 of 163 files, more files were not shown because too many files have changed in this diff. Show more