mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-21 12:52:19 +00:00
Compare commits
26
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae0e03bead | ||
|
|
7d7d73a48f | ||
|
|
6dcc4649db | ||
|
|
5db5c7f683 | ||
|
|
21b9b8cb3f | ||
|
|
fc520de642 | ||
|
|
9916075569 | ||
|
|
6624a9adb3 | ||
|
|
c3216007c1 | ||
|
|
92b22b1827 | ||
|
|
f32c14f795 | ||
|
|
ef15577b15 | ||
|
|
ac60c01788 | ||
|
|
9410902937 | ||
|
|
52776530d8 | ||
|
|
9cebb352ad | ||
|
|
d810eaf876 | ||
|
|
1a1ca32721 | ||
|
|
a3d689e806 | ||
|
|
d4e22b6c0c | ||
|
|
7e24f6a395 | ||
|
|
c8e6a6f34f | ||
|
|
f7a79cf02f | ||
|
|
21b0de542c | ||
|
|
7ae4e14a3e | ||
|
|
bfd6c25a03 |
No files matched your search
@@ -45,9 +45,9 @@ body:
|
||||
- type: textarea
|
||||
id: modlist
|
||||
attributes:
|
||||
label: Mod List
|
||||
description: "List of mods, ideally a minimal reproducible set (can be retrieved from latest.log)"
|
||||
placeholder: "List of mods go here"
|
||||
label: Mod List or GTNH Pack Version
|
||||
description: "List of mods, ideally a minimal reproducible set (can be retrieved from latest.log). If using GTNH please indicate pack version and any changed mods, not the entire modlist."
|
||||
placeholder: "List of mods or GTNH Pack version goes here"
|
||||
validations:
|
||||
required: true
|
||||
- type: checkboxes
|
||||
@@ -60,4 +60,6 @@ body:
|
||||
required: true
|
||||
- label: "I have read the known incompatibilities and this is not related to one of those."
|
||||
required: true
|
||||
|
||||
- label: "This issue is not shader related (they aren't ready yet for testing)"
|
||||
required: true
|
||||
|
||||
@@ -9,14 +9,18 @@
|
||||
* Forge Relocation - Currently non Thread Safe; safe if not in use
|
||||
* ProjectRed Frames - Currently non Thread Safe; safe if not in use
|
||||
* EndlessIDs - Future compat planned
|
||||
* FalseTweaks - Future compat planned
|
||||
* SmoothFont - Future compat planned
|
||||
* RPLE - Future compat planned
|
||||
|
||||
# Permanent Incompatibilities
|
||||
* Optifine [Disabled, won't fix]
|
||||
* 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.2 and below - Use 2.4.3 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+
|
||||
* Neodymium - Untested, but unlikely to be compatible. (Chunk Meshing is definitely incompatible, other features might work depending on config)
|
||||
|
||||
# Credits
|
||||
* ShadersMod
|
||||
@@ -36,6 +40,9 @@
|
||||
* Embeddedt for [Embeddium](https://github.com/embeddedt/embeddium/tree/dc59ca357c25beefd6288f0d1d40b4cd8e670ab8) under the [LGPL 3.0](https://github.com/embeddedt/embeddium/blob/16.x/forge/LICENSE)
|
||||
* Neodymium
|
||||
* Makamys for [Neodymium](https://github.com/makamys/Neodymium) - Various Tessellator -> Quad functionality taken under the LGPL 3
|
||||
* MCPatcherForge
|
||||
* Original [MCPatcher](https://bitbucket.org/prupe/mcpatcher/src/master/): Paul Rupe
|
||||
* [Forge version](https://bitbucket.org/prupe/mcpatcher/src/master/): Mist475 under LGPL 3.0 with default ctm textures for glass and bookshelves by DarkBum under CC-BY-SA
|
||||
* HUDCaching
|
||||
* Created by [Moulberry](https://github.com/Moulberry/MCHUDCaching), backported from [Patcher](https://github.com/Sk1erLLC/Patcher) mod by Alexdoru under the CC-BY-SA-NC 4.0 license
|
||||
* Angelica
|
||||
|
||||
+17
-1
@@ -33,9 +33,23 @@
|
||||
*
|
||||
* For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
|
||||
*/
|
||||
configurations {
|
||||
transformedMod // Mods that can be transformed - used for compiling angelica, but not necessary at runtime
|
||||
transformedMod.canBeConsumed = false
|
||||
transformedModCompileOnly
|
||||
transformedModCompileOnly.canBeConsumed = false
|
||||
|
||||
// Add the transformed mod dependencies to the compilation classpaths, but don't publish them in the Maven metadata
|
||||
compileClasspath.extendsFrom(transformedMod, transformedModCompileOnly)
|
||||
testCompileClasspath.extendsFrom(transformedMod, transformedModCompileOnly)
|
||||
|
||||
// Can be enabled for testing if desired
|
||||
// runtimeClasspath.extendsFrom(transformedMod)
|
||||
// testRuntimeClasspath.extendsFrom(transformedMod)
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.3")
|
||||
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.4")
|
||||
|
||||
compileOnly("org.projectlombok:lombok:1.18.22") {transitive = false }
|
||||
annotationProcessor("org.projectlombok:lombok:1.18.22")
|
||||
@@ -74,4 +88,6 @@ dependencies {
|
||||
|
||||
runtimeOnly(deobf("https://github.com/makamys/CoreTweaks/releases/download/0.3.3.2/CoreTweaks-1.7.10-0.3.3.2+nomixin.jar"))
|
||||
|
||||
// Hodgepodge
|
||||
transformedMod("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
|
||||
}
|
||||
+1
-1
@@ -62,7 +62,7 @@ apiPackage =
|
||||
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
|
||||
# There can be multiple files in a comma-separated list.
|
||||
# Example value: mymodid_at.cfg,nei_at.cfg
|
||||
accessTransformersFile = angelica_at.cfg notfine_at.cfg archaicfix_at.cfg
|
||||
accessTransformersFile = angelica_at.cfg notfine_at.cfg archaicfix_at.cfg mcpatcherforge_at.cfg
|
||||
|
||||
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
|
||||
usesMixins = true
|
||||
|
||||
@@ -14,7 +14,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
modid = "angelica",
|
||||
name = "Angelica",
|
||||
version = Tags.VERSION,
|
||||
dependencies = " before:lwjgl3ify@[1.5.3,);" + " after:hodgepodge@[2.4.3,);" + " after:CodeChickenCore@[1.2.0,);",
|
||||
dependencies = " before:lwjgl3ify@[1.5.3,);" + " after:hodgepodge@[2.4.4,);" + " after:CodeChickenCore@[1.2.0,);",
|
||||
acceptedMinecraftVersions = "[1.7.10]",
|
||||
acceptableRemoteVersions = "*")
|
||||
public class AngelicaMod {
|
||||
|
||||
@@ -17,6 +17,11 @@ public class AngelicaConfig {
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean enableIris;
|
||||
|
||||
@Config.Comment("Enable MCPatcherForge features, still in Alpha. Individual features are toggled in mcpatcher.json")
|
||||
@Config.DefaultBoolean(false)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean enableMCPatcherForgeFeatures;
|
||||
|
||||
@Config.Comment("Enable NotFine optimizations")
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
@@ -68,4 +73,9 @@ public class AngelicaConfig {
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean optimizeTextureLoading;
|
||||
|
||||
@Config.Comment("Optimize slow glGetInteger in Jabba w/ Nvidia Drivers")
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean optimizeJabbaGetInteger;
|
||||
}
|
||||
@@ -0,0 +1,258 @@
|
||||
package com.gtnewhorizons.angelica.glsm;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.IStateStack;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL13;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
public class Feature {
|
||||
private static final int[] supportedAttribs = new int[] { GL11.GL_ACCUM_BUFFER_BIT, GL11.GL_COLOR_BUFFER_BIT, GL11.GL_CURRENT_BIT, GL11.GL_DEPTH_BUFFER_BIT,
|
||||
GL11.GL_ENABLE_BIT, GL11.GL_EVAL_BIT, GL11.GL_FOG_BIT, GL11.GL_HINT_BIT, GL11.GL_LIGHTING_BIT, GL11.GL_LINE_BIT, GL11.GL_LIST_BIT,
|
||||
GL13.GL_MULTISAMPLE_BIT, GL11.GL_PIXEL_MODE_BIT, GL11.GL_POINT_BIT, GL11.GL_POLYGON_BIT, GL11.GL_POLYGON_STIPPLE_BIT, GL11.GL_SCISSOR_BIT,
|
||||
GL11.GL_STENCIL_BUFFER_BIT, GL11.GL_TEXTURE_BIT, GL11.GL_TRANSFORM_BIT, GL11.GL_VIEWPORT_BIT };
|
||||
|
||||
static final Int2ObjectMap<Set<IStateStack<?>>> maskToFeaturesMap = new Int2ObjectOpenHashMap<>();
|
||||
|
||||
static Set<IStateStack<?>> maskToFeatures(int mask) {
|
||||
if(maskToFeaturesMap.containsKey(mask)) {
|
||||
return maskToFeaturesMap.get(mask);
|
||||
}
|
||||
|
||||
final Set<IStateStack<?>> features = new HashSet<>();
|
||||
for(int attrib : Feature.supportedAttribs) {
|
||||
if((mask & attrib) == attrib) {
|
||||
features.addAll(getFeatures(attrib));
|
||||
}
|
||||
}
|
||||
maskToFeaturesMap.put(mask, features);
|
||||
return features;
|
||||
}
|
||||
|
||||
private static final Map<Integer, Set<IStateStack<?>>> attribToFeatures = new HashMap<>();
|
||||
static {
|
||||
attribToFeatures.put(GL11.GL_COLOR_BUFFER_BIT, ImmutableSet.of(
|
||||
GLStateManager.alphaTest // GL_ALPHA_TEST enable bit
|
||||
, GLStateManager.alphaState // Alpha test function and reference value
|
||||
, GLStateManager.blendMode // GL_BLEND enable bit
|
||||
, GLStateManager.blendState // Blending source and destination functions
|
||||
// Constant blend color
|
||||
// Blending equation
|
||||
// GL_DITHER enable bit
|
||||
// GL_DRAW_BUFFER setting
|
||||
// GL_COLOR_LOGIC_OP enable bit
|
||||
// GL_INDEX_LOGIC_OP enable bit
|
||||
// Logic op function
|
||||
, GLStateManager.colorMask // Color mode and index mode writemasks
|
||||
, GLStateManager.color // Color mode and index mode writemasks
|
||||
, GLStateManager.clearColor // Color mode and index mode clear values
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_CURRENT_BIT, ImmutableSet.of(
|
||||
// Current RGBA color
|
||||
// Current color index
|
||||
// Current normal vector
|
||||
// Current texture coordinates
|
||||
// Current raster position
|
||||
// GL_CURRENT_RASTER_POSITION_VALID flag
|
||||
// RGBA color associated with current raster position
|
||||
// Color index associated with current raster position
|
||||
// Texture coordinates associated with current raster position
|
||||
// GL_EDGE_FLAG flag
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_DEPTH_BUFFER_BIT, ImmutableSet.of(
|
||||
GLStateManager.depthTest // GL_DEPTH_TEST enable bit
|
||||
, GLStateManager.depthState // Depth buffer test function
|
||||
// Depth buffer clear value
|
||||
// GL_DEPTH_WRITEMASK enable bit
|
||||
));
|
||||
|
||||
final HashSet<IStateStack<?>> enableBits = new HashSet<>(ImmutableSet.of(
|
||||
GLStateManager.alphaTest // GL_ALPHA_TEST flag
|
||||
// GL_AUTO_NORMAL flag
|
||||
, GLStateManager.blendMode // GL_BLEND flag
|
||||
// Enable bits for the user-definable clipping planes
|
||||
// GL_COLOR_MATERIAL
|
||||
, GLStateManager.cullState // GL_CULL_FACE flag
|
||||
, GLStateManager.depthTest // GL_DEPTH_TEST flag
|
||||
// GL_DITHER flag
|
||||
, GLStateManager.fogMode // GL_FOG flag
|
||||
// GL_LIGHTi where 0 <= i < GL_MAX_LIGHTS
|
||||
// GL_LIGHTING flag
|
||||
// GL_LINE_SMOOTH flag
|
||||
// GL_LINE_STIPPLE flag
|
||||
// GL_INDEX_LOGIC_OP flag
|
||||
// GL_COLOR_LOGIC_OP flag
|
||||
// GL_MAP1_x where x is a map type
|
||||
// GL_MAP2_x where x is a map type
|
||||
// GL_MULTISAMPLE flag
|
||||
// GL_NORMALIZE flag
|
||||
// GL_POINT_SMOOTH flag
|
||||
// GL_POLYGON_OFFSET_LINE flag
|
||||
// GL_POLYGON_OFFSET_FILL flag
|
||||
// GL_POLYGON_OFFSET_POINT flag
|
||||
// GL_POLYGON_SMOOTH flag
|
||||
// GL_POLYGON_STIPPLE flag
|
||||
// GL_SAMPLE_ALPHA_TO_COVERAGE flag
|
||||
// GL_SAMPLE_ALPHA_TO_ONE flag
|
||||
// GL_SAMPLE_COVERAGE flag
|
||||
// GL_SCISSOR_TEST flag
|
||||
// GL_STENCIL_TEST flag
|
||||
// GL_TEXTURE_1D flag
|
||||
// GL_TEXTURE_2D flag - Below
|
||||
// GL_TEXTURE_3D flag
|
||||
// Flags GL_TEXTURE_GEN_x where x is S, T, R, or Q
|
||||
));
|
||||
|
||||
// GL_TEXTURE_2D flag
|
||||
for(int i = 0 ; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
|
||||
enableBits.add(GLStateManager.textures.getTextureUnitStates(i));
|
||||
}
|
||||
|
||||
attribToFeatures.put(GL11.GL_ENABLE_BIT, enableBits);
|
||||
attribToFeatures.put(GL11.GL_EVAL_BIT, ImmutableSet.of(
|
||||
// GL_MAP1_x enable bits, where x is a map type
|
||||
// GL_MAP2_x enable bits, where x is a map type
|
||||
// 1D grid endpoints and divisions
|
||||
// 2D grid endpoints and divisions
|
||||
// GL_AUTO_NORMAL enable bit
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_FOG_BIT, ImmutableSet.of(
|
||||
GLStateManager.fogMode // GL_FOG enable bit
|
||||
, GLStateManager.fogState // Fog color
|
||||
// ^^ Fog density
|
||||
// ^^ Linear fog start
|
||||
// ^^ Linear fog end
|
||||
// Fog index
|
||||
// ^^ GL_FOG_MODE value
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_HINT_BIT, ImmutableSet.of(
|
||||
// GL_PERSPECTIVE_CORRECTION_HINT setting
|
||||
// GL_POINT_SMOOTH_HINT setting
|
||||
// GL_LINE_SMOOTH_HINT setting
|
||||
// GL_POLYGON_SMOOTH_HINT setting
|
||||
// GL_FOG_HINT setting
|
||||
// GL_GENERATE_MIPMAP_HINT setting
|
||||
// GL_TEXTURE_COMPRESSION_HINT setting
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_LIGHTING_BIT, ImmutableSet.of(
|
||||
// GL_COLOR_MATERIAL enable bit
|
||||
// GL_COLOR_MATERIAL_FACE value
|
||||
// Color material parameters that are tracking the current color
|
||||
// Ambient scene color
|
||||
// GL_LIGHT_MODEL_LOCAL_VIEWER value
|
||||
// GL_LIGHT_MODEL_TWO_SIDE setting
|
||||
// GL_LIGHTING enable bit
|
||||
// Enable bit for each light
|
||||
// Ambient, diffuse, and specular intensity for each light
|
||||
// Direction, position, exponent, and cutoff angle for each light
|
||||
// Constant, linear, and quadratic attenuation factors for each light
|
||||
// Ambient, diffuse, specular, and emissive color for each material
|
||||
// Ambient, diffuse, and specular color indices for each material
|
||||
// Specular exponent for each material
|
||||
// GL_SHADE_MODEL setting
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_LINE_BIT, ImmutableSet.of(
|
||||
// GL_LINE_SMOOTH flag
|
||||
// GL_LINE_STIPPLE enable bit
|
||||
// Line stipple pattern and repeat counter
|
||||
// Line width
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_LIST_BIT, ImmutableSet.of(
|
||||
// GL_LIST_BASE setting
|
||||
));
|
||||
attribToFeatures.put(GL13.GL_MULTISAMPLE_BIT, ImmutableSet.of(
|
||||
// GL_MULTISAMPLE enable bit
|
||||
// GL_SAMPLE_ALPHA_TO_COVERAGE flag
|
||||
// GL_SAMPLE_ALPHA_TO_ONE flag
|
||||
// GL_SAMPLE_COVERAGE flag
|
||||
// GL_SAMPLE_COVERAGE_VALUE value
|
||||
// GL_SAMPLE_COVERAGE_INVERT value
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_PIXEL_MODE_BIT, ImmutableSet.of(
|
||||
// GL_RED_BIAS and GL_RED_SCALE settings
|
||||
// GL_GREEN_BIAS and GL_GREEN_SCALE values
|
||||
// GL_BLUE_BIAS and GL_BLUE_SCALE
|
||||
// GL_ALPHA_BIAS and GL_ALPHA_SCALE
|
||||
// GL_DEPTH_BIAS and GL_DEPTH_SCALE
|
||||
// GL_INDEX_OFFSET and GL_INDEX_SHIFT values
|
||||
// GL_MAP_COLOR and GL_MAP_STENCIL flags
|
||||
// GL_ZOOM_X and GL_ZOOM_Y factors
|
||||
// GL_READ_BUFFER setting
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_POINT_BIT, ImmutableSet.of(
|
||||
// GL_POINT_SMOOTH flag
|
||||
// Point size
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_POLYGON_BIT, ImmutableSet.of(
|
||||
GLStateManager.cullState // GL_CULL_FACE enable bit
|
||||
// GL_CULL_FACE_MODE value
|
||||
// GL_FRONT_FACE indicator
|
||||
// GL_POLYGON_MODE setting
|
||||
// GL_POLYGON_SMOOTH flag
|
||||
// GL_POLYGON_STIPPLE enable bit
|
||||
// GL_POLYGON_OFFSET_FILL flag
|
||||
// GL_POLYGON_OFFSET_LINE flag
|
||||
// GL_POLYGON_OFFSET_POINT flag
|
||||
// GL_POLYGON_OFFSET_FACTOR
|
||||
// GL_POLYGON_OFFSET_UNITS
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_POLYGON_STIPPLE_BIT, ImmutableSet.of(
|
||||
// Polygon stipple pattern
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_SCISSOR_BIT, ImmutableSet.of(
|
||||
// GL_SCISSOR_TEST enable bit
|
||||
// Scissor box
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_STENCIL_BUFFER_BIT, ImmutableSet.of(
|
||||
// GL_STENCIL_TEST enable bit
|
||||
// Stencil function and reference value
|
||||
// Stencil value mask
|
||||
// Stencil fail, pass, and depth buffer pass actions
|
||||
// Stencil buffer clear value
|
||||
// Stencil buffer writemask
|
||||
));
|
||||
final Set<IStateStack<?>> textureAttribs = new HashSet<>(ImmutableSet.of(
|
||||
// Enable bits for the four texture coordinates
|
||||
// Border color for each texture image
|
||||
// Minification function for each texture image
|
||||
// Magnification function for each texture image
|
||||
// Texture coordinates and wrap mode for each texture image
|
||||
// Color and mode for each texture environment
|
||||
// Enable bits GL_TEXTURE_GEN_x, x is S, T, R, and Q
|
||||
// GL_TEXTURE_GEN_MODE setting for S, T, R, and Q
|
||||
// glTexGen plane equations for S, T, R, and Q
|
||||
// Current texture bindings (for example, GL_TEXTURE_BINDING_2D) - Below
|
||||
));
|
||||
|
||||
// Current Texture Bindings - GL_TEXTURE_BINDING_2D
|
||||
for(int i = 0 ; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
|
||||
textureAttribs.add(GLStateManager.textures.getTextureUnitBindings(i));
|
||||
}
|
||||
|
||||
attribToFeatures.put(GL11.GL_TEXTURE_BIT, textureAttribs);
|
||||
attribToFeatures.put(GL11.GL_TRANSFORM_BIT, ImmutableSet.of(
|
||||
// Coefficients of the six clipping planes
|
||||
// Enable bits for the user-definable clipping planes
|
||||
GLStateManager.matrixMode
|
||||
// GL_NORMALIZE flag
|
||||
// GL_RESCALE_NORMAL flag
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_VIEWPORT_BIT, ImmutableSet.of(
|
||||
// Depth range (near and far)
|
||||
GLStateManager.viewportState
|
||||
));
|
||||
}
|
||||
|
||||
public static Set<IStateStack<?>> getFeatures(int attrib) {
|
||||
return attribToFeatures.getOrDefault(attrib, Collections.emptySet());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,22 +1,29 @@
|
||||
package com.gtnewhorizons.angelica.glsm;
|
||||
|
||||
import com.gtnewhorizons.angelica.AngelicaMod;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.glsm.states.AlphaState;
|
||||
import com.gtnewhorizons.angelica.glsm.states.BlendState;
|
||||
import com.gtnewhorizons.angelica.glsm.states.BooleanState;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.AlphaStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.BlendStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.BooleanStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.Color4Stack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.ColorMaskStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.DepthStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.FogStateStack;
|
||||
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.DepthState;
|
||||
import com.gtnewhorizons.angelica.glsm.states.FogState;
|
||||
import com.gtnewhorizons.angelica.glsm.states.GLColorMask;
|
||||
import com.gtnewhorizons.angelica.glsm.states.TextureState;
|
||||
import com.gtnewhorizons.angelica.glsm.states.TextureBinding;
|
||||
import com.gtnewhorizons.angelica.glsm.states.TextureUnitArray;
|
||||
import com.gtnewhorizons.angelica.hudcaching.HUDCaching;
|
||||
import it.unimi.dsi.fastutil.ints.IntArrayList;
|
||||
import it.unimi.dsi.fastutil.ints.IntStack;
|
||||
import lombok.Getter;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.gbuffer_overrides.state.StateTracker;
|
||||
import net.coderbot.iris.gl.blending.AlphaTestStorage;
|
||||
import net.coderbot.iris.gl.blending.BlendModeStorage;
|
||||
import net.coderbot.iris.gl.blending.DepthColorStorage;
|
||||
import net.coderbot.iris.gl.sampler.SamplerLimits;
|
||||
import net.coderbot.iris.gl.state.StateUpdateNotifiers;
|
||||
import net.coderbot.iris.pipeline.WorldRenderingPipeline;
|
||||
import net.coderbot.iris.samplers.IrisSamplers;
|
||||
@@ -24,45 +31,69 @@ import net.coderbot.iris.texture.TextureInfoCache;
|
||||
import net.coderbot.iris.texture.TextureTracker;
|
||||
import net.coderbot.iris.texture.pbr.PBRTextureManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import org.joml.Matrix4d;
|
||||
import org.joml.Matrix4f;
|
||||
import org.joml.Matrix4fStack;
|
||||
import org.joml.Vector3d;
|
||||
import org.lwjgl.BufferUtils;
|
||||
import org.lwjgl.LWJGLException;
|
||||
import org.lwjgl.opengl.ARBMultitexture;
|
||||
import org.lwjgl.opengl.Drawable;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
import org.lwjgl.opengl.GL13;
|
||||
import org.lwjgl.opengl.GL20;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.DoubleBuffer;
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.IntBuffer;
|
||||
import java.util.stream.IntStream;
|
||||
|
||||
import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
|
||||
|
||||
@SuppressWarnings("unused") // Used in ASM
|
||||
public class GLStateManager {
|
||||
public static final boolean BYPASS_CACHE = Boolean.parseBoolean(System.getProperty("angelica.disableGlCache", "false"));
|
||||
public static final int MAX_ATTRIB_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_ATTRIB_STACK_DEPTH);
|
||||
public static final int MAX_MODELVIEW_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_MODELVIEW_STACK_DEPTH);
|
||||
public static final int MAX_PROJECTION_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_PROJECTION_STACK_DEPTH);
|
||||
public static final int MAX_TEXTURE_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_TEXTURE_STACK_DEPTH);
|
||||
public static final int MAX_TEXTURE_UNITS = GL11.glGetInteger(GL20.GL_MAX_TEXTURE_IMAGE_UNITS);
|
||||
|
||||
// GLStateManager State Trackers
|
||||
@Getter private static int activeTexture;
|
||||
@Getter private static final BlendState blendState = new BlendState();
|
||||
@Getter private static final DepthState depthState = new DepthState();
|
||||
@Getter private static final FogState fogState = new FogState();
|
||||
@Getter private static final Color4 Color = new Color4();
|
||||
@Getter private static final Color4 ClearColor = new Color4();
|
||||
@Getter private static final GLColorMask ColorMask = new GLColorMask();
|
||||
@Getter private static final BooleanState cullState = new BooleanState(GL11.GL_CULL_FACE);
|
||||
@Getter private static final AlphaState alphaState = new AlphaState();
|
||||
@Getter private static final BooleanState lightingState = new BooleanState(GL11.GL_LIGHTING);
|
||||
@Getter private static final BooleanState rescaleNormalState = new BooleanState(GL12.GL_RESCALE_NORMAL);
|
||||
private static final IntStack attribs = new IntArrayList(MAX_ATTRIB_STACK_DEPTH);
|
||||
private static final IntStack activeTextureUnit = new IntArrayList(MAX_ATTRIB_STACK_DEPTH);
|
||||
static {
|
||||
activeTextureUnit.push(0); // GL_TEXTURE0
|
||||
}
|
||||
@Getter protected static final TextureUnitArray textures = new TextureUnitArray();
|
||||
@Getter protected static final BlendStateStack blendState = new BlendStateStack();
|
||||
@Getter protected static final BooleanStateStack blendMode = new BooleanStateStack(GL11.GL_BLEND);
|
||||
@Getter protected static final DepthStateStack depthState = new DepthStateStack();
|
||||
@Getter protected static final BooleanStateStack depthTest = new BooleanStateStack(GL11.GL_DEPTH_TEST);
|
||||
|
||||
private static long dirty = 0;
|
||||
// @Getter private static final FogState fogState = new FogState();
|
||||
@Getter protected static final FogStateStack fogState = new FogStateStack();
|
||||
@Getter protected static final BooleanStateStack fogMode = new BooleanStateStack(GL11.GL_FOG);
|
||||
@Getter protected static final Color4Stack color = new Color4Stack();
|
||||
@Getter protected static final Color4Stack clearColor = new Color4Stack();
|
||||
@Getter protected static final ColorMaskStack colorMask = new ColorMaskStack();
|
||||
@Getter protected static final BooleanStateStack cullState = new BooleanStateStack(GL11.GL_CULL_FACE);
|
||||
@Getter protected static final AlphaStateStack alphaState = new AlphaStateStack();
|
||||
@Getter protected static final BooleanStateStack alphaTest = new BooleanStateStack(GL11.GL_ALPHA_TEST);
|
||||
|
||||
@Getter protected static final BooleanStateStack lightingState = new BooleanStateStack(GL11.GL_LIGHTING);
|
||||
@Getter protected static final BooleanStateStack rescaleNormalState = new BooleanStateStack(GL12.GL_RESCALE_NORMAL);
|
||||
|
||||
@Getter protected static final MatrixModeStack matrixMode = new MatrixModeStack();
|
||||
@Getter protected static final Matrix4fStack modelViewMatrix = new Matrix4fStack(MAX_MODELVIEW_STACK_DEPTH);
|
||||
@Getter protected static final Matrix4fStack projectionMatrix = new Matrix4fStack(MAX_PROJECTION_STACK_DEPTH);
|
||||
@Getter protected static final Matrix4fStack textureMatrix = new Matrix4fStack(MAX_TEXTURE_STACK_DEPTH);
|
||||
|
||||
@Getter protected static final ViewPortStateStack viewportState = new ViewPortStateStack();
|
||||
|
||||
private static int modelShadeMode;
|
||||
|
||||
@Getter
|
||||
private static TextureState[] Textures;
|
||||
|
||||
// Iris Listeners
|
||||
private static Runnable blendFuncListener = null;
|
||||
private static Runnable fogToggleListener = null;
|
||||
@@ -77,7 +108,7 @@ public class GLStateManager {
|
||||
private static Thread CurrentThread = MainThread;
|
||||
private static boolean runningSplash = false;
|
||||
|
||||
private static boolean inGLNewList = false;
|
||||
private static int glListMode = 0;
|
||||
|
||||
private static boolean hudCaching$blendEnabled;
|
||||
|
||||
@@ -90,8 +121,6 @@ public class GLStateManager {
|
||||
StateUpdateNotifiers.fogEndNotifier = listener -> fogEndListener = listener;
|
||||
StateUpdateNotifiers.fogDensityNotifier = listener -> fogDensityListener = listener;
|
||||
}
|
||||
// We want textures regardless of Iris being initialized, and using SamplerLimits is isolated enough
|
||||
Textures = IntStream.range(0, SamplerLimits.get().getMaxTextureUnits()).mapToObj(i -> new TextureState()).toArray(TextureState[]::new);
|
||||
}
|
||||
|
||||
public static void assertMainThread() {
|
||||
@@ -129,6 +158,19 @@ public class GLStateManager {
|
||||
}
|
||||
}
|
||||
|
||||
public static void glGetFloat(int pname, FloatBuffer params) {
|
||||
switch (pname) {
|
||||
case GL11.GL_MODELVIEW_MATRIX -> modelViewMatrix.get(params);
|
||||
case GL11.GL_PROJECTION_MATRIX -> projectionMatrix.get(params);
|
||||
case GL11.GL_TEXTURE_MATRIX -> textureMatrix.get(params);
|
||||
default -> GL11.glGetFloat(pname, params);
|
||||
}
|
||||
}
|
||||
|
||||
public static float glGetFloat(int pname) {
|
||||
return GL11.glGetFloat(pname);
|
||||
}
|
||||
|
||||
// GLStateManager Functions
|
||||
|
||||
public static void enableBlend() {
|
||||
@@ -139,7 +181,7 @@ public class GLStateManager {
|
||||
}
|
||||
}
|
||||
hudCaching$blendEnabled = true;
|
||||
blendState.mode.enable();
|
||||
blendMode.enable();
|
||||
}
|
||||
|
||||
public static void disableBlend() {
|
||||
@@ -150,7 +192,7 @@ public class GLStateManager {
|
||||
}
|
||||
}
|
||||
hudCaching$blendEnabled = false;
|
||||
blendState.mode.disable();
|
||||
blendMode.disable();
|
||||
}
|
||||
|
||||
public static void glBlendFunc(int srcFactor, int dstFactor) {
|
||||
@@ -161,17 +203,16 @@ public class GLStateManager {
|
||||
}
|
||||
}
|
||||
if (HUDCaching.renderingCacheOverride) {
|
||||
blendState.srcRgb = srcFactor;
|
||||
blendState.dstRgb = dstFactor;
|
||||
blendState.srcAlpha = GL11.GL_ONE;
|
||||
blendState.dstAlpha = GL11.GL_ONE_MINUS_SRC_ALPHA;
|
||||
blendState.setSrcRgb(srcFactor);
|
||||
blendState.setDstRgb(dstFactor);
|
||||
blendState.setSrcAlpha(GL11.GL_ONE);
|
||||
blendState.setDstAlpha(GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
OpenGlHelper.glBlendFunc(srcFactor, dstFactor, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
clean(Dirty.BLEND_STATE);
|
||||
return;
|
||||
}
|
||||
if (GLStateManager.BYPASS_CACHE || blendState.srcRgb != srcFactor || blendState.dstRgb != dstFactor || checkDirty(Dirty.BLEND_STATE)) {
|
||||
blendState.srcRgb = srcFactor;
|
||||
blendState.dstRgb = dstFactor;
|
||||
if (GLStateManager.BYPASS_CACHE || blendState.getSrcRgb() != srcFactor || blendState.getDstRgb() != dstFactor) {
|
||||
blendState.setSrcRgb(srcFactor);
|
||||
blendState.setDstRgb(dstFactor);
|
||||
GL11.glBlendFunc(srcFactor, dstFactor);
|
||||
}
|
||||
|
||||
@@ -190,11 +231,12 @@ public class GLStateManager {
|
||||
srcAlpha = GL11.GL_ONE;
|
||||
dstAlpha = GL11.GL_ONE_MINUS_SRC_ALPHA;
|
||||
}
|
||||
if (GLStateManager.BYPASS_CACHE || blendState.srcRgb != srcRgb || blendState.dstRgb != dstRgb || blendState.srcAlpha != srcAlpha || blendState.dstAlpha != dstAlpha || checkDirty(Dirty.BLEND_STATE)) {
|
||||
blendState.srcRgb = srcRgb;
|
||||
blendState.dstRgb = dstRgb;
|
||||
blendState.srcAlpha = srcAlpha;
|
||||
blendState.dstAlpha = dstAlpha;
|
||||
if (GLStateManager.BYPASS_CACHE || blendState.getSrcRgb() != srcRgb || blendState.getDstRgb() != dstRgb || blendState.getSrcAlpha()
|
||||
!= srcAlpha || blendState.getDstAlpha() != dstAlpha) {
|
||||
blendState.setSrcRgb(srcRgb);
|
||||
blendState.setDstRgb(dstRgb);
|
||||
blendState.setSrcAlpha(srcAlpha);
|
||||
blendState.setDstAlpha(dstAlpha);
|
||||
OpenGlHelper.glBlendFunc(srcRgb, dstRgb, srcAlpha, dstAlpha);
|
||||
}
|
||||
|
||||
@@ -204,8 +246,8 @@ public class GLStateManager {
|
||||
|
||||
public static void glDepthFunc(int func) {
|
||||
// Hacky workaround for now, need to figure out why this isn't being applied...
|
||||
if (GLStateManager.BYPASS_CACHE || func != depthState.func || GLStateManager.runningSplash || checkDirty(Dirty.DEPTH_FUNC)) {
|
||||
depthState.func = func;
|
||||
if (GLStateManager.BYPASS_CACHE || func != depthState.getFunc() || GLStateManager.runningSplash) {
|
||||
depthState.setFunc(func);
|
||||
GL11.glDepthFunc(func);
|
||||
}
|
||||
}
|
||||
@@ -218,8 +260,8 @@ public class GLStateManager {
|
||||
}
|
||||
}
|
||||
|
||||
if (mask != depthState.mask || checkDirty(Dirty.DEPTH_MASK)) {
|
||||
depthState.mask = mask;
|
||||
if (mask != depthState.isMask()) {
|
||||
depthState.setMask(mask);
|
||||
GL11.glDepthMask(mask);
|
||||
}
|
||||
}
|
||||
@@ -294,19 +336,20 @@ public class GLStateManager {
|
||||
|
||||
private static boolean changeColor(float red, float green, float blue, float alpha) {
|
||||
// Helper function for glColor*
|
||||
if (GLStateManager.BYPASS_CACHE || red != Color.red || green != Color.green || blue != Color.blue || alpha != Color.alpha || checkDirty(Dirty.COLOR)) {
|
||||
Color.red = red;
|
||||
Color.green = green;
|
||||
Color.blue = blue;
|
||||
Color.alpha = alpha;
|
||||
if (GLStateManager.BYPASS_CACHE || red != color.getRed() || green != color.getGreen() || blue != color.getBlue() || alpha != color.getAlpha()) {
|
||||
color.setRed(red);
|
||||
color.setGreen(green);
|
||||
color.setBlue(blue);
|
||||
color.setAlpha(alpha);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static final Color4 DirtyColor = new Color4(-1.0F, -1.0F, -1.0F, -1.0F);
|
||||
public static void clearCurrentColor() {
|
||||
// Marks the cache dirty, doesn't actually reset the color
|
||||
dirty(Dirty.COLOR);
|
||||
color.set(DirtyColor);
|
||||
}
|
||||
|
||||
public static void glColorMask(boolean red, boolean green, boolean blue, boolean alpha) {
|
||||
@@ -316,22 +359,22 @@ public class GLStateManager {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (GLStateManager.BYPASS_CACHE || red != ColorMask.red || green != ColorMask.green || blue != ColorMask.blue || alpha != ColorMask.alpha || checkDirty(Dirty.COLOR_MASK)) {
|
||||
ColorMask.red = red;
|
||||
ColorMask.green = green;
|
||||
ColorMask.blue = blue;
|
||||
ColorMask.alpha = alpha;
|
||||
if (GLStateManager.BYPASS_CACHE || red != colorMask.red || green != colorMask.green || blue != colorMask.blue || alpha != colorMask.alpha) {
|
||||
colorMask.red = red;
|
||||
colorMask.green = green;
|
||||
colorMask.blue = blue;
|
||||
colorMask.alpha = alpha;
|
||||
GL11.glColorMask(red, green, blue, alpha);
|
||||
}
|
||||
}
|
||||
|
||||
// Clear Color
|
||||
public static void glClearColor(float red, float green, float blue, float alpha) {
|
||||
if (GLStateManager.BYPASS_CACHE || red != ClearColor.red || green != ClearColor.green || blue != ClearColor.blue || alpha != ClearColor.alpha || checkDirty(Dirty.CLEAR_COLOR)) {
|
||||
ClearColor.red = red;
|
||||
ClearColor.green = green;
|
||||
ClearColor.blue = blue;
|
||||
ClearColor.alpha = alpha;
|
||||
if (GLStateManager.BYPASS_CACHE || red != clearColor.getRed() || green != clearColor.getGreen() || blue != clearColor.getBlue() || alpha != clearColor.getAlpha()) {
|
||||
clearColor.setRed(red);
|
||||
clearColor.setGreen(green);
|
||||
clearColor.setBlue(blue);
|
||||
clearColor.setAlpha(alpha);
|
||||
GL11.glClearColor(red, green, blue, alpha);
|
||||
}
|
||||
}
|
||||
@@ -344,7 +387,7 @@ public class GLStateManager {
|
||||
return;
|
||||
}
|
||||
}
|
||||
alphaState.mode.enable();
|
||||
alphaTest.enable();
|
||||
}
|
||||
|
||||
public static void disableAlphaTest() {
|
||||
@@ -354,7 +397,7 @@ public class GLStateManager {
|
||||
return;
|
||||
}
|
||||
}
|
||||
alphaState.mode.disable();
|
||||
alphaTest.disable();
|
||||
}
|
||||
|
||||
public static void glAlphaFunc(int function, float reference) {
|
||||
@@ -364,41 +407,55 @@ public class GLStateManager {
|
||||
return;
|
||||
}
|
||||
}
|
||||
alphaState.function = function;
|
||||
alphaState.reference = reference;
|
||||
alphaState.setFunction(function);
|
||||
alphaState.setReference(reference);
|
||||
GL11.glAlphaFunc(function, reference);
|
||||
}
|
||||
|
||||
// Textures
|
||||
public static void glActiveTexture(int texture) {
|
||||
final int newTexture = texture - GL13.GL_TEXTURE0;
|
||||
if (GLStateManager.BYPASS_CACHE || activeTexture != newTexture || checkDirty(Dirty.ACTIVE_TEXTURE)) {
|
||||
activeTexture = newTexture;
|
||||
if (GLStateManager.BYPASS_CACHE || getActiveTextureUnit() != newTexture) {
|
||||
activeTextureUnit.popInt();
|
||||
activeTextureUnit.push(newTexture);
|
||||
GL13.glActiveTexture(texture);
|
||||
}
|
||||
}
|
||||
|
||||
public static void glActiveTextureARB(int texture) {
|
||||
final int newTexture = texture - GL13.GL_TEXTURE0;
|
||||
if (GLStateManager.BYPASS_CACHE || activeTexture != newTexture || checkDirty(Dirty.ACTIVE_TEXTURE)) {
|
||||
activeTexture = newTexture;
|
||||
if (GLStateManager.BYPASS_CACHE || getActiveTextureUnit() != newTexture) {
|
||||
activeTextureUnit.popInt();
|
||||
activeTextureUnit.push(newTexture);
|
||||
ARBMultitexture.glActiveTextureARB(texture);
|
||||
}
|
||||
}
|
||||
|
||||
public static int getBoundTexture() {
|
||||
return textures.getTextureUnitBindings(activeTextureUnit.topInt()).getBinding();
|
||||
}
|
||||
|
||||
public static void glBindTexture(int target, int texture) {
|
||||
if(inGLNewList) {
|
||||
// Binding a texture, while building a list, is not allowed and is a silent noop
|
||||
Throwable throwable = new Throwable();
|
||||
LOGGER.info("Naughty naughty, someone's making a texture binding in a display list!", throwable);
|
||||
if(target != GL11.GL_TEXTURE_2D) {
|
||||
// We're only supporting 2D textures for now
|
||||
GL11.glBindTexture(target, texture);
|
||||
return;
|
||||
}
|
||||
|
||||
// TODO: Do we need to do the check dirty for each bound texture?
|
||||
if (GLStateManager.BYPASS_CACHE || Textures[activeTexture].binding != texture || runningSplash || checkDirty(Dirty.BOUND_TEXTURE)) {
|
||||
GL11.glBindTexture(target, texture);
|
||||
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;
|
||||
}
|
||||
|
||||
Textures[activeTexture].binding = texture;
|
||||
final TextureBinding textureUnit = textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt());
|
||||
|
||||
if (GLStateManager.BYPASS_CACHE || textureUnit.getBinding() != texture || runningSplash) {
|
||||
GL11.glBindTexture(target, texture);
|
||||
textureUnit.setBinding(texture);
|
||||
if (AngelicaConfig.enableIris) {
|
||||
TextureTracker.INSTANCE.onBindTexture(texture);
|
||||
}
|
||||
@@ -431,7 +488,7 @@ public class GLStateManager {
|
||||
if (AngelicaConfig.enableIris) {
|
||||
iris$onDeleteTexture(id);
|
||||
}
|
||||
Textures[activeTexture].binding = -1;
|
||||
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt()).setBinding(-1);
|
||||
GL11.glDeleteTextures(id);
|
||||
}
|
||||
|
||||
@@ -441,21 +498,22 @@ public class GLStateManager {
|
||||
iris$onDeleteTexture(ids.get(i));
|
||||
}
|
||||
}
|
||||
Textures[activeTexture].binding = -1;
|
||||
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt()).setBinding(-1);
|
||||
GL11.glDeleteTextures(ids);
|
||||
}
|
||||
|
||||
public static void enableTexture() {
|
||||
final int textureUnit = getActiveTextureUnit();
|
||||
if (AngelicaConfig.enableIris) {
|
||||
// Iris
|
||||
boolean updatePipeline = false;
|
||||
if (activeTexture == IrisSamplers.ALBEDO_TEXTURE_UNIT) {
|
||||
if (textureUnit == IrisSamplers.ALBEDO_TEXTURE_UNIT) {
|
||||
StateTracker.INSTANCE.albedoSampler = true;
|
||||
updatePipeline = true;
|
||||
} else if (activeTexture == IrisSamplers.LIGHTMAP_TEXTURE_UNIT) {
|
||||
} else if (textureUnit == IrisSamplers.LIGHTMAP_TEXTURE_UNIT) {
|
||||
StateTracker.INSTANCE.lightmapSampler = true;
|
||||
updatePipeline = true;
|
||||
} else if (activeTexture == IrisSamplers.OVERLAY_TEXTURE_UNIT) {
|
||||
} else if (textureUnit == IrisSamplers.OVERLAY_TEXTURE_UNIT) {
|
||||
StateTracker.INSTANCE.overlaySampler = true;
|
||||
updatePipeline = true;
|
||||
}
|
||||
@@ -464,20 +522,21 @@ public class GLStateManager {
|
||||
Iris.getPipelineManager().getPipeline().ifPresent(p -> p.setInputs(StateTracker.INSTANCE.getInputs()));
|
||||
}
|
||||
}
|
||||
Textures[activeTexture].mode.enable();
|
||||
textures.getTextureUnitStates(textureUnit).enable();
|
||||
}
|
||||
|
||||
public static void disableTexture() {
|
||||
final int textureUnit = getActiveTextureUnit();
|
||||
if (AngelicaConfig.enableIris) {
|
||||
// Iris
|
||||
boolean updatePipeline = false;
|
||||
if (activeTexture == IrisSamplers.ALBEDO_TEXTURE_UNIT) {
|
||||
if (textureUnit == IrisSamplers.ALBEDO_TEXTURE_UNIT) {
|
||||
StateTracker.INSTANCE.albedoSampler = false;
|
||||
updatePipeline = true;
|
||||
} else if (activeTexture == IrisSamplers.LIGHTMAP_TEXTURE_UNIT) {
|
||||
} else if (textureUnit == IrisSamplers.LIGHTMAP_TEXTURE_UNIT) {
|
||||
StateTracker.INSTANCE.lightmapSampler = false;
|
||||
updatePipeline = true;
|
||||
} else if (activeTexture == IrisSamplers.OVERLAY_TEXTURE_UNIT) {
|
||||
} else if (textureUnit == IrisSamplers.OVERLAY_TEXTURE_UNIT) {
|
||||
StateTracker.INSTANCE.overlaySampler = false;
|
||||
updatePipeline = true;
|
||||
}
|
||||
@@ -486,7 +545,7 @@ public class GLStateManager {
|
||||
Iris.getPipelineManager().getPipeline().ifPresent(p -> p.setInputs(StateTracker.INSTANCE.getInputs()));
|
||||
}
|
||||
}
|
||||
Textures[activeTexture].mode.disable();
|
||||
textures.getTextureUnitStates(textureUnit).disable();
|
||||
}
|
||||
|
||||
public static void setFilter(boolean bilinear, boolean mipmap) {
|
||||
@@ -521,11 +580,11 @@ public class GLStateManager {
|
||||
}
|
||||
|
||||
public static void enableDepthTest() {
|
||||
depthState.mode.enable();
|
||||
depthTest.enable();
|
||||
}
|
||||
|
||||
public static void disableDepthTest() {
|
||||
depthState.mode.disable();
|
||||
depthTest.disable();
|
||||
}
|
||||
|
||||
public static void enableLighting() {
|
||||
@@ -545,14 +604,14 @@ public class GLStateManager {
|
||||
}
|
||||
|
||||
public static void enableFog() {
|
||||
fogState.mode.enable();
|
||||
fogMode.enable();
|
||||
if (fogToggleListener != null) {
|
||||
fogToggleListener.run();
|
||||
}
|
||||
}
|
||||
|
||||
public static void disableFog() {
|
||||
fogState.mode.disable();
|
||||
fogMode.disable();
|
||||
if (fogToggleListener != null) {
|
||||
fogToggleListener.run();
|
||||
}
|
||||
@@ -566,44 +625,45 @@ public class GLStateManager {
|
||||
final float green = param.get(1);
|
||||
final float blue = param.get(2);
|
||||
|
||||
fogState.fogColor.set(red, green, blue);
|
||||
fogState.fogAlpha = param.get(3);
|
||||
fogState.fogColorBuffer.clear();
|
||||
fogState.fogColorBuffer.put((FloatBuffer) param.position(0)).flip();
|
||||
fogState.getFogColor().set(red, green, blue);
|
||||
fogState.setFogAlpha(param.get(3));
|
||||
fogState.getFogColorBuffer().clear();
|
||||
fogState.getFogColorBuffer().put((FloatBuffer) param.position(0)).flip();
|
||||
}
|
||||
}
|
||||
|
||||
public static Vector3d getFogColor() {
|
||||
return fogState.fogColor;
|
||||
return fogState.getFogColor();
|
||||
}
|
||||
|
||||
public static void fogColor(float red, float green, float blue, float alpha) {
|
||||
if (GLStateManager.BYPASS_CACHE || red != fogState.fogColor.x || green != fogState.fogColor.y || blue != fogState.fogColor.z || alpha != fogState.fogAlpha) {
|
||||
fogState.fogColor.set(red, green, blue);
|
||||
fogState.fogAlpha = alpha;
|
||||
fogState.fogColorBuffer.clear();
|
||||
fogState.fogColorBuffer.put(red).put(green).put(blue).put(alpha).flip();
|
||||
GL11.glFog(GL11.GL_FOG_COLOR, fogState.fogColorBuffer);
|
||||
if (GLStateManager.BYPASS_CACHE || red != fogState.getFogColor().x || green != fogState.getFogColor().y || blue != fogState.getFogColor().z || alpha != fogState.getFogAlpha()) {
|
||||
fogState.getFogColor().set(red, green, blue);
|
||||
fogState.setFogAlpha(alpha);
|
||||
fogState.getFogColorBuffer().clear();
|
||||
fogState.getFogColorBuffer().put(red).put(green).put(blue).put(alpha).flip();
|
||||
GL11.glFog(GL11.GL_FOG_COLOR, fogState.getFogColorBuffer());
|
||||
}
|
||||
}
|
||||
|
||||
public static void glFogf(int pname, float param) {
|
||||
GL11.glFogf(pname, param);
|
||||
// Note: Does not handle GL_FOG_INDEX
|
||||
switch (pname) {
|
||||
case GL11.GL_FOG_DENSITY -> {
|
||||
fogState.density = param;
|
||||
fogState.setDensity(param);
|
||||
if (fogDensityListener != null) {
|
||||
fogDensityListener.run();
|
||||
}
|
||||
}
|
||||
case GL11.GL_FOG_START -> {
|
||||
fogState.start = param;
|
||||
fogState.setStart(param);
|
||||
if (fogStartListener != null) {
|
||||
fogStartListener.run();
|
||||
}
|
||||
}
|
||||
case GL11.GL_FOG_END -> {
|
||||
fogState.end = param;
|
||||
fogState.setEnd(param);
|
||||
if (fogEndListener != null) {
|
||||
fogEndListener.run();
|
||||
}
|
||||
@@ -614,7 +674,7 @@ public class GLStateManager {
|
||||
public static void glFogi(int pname, int param) {
|
||||
GL11.glFogi(pname, param);
|
||||
if (pname == GL11.GL_FOG_MODE) {
|
||||
fogState.fogMode = param;
|
||||
fogState.setFogMode(param);
|
||||
if (fogModeListener != null) {
|
||||
fogModeListener.run();
|
||||
}
|
||||
@@ -626,7 +686,7 @@ public class GLStateManager {
|
||||
}
|
||||
|
||||
public static void glShadeModel(int mode) {
|
||||
if (GLStateManager.BYPASS_CACHE || modelShadeMode != mode || checkDirty(Dirty.SHADE_MODEL)) {
|
||||
if (GLStateManager.BYPASS_CACHE || modelShadeMode != mode) {
|
||||
modelShadeMode = mode;
|
||||
GL11.glShadeModel(mode);
|
||||
}
|
||||
@@ -654,44 +714,146 @@ public class GLStateManager {
|
||||
}
|
||||
|
||||
public static void glNewList(int list, int mode) {
|
||||
if(inGLNewList) {
|
||||
if(glListMode > 0) {
|
||||
throw new RuntimeException("glNewList called inside of a display list!");
|
||||
}
|
||||
inGLNewList = true;
|
||||
|
||||
glListMode = mode;
|
||||
GL11.glNewList(list, mode);
|
||||
}
|
||||
|
||||
public static void glEndList() {
|
||||
if(!inGLNewList) {
|
||||
if(glListMode == 0) {
|
||||
throw new RuntimeException("glEndList called outside of a display list!");
|
||||
}
|
||||
inGLNewList = false;
|
||||
glListMode = 0;
|
||||
GL11.glEndList();
|
||||
}
|
||||
|
||||
|
||||
public static void glPushAttrib(int mask) {
|
||||
// TODO: Proper state tracking; but at least for now the current cases of this didn't do anything related to textures and
|
||||
// just overly broadly set ALL_BITS :facepalm:
|
||||
GL11.glPushAttrib(mask & ~(GL11.GL_TEXTURE_BIT));
|
||||
attribs.push(mask);
|
||||
for(IStateStack<?> stack : Feature.maskToFeatures(mask)) {
|
||||
stack.push();
|
||||
}
|
||||
GL11.glPushAttrib(mask);
|
||||
}
|
||||
|
||||
public static void glPopAttrib() {
|
||||
dirty = Dirty.ALL;
|
||||
final int mask = attribs.pop();
|
||||
for(IStateStack<?> stack : Feature.maskToFeatures(mask)) {
|
||||
stack.pop();
|
||||
}
|
||||
GL11.glPopAttrib();
|
||||
}
|
||||
|
||||
public static boolean checkDirty(long flag) {
|
||||
if((dirty & flag ) == flag) {
|
||||
dirty &= ~flag;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
public static void clean(long dirtyFlag) {
|
||||
dirty &= ~dirtyFlag;
|
||||
// Matrix Operations
|
||||
public static void glMatrixMode(int mode) {
|
||||
matrixMode.setMode(mode);
|
||||
}
|
||||
|
||||
public static void dirty(long dirtyFlag) {
|
||||
dirty |= dirtyFlag;
|
||||
public static Matrix4fStack getMatrixStack() {
|
||||
switch (matrixMode.getMode()) {
|
||||
case GL11.GL_MODELVIEW -> {
|
||||
return modelViewMatrix;
|
||||
}
|
||||
case GL11.GL_PROJECTION -> {
|
||||
return projectionMatrix;
|
||||
}
|
||||
case GL11.GL_TEXTURE -> {
|
||||
return textureMatrix;
|
||||
}
|
||||
default -> throw new IllegalStateException("Unknown matrix mode: " + matrixMode.getMode());
|
||||
}
|
||||
}
|
||||
|
||||
public static void glLoadIdentity() {
|
||||
GL11.glLoadIdentity();
|
||||
getMatrixStack().identity();
|
||||
}
|
||||
|
||||
public static void glTranslatef(float x, float y, float z) {
|
||||
GL11.glTranslatef(x, y, z);
|
||||
getMatrixStack().translate(x, y, z);
|
||||
}
|
||||
public static void glTranslated(double x, double y, double z) {
|
||||
GL11.glTranslated(x, y, z);
|
||||
getMatrixStack().translate((float) x, (float) y, (float) z);
|
||||
}
|
||||
|
||||
public static void glScalef(float x, float y, float z) {
|
||||
GL11.glScalef(x, y, z);
|
||||
getMatrixStack().scale(x, y, z);
|
||||
}
|
||||
|
||||
public static void glScaled(double x, double y, double z) {
|
||||
GL11.glScaled(x, y, z);
|
||||
getMatrixStack().scale((float) x, (float) y, (float) z);
|
||||
}
|
||||
|
||||
private static final Matrix4f tempMatrix4f = new Matrix4f();
|
||||
public static void glMultMatrix(FloatBuffer floatBuffer) {
|
||||
GL11.glMultMatrix(floatBuffer);
|
||||
tempMatrix4f.set(floatBuffer);
|
||||
getMatrixStack().mul(conersionMatrix4f);
|
||||
}
|
||||
|
||||
public static final Matrix4d conersionMatrix4d = new Matrix4d();
|
||||
public static final Matrix4f conersionMatrix4f = new Matrix4f();
|
||||
public static void glMultMatrix(DoubleBuffer matrix) {
|
||||
GL11.glMultMatrix(matrix);
|
||||
conersionMatrix4d.set(matrix);
|
||||
conersionMatrix4f.set(conersionMatrix4d);
|
||||
getMatrixStack().mul(conersionMatrix4f);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
public static void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar) {
|
||||
GL11.glOrtho(left, right, bottom, top, zNear, zFar);
|
||||
getMatrixStack().ortho((float)left, (float)right, (float)bottom, (float)top, (float)zNear, (float)zFar);
|
||||
}
|
||||
|
||||
public static void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar) {
|
||||
GL11.glFrustum(left, right, bottom, top, zNear, zFar);
|
||||
getMatrixStack().frustum((float)left, (float)right, (float)bottom, (float)top, (float)zNear, (float)zFar);
|
||||
}
|
||||
public static void glPushMatrix() {
|
||||
GL11.glPushMatrix();
|
||||
getMatrixStack().pushMatrix();
|
||||
}
|
||||
|
||||
public static void glPopMatrix() {
|
||||
GL11.glPopMatrix();
|
||||
getMatrixStack().popMatrix();
|
||||
}
|
||||
|
||||
private static final Matrix4f perspectiveMatrix = new Matrix4f();
|
||||
private static final FloatBuffer perspectiveBuffer = BufferUtils.createFloatBuffer(16);
|
||||
public static void gluPerspective(float fovy, float aspect, float zNear, float zFar) {
|
||||
perspectiveMatrix.identity().perspective((float)Math.toRadians(fovy), aspect, zNear, zFar);
|
||||
|
||||
perspectiveMatrix.get(0, perspectiveBuffer);
|
||||
GL11.glMultMatrix(perspectiveBuffer);
|
||||
|
||||
getMatrixStack().mul(perspectiveMatrix);
|
||||
|
||||
}
|
||||
|
||||
public static void glViewport(int x, int y, int width, int height) {
|
||||
GL11.glViewport(x, y, width, height);
|
||||
viewportState.setViewPort(x, y, width, height);
|
||||
}
|
||||
|
||||
public static int getActiveTextureUnit() {
|
||||
return activeTextureUnit.topInt();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.AlphaState;
|
||||
|
||||
public class AlphaStateStack extends AlphaState implements IStateStack<AlphaState> {
|
||||
|
||||
protected final AlphaState[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public AlphaStateStack() {
|
||||
stack = new AlphaState[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new AlphaState();
|
||||
}
|
||||
}
|
||||
|
||||
public AlphaStateStack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public AlphaStateStack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.BlendState;
|
||||
|
||||
public class BlendStateStack extends BlendState implements IStateStack<BlendStateStack> {
|
||||
|
||||
protected final BlendState[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public BlendStateStack() {
|
||||
stack = new BlendState[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new BlendState();
|
||||
}
|
||||
}
|
||||
|
||||
public BlendStateStack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public BlendStateStack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.BooleanState;
|
||||
|
||||
public class BooleanStateStack extends BooleanState implements IStateStack<BooleanStateStack> {
|
||||
|
||||
protected final BooleanState[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public BooleanStateStack(int glCap) {
|
||||
super(glCap);
|
||||
stack = new BooleanState[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new BooleanState(glCap);
|
||||
}
|
||||
}
|
||||
|
||||
public BooleanStateStack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public BooleanStateStack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.Color4;
|
||||
|
||||
public class Color4Stack extends Color4 implements IStateStack<Color4Stack> {
|
||||
|
||||
protected final Color4[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public Color4Stack() {
|
||||
stack = new Color4[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new Color4();
|
||||
}
|
||||
}
|
||||
|
||||
public Color4Stack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Color4Stack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.ColorMask;
|
||||
|
||||
public class ColorMaskStack extends ColorMask implements IStateStack<ColorMaskStack> {
|
||||
|
||||
protected final ColorMask[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public ColorMaskStack() {
|
||||
stack = new ColorMask[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new ColorMask();
|
||||
}
|
||||
}
|
||||
|
||||
public ColorMaskStack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public ColorMaskStack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.DepthState;
|
||||
|
||||
public class DepthStateStack extends DepthState implements IStateStack<DepthStateStack> {
|
||||
|
||||
protected final DepthState[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public DepthStateStack() {
|
||||
stack = new DepthState[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new DepthState();
|
||||
}
|
||||
}
|
||||
|
||||
public DepthStateStack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public DepthStateStack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.FogState;
|
||||
|
||||
public class FogStateStack extends FogState implements IStateStack<FogStateStack> {
|
||||
|
||||
protected final FogState[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public FogStateStack() {
|
||||
stack = new FogState[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new FogState();
|
||||
}
|
||||
}
|
||||
|
||||
public FogStateStack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public FogStateStack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
public interface IStateStack<T>{
|
||||
|
||||
T push();
|
||||
|
||||
T pop();
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.MatrixMode;
|
||||
|
||||
public class MatrixModeStack extends MatrixMode implements IStateStack<MatrixModeStack> {
|
||||
|
||||
protected final MatrixMode[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public MatrixModeStack() {
|
||||
stack = new MatrixMode[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new MatrixMode();
|
||||
}
|
||||
}
|
||||
|
||||
public MatrixModeStack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public MatrixModeStack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.TextureBinding;
|
||||
|
||||
public class TextureBindingStack extends TextureBinding implements IStateStack<TextureBindingStack> {
|
||||
|
||||
protected final TextureBinding[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public TextureBindingStack() {
|
||||
stack = new TextureBinding[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new TextureBinding();
|
||||
}
|
||||
}
|
||||
|
||||
public TextureBindingStack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public TextureBindingStack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
public TextureBinding peek() {
|
||||
return stack[pointer];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.ViewportState;
|
||||
|
||||
public class ViewPortStateStack extends ViewportState implements IStateStack<ViewPortStateStack> {
|
||||
|
||||
protected final ViewportState[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public ViewPortStateStack() {
|
||||
stack = new ViewportState[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new ViewportState();
|
||||
}
|
||||
}
|
||||
|
||||
public ViewPortStateStack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public ViewPortStateStack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,9 +1,19 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class AlphaState {
|
||||
public final BooleanState mode = new BooleanState(GL11.GL_ALPHA_TEST);
|
||||
public int function = GL11.GL_ALWAYS;
|
||||
public float reference = -1.0F;
|
||||
@Getter
|
||||
public class AlphaState implements ISettableState<AlphaState> {
|
||||
@Setter protected int function = GL11.GL_ALWAYS;
|
||||
@Setter protected float reference = -1.0F;
|
||||
|
||||
@Override
|
||||
public AlphaState set(AlphaState state) {
|
||||
this.function = state.function;
|
||||
this.reference = state.reference;
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,13 +1,24 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class BlendState {
|
||||
|
||||
public final BooleanState mode = new BooleanState(GL11.GL_BLEND);
|
||||
public int srcRgb = GL11.GL_ONE;
|
||||
public int dstRgb = GL11.GL_ZERO;
|
||||
public int srcAlpha = GL11.GL_ONE;
|
||||
public int dstAlpha = GL11.GL_ZERO;
|
||||
@Getter @Setter
|
||||
public class BlendState implements ISettableState<BlendState> {
|
||||
protected int srcRgb = GL11.GL_ONE;
|
||||
protected int dstRgb = GL11.GL_ZERO;
|
||||
protected int srcAlpha = GL11.GL_ONE;
|
||||
protected int dstAlpha = GL11.GL_ZERO;
|
||||
|
||||
@Override
|
||||
public BlendState set(BlendState state) {
|
||||
this.srcRgb = state.srcRgb;
|
||||
this.dstRgb = state.dstRgb;
|
||||
this.srcAlpha = state.srcAlpha;
|
||||
this.dstAlpha = state.dstAlpha;
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -5,17 +5,17 @@ import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import lombok.Getter;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class BooleanState {
|
||||
private final int cap;
|
||||
public class BooleanState implements ISettableState<BooleanState> {
|
||||
private final int glCap;
|
||||
|
||||
private final long dirtyFlag;
|
||||
|
||||
@Getter
|
||||
private boolean enabled;
|
||||
|
||||
public BooleanState(int cap) {
|
||||
this.cap = cap;
|
||||
this.dirtyFlag = Dirty.getFlagFromCap(this.cap);
|
||||
public BooleanState(int glCap) {
|
||||
this.glCap = glCap;
|
||||
this.dirtyFlag = Dirty.getFlagFromCap(this.glCap);
|
||||
}
|
||||
|
||||
public void disable() {
|
||||
@@ -27,13 +27,19 @@ public class BooleanState {
|
||||
}
|
||||
|
||||
public void setEnabled(boolean enabled) {
|
||||
if (GLStateManager.BYPASS_CACHE || enabled != this.enabled || GLStateManager.checkDirty(this.dirtyFlag)) {
|
||||
if (GLStateManager.BYPASS_CACHE || enabled != this.enabled) {
|
||||
this.enabled = enabled;
|
||||
if (enabled) {
|
||||
GL11.glEnable(this.cap);
|
||||
GL11.glEnable(this.glCap);
|
||||
} else {
|
||||
GL11.glDisable(this.cap);
|
||||
GL11.glDisable(this.glCap);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public BooleanState set(BooleanState state) {
|
||||
this.enabled = state.enabled;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,32 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
public class Color4 {
|
||||
public float red = 1.0F;
|
||||
public float green = 1.0F;
|
||||
public float blue = 1.0F;
|
||||
public float alpha = 1.0F;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter @Setter
|
||||
public class Color4 implements ISettableState<Color4> {
|
||||
protected float red = 1.0F;
|
||||
protected float green = 1.0F;
|
||||
protected float blue = 1.0F;
|
||||
protected float alpha = 1.0F;
|
||||
|
||||
public Color4() {
|
||||
}
|
||||
|
||||
public Color4(float red, float green, float blue, float alpha) {
|
||||
this.red = red;
|
||||
this.green = green;
|
||||
this.blue = blue;
|
||||
this.alpha = alpha;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Color4 set(Color4 state) {
|
||||
this.red = state.red;
|
||||
this.green = state.green;
|
||||
this.blue = state.blue;
|
||||
this.alpha = state.alpha;
|
||||
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
public class ColorMask implements ISettableState<ColorMask> {
|
||||
public boolean red = true;
|
||||
public boolean green = true;
|
||||
public boolean blue = true;
|
||||
public boolean alpha = true;
|
||||
|
||||
@Override
|
||||
public ColorMask set(ColorMask state) {
|
||||
this.red = state.red;
|
||||
this.green = state.green;
|
||||
this.blue = state.blue;
|
||||
this.alpha = state.alpha;
|
||||
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,18 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class DepthState {
|
||||
public final BooleanState mode = new BooleanState(GL11.GL_DEPTH_TEST);
|
||||
public boolean mask = true;
|
||||
public int func = GL11.GL_LESS;
|
||||
@Getter @Setter
|
||||
public class DepthState implements ISettableState<DepthState> {
|
||||
protected boolean mask = true;
|
||||
protected int func = GL11.GL_LESS;
|
||||
|
||||
@Override
|
||||
public DepthState set(DepthState state) {
|
||||
this.mask = state.mask;
|
||||
this.func = state.func;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,32 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.joml.Vector3d;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
|
||||
public class FogState {
|
||||
public BooleanState mode = new BooleanState(GL11.GL_FOG);
|
||||
public int fogMode = GL11.GL_EXP;
|
||||
public final Vector3d fogColor = new Vector3d(0.0F, 0.0F, 0.0F);
|
||||
public float fogAlpha = 1.0F;
|
||||
public final FloatBuffer fogColorBuffer = FloatBuffer.allocate(4);
|
||||
public float density = 1.0F;
|
||||
public float start;
|
||||
public float end = 1.0F;
|
||||
@Getter @Setter
|
||||
public class FogState implements ISettableState<FogState> {
|
||||
protected int fogMode = GL11.GL_EXP;
|
||||
protected final Vector3d fogColor = new Vector3d(0.0F, 0.0F, 0.0F);
|
||||
protected float fogAlpha = 1.0F;
|
||||
protected final FloatBuffer fogColorBuffer = FloatBuffer.allocate(4);
|
||||
protected float density = 1.0F;
|
||||
protected float start;
|
||||
protected float end = 1.0F;
|
||||
|
||||
@Override
|
||||
public FogState set(FogState state) {
|
||||
this.fogMode = state.fogMode;
|
||||
this.fogColor.set(state.fogColor);
|
||||
this.fogAlpha = state.fogAlpha;
|
||||
this.fogColorBuffer.put(0, state.fogColorBuffer.get(0));
|
||||
this.density = state.density;
|
||||
this.start = state.start;
|
||||
this.end = state.end;
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
public class GLColorMask {
|
||||
public boolean red = true;
|
||||
public boolean green = true;
|
||||
public boolean blue = true;
|
||||
public boolean alpha = true;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
public interface ISettableState<T> {
|
||||
T set(T state);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import lombok.Getter;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@Getter
|
||||
public class MatrixMode implements ISettableState<MatrixMode> {
|
||||
protected int mode = GL11.GL_MODELVIEW;
|
||||
|
||||
public void setMode(int mode) {
|
||||
if(this.mode != mode || GLStateManager.BYPASS_CACHE) {
|
||||
this.mode = mode;
|
||||
GL11.glMatrixMode(mode);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public MatrixMode set(MatrixMode state) {
|
||||
this.mode = state.mode;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,136 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import org.joml.Matrix4f;
|
||||
import org.joml.Matrix4fStack;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
|
||||
public class MatrixState {
|
||||
|
||||
public MatrixMode mode = MatrixMode.NONE;
|
||||
public final Matrix4fStack projectionMatrix;
|
||||
public final Matrix4fStack modelViewMatrix;
|
||||
|
||||
public MatrixState() {
|
||||
projectionMatrix = new Matrix4fStack(GL11.glGetInteger(GL11.GL_MAX_PROJECTION_STACK_DEPTH));
|
||||
modelViewMatrix = new Matrix4fStack(GL11.glGetInteger(GL11.GL_MAX_MODELVIEW_STACK_DEPTH));
|
||||
}
|
||||
|
||||
public void identity() {
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.identity();
|
||||
case PROJECTION -> projectionMatrix.identity();
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void setMode(int mode) {
|
||||
switch (mode) {
|
||||
case GL11.GL_MODELVIEW -> this.mode = MatrixMode.MODELVIEW;
|
||||
case GL11.GL_PROJECTION -> this.mode = MatrixMode.PROJECTION;
|
||||
case GL11.GL_TEXTURE -> this.mode = MatrixMode.TEXTURE;
|
||||
default -> throw new RuntimeException("Unsupported matrix mode: " + mode);
|
||||
}
|
||||
}
|
||||
|
||||
public void translate(float x, float y, float z) {
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.translate(x, y, z);
|
||||
case PROJECTION -> projectionMatrix.translate(x, y, z);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void scale(float x, float y, float z) {
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.scale(x, y, z);
|
||||
case PROJECTION -> projectionMatrix.scale(x, y, z);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private final Matrix4f tempMatrix = new Matrix4f();
|
||||
|
||||
public void multiply(FloatBuffer matrix) {
|
||||
tempMatrix.set(matrix);
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.mul(tempMatrix);
|
||||
case PROJECTION -> projectionMatrix.mul(tempMatrix);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void multiply(Matrix4f matrix) {
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.mul(matrix);
|
||||
case PROJECTION -> projectionMatrix.mul(matrix);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void rotate(float angle, float x, float y, float z) {
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.rotate(angle, x, y, z);
|
||||
case PROJECTION -> projectionMatrix.rotate(angle, x, y, z);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void ortho(double left, double right, double bottom, double top, double zNear, double zFar) {
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.ortho((float) left, (float) right, (float) bottom, (float) top, (float) zNear, (float) zFar);
|
||||
case PROJECTION -> projectionMatrix.ortho((float) left, (float) right, (float) bottom, (float) top, (float) zNear, (float) zFar);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void frustum(double left, double right, double bottom, double top, double zNear, double zFar) {
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.frustum((float) left, (float) right, (float) bottom, (float) top, (float) zNear, (float) zFar);
|
||||
case PROJECTION -> projectionMatrix.frustum((float) left, (float) right, (float) bottom, (float) top, (float) zNear, (float) zFar);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
public void push() {
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.pushMatrix();
|
||||
case PROJECTION -> projectionMatrix.pushMatrix();
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void pop() {
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.popMatrix();
|
||||
case PROJECTION -> projectionMatrix.popMatrix();
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void perspective(float fovy, float aspect, float zNear, float zFar) {
|
||||
switch (mode) {
|
||||
case MODELVIEW -> modelViewMatrix.perspective(fovy, aspect, zNear, zFar);
|
||||
case PROJECTION -> projectionMatrix.perspective(fovy, aspect, zNear, zFar);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
enum MatrixMode {
|
||||
NONE,
|
||||
MODELVIEW,
|
||||
PROJECTION,
|
||||
TEXTURE
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
public class TextureBinding implements ISettableState<TextureBinding> {
|
||||
@Setter protected int binding;
|
||||
|
||||
@Override
|
||||
public TextureBinding set(TextureBinding state) {
|
||||
this.binding = state.binding;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class TextureState {
|
||||
public final BooleanState mode = new BooleanState(GL11.GL_TEXTURE_2D);
|
||||
public int binding;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.BooleanStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.TextureBindingStack;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class TextureUnitArray {
|
||||
private TextureBindingStack[] bindings;
|
||||
private BooleanStateStack[] states;
|
||||
|
||||
public TextureUnitArray() {
|
||||
bindings = new TextureBindingStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
states = new BooleanStateStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
for (int i = 0; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
|
||||
bindings[i] = new TextureBindingStack();
|
||||
states[i] = new BooleanStateStack(GL11.GL_TEXTURE_2D);
|
||||
}
|
||||
}
|
||||
|
||||
public TextureBindingStack getTextureUnitBindings(int index) {
|
||||
return bindings[index];
|
||||
}
|
||||
|
||||
public BooleanStateStack getTextureUnitStates(int index) {
|
||||
return states[index];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import java.nio.IntBuffer;
|
||||
|
||||
public class ViewportState implements ISettableState<ViewportState> {
|
||||
public int x;
|
||||
public int y;
|
||||
public int width;
|
||||
public int height;
|
||||
|
||||
public void setViewPort(int x, int y, int width, int height) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.width = width;
|
||||
this.height = height;
|
||||
}
|
||||
|
||||
public void get(IntBuffer params) {
|
||||
params.put(0, x);
|
||||
params.put(1, y);
|
||||
params.put(2, width);
|
||||
params.put(3, height);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ViewportState set(ViewportState state) {
|
||||
this.x = state.x;
|
||||
this.y = state.y;
|
||||
this.width = state.width;
|
||||
this.height = state.height;
|
||||
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,8 @@ import com.gtnewhorizons.angelica.mixins.Mixins;
|
||||
import com.gtnewhorizons.angelica.mixins.TargetedMod;
|
||||
import cpw.mods.fml.relauncher.FMLLaunchHandler;
|
||||
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
|
||||
import mist475.mcpatcherforge.asm.AsmTransformers;
|
||||
import mist475.mcpatcherforge.asm.mappings.Namer;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
@@ -32,6 +34,8 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
|
||||
|
||||
public static final Logger LOGGER = LogManager.getLogger("Angelica");
|
||||
|
||||
private String[] transformerClasses;
|
||||
|
||||
static {
|
||||
try {
|
||||
// Angelica Config
|
||||
@@ -55,7 +59,12 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
|
||||
}
|
||||
|
||||
// Return any others here
|
||||
return null;
|
||||
|
||||
if (transformerClasses == null) {
|
||||
Namer.initNames();
|
||||
transformerClasses = AsmTransformers.getTransformers();
|
||||
}
|
||||
return transformerClasses;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.gtnewhorizons.angelica.loading;
|
||||
|
||||
import com.gtnewhorizons.angelica.transform.BlockTransformer;
|
||||
import com.gtnewhorizons.angelica.transform.RedirectorTransformer;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.relauncher.FMLLaunchHandler;
|
||||
@@ -74,6 +75,7 @@ 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());
|
||||
}
|
||||
|
||||
return new String[0];
|
||||
|
||||
@@ -3,7 +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.mitchej123.hodgepodge.Common;
|
||||
import com.prupe.mcpatcher.Config;
|
||||
import com.prupe.mcpatcher.MCPatcherUtils;
|
||||
import cpw.mods.fml.relauncher.FMLLaunchHandler;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -12,6 +13,7 @@ import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public enum Mixins {
|
||||
ANGELICA_STARTUP(new Builder("Angelica Startup").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
|
||||
@@ -23,8 +25,8 @@ public enum Mixins {
|
||||
|
||||
ANGELICA(new Builder("Angelica").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
|
||||
.setPhase(Phase.EARLY).addMixinClasses(
|
||||
"angelica.MixinEntityRenderer"
|
||||
|
||||
"angelica.MixinActiveRenderInfo"
|
||||
,"angelica.MixinEntityRenderer"
|
||||
)
|
||||
),
|
||||
|
||||
@@ -133,6 +135,11 @@ public enum Mixins {
|
||||
)
|
||||
),
|
||||
|
||||
OPTIMIZE_JABBA_GET_INTEGER(new Builder("Optimize Jabba getInteger").setPhase(Phase.LATE)
|
||||
.addTargetedMod(TargetedMod.JABBA).setSide(Side.CLIENT)
|
||||
.setApplyIf(() -> AngelicaConfig.optimizeJabbaGetInteger)
|
||||
.addMixinClasses("client.jabba.MixinTileEntityBaseRenderer")),
|
||||
|
||||
|
||||
ANGELICA_TEXTURE(new Builder("Textures").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
|
||||
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableIris || AngelicaConfig.enableSodium).addMixinClasses(
|
||||
@@ -170,6 +177,10 @@ public enum Mixins {
|
||||
"angelica.animation.MixinWorldRenderer",
|
||||
"angelica.animation.MixinRenderItem")),
|
||||
|
||||
IC2_FLUID_RENDER_FIX(new Builder("IC2 Fluid Render Fix").setPhase(Phase.EARLY).setSide(Side.CLIENT)
|
||||
.addTargetedMod(TargetedMod.IC2).setApplyIf(() -> AngelicaConfig.speedupAnimations)
|
||||
.addMixinClasses("angelica.textures.ic2.MixinRenderLiquidCell")),
|
||||
|
||||
OPTIMIZE_TEXTURE_LOADING(new Builder("Optimize Texture Loading").setPhase(Phase.EARLY)
|
||||
.addMixinClasses("angelica.textures.MixinTextureUtil_OptimizeMipmap").addTargetedMod(TargetedMod.VANILLA)
|
||||
.setApplyIf(() -> AngelicaConfig.optimizeTextureLoading).setSide(Side.CLIENT)),
|
||||
@@ -184,14 +195,22 @@ public enum Mixins {
|
||||
|
||||
NOTFINE_FEATURES(new Builder("NotFine Features").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
|
||||
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures).addMixinClasses(
|
||||
"notfine.glint.MixinItemRenderer"
|
||||
,"notfine.glint.MixinRenderBiped"
|
||||
"notfine.glint.MixinRenderBiped"
|
||||
,"notfine.glint.MixinRenderItem"
|
||||
,"notfine.glint.MixinRenderPlayer"
|
||||
,"notfine.gui.MixinGuiSlot"
|
||||
,"notfine.renderer.MixinRenderGlobal"
|
||||
,"notfine.settings.MixinGameSettings"
|
||||
)),
|
||||
|
||||
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))
|
||||
).addMixinClasses(
|
||||
"notfine.glint.MixinItemRenderer",
|
||||
"notfine.glint.MixinRenderItemGlint"
|
||||
)),
|
||||
|
||||
NOTFINE_LATE_TWILIGHT_FORESTLEAVES(new Builder("NotFine Mod Leaves").addTargetedMod(TargetedMod.TWILIGHT_FOREST).setSide(Side.CLIENT)
|
||||
.setPhase(Phase.LATE).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures).addMixinClasses(
|
||||
"notfine.leaves.twilightforest.MixinBlockTFLeaves"
|
||||
@@ -206,7 +225,172 @@ public enum Mixins {
|
||||
NOTFINE_LATE_WITCHERY_LEAVES(new Builder("NotFine Mod Leaves").addTargetedMod(TargetedMod.WITCHERY).setSide(Side.CLIENT)
|
||||
.setPhase(Phase.LATE).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures).addMixinClasses(
|
||||
"notfine.leaves.witchery.MixinBlockWitchLeaves"
|
||||
))
|
||||
)),
|
||||
|
||||
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))
|
||||
.addMixinClasses(addPrefix(
|
||||
"notfine_mcpf_compat.",
|
||||
"MixinRenderItem",
|
||||
"MixinItemRenderer"))),
|
||||
|
||||
MCPATCHERFORGE_BASE_MOD(new Builder("Base MCPatcher mixins").setSide(Side.CLIENT)
|
||||
.setPhase(Phase.EARLY)
|
||||
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures)
|
||||
.addTargetedMod(TargetedMod.VANILLA)
|
||||
.addMixinClasses(addPrefix(
|
||||
"mcpatcherforge.",
|
||||
"base.MixinBlockGrass",
|
||||
"base.MixinBlockMycelium",
|
||||
|
||||
"base.MixinAbstractTexture",
|
||||
"base.MixinTextureAtlasSprite",
|
||||
|
||||
"base.MixinSimpleReloadableResourceManager",
|
||||
|
||||
"base.MixinMinecraft"
|
||||
|
||||
// TODO merge renderpass changes into Sodium renderer
|
||||
// "renderpass.MixinEntityRenderer",
|
||||
// "renderpass.MixinRenderBlocks",
|
||||
// "renderpass.MixinRenderGlobal",
|
||||
// "renderpass.MixinWorldRenderer"
|
||||
|
||||
)
|
||||
)),
|
||||
|
||||
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))
|
||||
.addTargetedMod(TargetedMod.VANILLA)
|
||||
.addMixinClasses(
|
||||
addPrefix(
|
||||
"mcpatcherforge.cc.",
|
||||
"block.material.MixinMapColor",
|
||||
|
||||
"block.MixinBlock",
|
||||
"block.MixinBlockDoublePlant",
|
||||
"block.MixinBlockGrass",
|
||||
"block.MixinBlockLeaves",
|
||||
"block.MixinBlockLilyPad",
|
||||
"block.MixinBlockLiquid",
|
||||
"block.MixinBlockOldLeaf",
|
||||
"block.MixinBlockRedstoneWire",
|
||||
"block.MixinBlockReed",
|
||||
"block.MixinBlockStem",
|
||||
"block.MixinBlockTallGrass",
|
||||
"block.MixinBlockVine",
|
||||
|
||||
"client.particle.MixinEntityAuraFX",
|
||||
"client.particle.MixinEntityBubbleFX",
|
||||
"client.particle.MixinEntityDropParticleFX",
|
||||
"client.particle.MixinEntityPortalFX",
|
||||
"client.particle.MixinEntityRainFX",
|
||||
"client.particle.MixinEntityRedDustFX",
|
||||
"client.particle.MixinEntitySplashFX",
|
||||
"client.particle.MixinEntitySuspendFX",
|
||||
|
||||
"client.renderer.entity.MixinRenderWolf",
|
||||
"client.renderer.entity.MixinRenderXPOrb",
|
||||
|
||||
"client.renderer.tileentity.MixinTileEntitySignRenderer",
|
||||
|
||||
"client.renderer.MixinEntityRenderer",
|
||||
"client.renderer.MixinItemRenderer",
|
||||
"client.renderer.MixinRenderBlocks",
|
||||
"client.renderer.MixinRenderGlobal",
|
||||
|
||||
"entity.MixinEntityList",
|
||||
|
||||
"item.crafting.MixinRecipesArmorDyes",
|
||||
|
||||
"item.MixinItemArmor",
|
||||
"item.MixinItemBlock",
|
||||
"item.MixinItemMonsterPlacer",
|
||||
|
||||
"potion.MixinPotion",
|
||||
"potion.MixinPotionHelper",
|
||||
|
||||
"world.MixinWorld",
|
||||
"world.MixinWorldProvider",
|
||||
"world.MixinWorldProviderEnd",
|
||||
"world.MixinWorldProviderHell"))),
|
||||
|
||||
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))
|
||||
.addTargetedMod(TargetedMod.VANILLA)
|
||||
.addMixinClasses(
|
||||
addPrefix(
|
||||
"mcpatcherforge.cit.",
|
||||
"client.renderer.entity.MixinRenderBiped",
|
||||
"client.renderer.entity.MixinRenderEntityLiving",
|
||||
"client.renderer.entity.MixinRenderItem",
|
||||
"client.renderer.entity.MixinRenderPlayer",
|
||||
"client.renderer.entity.MixinRenderSnowball",
|
||||
"client.renderer.MixinItemRenderer",
|
||||
"item.MixinItem",
|
||||
"nbt.MixinNBTTagCompound",
|
||||
"nbt.MixinNBTTagList"))),
|
||||
|
||||
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)
|
||||
.addTargetedMod(TargetedMod.VANILLA)
|
||||
.addMixinClasses(addPrefix(
|
||||
"mcpatcherforge.cit.client.renderer.",
|
||||
"entity.MixinRenderItemRenderDroppedItem",
|
||||
"MixinItemRenderer_NO_NF"
|
||||
))),
|
||||
|
||||
MCPATCHERFORGE_CONNECTED_TEXTURES(new Builder("Connected Textures").setSide(Side.CLIENT)
|
||||
.setPhase(Mixins.Phase.EARLY)
|
||||
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.CONNECTED_TEXTURES, "enabled", true))
|
||||
.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))
|
||||
.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))
|
||||
.addTargetedMod(TargetedMod.VANILLA)
|
||||
.addMixinClasses(
|
||||
addPrefix(
|
||||
"mcpatcherforge.mob.",
|
||||
"MixinRender",
|
||||
"MixinRenderEnderman",
|
||||
"MixinRenderFish",
|
||||
"MixinRenderLiving",
|
||||
"MixinRenderMooshroom",
|
||||
"MixinRenderSheep",
|
||||
"MixinRenderSnowMan",
|
||||
"MixinRenderSpider",
|
||||
"MixinRenderWolf",
|
||||
"MixinEntityLivingBase"))),
|
||||
|
||||
MCPATCHERFORGE_SKY(new Builder("Sky").setSide(Side.CLIENT)
|
||||
.setPhase(Phase.EARLY)
|
||||
.setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && Config.getBoolean(MCPatcherUtils.BETTER_SKIES, "enabled", true))
|
||||
.addTargetedMod(TargetedMod.VANILLA)
|
||||
.addMixinClasses(addPrefix("mcpatcherforge.sky.", "MixinEffectRenderer", "MixinRenderGlobal"
|
||||
))),
|
||||
|
||||
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))
|
||||
.addTargetedMod(TargetedMod.VANILLA)
|
||||
.addMixinClasses(addPrefix("mcpatcherforge.ctm_cc.", "MixinRenderBlocks", "MixinTextureMap")))
|
||||
|
||||
;
|
||||
|
||||
private final List<String> mixinClasses;
|
||||
@@ -348,6 +532,14 @@ public enum Mixins {
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("SimplifyStreamApiCallChains")
|
||||
private static String[] addPrefix(String prefix, String... values) {
|
||||
return Arrays.stream(values)
|
||||
.map(s -> prefix + s)
|
||||
.collect(Collectors.toList())
|
||||
.toArray(new String[values.length]);
|
||||
}
|
||||
|
||||
private enum Side {
|
||||
BOTH,
|
||||
CLIENT,
|
||||
|
||||
@@ -12,6 +12,7 @@ public enum TargetedMod {
|
||||
, COFHCORE("CoFHCore", "cofh.asm.LoadingPlugin", "CoFHCore")
|
||||
, EXTRAUTILS("ExtraUtilities", null, "ExtraUtilities")
|
||||
, GTNHLIB("GTNHLib", "com.gtnewhorizon.gtnhlib.core.GTNHLibCore", "gtnhlib")
|
||||
, IC2("IC2", "ic2.core.coremod.IC2core", "IC2")
|
||||
, JABBA("JABBA", null, "JABBA")
|
||||
, JOURNEYMAP("JourneyMap", null, "journeymap")
|
||||
, LWJGL3IFY("lwjgl3ify", "me.eigenraven.lwjgl3ify.core.Lwjgl3ifyCoremod", "lwjgl3ify")
|
||||
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.angelica;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.rendering.RenderingState;
|
||||
import net.minecraft.client.renderer.ActiveRenderInfo;
|
||||
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.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
|
||||
@Mixin(ActiveRenderInfo.class)
|
||||
public class MixinActiveRenderInfo {
|
||||
@Shadow private static FloatBuffer modelview;
|
||||
@Shadow private static FloatBuffer projection;
|
||||
@Inject(method = "updateRenderInfo", at = @At(value = "TAIL"))
|
||||
private static void angelica$onUpdateRenderInfo(CallbackInfo ci) {
|
||||
RenderingState.INSTANCE.setProjectionMatrix(projection);
|
||||
RenderingState.INSTANCE.setModelViewMatrix(modelview);
|
||||
}
|
||||
|
||||
@Redirect(method = "updateRenderInfo", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glGetInteger(ILjava/nio/IntBuffer;)V"), remap = false)
|
||||
private static void angelica$glGetInteger(int pname, java.nio.IntBuffer params) {
|
||||
if(pname == GL11.GL_VIEWPORT) {
|
||||
GLStateManager.getViewportState().get(params);
|
||||
} else {
|
||||
GL11.glGetInteger(pname, params);
|
||||
}
|
||||
}
|
||||
}
|
||||
-3
@@ -21,8 +21,5 @@ public abstract class MixinEntityRenderer {
|
||||
viewEntity.lastTickPosY + (viewEntity.posY - viewEntity.lastTickPosY) * partialTicks,
|
||||
viewEntity.lastTickPosZ + (viewEntity.posZ - viewEntity.lastTickPosZ) * partialTicks
|
||||
);
|
||||
RenderingState.INSTANCE.captureProjectionMatrix();
|
||||
RenderingState.INSTANCE.captureModelViewMatrix();
|
||||
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -16,7 +16,7 @@ public class MixinBlockFire {
|
||||
private IIcon[] field_149850_M;
|
||||
|
||||
@Inject(method = "getFireIcon", at = @At("HEAD"))
|
||||
private void hodgepodge$markFireAnimationForUpdate(int p_149840_1_, CallbackInfoReturnable<IIcon> cir) {
|
||||
private void angelica$markFireAnimationForUpdate(int p_149840_1_, CallbackInfoReturnable<IIcon> cir) {
|
||||
AnimationsRenderUtils.markBlockTextureForUpdate(field_149850_M[p_149840_1_]);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -19,7 +19,7 @@ public class MixinMinecraftForgeClient {
|
||||
* @author laetansky We can just mark any item texture that gets rendered for an update
|
||||
*/
|
||||
@Inject(method = "getItemRenderer", at = @At("HEAD"), remap = false)
|
||||
private static void hodgepodge$beforeRenderItem(ItemStack itemStack, IItemRenderer.ItemRenderType type,
|
||||
private static void angelica$beforeRenderItem(ItemStack itemStack, IItemRenderer.ItemRenderType type,
|
||||
CallbackInfoReturnable<IItemRenderer> cir) {
|
||||
final Item item = itemStack.getItem();
|
||||
if (item.requiresMultipleRenderPasses()) {
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ public abstract class MixinRenderBlockFluid {
|
||||
private IBlockAccess currentBlockAccess;
|
||||
|
||||
@Inject(method = "renderWorldBlock", at = @At(value = "HEAD"))
|
||||
private void hodgepodge$saveCurrentBlockAccess(IBlockAccess world, int x, int y, int z, Block block, int modelId,
|
||||
private void angelica$saveCurrentBlockAccess(IBlockAccess world, int x, int y, int z, Block block, int modelId,
|
||||
RenderBlocks renderer, CallbackInfoReturnable<Boolean> cir) {
|
||||
currentBlockAccess = world;
|
||||
}
|
||||
|
||||
+3
-3
@@ -32,7 +32,7 @@ public class MixinRenderBlocks {
|
||||
* visible (on the viewport) at the moment)
|
||||
*/
|
||||
@Inject(method = "*(Lnet/minecraft/block/Block;DDDLnet/minecraft/util/IIcon;)V", at = @At("HEAD"))
|
||||
public void hodgepodge$beforeRenderFace(Block p_147761_1_, double p_147761_2_, double p_147761_4_,
|
||||
public void angelica$beforeRenderFace(Block p_147761_1_, double p_147761_2_, double p_147761_4_,
|
||||
double p_147761_6_, IIcon icon, CallbackInfo ci) {
|
||||
if (overrideBlockTexture != null) {
|
||||
icon = overrideBlockTexture;
|
||||
@@ -42,14 +42,14 @@ public class MixinRenderBlocks {
|
||||
}
|
||||
|
||||
@Inject(method = "renderBlockFire", at = @At("HEAD"))
|
||||
public void hodgepodge$markFireBlockAnimationForUpdate(BlockFire instance, int x, int y, int z,
|
||||
public void angelica$markFireBlockAnimationForUpdate(BlockFire instance, int x, int y, int z,
|
||||
CallbackInfoReturnable<Boolean> cir) {
|
||||
AnimationsRenderUtils.markBlockTextureForUpdate(instance.getFireIcon(0), blockAccess);
|
||||
AnimationsRenderUtils.markBlockTextureForUpdate(instance.getFireIcon(1), blockAccess);
|
||||
}
|
||||
|
||||
@ModifyVariable(method = "renderBlockLiquid", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/renderer/RenderBlocks;getBlockIconFromSideAndMetadata(Lnet/minecraft/block/Block;II)Lnet/minecraft/util/IIcon;"))
|
||||
public IIcon hodgepodge$markFluidAnimationForUpdate(IIcon icon) {
|
||||
public IIcon angelica$markFluidAnimationForUpdate(IIcon icon) {
|
||||
AnimationsRenderUtils.markBlockTextureForUpdate(icon, blockAccess);
|
||||
|
||||
return icon;
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ public class MixinRenderItem {
|
||||
* Some mods may call it to render their internally stored icons, so we make sure we mark those for an update
|
||||
*/
|
||||
@Inject(method = "renderIcon", at = @At("HEAD"))
|
||||
private void hodgepodge$beforeRenderIcon(int p_94149_1_, int p_94149_2_, IIcon icon, int p_94149_4_, int p_94149_5_,
|
||||
private void angelica$beforeRenderIcon(int p_94149_1_, int p_94149_2_, IIcon icon, int p_94149_4_, int p_94149_5_,
|
||||
CallbackInfo ci) {
|
||||
if (icon instanceof TextureAtlasSprite) {
|
||||
((IPatchedTextureAtlasSprite) icon).markNeedsAnimationUpdate();
|
||||
|
||||
+2
-2
@@ -25,13 +25,13 @@ public class MixinWorldRenderer implements ITexturesCache {
|
||||
private Set<IIcon> renderedIcons;
|
||||
|
||||
@ModifyArg(method = "updateRenderer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderBlocks;<init>(Lnet/minecraft/world/IBlockAccess;)V"))
|
||||
private IBlockAccess hodgepodge$onUpdateRenderer(IBlockAccess chunkCache) {
|
||||
private IBlockAccess angelica$onUpdateRenderer(IBlockAccess chunkCache) {
|
||||
renderedIcons = ((ITexturesCache) chunkCache).getRenderedTextures();
|
||||
return chunkCache;
|
||||
}
|
||||
|
||||
@Inject(method = "getGLCallListForPass", at = @At("HEAD"))
|
||||
private void hodgepodge$getGLCallListForPass(int pass, CallbackInfoReturnable<Integer> cir) {
|
||||
private void angelica$getGLCallListForPass(int pass, CallbackInfoReturnable<Integer> cir) {
|
||||
if (isInFrustum && pass == 0 && renderedIcons != null) {
|
||||
for (IIcon icon : renderedIcons) {
|
||||
((IPatchedTextureAtlasSprite) icon).markNeedsAnimationUpdate();
|
||||
|
||||
+3
-3
@@ -22,18 +22,18 @@ public abstract class MixinWorld_FixLightUpdateLag {
|
||||
public abstract boolean doChunksNearChunkExist(int p_72873_1_, int p_72873_2_, int p_72873_3_, int p_72873_4_);
|
||||
|
||||
@ModifyConstant(method = "updateLightByType", constant = @Constant(intValue = 17, ordinal = 0))
|
||||
public int hodgepodge$modifyRangeCheck1(int cst) {
|
||||
public int angelica$modifyRangeCheck1(int cst) {
|
||||
return 16;
|
||||
}
|
||||
|
||||
@Inject(method = "updateLightByType", at = @At(value = "FIELD", target = "Lnet/minecraft/world/World;theProfiler:Lnet/minecraft/profiler/Profiler;", shift = At.Shift.BEFORE, ordinal = 0))
|
||||
public void hodgepodge$modifyUpdateRange(EnumSkyBlock p_147463_1_, int x, int y, int z,
|
||||
public void angelica$modifyUpdateRange(EnumSkyBlock p_147463_1_, int x, int y, int z,
|
||||
CallbackInfoReturnable<Boolean> cir, @Share("updateRange") LocalIntRef updateRange) {
|
||||
updateRange.set(this.doChunksNearChunkExist(x, y, z, 18) ? 17 : 15);
|
||||
}
|
||||
|
||||
@ModifyConstant(method = "updateLightByType", constant = { @Constant(intValue = 17, ordinal = 1), @Constant(intValue = 17, ordinal = 2) })
|
||||
public int hodgepodge$modifyRangeCheck2(int cst, @Share("updateRange") LocalIntRef updateRange) {
|
||||
public int angelica$modifyRangeCheck2(int cst, @Share("updateRange") LocalIntRef updateRange) {
|
||||
return updateRange.get();
|
||||
}
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.angelica.textures.ic2;
|
||||
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.IPatchedTextureAtlasSprite;
|
||||
import ic2.core.item.ItemFluidCell;
|
||||
import ic2.core.item.RenderLiquidCell;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.At.Shift;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
||||
|
||||
@Mixin(RenderLiquidCell.class)
|
||||
public class MixinRenderLiquidCell {
|
||||
|
||||
@Inject(at = @At(ordinal = 0, remap = false, shift = Shift.AFTER, target = "Lorg/lwjgl/opengl/GL11;glColor3ub(BBB)V", value = "INVOKE"), locals = LocalCapture.CAPTURE_FAILSOFT, method = "renderItem", remap = false)
|
||||
private void angelica$markNeedsAnimationUpdate(ItemRenderType type, ItemStack item, Object[] data, CallbackInfo ci, ItemFluidCell cell, IIcon icon, FluidStack fs, IIcon windowIcon, IIcon fluidicon) {
|
||||
if (fluidicon instanceof TextureAtlasSprite) {
|
||||
((IPatchedTextureAtlasSprite) fluidicon).markNeedsAnimationUpdate();
|
||||
}
|
||||
}
|
||||
}
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.base;
|
||||
|
||||
import net.minecraft.client.renderer.texture.AbstractTexture;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.AbstractTextureExpansion;
|
||||
|
||||
@Mixin(AbstractTexture.class)
|
||||
public abstract class MixinAbstractTexture implements AbstractTextureExpansion {
|
||||
|
||||
@Shadow
|
||||
public int glTextureId;
|
||||
|
||||
public void unloadGLTexture() {
|
||||
if (this.glTextureId >= 0) {
|
||||
GL11.glDeleteTextures(this.glTextureId);
|
||||
this.glTextureId = -1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.base;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockGrass;
|
||||
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.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
import com.prupe.mcpatcher.mal.block.RenderBlocksUtils;
|
||||
|
||||
@Mixin(BlockGrass.class)
|
||||
public class MixinBlockGrass {
|
||||
|
||||
@Shadow
|
||||
private IIcon field_149991_b;
|
||||
|
||||
@Inject(
|
||||
method = "getIcon(Lnet/minecraft/world/IBlockAccess;IIII)Lnet/minecraft/util/IIcon;",
|
||||
at = @At("HEAD"),
|
||||
cancellable = true)
|
||||
private void modifyGetIcon(IBlockAccess worldIn, int x, int y, int z, int side, CallbackInfoReturnable<IIcon> cir) {
|
||||
final IIcon grassTexture = RenderBlocksUtils
|
||||
.getGrassTexture((Block) (Object) this, worldIn, x, y, z, side, this.field_149991_b);
|
||||
if (grassTexture != null) {
|
||||
cir.setReturnValue(grassTexture);
|
||||
}
|
||||
}
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.base;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockMycelium;
|
||||
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.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
import com.prupe.mcpatcher.mal.block.RenderBlocksUtils;
|
||||
|
||||
@Mixin(BlockMycelium.class)
|
||||
public abstract class MixinBlockMycelium {
|
||||
|
||||
@Shadow
|
||||
private IIcon field_150200_a;
|
||||
|
||||
@Inject(
|
||||
method = "getIcon(Lnet/minecraft/world/IBlockAccess;IIII)Lnet/minecraft/util/IIcon;",
|
||||
at = @At("HEAD"),
|
||||
cancellable = true)
|
||||
private void modifyGetIcon(IBlockAccess worldIn, int x, int y, int z, int side, CallbackInfoReturnable<IIcon> cir) {
|
||||
final IIcon grassTexture = RenderBlocksUtils
|
||||
.getGrassTexture((Block) (Object) this, worldIn, x, y, z, side, this.field_150200_a);
|
||||
if (grassTexture != null) {
|
||||
cir.setReturnValue(grassTexture);
|
||||
}
|
||||
}
|
||||
}
|
||||
+119
@@ -0,0 +1,119 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.base;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.Proxy;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.texture.DynamicTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.client.resources.IResourceManager;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.Session;
|
||||
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
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.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;
|
||||
import com.prupe.mcpatcher.ctm.CTMUtils;
|
||||
import com.prupe.mcpatcher.hd.FontUtils;
|
||||
import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler;
|
||||
import com.prupe.mcpatcher.mal.tile.TileLoader;
|
||||
import com.prupe.mcpatcher.mob.MobRandomizer;
|
||||
|
||||
@Mixin(Minecraft.class)
|
||||
public abstract class MixinMinecraft {
|
||||
|
||||
@Shadow
|
||||
public abstract IResourceManager getResourceManager();
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
private static ResourceLocation locationMojangPng;
|
||||
|
||||
@Inject(
|
||||
method = "<init>(Lnet/minecraft/util/Session;IIZZLjava/io/File;Ljava/io/File;Ljava/io/File;Ljava/net/Proxy;Ljava/lang/String;Lcom/google/common/collect/Multimap;Ljava/lang/String;)V",
|
||||
at = @At("RETURN"))
|
||||
private void modifyConstructor(Session sessionIn, int displayWidth, int displayHeight, boolean fullscreen,
|
||||
boolean isDemo, File dataDir, File assetsDir, File resourcePackDir, Proxy proxy, String version,
|
||||
Multimap<String, String> twitchDetails, String assetsJsonVersion, CallbackInfo ci) {
|
||||
MCPatcherUtils.setMinecraft(dataDir);
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "startGame()V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/resources/IReloadableResourceManager;registerReloadListener(Lnet/minecraft/client/resources/IResourceManagerReloadListener;)V",
|
||||
ordinal = 0))
|
||||
private void modifyStartGame1(CallbackInfo ci) {
|
||||
TileLoader.init();
|
||||
CTMUtils.reset();
|
||||
if (Config.getBoolean(MCPatcherUtils.CUSTOM_ITEM_TEXTURES, "enabled", true)) {
|
||||
CITUtils.init();
|
||||
}
|
||||
if (Config.getBoolean(MCPatcherUtils.EXTENDED_HD, "enabled", true)) {
|
||||
FontUtils.init();
|
||||
}
|
||||
if (Config.getBoolean(MCPatcherUtils.RANDOM_MOBS, "enabled", true)) {
|
||||
MobRandomizer.init();
|
||||
}
|
||||
if (Config.getBoolean(MCPatcherUtils.CUSTOM_COLORS, "enabled", true)) {
|
||||
Colorizer.init();
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "startGame()V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lcpw/mods/fml/client/FMLClientHandler;beginMinecraftLoading(Lnet/minecraft/client/Minecraft;Ljava/util/List;Lnet/minecraft/client/resources/IReloadableResourceManager;)V",
|
||||
remap = false,
|
||||
shift = At.Shift.AFTER))
|
||||
private void modifyStartGame2(CallbackInfo ci) {
|
||||
TexturePackChangeHandler.beforeChange1();
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "startGame()V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lorg/lwjgl/opengl/GL11;glViewport(IIII)V",
|
||||
remap = false,
|
||||
shift = At.Shift.AFTER))
|
||||
private void modifyStartGame3(CallbackInfo ci) {
|
||||
TexturePackChangeHandler.afterChange1();
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "loadScreen()V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/texture/TextureManager;getDynamicTextureLocation(Ljava/lang/String;Lnet/minecraft/client/renderer/texture/DynamicTexture;)Lnet/minecraft/util/ResourceLocation;"))
|
||||
private ResourceLocation modifyLoadScreen(TextureManager renderEngine, String p_110578_1_,
|
||||
DynamicTexture p_110578_2_) throws IOException {
|
||||
return renderEngine.getDynamicTextureLocation(
|
||||
"logo",
|
||||
new DynamicTexture(
|
||||
ImageIO.read(
|
||||
this.getResourceManager()
|
||||
.getResource(locationMojangPng)
|
||||
.getInputStream())));
|
||||
}
|
||||
|
||||
@Inject(method = "runGameLoop()V", at = @At(value = "HEAD"))
|
||||
private void modifyRunGameLoop(CallbackInfo ci) {
|
||||
TexturePackChangeHandler.checkForTexturePackChange();
|
||||
}
|
||||
}
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.base;
|
||||
|
||||
import net.minecraft.client.resources.SimpleReloadableResourceManager;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler;
|
||||
|
||||
@Mixin(SimpleReloadableResourceManager.class)
|
||||
public abstract class MixinSimpleReloadableResourceManager {
|
||||
|
||||
@Inject(method = "notifyReloadListeners()V", at = @At("HEAD"))
|
||||
private void modifyNotifyReloadListeners1(CallbackInfo ci) {
|
||||
TexturePackChangeHandler.beforeChange1();
|
||||
}
|
||||
|
||||
@Inject(method = "notifyReloadListeners()V", at = @At("RETURN"))
|
||||
private void modifyNotifyReloadListeners2(CallbackInfo ci) {
|
||||
TexturePackChangeHandler.afterChange1();
|
||||
}
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.base;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
@Mixin(TextureAtlasSprite.class)
|
||||
public abstract class MixinTextureAtlasSprite {
|
||||
|
||||
// In 1.6 this is a List<int[]>
|
||||
@Shadow
|
||||
public List<int[][]> framesTextureData;
|
||||
|
||||
/**
|
||||
* @author Mist475 (adapted from Paul Rupe)
|
||||
* @reason null check?
|
||||
*/
|
||||
@Overwrite
|
||||
public int getFrameCount() {
|
||||
if (this.framesTextureData != null) {
|
||||
return this.framesTextureData.size();
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(Block.class)
|
||||
public abstract class MixinBlock {
|
||||
|
||||
@Inject(method = "getBlockColor()I", at = @At("HEAD"), cancellable = true)
|
||||
public void modifyGetBlockColor(CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "getRenderColor(I)I", at = @At("HEAD"), cancellable = true)
|
||||
public void modifyGetRenderColor(int meta, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, meta)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
public void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockDoublePlant;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(BlockDoublePlant.class)
|
||||
public abstract class MixinBlockDoublePlant {
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockGrass;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(BlockGrass.class)
|
||||
public abstract class MixinBlockGrass {
|
||||
|
||||
@Inject(method = "getBlockColor()I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetBlockColor(CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "getRenderColor(I)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetRenderColor(int meta, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, meta)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLeaves;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(BlockLeaves.class)
|
||||
public abstract class MixinBlockLeaves {
|
||||
|
||||
@Inject(method = "getBlockColor()I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetBlockColor(CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "getRenderColor(I)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetRenderColor(int meta, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, meta)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLilyPad;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(BlockLilyPad.class)
|
||||
public abstract class MixinBlockLilyPad {
|
||||
|
||||
@Inject(method = "getBlockColor()I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetBlockColor(CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "getRenderColor(I)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetRenderColor(int meta, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, meta)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLiquid;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(BlockLiquid.class)
|
||||
public abstract class MixinBlockLiquid {
|
||||
|
||||
@Inject(method = "getBlockColor()I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetBlockColor(CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockOldLeaf;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(BlockOldLeaf.class)
|
||||
public abstract class MixinBlockOldLeaf {
|
||||
|
||||
@Inject(method = "getRenderColor(I)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetRenderColor(int meta, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, meta)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockRedstoneWire;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArgs;
|
||||
import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
import com.prupe.mcpatcher.cc.Colorizer;
|
||||
|
||||
@Mixin(BlockRedstoneWire.class)
|
||||
public abstract class MixinBlockRedstoneWire {
|
||||
|
||||
// Not much more compatible but it's the thought that counts
|
||||
@ModifyReturnValue(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("RETURN"))
|
||||
public int modifyColorMultiplier(int defaultColor, IBlockAccess worldIn, int x, int y, int z) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
return ColorizeBlock.blockColor;
|
||||
}
|
||||
return ColorizeBlock.colorizeRedstoneWire(worldIn, x, y, z, defaultColor);
|
||||
}
|
||||
|
||||
@ModifyArgs(
|
||||
method = "randomDisplayTick(Lnet/minecraft/world/World;IIILjava/util/Random;)V",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;spawnParticle(Ljava/lang/String;DDDDDD)V"))
|
||||
private void modifyRandomDisplayTick(Args args, World worldIn, int x, int y, int z, Random random) {
|
||||
if (ColorizeBlock.computeRedstoneWireColor(worldIn.getBlockMetadata(x, y, z))) {
|
||||
float f1 = Colorizer.setColor[0];
|
||||
float f2 = Colorizer.setColor[1];
|
||||
float f3 = Colorizer.setColor[2];
|
||||
|
||||
if (f2 < 0.0f) {
|
||||
f2 = 0.0f;
|
||||
}
|
||||
|
||||
if (f3 < 0.0f) {
|
||||
f3 = 0.0f;
|
||||
}
|
||||
|
||||
args.set(4, (double) f1);
|
||||
args.set(5, (double) f2);
|
||||
args.set(6, (double) f3);
|
||||
}
|
||||
}
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockReed;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(BlockReed.class)
|
||||
public abstract class MixinBlockReed {
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockStem;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(BlockStem.class)
|
||||
public abstract class MixinBlockStem {
|
||||
|
||||
@Inject(method = "getRenderColor(I)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetRenderColor(int meta, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, meta)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockTallGrass;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(BlockTallGrass.class)
|
||||
public abstract class MixinBlockTallGrass {
|
||||
|
||||
@Inject(method = "getBlockColor()I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetBlockColor(CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "getRenderColor(I)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetRenderColor(int meta, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, meta)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockVine;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(BlockVine.class)
|
||||
public abstract class MixinBlockVine {
|
||||
|
||||
@Inject(method = "getBlockColor()I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetBlockColor(CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "getRenderColor(I)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyGetRenderColor(int meta, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, meta)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(method = "colorMultiplier(Lnet/minecraft/world/IBlockAccess;III)I", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyColorMultiplier(IBlockAccess worldIn, int x, int y, int z, CallbackInfoReturnable<Integer> cir) {
|
||||
if (ColorizeBlock.colorizeBlock((Block) (Object) this, worldIn, x, y, z)) {
|
||||
cir.setReturnValue(ColorizeBlock.blockColor);
|
||||
}
|
||||
}
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.block.material;
|
||||
|
||||
import net.minecraft.block.material.MapColor;
|
||||
|
||||
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.callback.CallbackInfo;
|
||||
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.MapColorExpansion;
|
||||
|
||||
@Mixin(MapColor.class)
|
||||
public abstract class MixinMapColor implements MapColorExpansion {
|
||||
|
||||
@Unique
|
||||
private int mcpatcher_forge$origColorValue;
|
||||
|
||||
@Inject(method = "<init>(II)V", at = @At("RETURN"))
|
||||
private void modifyConstructor(int colorIndex, int colorValue, CallbackInfo ci) {
|
||||
this.setOriginalColorValue(colorValue);
|
||||
}
|
||||
|
||||
public int getOriginalColorValue() {
|
||||
return mcpatcher_forge$origColorValue;
|
||||
}
|
||||
|
||||
public void setOriginalColorValue(int value) {
|
||||
mcpatcher_forge$origColorValue = value;
|
||||
}
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.particle;
|
||||
|
||||
import net.minecraft.client.particle.EntityAuraFX;
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeEntity;
|
||||
import com.prupe.mcpatcher.cc.Colorizer;
|
||||
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.EntityAuraFXExpansion;
|
||||
|
||||
@Mixin(EntityAuraFX.class)
|
||||
public abstract class MixinEntityAuraFX extends EntityFX implements EntityAuraFXExpansion {
|
||||
|
||||
protected MixinEntityAuraFX(World world, double x, double y, double z) {
|
||||
super(world, x, y, z);
|
||||
}
|
||||
|
||||
@SuppressWarnings("DataFlowIssue")
|
||||
@Override
|
||||
public EntityAuraFX colorize() {
|
||||
if (ColorizeEntity.computeMyceliumParticleColor()) {
|
||||
this.particleRed = Colorizer.setColor[0];
|
||||
this.particleGreen = Colorizer.setColor[1];
|
||||
this.particleBlue = Colorizer.setColor[2];
|
||||
}
|
||||
return (EntityAuraFX) (Object) this;
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.particle;
|
||||
|
||||
import net.minecraft.client.particle.EntityBubbleFX;
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
import com.prupe.mcpatcher.cc.Colorizer;
|
||||
|
||||
@Mixin(EntityBubbleFX.class)
|
||||
public abstract class MixinEntityBubbleFX extends EntityFX {
|
||||
|
||||
protected MixinEntityBubbleFX(World world, double x, double y, double z) {
|
||||
super(world, x, y, z);
|
||||
}
|
||||
|
||||
@Inject(method = "<init>(Lnet/minecraft/world/World;DDDDDD)V", at = @At("RETURN"))
|
||||
private void modifyConstructor(World world, double x, double y, double z, double motionX, double motionY,
|
||||
double motionZ, CallbackInfo ci) {
|
||||
if (ColorizeBlock.computeWaterColor(false, (int) this.posX, (int) this.posY, (int) this.posZ)) {
|
||||
this.particleRed = Colorizer.setColor[0];
|
||||
this.particleGreen = Colorizer.setColor[1];
|
||||
this.particleBlue = Colorizer.setColor[2];
|
||||
} else {
|
||||
this.particleRed = 1.0f;
|
||||
this.particleGreen = 1.0f;
|
||||
this.particleBlue = 1.0f;
|
||||
}
|
||||
}
|
||||
}
|
||||
+135
@@ -0,0 +1,135 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.particle;
|
||||
|
||||
import net.minecraft.block.BlockLiquid;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.particle.EntityDropParticleFX;
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
import com.prupe.mcpatcher.cc.ColorizeEntity;
|
||||
import com.prupe.mcpatcher.cc.Colorizer;
|
||||
|
||||
@Mixin(EntityDropParticleFX.class)
|
||||
public abstract class MixinEntityDropParticleFX extends EntityFX {
|
||||
|
||||
@Shadow
|
||||
private Material materialType;
|
||||
|
||||
@Shadow
|
||||
private int bobTimer;
|
||||
|
||||
protected MixinEntityDropParticleFX(World world, double x, double y, double z) {
|
||||
super(world, x, y, z);
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "<init>(Lnet/minecraft/world/World;DDDLnet/minecraft/block/material/Material;)V",
|
||||
at = @At("RETURN"))
|
||||
private void modifyConstructor(World worldIn, double x, double y, double z, Material material, CallbackInfo ci) {
|
||||
if (material == Material.water) {
|
||||
if (ColorizeBlock.computeWaterColor(true, (int) this.posX, (int) this.posY, (int) this.posZ)) {
|
||||
this.particleRed = Colorizer.setColor[0];
|
||||
this.particleGreen = Colorizer.setColor[1];
|
||||
this.particleBlue = Colorizer.setColor[2];
|
||||
} else {
|
||||
this.particleRed = 0.2f;
|
||||
this.particleGreen = 0.3f;
|
||||
this.particleBlue = 1.0f;
|
||||
}
|
||||
} else {
|
||||
this.particleRed = 1.0F;
|
||||
this.particleGreen = 0.0F;
|
||||
this.particleBlue = 0.0F;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @author Mist475 (adapted from Paul Rupe)
|
||||
* @reason Inject would be too inefficient
|
||||
*/
|
||||
@SuppressWarnings("DuplicatedCode")
|
||||
@Overwrite
|
||||
public void onUpdate() {
|
||||
this.prevPosX = this.posX;
|
||||
this.prevPosY = this.posY;
|
||||
this.prevPosZ = this.posZ;
|
||||
|
||||
if (this.materialType != Material.water) {
|
||||
// Patch start
|
||||
if (ColorizeEntity.computeLavaDropColor(40 - this.bobTimer)) {
|
||||
this.particleRed = Colorizer.setColor[0];
|
||||
this.particleGreen = Colorizer.setColor[1];
|
||||
this.particleBlue = Colorizer.setColor[2];
|
||||
} else {
|
||||
this.particleRed = 1.0f;
|
||||
this.particleGreen = 16.0f / (40 - this.bobTimer + 16);
|
||||
this.particleBlue = 4.0f / (40 - this.bobTimer + 8);
|
||||
}
|
||||
// Patch end
|
||||
} else {
|
||||
this.particleRed = 1.0F;
|
||||
this.particleGreen = 16.0F / (float) (40 - this.bobTimer + 16);
|
||||
this.particleBlue = 4.0F / (float) (40 - this.bobTimer + 8);
|
||||
}
|
||||
|
||||
this.motionY -= this.particleGravity;
|
||||
|
||||
if (this.bobTimer-- > 0) {
|
||||
this.motionX *= 0.02D;
|
||||
this.motionY *= 0.02D;
|
||||
this.motionZ *= 0.02D;
|
||||
this.setParticleTextureIndex(113);
|
||||
} else {
|
||||
this.setParticleTextureIndex(112);
|
||||
}
|
||||
|
||||
this.moveEntity(this.motionX, this.motionY, this.motionZ);
|
||||
this.motionX *= 0.9800000190734863D;
|
||||
this.motionY *= 0.9800000190734863D;
|
||||
this.motionZ *= 0.9800000190734863D;
|
||||
|
||||
if (this.particleMaxAge-- <= 0) {
|
||||
this.setDead();
|
||||
}
|
||||
|
||||
if (this.onGround) {
|
||||
if (this.materialType == Material.water) {
|
||||
this.setDead();
|
||||
this.worldObj.spawnParticle("splash", this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D);
|
||||
} else {
|
||||
this.setParticleTextureIndex(114);
|
||||
}
|
||||
|
||||
this.motionX *= 0.699999988079071D;
|
||||
this.motionZ *= 0.699999988079071D;
|
||||
}
|
||||
|
||||
Material material = this.worldObj
|
||||
.getBlock(
|
||||
MathHelper.floor_double(this.posX),
|
||||
MathHelper.floor_double(this.posY),
|
||||
MathHelper.floor_double(this.posZ))
|
||||
.getMaterial();
|
||||
|
||||
if (material.isLiquid() || material.isSolid()) {
|
||||
double d0 = (float) (MathHelper.floor_double(this.posY) + 1) - BlockLiquid.getLiquidHeightPercent(
|
||||
this.worldObj.getBlockMetadata(
|
||||
MathHelper.floor_double(this.posX),
|
||||
MathHelper.floor_double(this.posY),
|
||||
MathHelper.floor_double(this.posZ)));
|
||||
|
||||
if (this.posY < d0) {
|
||||
this.setDead();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.particle;
|
||||
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.client.particle.EntityPortalFX;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeEntity;
|
||||
|
||||
@Mixin(EntityPortalFX.class)
|
||||
public abstract class MixinEntityPortalFX extends EntityFX {
|
||||
|
||||
@Shadow
|
||||
private float portalParticleScale;
|
||||
|
||||
protected MixinEntityPortalFX(World world, double x, double y, double z) {
|
||||
super(world, x, y, z);
|
||||
}
|
||||
|
||||
@Inject(method = "<init>(Lnet/minecraft/world/World;DDDDDD)V", at = @At("RETURN"))
|
||||
private void modifyConstructor(World world, double x, double y, double z, double motionX, double motionY,
|
||||
double motionZ, CallbackInfo ci) {
|
||||
// green & red get multiplied in constructor, blue doesn't
|
||||
this.particleGreen = this.portalParticleScale / 0.3f;
|
||||
this.particleGreen *= ColorizeEntity.portalColor[1];
|
||||
this.particleRed = this.portalParticleScale / 0.9f;
|
||||
this.particleRed *= ColorizeEntity.portalColor[0];
|
||||
this.particleBlue = ColorizeEntity.portalColor[2];
|
||||
}
|
||||
}
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.particle;
|
||||
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.client.particle.EntityRainFX;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
import com.prupe.mcpatcher.cc.Colorizer;
|
||||
|
||||
@Mixin(EntityRainFX.class)
|
||||
public abstract class MixinEntityRainFX extends EntityFX {
|
||||
|
||||
protected MixinEntityRainFX(World world, double x, double y, double z) {
|
||||
super(world, x, y, z);
|
||||
}
|
||||
|
||||
@Inject(method = "<init>(Lnet/minecraft/world/World;DDD)V", at = @At("RETURN"))
|
||||
private void modifyConstructor(World world, double x, double y, double z, CallbackInfo ci) {
|
||||
if (ColorizeBlock.computeWaterColor(false, (int) this.posX, (int) this.posY, (int) this.posZ)) {
|
||||
this.particleRed = Colorizer.setColor[0];
|
||||
this.particleGreen = Colorizer.setColor[1];
|
||||
this.particleBlue = Colorizer.setColor[2];
|
||||
} else {
|
||||
this.particleRed = 0.2f;
|
||||
this.particleGreen = 0.3f;
|
||||
this.particleBlue = 1.0f;
|
||||
}
|
||||
}
|
||||
}
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.particle;
|
||||
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.client.particle.EntityReddustFX;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
import com.prupe.mcpatcher.cc.Colorizer;
|
||||
|
||||
@Mixin(EntityReddustFX.class)
|
||||
public abstract class MixinEntityRedDustFX extends EntityFX {
|
||||
|
||||
@Shadow
|
||||
float reddustParticleScale;
|
||||
|
||||
protected MixinEntityRedDustFX(World world, double x, double y, double z) {
|
||||
super(world, x, y, z);
|
||||
}
|
||||
|
||||
@Inject(method = "<init>(Lnet/minecraft/world/World;DDDFFFF)V", at = @At("RETURN"))
|
||||
private void modifyConstructor(World world, double x, double y, double z, float p_i1224_8_, float red, float green,
|
||||
float blue, CallbackInfo ci) {
|
||||
// == 1.0f is needed as this runs after the rest of the constructor
|
||||
if (red == 0.0F || red == 1.0f) {
|
||||
red = 1.0F;
|
||||
// Injected block
|
||||
if (ColorizeBlock.computeRedstoneWireColor(15)) {
|
||||
red = Colorizer.setColor[0];
|
||||
green = Colorizer.setColor[1];
|
||||
blue = Colorizer.setColor[2];
|
||||
}
|
||||
}
|
||||
|
||||
float f4 = (float) Math.random() * 0.4F + 0.6F;
|
||||
this.particleRed = ((float) (Math.random() * 0.20000000298023224D) + 0.8F) * red * f4;
|
||||
this.particleGreen = ((float) (Math.random() * 0.20000000298023224D) + 0.8F) * green * f4;
|
||||
this.particleBlue = ((float) (Math.random() * 0.20000000298023224D) + 0.8F) * blue * f4;
|
||||
this.particleScale *= 0.75F;
|
||||
this.particleScale *= p_i1224_8_;
|
||||
this.reddustParticleScale = this.particleScale;
|
||||
this.particleMaxAge = (int) (8.0D / (Math.random() * 0.8D + 0.2D));
|
||||
this.particleMaxAge = (int) ((float) this.particleMaxAge * p_i1224_8_);
|
||||
this.noClip = false;
|
||||
}
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.particle;
|
||||
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.client.particle.EntitySplashFX;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
import com.prupe.mcpatcher.cc.Colorizer;
|
||||
|
||||
@Mixin(EntitySplashFX.class)
|
||||
public abstract class MixinEntitySplashFX extends EntityFX {
|
||||
|
||||
protected MixinEntitySplashFX(World world, double x, double y, double z) {
|
||||
super(world, x, y, z);
|
||||
}
|
||||
|
||||
@Inject(method = "<init>(Lnet/minecraft/world/World;DDDDDD)V", at = @At("RETURN"))
|
||||
private void modifyConstructor(World world, double x, double y, double z, double motionX, double motionY,
|
||||
double motionZ, CallbackInfo ci) {
|
||||
if (ColorizeBlock.computeWaterColor(false, (int) this.posX, (int) this.posY, (int) this.posZ)) {
|
||||
this.particleRed = Colorizer.setColor[0];
|
||||
this.particleGreen = Colorizer.setColor[1];
|
||||
this.particleBlue = Colorizer.setColor[2];
|
||||
}
|
||||
}
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.particle;
|
||||
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.client.particle.EntitySuspendFX;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeEntity;
|
||||
import com.prupe.mcpatcher.cc.Colorizer;
|
||||
|
||||
@Mixin(EntitySuspendFX.class)
|
||||
public abstract class MixinEntitySuspendFX extends EntityFX {
|
||||
|
||||
protected MixinEntitySuspendFX(World world, double x, double y, double z) {
|
||||
super(world, x, y, z);
|
||||
}
|
||||
|
||||
@Inject(method = "<init>(Lnet/minecraft/world/World;DDDDDD)V", at = @At("RETURN"))
|
||||
private void modifyConstructor(World world, double x, double y, double z, double motionX, double motionY,
|
||||
double motionZ, CallbackInfo ci) {
|
||||
ColorizeEntity.computeSuspendColor(6710962, (int) x, (int) y, (int) z);
|
||||
this.particleRed = Colorizer.setColor[0];
|
||||
this.particleGreen = Colorizer.setColor[1];
|
||||
this.particleBlue = Colorizer.setColor[2];
|
||||
}
|
||||
}
|
||||
+85
@@ -0,0 +1,85 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.renderer;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.renderer.texture.DynamicTexture;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeWorld;
|
||||
import com.prupe.mcpatcher.cc.Colorizer;
|
||||
import com.prupe.mcpatcher.cc.Lightmap;
|
||||
|
||||
@Mixin(EntityRenderer.class)
|
||||
public abstract class MixinEntityRenderer {
|
||||
|
||||
@Shadow
|
||||
private Minecraft mc;
|
||||
|
||||
@Shadow
|
||||
float fogColorRed;
|
||||
|
||||
@Shadow
|
||||
float fogColorGreen;
|
||||
|
||||
@Shadow
|
||||
float fogColorBlue;
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
private DynamicTexture lightmapTexture;
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
private int[] lightmapColors;
|
||||
|
||||
@Shadow
|
||||
private boolean lightmapUpdateNeeded;
|
||||
|
||||
@Inject(method = "updateLightmap(F)V", at = @At("HEAD"), cancellable = true)
|
||||
private void modifyUpdateLightMap(float partialTick, CallbackInfo ci) {
|
||||
if (Lightmap
|
||||
.computeLightmap((EntityRenderer) (Object) this, this.mc.theWorld, this.lightmapColors, partialTick)) {
|
||||
this.lightmapTexture.updateDynamicTexture();
|
||||
this.lightmapUpdateNeeded = false;
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "updateFogColor(F)V",
|
||||
at = @At(
|
||||
value = "FIELD",
|
||||
target = "Lnet/minecraft/client/renderer/EntityRenderer;fogColorBlue:F",
|
||||
ordinal = 11,
|
||||
shift = At.Shift.AFTER))
|
||||
private void modifyUpdateFogColor1(float p_78466_1_, CallbackInfo ci) {
|
||||
float n11 = (float) EnchantmentHelper.getRespiration(this.mc.renderViewEntity) * 0.2F;
|
||||
if (ColorizeWorld.computeUnderwaterColor()) {
|
||||
this.fogColorRed = Colorizer.setColor[0] + n11;
|
||||
this.fogColorGreen = Colorizer.setColor[1] + n11;
|
||||
this.fogColorBlue = Colorizer.setColor[2] + n11;
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "updateFogColor(F)V",
|
||||
at = @At(
|
||||
value = "FIELD",
|
||||
target = "Lnet/minecraft/client/renderer/EntityRenderer;fogColorBlue:F",
|
||||
ordinal = 12,
|
||||
shift = At.Shift.AFTER))
|
||||
private void modifyUpdateFogColor2(float p_78466_1_, CallbackInfo ci) {
|
||||
if (ColorizeWorld.computeUnderlavaColor()) {
|
||||
this.fogColorRed = Colorizer.setColor[0];
|
||||
this.fogColorGreen = Colorizer.setColor[1];
|
||||
this.fogColorBlue = Colorizer.setColor[2];
|
||||
}
|
||||
}
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.renderer;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
|
||||
@Mixin(ItemRenderer.class)
|
||||
public abstract class MixinItemRenderer {
|
||||
|
||||
@Inject(
|
||||
method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemIn2D(Lnet/minecraft/client/renderer/Tessellator;FFFFIIF)V",
|
||||
ordinal = 0))
|
||||
private void modifyRenderItem2(EntityLivingBase entity, ItemStack itemStack, int renderPass,
|
||||
IItemRenderer.ItemRenderType type, CallbackInfo ci) {
|
||||
ColorizeBlock.colorizeWaterBlockGL(Block.getBlockFromItem(itemStack.getItem()));
|
||||
}
|
||||
}
|
||||
+800
@@ -0,0 +1,800 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.renderer;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockCauldron;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
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;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArgs;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyConstant;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyVariable;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
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.prupe.mcpatcher.cc.ColorizeBlock;
|
||||
import com.prupe.mcpatcher.cc.Colorizer;
|
||||
import com.prupe.mcpatcher.mal.block.RenderBlocksUtils;
|
||||
import com.prupe.mcpatcher.renderpass.RenderPass;
|
||||
|
||||
@Mixin(RenderBlocks.class)
|
||||
public abstract class MixinRenderBlocks {
|
||||
|
||||
@Shadow
|
||||
public IBlockAccess blockAccess;
|
||||
|
||||
@Shadow
|
||||
public boolean enableAO;
|
||||
|
||||
@Shadow
|
||||
public float colorRedTopLeft;
|
||||
@Shadow
|
||||
public float colorRedBottomLeft;
|
||||
@Shadow
|
||||
public float colorRedBottomRight;
|
||||
@Shadow
|
||||
public float colorRedTopRight;
|
||||
@Shadow
|
||||
public float colorGreenTopLeft;
|
||||
@Shadow
|
||||
public float colorGreenBottomLeft;
|
||||
@Shadow
|
||||
public float colorGreenBottomRight;
|
||||
@Shadow
|
||||
public float colorGreenTopRight;
|
||||
@Shadow
|
||||
public float colorBlueTopLeft;
|
||||
@Shadow
|
||||
public float colorBlueBottomLeft;
|
||||
@Shadow
|
||||
public float colorBlueBottomRight;
|
||||
@Shadow
|
||||
public float colorBlueTopRight;
|
||||
|
||||
@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) {
|
||||
if (ColorizeBlock.isSmooth) {
|
||||
tessellator.setColorOpaque_F(red, green, blue);
|
||||
}
|
||||
tessellator.addVertexWithUV(x, y, z, u, v);
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderBlockCauldron(Lnet/minecraft/block/BlockCauldron;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/block/BlockCauldron;getBlockTextureFromSide(I)Lnet/minecraft/util/IIcon;",
|
||||
shift = At.Shift.AFTER))
|
||||
private void modifyRenderBlockCauldron1(BlockCauldron block, int x, int y, int z,
|
||||
CallbackInfoReturnable<Boolean> cir) {
|
||||
ColorizeBlock.computeWaterColor();
|
||||
Tessellator.instance.setColorOpaque_F(Colorizer.setColor[0], Colorizer.setColor[1], Colorizer.setColor[2]);
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderBlockCauldron(Lnet/minecraft/block/BlockCauldron;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/block/BlockLiquid;getLiquidIcon(Ljava/lang/String;)Lnet/minecraft/util/IIcon;"))
|
||||
private void modifyRenderBlockCauldron2(BlockCauldron block, int x, int y, int z,
|
||||
CallbackInfoReturnable<Boolean> cir) {
|
||||
ColorizeBlock.computeWaterColor();
|
||||
Tessellator.instance.setColorOpaque_F(Colorizer.setColor[0], Colorizer.setColor[1], Colorizer.setColor[2]);
|
||||
}
|
||||
|
||||
@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);
|
||||
}
|
||||
|
||||
@ModifyArgs(
|
||||
method = "renderBlockRedstoneWire(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ModifyArgs(
|
||||
method = "renderBlockRedstoneWire(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ModifyArgs(
|
||||
method = "renderBlockRedstoneWire(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ModifyArgs(
|
||||
method = "renderBlockRedstoneWire(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@ModifyArgs(
|
||||
method = "renderBlockRedstoneWire(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderStandardBlock(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;isAmbientOcclusionEnabled()Z"))
|
||||
private void modifyRenderStandardBlock(Block block, int x, int y, int z, CallbackInfoReturnable<Boolean> cir) {
|
||||
|
||||
// TODO: capture local variables to prevent double math
|
||||
int l = block.colorMultiplier(this.blockAccess, x, y, z);
|
||||
float f = (float) (l >> 16 & 255) / 255.0F;
|
||||
float f1 = (float) (l >> 8 & 255) / 255.0F;
|
||||
float f2 = (float) (l & 255) / 255.0F;
|
||||
|
||||
if (EntityRenderer.anaglyphEnable) {
|
||||
float f3 = (f * 30.0F + f1 * 59.0F + f2 * 11.0F) / 100.0F;
|
||||
float f4 = (f * 30.0F + f1 * 70.0F) / 100.0F;
|
||||
float f5 = (f * 30.0F + f2 * 70.0F) / 100.0F;
|
||||
f = f3;
|
||||
f1 = f4;
|
||||
f2 = f5;
|
||||
}
|
||||
RenderBlocksUtils
|
||||
.setupColorMultiplier(block, this.blockAccess, x, y, z, this.hasOverrideBlockTexture(), f, f1, f2);
|
||||
}
|
||||
|
||||
@ModifyConstant(
|
||||
method = "renderStandardBlockWithAmbientOcclusion(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
constant = { @Constant(floatValue = 0.5F), @Constant(floatValue = 0.6F), @Constant(floatValue = 0.8F) })
|
||||
private float redirectAOBaseMultiplier(float constant) {
|
||||
return RenderPass.getAOBaseMultiplier(constant);
|
||||
}
|
||||
|
||||
// If only ordinal number was accessible ...
|
||||
|
||||
@ModifyVariable(
|
||||
method = "renderStandardBlockWithAmbientOcclusion(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(value = "LOAD", ordinal = 0),
|
||||
ordinal = 1)
|
||||
private boolean redirectColorMultiplier1(boolean value) {
|
||||
return RenderBlocksUtils.useColorMultiplier(0);
|
||||
}
|
||||
|
||||
@ModifyVariable(
|
||||
method = "renderStandardBlockWithAmbientOcclusion(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(value = "LOAD", ordinal = 1),
|
||||
ordinal = 1)
|
||||
private boolean redirectColorMultiplier2(boolean value) {
|
||||
return RenderBlocksUtils.useColorMultiplier(2);
|
||||
}
|
||||
|
||||
@ModifyVariable(
|
||||
method = "renderStandardBlockWithAmbientOcclusion(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(value = "LOAD", ordinal = 2),
|
||||
ordinal = 1)
|
||||
private boolean redirectColorMultiplier3(boolean value) {
|
||||
return RenderBlocksUtils.useColorMultiplier(3);
|
||||
}
|
||||
|
||||
@ModifyVariable(
|
||||
method = "renderStandardBlockWithAmbientOcclusion(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(value = "LOAD", ordinal = 3),
|
||||
ordinal = 1)
|
||||
private boolean redirectColorMultiplier4(boolean value) {
|
||||
return RenderBlocksUtils.useColorMultiplier(4);
|
||||
}
|
||||
|
||||
@ModifyVariable(
|
||||
method = "renderStandardBlockWithAmbientOcclusion(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(value = "LOAD", ordinal = 4),
|
||||
ordinal = 1)
|
||||
private boolean redirectColorMultiplier5(boolean value) {
|
||||
return RenderBlocksUtils.useColorMultiplier(5);
|
||||
}
|
||||
|
||||
@ModifyVariable(
|
||||
method = "renderStandardBlockWithAmbientOcclusionPartial(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(value = "LOAD", ordinal = 0),
|
||||
ordinal = 1)
|
||||
private boolean redirectColorMultiplierPartial1(boolean value) {
|
||||
return RenderBlocksUtils.useColorMultiplier(0);
|
||||
}
|
||||
|
||||
@ModifyVariable(
|
||||
method = "renderStandardBlockWithAmbientOcclusionPartial(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(value = "LOAD", ordinal = 1),
|
||||
ordinal = 1)
|
||||
private boolean redirectColorMultiplierPartial2(boolean value) {
|
||||
return RenderBlocksUtils.useColorMultiplier(2);
|
||||
}
|
||||
|
||||
@ModifyVariable(
|
||||
method = "renderStandardBlockWithAmbientOcclusionPartial(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(value = "LOAD", ordinal = 2),
|
||||
ordinal = 1)
|
||||
private boolean redirectColorMultiplierPartial3(boolean value) {
|
||||
return RenderBlocksUtils.useColorMultiplier(3);
|
||||
}
|
||||
|
||||
@ModifyVariable(
|
||||
method = "renderStandardBlockWithAmbientOcclusionPartial(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(value = "LOAD", ordinal = 3),
|
||||
ordinal = 1)
|
||||
private boolean redirectColorMultiplierPartial4(boolean value) {
|
||||
return RenderBlocksUtils.useColorMultiplier(4);
|
||||
}
|
||||
|
||||
@ModifyVariable(
|
||||
method = "renderStandardBlockWithAmbientOcclusionPartial(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(value = "LOAD", ordinal = 4),
|
||||
ordinal = 1)
|
||||
private boolean redirectColorMultiplierPartial5(boolean value) {
|
||||
return RenderBlocksUtils.useColorMultiplier(5);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderStandardBlockWithColorMultiplier(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 0))
|
||||
private void redirectColorMultiplier1(Tessellator instance, float red, float green, float blue) {
|
||||
Tessellator.instance.setColorOpaque_F(
|
||||
RenderBlocksUtils.getColorMultiplierRed(0),
|
||||
RenderBlocksUtils.getColorMultiplierGreen(0),
|
||||
RenderBlocksUtils.getColorMultiplierBlue(0));
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderStandardBlockWithColorMultiplier(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 1))
|
||||
private void redirectColorMultiplier2(Tessellator instance, float red, float green, float blue) {
|
||||
Tessellator.instance.setColorOpaque_F(
|
||||
RenderBlocksUtils.getColorMultiplierRed(1),
|
||||
RenderBlocksUtils.getColorMultiplierGreen(1),
|
||||
RenderBlocksUtils.getColorMultiplierBlue(1));
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderStandardBlockWithColorMultiplier(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 2))
|
||||
private void redirectColorMultiplier3(Tessellator instance, float red, float green, float blue) {
|
||||
Tessellator.instance.setColorOpaque_F(
|
||||
RenderBlocksUtils.getColorMultiplierRed(2),
|
||||
RenderBlocksUtils.getColorMultiplierGreen(2),
|
||||
RenderBlocksUtils.getColorMultiplierBlue(2));
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderStandardBlockWithColorMultiplier(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 4))
|
||||
private void redirectColorMultiplier4(Tessellator instance, float red, float green, float blue) {
|
||||
Tessellator.instance.setColorOpaque_F(
|
||||
RenderBlocksUtils.getColorMultiplierRed(3),
|
||||
RenderBlocksUtils.getColorMultiplierGreen(3),
|
||||
RenderBlocksUtils.getColorMultiplierBlue(3));
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderStandardBlockWithColorMultiplier(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 6))
|
||||
private void redirectColorMultiplier5(Tessellator instance, float red, float green, float blue) {
|
||||
Tessellator.instance.setColorOpaque_F(
|
||||
RenderBlocksUtils.getColorMultiplierRed(4),
|
||||
RenderBlocksUtils.getColorMultiplierGreen(4),
|
||||
RenderBlocksUtils.getColorMultiplierBlue(4));
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderStandardBlockWithColorMultiplier(Lnet/minecraft/block/Block;IIIFFF)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 8))
|
||||
private void redirectColorMultiplier6(Tessellator instance, float red, float green, float blue) {
|
||||
Tessellator.instance.setColorOpaque_F(
|
||||
RenderBlocksUtils.getColorMultiplierRed(5),
|
||||
RenderBlocksUtils.getColorMultiplierGreen(5),
|
||||
RenderBlocksUtils.getColorMultiplierBlue(5));
|
||||
}
|
||||
|
||||
// If I was able to access ordinal number the duplication wouldn't be necessary
|
||||
@WrapWithCondition(
|
||||
method = "renderBlockSandFalling(Lnet/minecraft/block/Block;Lnet/minecraft/world/World;IIII)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 0))
|
||||
private boolean modifyRenderBlockSandFalling0(Tessellator tessellator, float x, float y, float z, Block block,
|
||||
World world) {
|
||||
return !ColorizeBlock
|
||||
.setupBlockSmoothing((RenderBlocks) (Object) this, block, this.blockAccess, (int) x, (int) y, (int) z, 0);
|
||||
}
|
||||
|
||||
@WrapWithCondition(
|
||||
method = "renderBlockSandFalling(Lnet/minecraft/block/Block;Lnet/minecraft/world/World;IIII)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 1))
|
||||
private boolean modifyRenderBlockSandFalling1(Tessellator tessellator, float x, float y, float z, Block block,
|
||||
World world) {
|
||||
return !ColorizeBlock
|
||||
.setupBlockSmoothing((RenderBlocks) (Object) this, block, this.blockAccess, (int) x, (int) y, (int) z, 1);
|
||||
}
|
||||
|
||||
@WrapWithCondition(
|
||||
method = "renderBlockSandFalling(Lnet/minecraft/block/Block;Lnet/minecraft/world/World;IIII)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 2))
|
||||
private boolean modifyRenderBlockSandFalling2(Tessellator tessellator, float x, float y, float z, Block block,
|
||||
World world) {
|
||||
return !ColorizeBlock
|
||||
.setupBlockSmoothing((RenderBlocks) (Object) this, block, this.blockAccess, (int) x, (int) y, (int) z, 2);
|
||||
}
|
||||
|
||||
@WrapWithCondition(
|
||||
method = "renderBlockSandFalling(Lnet/minecraft/block/Block;Lnet/minecraft/world/World;IIII)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 3))
|
||||
private boolean modifyRenderBlockSandFalling3(Tessellator tessellator, float x, float y, float z, Block block,
|
||||
World world) {
|
||||
return !ColorizeBlock
|
||||
.setupBlockSmoothing((RenderBlocks) (Object) this, block, this.blockAccess, (int) x, (int) y, (int) z, 3);
|
||||
}
|
||||
|
||||
@WrapWithCondition(
|
||||
method = "renderBlockSandFalling(Lnet/minecraft/block/Block;Lnet/minecraft/world/World;IIII)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 4))
|
||||
private boolean modifyRenderBlockSandFalling4(Tessellator tessellator, float x, float y, float z, Block block,
|
||||
World world) {
|
||||
return !ColorizeBlock
|
||||
.setupBlockSmoothing((RenderBlocks) (Object) this, block, this.blockAccess, (int) x, (int) y, (int) z, 4);
|
||||
}
|
||||
|
||||
@WrapWithCondition(
|
||||
method = "renderBlockSandFalling(Lnet/minecraft/block/Block;Lnet/minecraft/world/World;IIII)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 5))
|
||||
private boolean modifyRenderBlockSandFalling5(Tessellator tessellator, float x, float y, float z, Block block,
|
||||
World world) {
|
||||
return !ColorizeBlock
|
||||
.setupBlockSmoothing((RenderBlocks) (Object) this, block, this.blockAccess, (int) x, (int) y, (int) z, 5);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_F(FFF)V",
|
||||
ordinal = 0))
|
||||
private void mcpatcherforge$handleSmoothing(Tessellator tessellator, float red, float green, float blue,
|
||||
Block block, int x, int y, int z) {
|
||||
if (!(ColorizeBlock.isSmooth = ColorizeBlock
|
||||
.setupBlockSmoothing((RenderBlocks) (Object) this, block, this.blockAccess, x, y, z, 1 + 6))) {
|
||||
tessellator.setColorOpaque_F(red, green, blue);
|
||||
}
|
||||
}
|
||||
|
||||
// Violate DRY
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 0))
|
||||
private void mcpatcherforge$redirectColor1(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedTopLeft,
|
||||
this.colorGreenTopLeft,
|
||||
this.colorBlueTopLeft,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 1))
|
||||
private void mcpatcherforge$redirectColor2(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedBottomLeft,
|
||||
this.colorGreenBottomLeft,
|
||||
this.colorBlueBottomLeft,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 2))
|
||||
private void mcpatcherforge$redirectColor3(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedBottomRight,
|
||||
this.colorGreenBottomRight,
|
||||
this.colorBlueBottomRight,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 3))
|
||||
private void mcpatcherforge$redirectColor4(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedTopRight,
|
||||
this.colorGreenTopRight,
|
||||
this.colorBlueTopRight,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 4))
|
||||
private void mcpatcherforge$redirectColor5(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedTopLeft,
|
||||
this.colorGreenTopLeft,
|
||||
this.colorBlueTopLeft,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 5))
|
||||
private void mcpatcherforge$redirectColor6(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedTopRight,
|
||||
this.colorGreenTopRight,
|
||||
this.colorBlueTopRight,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 6))
|
||||
private void mcpatcherforge$redirectColor7(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedBottomRight,
|
||||
this.colorGreenBottomRight,
|
||||
this.colorBlueBottomRight,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 7))
|
||||
private void mcpatcherforge$redirectColor8(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedBottomLeft,
|
||||
this.colorGreenBottomLeft,
|
||||
this.colorBlueBottomLeft,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/RenderBlocks;renderFaceYNeg(Lnet/minecraft/block/Block;DDDLnet/minecraft/util/IIcon;)V"))
|
||||
private void mcpatcherforge$setEnableAO(Block block, int x, int y, int z, CallbackInfoReturnable<Boolean> cir) {
|
||||
this.enableAO = false;
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 8))
|
||||
private void mcpatcherforge$redirectColor11(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedTopLeft,
|
||||
this.colorGreenTopLeft,
|
||||
this.colorBlueTopLeft,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 9))
|
||||
private void mcpatcherforge$redirectColor12(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedBottomLeft,
|
||||
this.colorGreenBottomLeft,
|
||||
this.colorBlueBottomLeft,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 10))
|
||||
private void mcpatcherforge$redirectColor13(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedBottomRight,
|
||||
this.colorGreenBottomRight,
|
||||
this.colorBlueBottomRight,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 11))
|
||||
private void mcpatcherforge$redirectColor14(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedTopRight,
|
||||
this.colorGreenTopRight,
|
||||
this.colorBlueTopRight,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 12))
|
||||
private void mcpatcherforge$redirectColor15(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedTopRight,
|
||||
this.colorGreenTopRight,
|
||||
this.colorBlueTopRight,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 13))
|
||||
private void mcpatcherforge$redirectColor16(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedBottomRight,
|
||||
this.colorGreenBottomRight,
|
||||
this.colorBlueBottomRight,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 14))
|
||||
private void mcpatcherforge$redirectColor17(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedBottomLeft,
|
||||
this.colorGreenBottomLeft,
|
||||
this.colorBlueBottomLeft,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockLiquid(Lnet/minecraft/block/Block;III)Z",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/Tessellator;addVertexWithUV(DDDDD)V",
|
||||
ordinal = 15))
|
||||
private void mcpatcherforge$redirectColor18(Tessellator tessellator, double x, double y, double z, double u,
|
||||
double v) {
|
||||
mcpatcherforge$setColorAndVertex(
|
||||
tessellator,
|
||||
this.colorRedTopLeft,
|
||||
this.colorGreenTopLeft,
|
||||
this.colorBlueTopLeft,
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
u,
|
||||
v);
|
||||
}
|
||||
}
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.renderer;
|
||||
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.client.settings.GameSettings;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeWorld;
|
||||
|
||||
@Mixin(RenderGlobal.class)
|
||||
public abstract class MixinRenderGlobal {
|
||||
|
||||
@ModifyArg(
|
||||
method = "renderSky(F)V",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/Tessellator;setColorOpaque_I(I)V"))
|
||||
private int modifyRenderSky2(int endSkyColor) {
|
||||
return ColorizeWorld.endSkyColor;
|
||||
}
|
||||
|
||||
|
||||
//TODO: decide if this is ok to leave out in Angelica
|
||||
/*
|
||||
@Redirect(
|
||||
method = "renderClouds(F)V",
|
||||
at = @At(value = "FIELD", target = "Lnet/minecraft/client/settings/GameSettings;fancyGraphics:Z"))
|
||||
private boolean modifyRenderClouds(GameSettings instance) {
|
||||
return ColorizeWorld.drawFancyClouds(instance.fancyGraphics);
|
||||
}
|
||||
|
||||
*/
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.renderer.entity;
|
||||
|
||||
import net.minecraft.client.renderer.entity.RenderWolf;
|
||||
import net.minecraft.entity.passive.EntitySheep;
|
||||
import net.minecraft.entity.passive.EntityWolf;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeEntity;
|
||||
|
||||
@Mixin(RenderWolf.class)
|
||||
public class MixinRenderWolf {
|
||||
|
||||
@Redirect(
|
||||
method = "shouldRenderPass(Lnet/minecraft/entity/passive/EntityWolf;IF)I",
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glColor3f(FFF)V", ordinal = 1, remap = false))
|
||||
private void modifyShouldRenderPass2(float red, float green, float blue, EntityWolf entity) {
|
||||
int collarColor = entity.getCollarColor();
|
||||
GL11.glColor3f(
|
||||
ColorizeEntity.getWolfCollarColor(EntitySheep.fleeceColorTable[collarColor], collarColor)[0],
|
||||
ColorizeEntity.getWolfCollarColor(EntitySheep.fleeceColorTable[collarColor], collarColor)[1],
|
||||
ColorizeEntity.getWolfCollarColor(EntitySheep.fleeceColorTable[collarColor], collarColor)[2]);
|
||||
}
|
||||
}
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.renderer.entity;
|
||||
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.RenderXPOrb;
|
||||
import net.minecraft.entity.item.EntityXPOrb;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeEntity;
|
||||
|
||||
@Mixin(RenderXPOrb.class)
|
||||
public abstract class MixinRenderXPOrb {
|
||||
|
||||
@Redirect(
|
||||
method = "doRender(Lnet/minecraft/entity/item/EntityXPOrb;DDDFF)V",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/Tessellator;setColorRGBA_I(II)V"))
|
||||
private void modifyDoRender(Tessellator instance, int color, int alpha, EntityXPOrb entity, double x, double y,
|
||||
double z, float p_76986_8_, float p_76986_9_) {
|
||||
instance
|
||||
.setColorRGBA_I(ColorizeEntity.colorizeXPOrb(color, ((float) entity.xpColor + p_76986_9_) / 2.0F), alpha);
|
||||
}
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.client.renderer.tileentity;
|
||||
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySignRenderer;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeWorld;
|
||||
|
||||
@Mixin(TileEntitySignRenderer.class)
|
||||
public abstract class MixinTileEntitySignRenderer {
|
||||
|
||||
@ModifyArg(
|
||||
method = "renderTileEntityAt(Lnet/minecraft/tileentity/TileEntitySign;DDDF)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/gui/FontRenderer;drawString(Ljava/lang/String;III)I"),
|
||||
index = 3)
|
||||
private int modifyRenderTileEntityAt(int color) {
|
||||
return ColorizeWorld.colorizeSignText();
|
||||
}
|
||||
}
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.entity;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityList;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeItem;
|
||||
|
||||
@Mixin(EntityList.class)
|
||||
public abstract class MixinEntityList {
|
||||
|
||||
@Inject(method = "addMapping(Ljava/lang/Class;Ljava/lang/String;III)V", at = @At("HEAD"))
|
||||
private static void modifyAddMapping(Class<? extends Entity> entityClass, String entityName, int entityId,
|
||||
int shellColor, int spotColor, CallbackInfo ci) {
|
||||
ColorizeItem.setupSpawnerEgg(entityName, entityId, shellColor, spotColor);
|
||||
}
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.item;
|
||||
|
||||
import net.minecraft.item.ItemArmor;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.Constant;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyConstant;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeEntity;
|
||||
|
||||
@Mixin(ItemArmor.class)
|
||||
public abstract class MixinItemArmor {
|
||||
|
||||
@ModifyConstant(method = "getColor(Lnet/minecraft/item/ItemStack;)I", constant = @Constant(intValue = 10511680))
|
||||
private int modifyGetColor(int input) {
|
||||
return ColorizeEntity.undyedLeatherColor;
|
||||
}
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.item;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
@Mixin(ItemBlock.class)
|
||||
public abstract class MixinItemBlock extends Item {
|
||||
|
||||
@Final
|
||||
@Shadow
|
||||
public Block field_150939_a;
|
||||
|
||||
@Override
|
||||
public int getColorFromItemStack(final ItemStack itemStack, final int meta) {
|
||||
final Block block = this.field_150939_a;
|
||||
if (block != null) {
|
||||
return block.getRenderColor(meta);
|
||||
}
|
||||
return super.getColorFromItemStack(itemStack, meta);
|
||||
}
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.item;
|
||||
|
||||
import net.minecraft.item.ItemMonsterPlacer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
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;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeItem;
|
||||
|
||||
@Mixin(ItemMonsterPlacer.class)
|
||||
public abstract class MixinItemMonsterPlacer {
|
||||
|
||||
@Inject(method = "getColorFromItemStack(Lnet/minecraft/item/ItemStack;I)I", at = @At("RETURN"), cancellable = true)
|
||||
private void modifyGetColorFromItemStack(ItemStack itemStack, int spots, CallbackInfoReturnable<Integer> cir) {
|
||||
cir.setReturnValue(ColorizeItem.colorizeSpawnerEgg(cir.getReturnValue(), itemStack.getItemDamage(), spots));
|
||||
}
|
||||
}
|
||||
+99
@@ -0,0 +1,99 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.item.crafting;
|
||||
|
||||
import net.minecraft.block.BlockColored;
|
||||
import net.minecraft.entity.passive.EntitySheep;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.RecipesArmorDyes;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeEntity;
|
||||
|
||||
@Mixin(RecipesArmorDyes.class)
|
||||
public abstract class MixinRecipesArmorDyes {
|
||||
|
||||
/**
|
||||
* @author Mist475 (adapted from Paul Rupe)
|
||||
* @reason Fleece color redirection is beyond my skill atm
|
||||
*/
|
||||
@SuppressWarnings("DuplicatedCode")
|
||||
@Overwrite
|
||||
public ItemStack getCraftingResult(InventoryCrafting inventoryCrafting) {
|
||||
ItemStack itemstack = null;
|
||||
int[] aint = new int[3];
|
||||
int i = 0;
|
||||
int j = 0;
|
||||
ItemArmor itemarmor = null;
|
||||
int k;
|
||||
int l;
|
||||
float f;
|
||||
float f1;
|
||||
int l1;
|
||||
|
||||
for (k = 0; k < inventoryCrafting.getSizeInventory(); ++k) {
|
||||
ItemStack itemstack1 = inventoryCrafting.getStackInSlot(k);
|
||||
|
||||
if (itemstack1 != null) {
|
||||
if (itemstack1.getItem() instanceof ItemArmor) {
|
||||
itemarmor = (ItemArmor) itemstack1.getItem();
|
||||
|
||||
if (itemarmor.getArmorMaterial() != ItemArmor.ArmorMaterial.CLOTH || itemstack != null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
itemstack = itemstack1.copy();
|
||||
itemstack.stackSize = 1;
|
||||
|
||||
if (itemarmor.hasColor(itemstack1)) {
|
||||
l = itemarmor.getColor(itemstack);
|
||||
f = (float) (l >> 16 & 255) / 255.0F;
|
||||
f1 = (float) (l >> 8 & 255) / 255.0F;
|
||||
float f2 = (float) (l & 255) / 255.0F;
|
||||
i = (int) ((float) i + Math.max(f, Math.max(f1, f2)) * 255.0F);
|
||||
aint[0] = (int) ((float) aint[0] + f * 255.0F);
|
||||
aint[1] = (int) ((float) aint[1] + f1 * 255.0F);
|
||||
aint[2] = (int) ((float) aint[2] + f2 * 255.0F);
|
||||
++j;
|
||||
}
|
||||
} else {
|
||||
if (itemstack1.getItem() != Items.dye) {
|
||||
return null;
|
||||
}
|
||||
// patch
|
||||
float[] afloat = ColorizeEntity.getArmorDyeColor(
|
||||
EntitySheep.fleeceColorTable[BlockColored.func_150032_b(itemstack1.getItemDamage())],
|
||||
BlockColored.func_150032_b(itemstack1.getItemDamage()));
|
||||
int j1 = (int) (afloat[0] * 255.0F);
|
||||
int k1 = (int) (afloat[1] * 255.0F);
|
||||
l1 = (int) (afloat[2] * 255.0F);
|
||||
i += Math.max(j1, Math.max(k1, l1));
|
||||
aint[0] += j1;
|
||||
aint[1] += k1;
|
||||
aint[2] += l1;
|
||||
++j;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (itemarmor == null) {
|
||||
return null;
|
||||
} else {
|
||||
k = aint[0] / j;
|
||||
int i1 = aint[1] / j;
|
||||
l = aint[2] / j;
|
||||
f = (float) i / (float) j;
|
||||
f1 = (float) Math.max(k, Math.max(i1, l));
|
||||
k = (int) ((float) k * f / f1);
|
||||
i1 = (int) ((float) i1 * f / f1);
|
||||
l = (int) ((float) l * f / f1);
|
||||
l1 = (k << 8) + i1;
|
||||
l1 = (l1 << 8) + l;
|
||||
itemarmor.func_82813_b(itemstack, l1);
|
||||
return itemstack;
|
||||
}
|
||||
}
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.potion;
|
||||
|
||||
import net.minecraft.potion.Potion;
|
||||
|
||||
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.callback.CallbackInfoReturnable;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeItem;
|
||||
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.PotionExpansion;
|
||||
|
||||
@Mixin(Potion.class)
|
||||
public abstract class MixinPotion implements PotionExpansion {
|
||||
|
||||
@Unique
|
||||
private int mcpatcher_forge$origColor;
|
||||
|
||||
@Inject(method = "setPotionName(Ljava/lang/String;)Lnet/minecraft/potion/Potion;", at = @At("RETURN"))
|
||||
private void modifySetPotionName(String name, CallbackInfoReturnable<Potion> cir) {
|
||||
ColorizeItem.setupPotion((Potion) (Object) this);
|
||||
}
|
||||
|
||||
public void setOrigColor(int color) {
|
||||
this.mcpatcher_forge$origColor = color;
|
||||
}
|
||||
|
||||
public int getOrigColor() {
|
||||
return this.mcpatcher_forge$origColor;
|
||||
}
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.potion;
|
||||
|
||||
import net.minecraft.potion.PotionHelper;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.Constant;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyConstant;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeItem;
|
||||
|
||||
@Mixin(PotionHelper.class)
|
||||
public abstract class MixinPotionHelper {
|
||||
|
||||
@ModifyConstant(method = "calcPotionLiquidColor(Ljava/util/Collection;)I", constant = @Constant(intValue = 3694022))
|
||||
private static int modifyCalcPotionLiquidColor(int constant) {
|
||||
return ColorizeItem.getWaterBottleColor();
|
||||
}
|
||||
}
|
||||
+80
@@ -0,0 +1,80 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.world;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
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.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_);
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "getSkyColorBody(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/util/Vec3;",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraftforge/client/ForgeHooksClient;getSkyBlendColour(Lnet/minecraft/world/World;III)I",
|
||||
remap = false),
|
||||
remap = false)
|
||||
private void modifyGetSkyColorBody2(Entity entity, float p_72833_2_, CallbackInfoReturnable<Vec3> cir) {
|
||||
ColorizeWorld.setupForFog(entity);
|
||||
}
|
||||
|
||||
@SuppressWarnings("InvalidInjectorMethodSignature")
|
||||
@ModifyVariable(
|
||||
method = "getSkyColorBody(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/util/Vec3;",
|
||||
at = @At(value = "STORE", ordinal = 0),
|
||||
ordinal = 3,
|
||||
remap = false)
|
||||
private float modifyGetSkyColorBody3(float input) {
|
||||
if (this.mcpatcher_forge$computeSkyColor) {
|
||||
return Colorizer.setColor[0];
|
||||
}
|
||||
return input;
|
||||
}
|
||||
|
||||
@SuppressWarnings("InvalidInjectorMethodSignature")
|
||||
@ModifyVariable(
|
||||
method = "getSkyColorBody(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/util/Vec3;",
|
||||
at = @At(value = "STORE", ordinal = 0),
|
||||
ordinal = 4,
|
||||
remap = false)
|
||||
private float modifyGetSkyColorBody4(float input) {
|
||||
if (this.mcpatcher_forge$computeSkyColor) {
|
||||
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) {
|
||||
return Colorizer.setColor[2];
|
||||
}
|
||||
return input;
|
||||
}
|
||||
}
|
||||
+54
@@ -0,0 +1,54 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.world;
|
||||
|
||||
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.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);
|
||||
}
|
||||
|
||||
@ModifyConstant(method = "getFogColor(FF)Lnet/minecraft/util/Vec3;", constant = @Constant(floatValue = 0.7529412F))
|
||||
private float modifyGetFogColor1(float constant) {
|
||||
if (this.mcpatcher_forge$computeFogColor) {
|
||||
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) {
|
||||
return Colorizer.setColor[1];
|
||||
}
|
||||
return constant;
|
||||
}
|
||||
|
||||
@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) {
|
||||
return Colorizer.setColor[2];
|
||||
}
|
||||
return constant;
|
||||
}
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.world;
|
||||
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.WorldProviderEnd;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeWorld;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@Mixin(WorldProviderEnd.class)
|
||||
public abstract class MixinWorldProviderEnd {
|
||||
|
||||
/**
|
||||
* @author Mist475 (adapted from Paul Rupe)
|
||||
* @reason customized value
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Overwrite
|
||||
public Vec3 getFogColor(float celestialAngle, float renderPartialTicks) {
|
||||
return Vec3.createVectorHelper(
|
||||
ColorizeWorld.endFogColor[0],
|
||||
ColorizeWorld.endFogColor[1],
|
||||
ColorizeWorld.endFogColor[2]);
|
||||
}
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cc.world;
|
||||
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.WorldProviderHell;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
|
||||
import com.prupe.mcpatcher.cc.ColorizeWorld;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@Mixin(WorldProviderHell.class)
|
||||
public abstract class MixinWorldProviderHell {
|
||||
|
||||
/**
|
||||
* @author Mist475 (adapted from Paul Rupe)
|
||||
* @reason customized value
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Overwrite
|
||||
public Vec3 getFogColor(float celestialAngle, float renderPartialTicks) {
|
||||
return Vec3.createVectorHelper(
|
||||
ColorizeWorld.netherFogColor[0],
|
||||
ColorizeWorld.netherFogColor[1],
|
||||
ColorizeWorld.netherFogColor[2]);
|
||||
}
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.client.renderer;
|
||||
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
import com.prupe.mcpatcher.cit.CITUtils;
|
||||
|
||||
@Mixin(ItemRenderer.class)
|
||||
public abstract class MixinItemRenderer {
|
||||
|
||||
@Redirect(
|
||||
method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/entity/EntityLivingBase;getItemIcon(Lnet/minecraft/item/ItemStack;I)Lnet/minecraft/util/IIcon;"))
|
||||
private IIcon modifyRenderItem1(EntityLivingBase instance, ItemStack item, int renderPass, EntityLivingBase entity,
|
||||
ItemStack item2, int renderPass1) {
|
||||
return CITUtils.getIcon(entity.getItemIcon(item2, renderPass1), item2, renderPass1);
|
||||
}
|
||||
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.client.renderer;
|
||||
|
||||
import com.prupe.mcpatcher.cit.CITUtils;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Mixin(ItemRenderer.class)
|
||||
public class MixinItemRenderer_NO_NF {
|
||||
|
||||
@Redirect(
|
||||
method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;hasEffect(I)Z"),
|
||||
remap = false)
|
||||
private boolean modifyRenderItem3(ItemStack item, int pass, EntityLivingBase entity, ItemStack itemStack,
|
||||
int renderPass) {
|
||||
return !CITUtils.renderEnchantmentHeld(item, renderPass) && item.hasEffect(pass);
|
||||
}
|
||||
}
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.client.renderer.entity;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.renderer.entity.RenderBiped;
|
||||
import net.minecraft.client.renderer.entity.RenderLiving;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
import com.prupe.mcpatcher.cit.CITUtils;
|
||||
|
||||
@Mixin(RenderBiped.class)
|
||||
public abstract class MixinRenderBiped extends RenderLiving {
|
||||
|
||||
public MixinRenderBiped(ModelBase modelBase, float shadowSize) {
|
||||
super(modelBase, shadowSize);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "shouldRenderPass(Lnet/minecraft/entity/EntityLiving;IF)I",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/entity/RenderBiped;bindTexture(Lnet/minecraft/util/ResourceLocation;)V"))
|
||||
private void modifyShouldRenderPass(RenderBiped instance, ResourceLocation resourceLocation,
|
||||
EntityLiving entityLiving, int slotId, float p_77032_3_) {
|
||||
this.bindTexture(
|
||||
CITUtils.getArmorTexture(resourceLocation, entityLiving, entityLiving.func_130225_q(3 - slotId)));
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "func_82408_c(Lnet/minecraft/entity/EntityLiving;IF)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/entity/RenderBiped;bindTexture(Lnet/minecraft/util/ResourceLocation;)V"))
|
||||
|
||||
private void modifyFunc_82408_c(RenderBiped instance, ResourceLocation resourceLocation, EntityLiving entityLiving,
|
||||
int slotId, float p_82408_3_) {
|
||||
this.bindTexture(
|
||||
CITUtils.getArmorTexture(resourceLocation, entityLiving, entityLiving.func_130225_q(3 - slotId)));
|
||||
}
|
||||
}
|
||||
+286
@@ -0,0 +1,286 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.client.renderer.entity;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.entity.RendererLivingEntity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.event.RenderLivingEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
import com.prupe.mcpatcher.cit.CITUtils;
|
||||
|
||||
@Mixin(RendererLivingEntity.class)
|
||||
public abstract class MixinRenderEntityLiving extends Render {
|
||||
|
||||
@Final
|
||||
@Shadow
|
||||
private static Logger logger;
|
||||
@Final
|
||||
@Shadow
|
||||
private static ResourceLocation RES_ITEM_GLINT;
|
||||
@Shadow
|
||||
public ModelBase mainModel;
|
||||
@Shadow
|
||||
public ModelBase renderPassModel;
|
||||
|
||||
@Shadow
|
||||
protected abstract float interpolateRotation(float angle1, float angle2, float p_77034_3_);
|
||||
|
||||
@Shadow
|
||||
protected abstract void renderModel(EntityLivingBase entityLivingBase, float p_77036_2_, float p_77036_3_,
|
||||
float p_77036_4_, float p_77036_5_, float p_77036_6_, float p_77036_7_);
|
||||
|
||||
@Shadow
|
||||
protected abstract void renderLivingAt(EntityLivingBase entityLivingBase, double p_77039_2_, double p_77039_4_,
|
||||
double p_77039_6_);
|
||||
|
||||
@Shadow
|
||||
protected abstract void rotateCorpse(EntityLivingBase entityLivingBase, float p_77043_2_, float p_77043_3_,
|
||||
float p_77043_4_);
|
||||
|
||||
@Shadow
|
||||
protected abstract float renderSwingProgress(EntityLivingBase entityLivingBase, float p_77040_2_);
|
||||
|
||||
@Shadow
|
||||
protected abstract float handleRotationFloat(EntityLivingBase entityLivingBase, float p_77044_2_);
|
||||
|
||||
@Shadow
|
||||
protected abstract void renderEquippedItems(EntityLivingBase entityLivingBase, float p_77029_2_);
|
||||
|
||||
@Shadow
|
||||
protected abstract int inheritRenderPass(EntityLivingBase entityLivingBase, int p_77035_2_, float p_77035_3_);
|
||||
|
||||
@Shadow
|
||||
protected abstract int shouldRenderPass(EntityLivingBase entityLivingBase, int p_77032_2_, float p_77032_3_);
|
||||
|
||||
@Shadow
|
||||
protected abstract void func_82408_c(EntityLivingBase entityLivingBase, int p_82408_2_, float p_82408_3_);
|
||||
|
||||
@Shadow
|
||||
protected abstract int getColorMultiplier(EntityLivingBase entityLivingBase, float p_77030_2_, float p_77030_3_);
|
||||
|
||||
@Shadow
|
||||
protected abstract void preRenderCallback(EntityLivingBase entityLivingBase, float p_77041_2_);
|
||||
|
||||
@Shadow
|
||||
protected abstract void passSpecialRender(EntityLivingBase entityLivingBase, double p_77033_2_, double p_77033_4_,
|
||||
double p_77033_6_);
|
||||
|
||||
/**
|
||||
* @author Mist475 (adapted from Paul Rupe)
|
||||
* @reason if statement modified into else-if
|
||||
*/
|
||||
@SuppressWarnings("DuplicatedCode")
|
||||
@Overwrite
|
||||
public void doRender(EntityLivingBase entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) {
|
||||
if (MinecraftForge.EVENT_BUS
|
||||
.post(new RenderLivingEvent.Pre(entity, (RendererLivingEntity) (Object) this, x, y, z))) return;
|
||||
GL11.glPushMatrix();
|
||||
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||
this.mainModel.onGround = this.renderSwingProgress(entity, p_76986_9_);
|
||||
|
||||
if (this.renderPassModel != null) {
|
||||
this.renderPassModel.onGround = this.mainModel.onGround;
|
||||
}
|
||||
|
||||
this.mainModel.isRiding = entity.isRiding();
|
||||
|
||||
if (this.renderPassModel != null) {
|
||||
this.renderPassModel.isRiding = this.mainModel.isRiding;
|
||||
}
|
||||
|
||||
this.mainModel.isChild = entity.isChild();
|
||||
|
||||
if (this.renderPassModel != null) {
|
||||
this.renderPassModel.isChild = this.mainModel.isChild;
|
||||
}
|
||||
|
||||
try {
|
||||
float f2 = this.interpolateRotation(entity.prevRenderYawOffset, entity.renderYawOffset, p_76986_9_);
|
||||
float f3 = this.interpolateRotation(entity.prevRotationYawHead, entity.rotationYawHead, p_76986_9_);
|
||||
float f4;
|
||||
|
||||
if (entity.isRiding() && entity.ridingEntity instanceof EntityLivingBase entitylivingbase1) {
|
||||
f2 = this.interpolateRotation(
|
||||
entitylivingbase1.prevRenderYawOffset,
|
||||
entitylivingbase1.renderYawOffset,
|
||||
p_76986_9_);
|
||||
f4 = MathHelper.wrapAngleTo180_float(f3 - f2);
|
||||
|
||||
if (f4 < -85.0F) {
|
||||
f4 = -85.0F;
|
||||
}
|
||||
|
||||
if (f4 >= 85.0F) {
|
||||
f4 = 85.0F;
|
||||
}
|
||||
|
||||
f2 = f3 - f4;
|
||||
|
||||
if (f4 * f4 > 2500.0F) {
|
||||
f2 += f4 * 0.2F;
|
||||
}
|
||||
}
|
||||
|
||||
float f13 = entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * p_76986_9_;
|
||||
this.renderLivingAt(entity, x, y, z);
|
||||
f4 = this.handleRotationFloat(entity, p_76986_9_);
|
||||
this.rotateCorpse(entity, f4, f2, p_76986_9_);
|
||||
float f5 = 0.0625F;
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
GL11.glScalef(-1.0F, -1.0F, 1.0F);
|
||||
this.preRenderCallback(entity, p_76986_9_);
|
||||
GL11.glTranslatef(0.0F, -24.0F * f5 - 0.0078125F, 0.0F);
|
||||
float f6 = entity.prevLimbSwingAmount + (entity.limbSwingAmount - entity.prevLimbSwingAmount) * p_76986_9_;
|
||||
float f7 = entity.limbSwing - entity.limbSwingAmount * (1.0F - p_76986_9_);
|
||||
|
||||
if (entity.isChild()) {
|
||||
f7 *= 3.0F;
|
||||
}
|
||||
|
||||
if (f6 > 1.0F) {
|
||||
f6 = 1.0F;
|
||||
}
|
||||
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
this.mainModel.setLivingAnimations(entity, f7, f6, p_76986_9_);
|
||||
this.renderModel(entity, f7, f6, f4, f3 - f2, f13, f5);
|
||||
int j;
|
||||
float f8;
|
||||
float f9;
|
||||
float f10;
|
||||
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
j = this.shouldRenderPass(entity, i, p_76986_9_);
|
||||
|
||||
if (j > 0) {
|
||||
this.renderPassModel.setLivingAnimations(entity, f7, f6, p_76986_9_);
|
||||
this.renderPassModel.render(entity, f7, f6, f4, f3 - f2, f13, f5);
|
||||
|
||||
if ((j & 240) == 16) {
|
||||
this.func_82408_c(entity, i, p_76986_9_);
|
||||
this.renderPassModel.render(entity, f7, f6, f4, f3 - f2, f13, f5);
|
||||
}
|
||||
// patch start
|
||||
if (CITUtils.setupArmorEnchantments(entity, i)) {
|
||||
while (CITUtils.preRenderArmorEnchantment()) {
|
||||
this.renderPassModel.render(entity, f7, f6, f4, f3 - f2, f13, f5);
|
||||
CITUtils.postRenderArmorEnchantment();
|
||||
}
|
||||
} else if ((j & 15) == 15) {
|
||||
// if -> else if
|
||||
// patch end
|
||||
f8 = (float) entity.ticksExisted + p_76986_9_;
|
||||
this.bindTexture(RES_ITEM_GLINT);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
f9 = 0.5F;
|
||||
GL11.glColor4f(f9, f9, f9, 1.0F);
|
||||
GL11.glDepthFunc(GL11.GL_EQUAL);
|
||||
GL11.glDepthMask(false);
|
||||
|
||||
for (int k = 0; k < 2; ++k) {
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
f10 = 0.76F;
|
||||
GL11.glColor4f(0.5F * f10, 0.25F * f10, 0.8F * f10, 1.0F);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE);
|
||||
GL11.glMatrixMode(GL11.GL_TEXTURE);
|
||||
GL11.glLoadIdentity();
|
||||
float f11 = f8 * (0.001F + (float) k * 0.003F) * 20.0F;
|
||||
float f12 = 0.33333334F;
|
||||
GL11.glScalef(f12, f12, f12);
|
||||
GL11.glRotatef(30.0F - (float) k * 60.0F, 0.0F, 0.0F, 1.0F);
|
||||
GL11.glTranslatef(0.0F, f11, 0.0F);
|
||||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
this.renderPassModel.render(entity, f7, f6, f4, f3 - f2, f13, f5);
|
||||
}
|
||||
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
GL11.glMatrixMode(GL11.GL_TEXTURE);
|
||||
GL11.glDepthMask(true);
|
||||
GL11.glLoadIdentity();
|
||||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
GL11.glDepthFunc(GL11.GL_LEQUAL);
|
||||
}
|
||||
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
}
|
||||
}
|
||||
|
||||
GL11.glDepthMask(true);
|
||||
this.renderEquippedItems(entity, p_76986_9_);
|
||||
float f14 = entity.getBrightness(p_76986_9_);
|
||||
j = this.getColorMultiplier(entity, f14, p_76986_9_);
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
|
||||
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
|
||||
|
||||
if ((j >> 24 & 255) > 0 || entity.hurtTime > 0 || entity.deathTime > 0) {
|
||||
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
||||
GL11.glDisable(GL11.GL_ALPHA_TEST);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GL11.glDepthFunc(GL11.GL_EQUAL);
|
||||
|
||||
if (entity.hurtTime > 0 || entity.deathTime > 0) {
|
||||
GL11.glColor4f(f14, 0.0F, 0.0F, 0.4F);
|
||||
this.mainModel.render(entity, f7, f6, f4, f3 - f2, f13, f5);
|
||||
|
||||
for (int l = 0; l < 4; ++l) {
|
||||
if (this.inheritRenderPass(entity, l, p_76986_9_) >= 0) {
|
||||
GL11.glColor4f(f14, 0.0F, 0.0F, 0.4F);
|
||||
this.renderPassModel.render(entity, f7, f6, f4, f3 - f2, f13, f5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((j >> 24 & 255) > 0) {
|
||||
f8 = (float) (j >> 16 & 255) / 255.0F;
|
||||
f9 = (float) (j >> 8 & 255) / 255.0F;
|
||||
float f15 = (float) (j & 255) / 255.0F;
|
||||
f10 = (float) (j >> 24 & 255) / 255.0F;
|
||||
GL11.glColor4f(f8, f9, f15, f10);
|
||||
this.mainModel.render(entity, f7, f6, f4, f3 - f2, f13, f5);
|
||||
|
||||
for (int i1 = 0; i1 < 4; ++i1) {
|
||||
if (this.inheritRenderPass(entity, i1, p_76986_9_) >= 0) {
|
||||
GL11.glColor4f(f8, f9, f15, f10);
|
||||
this.renderPassModel.render(entity, f7, f6, f4, f3 - f2, f13, f5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GL11.glDepthFunc(GL11.GL_LEQUAL);
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
}
|
||||
|
||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||
} catch (Exception exception) {
|
||||
logger.error("Couldn't render entity", exception);
|
||||
}
|
||||
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
|
||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
|
||||
GL11.glEnable(GL11.GL_CULL_FACE);
|
||||
GL11.glPopMatrix();
|
||||
this.passSpecialRender(entity, x, y, z);
|
||||
MinecraftForge.EVENT_BUS
|
||||
.post(new RenderLivingEvent.Post(entity, (RendererLivingEntity) (Object) this, x, y, z));
|
||||
}
|
||||
}
|
||||
+135
@@ -0,0 +1,135 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.client.renderer.entity;
|
||||
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
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.prupe.mcpatcher.cit.CITUtils;
|
||||
|
||||
@Mixin(RenderItem.class)
|
||||
public abstract class MixinRenderItem extends Render {
|
||||
|
||||
@Final
|
||||
@Shadow
|
||||
private static ResourceLocation RES_ITEM_GLINT;
|
||||
|
||||
@Shadow
|
||||
public float zLevel;
|
||||
|
||||
@Shadow
|
||||
protected abstract void renderGlint(int p_77018_1_, int p_77018_2_, int p_77018_3_, int p_77018_4_, int p_77018_5_);
|
||||
|
||||
// TODO: figure out if ForgeHooksClient#renderEntityItem also needs work
|
||||
|
||||
@Redirect(
|
||||
method = "doRender(Lnet/minecraft/entity/item/EntityItem;DDDFF)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/item/Item;getIcon(Lnet/minecraft/item/ItemStack;I)Lnet/minecraft/util/IIcon;",
|
||||
remap = false))
|
||||
private IIcon modifyDoRender(Item item, ItemStack itemStack, int pass) {
|
||||
return CITUtils.getIcon(item.getIcon(itemStack, pass), itemStack, pass);
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderItemIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;IIZ)V",
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glColorMask(ZZZZ)V", remap = false, ordinal = 0),
|
||||
remap = false)
|
||||
private void modifyRenderItemIntoGUI1(FontRenderer fontRenderer, TextureManager manager, ItemStack itemStack, int x,
|
||||
int y, boolean renderEffect, CallbackInfo ci) {
|
||||
GL11.glDepthMask(false);
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderItemIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;IIZ)V",
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glEnable(I)V", remap = false, ordinal = 4),
|
||||
remap = false)
|
||||
private void modifyRenderItemIntoGUI2(FontRenderer fontRenderer, TextureManager manager, ItemStack itemStack, int x,
|
||||
int y, boolean renderEffect, CallbackInfo ci) {
|
||||
GL11.glDepthMask(true);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderItemIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;IIZ)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/item/Item;getIcon(Lnet/minecraft/item/ItemStack;I)Lnet/minecraft/util/IIcon;",
|
||||
remap = false),
|
||||
remap = false)
|
||||
private IIcon modifyRenderItemIntoGUI3(Item item, ItemStack itemStack, int pass) {
|
||||
return CITUtils.getIcon(item.getIcon(itemStack, pass), itemStack, pass);
|
||||
}
|
||||
|
||||
// if I don't do this the transparency in the inventory breaks, I'm sure there's a much better way of doing it but
|
||||
// my open gl knowledge is pretty much none-existent atm
|
||||
|
||||
@Redirect(
|
||||
method = "renderItemIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;IIZ)V",
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glEnable(I)V", remap = false, ordinal = 10),
|
||||
remap = false)
|
||||
private void cancelAlpha3(int cap) {
|
||||
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderItemIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;IIZ)V",
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDisable(I)V", remap = false, ordinal = 8),
|
||||
remap = false)
|
||||
private void cancelAlpha4(int cap) {
|
||||
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "renderItemAndEffectIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;II)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderItemIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;IIZ)V",
|
||||
remap = false))
|
||||
private void modifyRenderItemAndEffectIntoGUI1(FontRenderer fontRenderer, TextureManager manager,
|
||||
ItemStack itemStack, int x, int y, CallbackInfo ci) {
|
||||
// Moved to before call, will not trigger with forge event
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
GL11.glAlphaFunc(GL11.GL_GREATER, 0.01f);
|
||||
}
|
||||
|
||||
/**
|
||||
* Forge added a false && to the targeted if statement, this adds the entire statement back
|
||||
* TODO: target forges event render class instead & check compatibility
|
||||
*/
|
||||
@SuppressWarnings("DuplicatedCode")
|
||||
@Inject(
|
||||
method = "renderItemAndEffectIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;II)V",
|
||||
at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/entity/RenderItem;zLevel:F", ordinal = 2))
|
||||
private void modifyRenderItemAndEffectIntoGUI2(FontRenderer fontRenderer, TextureManager manager,
|
||||
ItemStack itemStack, int x, int y, CallbackInfo ci) {
|
||||
if (!CITUtils.renderEnchantmentGUI(itemStack, x, y, this.zLevel) && itemStack.hasEffect(0)) {
|
||||
GL11.glDepthFunc(GL11.GL_EQUAL);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDepthMask(false);
|
||||
manager.bindTexture(RES_ITEM_GLINT);
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glColor4f(0.5F, 0.25F, 0.8F, 1.0F);
|
||||
this.renderGlint(x * 431278612 + y * 32178161, x - 2, y - 2, 20, 20);
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
GL11.glDepthMask(true);
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glDepthFunc(GL11.GL_LEQUAL);
|
||||
}
|
||||
}
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.client.renderer.entity;
|
||||
|
||||
import com.prupe.mcpatcher.cit.CITUtils;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Mixin(RenderItem.class)
|
||||
public class MixinRenderItemRenderDroppedItem {
|
||||
|
||||
@Redirect(
|
||||
method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;hasEffect(I)Z", remap = false),
|
||||
remap = false)
|
||||
private boolean modifyRenderDroppedItem(ItemStack instance, int pass) {
|
||||
return !CITUtils.renderEnchantmentDropped(instance) && instance.hasEffect(pass);
|
||||
}
|
||||
}
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.client.renderer.entity;
|
||||
|
||||
import net.minecraft.client.entity.AbstractClientPlayer;
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.renderer.entity.RenderBiped;
|
||||
import net.minecraft.client.renderer.entity.RenderPlayer;
|
||||
import net.minecraft.client.renderer.entity.RendererLivingEntity;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
import com.prupe.mcpatcher.cit.CITUtils;
|
||||
|
||||
@Mixin(RenderPlayer.class)
|
||||
public abstract class MixinRenderPlayer extends RendererLivingEntity {
|
||||
|
||||
public MixinRenderPlayer(ModelBase modelBase, float shadowSize) {
|
||||
super(modelBase, shadowSize);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "shouldRenderPass(Lnet/minecraft/client/entity/AbstractClientPlayer;IF)I",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/entity/RenderBiped;getArmorResource(Lnet/minecraft/entity/Entity;Lnet/minecraft/item/ItemStack;ILjava/lang/String;)Lnet/minecraft/util/ResourceLocation;",
|
||||
remap = false))
|
||||
private ResourceLocation modifyShouldRenderPass(Entity entity, ItemStack stack, int slot, String type,
|
||||
AbstractClientPlayer player) {
|
||||
return CITUtils
|
||||
.getArmorTexture(RenderBiped.getArmorResource(player, stack, slot, type), (EntityLivingBase) entity, stack);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "func_82408_c(Lnet/minecraft/client/entity/AbstractClientPlayer;IF)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/renderer/entity/RenderBiped;getArmorResource(Lnet/minecraft/entity/Entity;Lnet/minecraft/item/ItemStack;ILjava/lang/String;)Lnet/minecraft/util/ResourceLocation;",
|
||||
remap = false))
|
||||
private ResourceLocation modifyFunc_82408_c(Entity entity, ItemStack stack, int slot, String type,
|
||||
AbstractClientPlayer player) {
|
||||
return CITUtils
|
||||
.getArmorTexture(RenderBiped.getArmorResource(player, stack, slot, type), (EntityLivingBase) entity, stack);
|
||||
}
|
||||
}
|
||||
Loaded 100 of 285 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user