mirror of
https://github.com/GTNewHorizons/CodeChickenCore.git
synced 2026-11-16 18:54:51 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
39ed6607a6 | ||
|
|
99b815c12e | ||
|
|
0f37937ada | ||
|
|
c9d29a5c8e |
No files matched your search
+12
-1
@@ -79,6 +79,11 @@ accessTransformersFile =
|
|||||||
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
|
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
|
||||||
usesMixins = false
|
usesMixins = false
|
||||||
|
|
||||||
|
# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
|
||||||
|
# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
|
||||||
|
# Mixin classes will have access to "main" classes, but not the other way around.
|
||||||
|
separateMixinSourceSet =
|
||||||
|
|
||||||
# Adds some debug arguments like verbose output and class export.
|
# Adds some debug arguments like verbose output and class export.
|
||||||
usesMixinDebug = false
|
usesMixinDebug = false
|
||||||
|
|
||||||
@@ -111,9 +116,15 @@ minimizeShadowedDependencies = true
|
|||||||
# If disabled, won't rename the shadowed classes.
|
# If disabled, won't rename the shadowed classes.
|
||||||
relocateShadowedDependencies = true
|
relocateShadowedDependencies = true
|
||||||
|
|
||||||
# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
|
# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
|
||||||
includeWellKnownRepositories = true
|
includeWellKnownRepositories = true
|
||||||
|
|
||||||
|
# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
|
||||||
|
# list of strings, with the acceptable keys being(case does not matter):
|
||||||
|
# cursemaven
|
||||||
|
# modrinth
|
||||||
|
excludeWellKnownRepositories =
|
||||||
|
|
||||||
# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
|
# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
|
||||||
# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
|
# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
|
||||||
# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
|
# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -84,7 +86,8 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||||
|
' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
|
|||||||
Vendored
+2
@@ -13,6 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
|
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -83,7 +83,7 @@ public class ClassConstantPoolParser {
|
|||||||
if (strLen == bytes.length) {
|
if (strLen == bytes.length) {
|
||||||
for (int j = index + 3; j < index + 3 + strLen; j++) {
|
for (int j = index + 3; j < index + 3 + strLen; j++) {
|
||||||
if (basicClass[j] != bytes[j - (index + 3)]) {
|
if (basicClass[j] != bytes[j - (index + 3)]) {
|
||||||
break label;
|
continue label;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import static codechicken.lib.math.MathHelper.phi;
|
|||||||
import codechicken.lib.vec.Matrix4;
|
import codechicken.lib.vec.Matrix4;
|
||||||
import codechicken.lib.vec.Quat;
|
import codechicken.lib.vec.Quat;
|
||||||
import codechicken.lib.vec.Rotation;
|
import codechicken.lib.vec.Rotation;
|
||||||
import codechicken.lib.vec.Scale;
|
|
||||||
import codechicken.lib.vec.Vector3;
|
import codechicken.lib.vec.Vector3;
|
||||||
|
|
||||||
public class CCModelLibrary {
|
public class CCModelLibrary {
|
||||||
@@ -82,7 +81,12 @@ public class CCModelLibrary {
|
|||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
public static Matrix4 getRenderMatrix(Vector3 position, Rotation rotation, double scale) {
|
public static Matrix4 getRenderMatrix(Vector3 position, Rotation rotation, double scale) {
|
||||||
return new Matrix4().translate(position).apply(new Scale(scale)).apply(rotation);
|
return new Matrix4().translate(position).scale(scale).apply(rotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Matrix4 getRenderMatrix(double posX, double posY, double posZ, Rotation rotation, double scale) {
|
||||||
|
return new Matrix4().translate(posX, posY, posZ).scale(scale).apply(rotation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -13,6 +13,7 @@ import net.minecraft.entity.item.EntityItem;
|
|||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
|
import net.minecraft.util.MathHelper;
|
||||||
import net.minecraftforge.client.IItemRenderer;
|
import net.minecraftforge.client.IItemRenderer;
|
||||||
import net.minecraftforge.client.MinecraftForgeClient;
|
import net.minecraftforge.client.MinecraftForgeClient;
|
||||||
import net.minecraftforge.fluids.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
@@ -26,87 +27,130 @@ import codechicken.lib.vec.Vector3;
|
|||||||
|
|
||||||
public class RenderUtils {
|
public class RenderUtils {
|
||||||
|
|
||||||
static Vector3[] vectors = new Vector3[8];
|
static RenderItem uniformRenderItem;
|
||||||
static RenderItem uniformRenderItem = new RenderItem() {
|
|
||||||
|
|
||||||
public boolean shouldBob() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
static EntityItem entityItem;
|
static EntityItem entityItem;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
for (int i = 0; i < vectors.length; i++) vectors[i] = new Vector3();
|
uniformRenderItem = new RenderItem() {
|
||||||
|
|
||||||
|
public boolean shouldBob() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
uniformRenderItem.setRenderManager(RenderManager.instance);
|
uniformRenderItem.setRenderManager(RenderManager.instance);
|
||||||
|
|
||||||
entityItem = new EntityItem(null);
|
entityItem = new EntityItem(null);
|
||||||
entityItem.hoverStart = 0;
|
entityItem.hoverStart = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
public static void renderFluidQuad(Vector3 point1, Vector3 point2, Vector3 point3, Vector3 point4, IIcon icon,
|
public static void renderFluidQuad(Vector3 point1, Vector3 point2, Vector3 point3, Vector3 point4, IIcon icon,
|
||||||
double res) {
|
double res) {
|
||||||
|
// spotless:off
|
||||||
renderFluidQuad(
|
renderFluidQuad(
|
||||||
point2,
|
point2.x, point2.y, point2.z,
|
||||||
vectors[0].set(point4).subtract(point1),
|
point4.x - point1.x, point4.y - point1.y, point4.z - point1.z,
|
||||||
vectors[1].set(point1).subtract(point2),
|
point1.x - point2.x, point1.y - point2.y, point1.z - point2.z,
|
||||||
icon,
|
icon, res);
|
||||||
res);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Draws a tessellated quadrilateral bottom to top, left to right
|
* Draws a tessellated quadrilateral bottom to top, left to right
|
||||||
*
|
*
|
||||||
* @param base The bottom left corner of the quad
|
* @param base The bottom left corner of the quad
|
||||||
* @param wide The bottom of the quad
|
* @param wide The bottom of the quad
|
||||||
* @param high The left side of the quad
|
* @param high The left side of the quad
|
||||||
* @param res Units per icon
|
* @param res Units per icon
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public static void renderFluidQuad(Vector3 base, Vector3 wide, Vector3 high, IIcon icon, double res) {
|
public static void renderFluidQuad(Vector3 base, Vector3 wide, Vector3 high, IIcon icon, double res) {
|
||||||
Tessellator t = Tessellator.instance;
|
renderFluidQuad(
|
||||||
|
base.x, base.y, base.z,
|
||||||
|
wide.x, wide.y, wide.z,
|
||||||
|
wide.x, wide.y, wide.z,
|
||||||
|
icon, res);
|
||||||
|
}
|
||||||
|
|
||||||
double u1 = icon.getMinU();
|
/**
|
||||||
|
* Draws a tessellated quadrilateral bottom to top, left to right
|
||||||
|
* <p>
|
||||||
|
* base : The bottom left corner of the quad
|
||||||
|
* <p>
|
||||||
|
* wide : The bottom of the quad
|
||||||
|
* <p>
|
||||||
|
* high : The left side of the quad
|
||||||
|
* <p>
|
||||||
|
* res : Units per icon
|
||||||
|
*/
|
||||||
|
public static void renderFluidQuad(
|
||||||
|
double baseX, double baseY, double baseZ,
|
||||||
|
double wideX, double wideY, double wideZ,
|
||||||
|
double highX, double highY, double highZ,
|
||||||
|
IIcon icon, double res) {
|
||||||
|
|
||||||
|
Tessellator tessellator = Tessellator.instance;
|
||||||
|
|
||||||
|
double u = icon.getMinU();
|
||||||
double du = icon.getMaxU() - icon.getMinU();
|
double du = icon.getMaxU() - icon.getMinU();
|
||||||
double v2 = icon.getMaxV();
|
double v = icon.getMinV();
|
||||||
double dv = icon.getMaxV() - icon.getMinV();
|
double dv = icon.getMaxV() - icon.getMinV();
|
||||||
|
|
||||||
double wlen = wide.mag();
|
double wideLen = Math.sqrt(wideX * wideX + wideY * wideY + wideZ * wideZ);
|
||||||
double hlen = high.mag();
|
double highLen = Math.sqrt(highX * highX + highY * highY + highZ * highZ);
|
||||||
|
|
||||||
double x = 0;
|
double x = 0;
|
||||||
while (x < wlen) {
|
while (x < wideLen) {
|
||||||
double rx = wlen - x;
|
double rx = wideLen - x;
|
||||||
if (rx > res) rx = res;
|
if (rx > res) rx = res;
|
||||||
|
|
||||||
double y = 0;
|
double y = 0;
|
||||||
while (y < hlen) {
|
while (y < highLen) {
|
||||||
double ry = hlen - y;
|
double ry = highLen - y;
|
||||||
if (ry > res) ry = res;
|
if (ry > res) ry = res;
|
||||||
|
|
||||||
Vector3 dx1 = vectors[2].set(wide).multiply(x / wlen);
|
final double mult1 = x / wideLen;
|
||||||
Vector3 dx2 = vectors[3].set(wide).multiply((x + rx) / wlen);
|
double dx1X = wideX * mult1;
|
||||||
Vector3 dy1 = vectors[4].set(high).multiply(y / hlen);
|
double dx1Y = wideY * mult1;
|
||||||
Vector3 dy2 = vectors[5].set(high).multiply((y + ry) / hlen);
|
double dx1Z = wideZ * mult1;
|
||||||
|
|
||||||
t.addVertexWithUV(
|
final double mult2 = (x + rx) / wideLen;
|
||||||
base.x + dx1.x + dy2.x,
|
double dx2X = wideX * mult2;
|
||||||
base.y + dx1.y + dy2.y,
|
double dx2Y = wideY * mult2;
|
||||||
base.z + dx1.z + dy2.z,
|
double dx2Z = wideZ * mult2;
|
||||||
u1,
|
|
||||||
v2 - ry / res * dv);
|
final double mult3 = y / highLen;
|
||||||
t.addVertexWithUV(base.x + dx1.x + dy1.x, base.y + dx1.y + dy1.y, base.z + dx1.z + dy1.z, u1, v2);
|
double dy1X = highX * mult3;
|
||||||
t.addVertexWithUV(
|
double dy1Y = highY * mult3;
|
||||||
base.x + dx2.x + dy1.x,
|
double dy1Z = highZ * mult3;
|
||||||
base.y + dx2.y + dy1.y,
|
|
||||||
base.z + dx2.z + dy1.z,
|
final double mult4 = (y + ry) / highLen;
|
||||||
u1 + rx / res * du,
|
double dy2X = highX * mult4;
|
||||||
v2);
|
double dy2Y = highY * mult4;
|
||||||
t.addVertexWithUV(
|
double dy2Z = highZ * mult4;
|
||||||
base.x + dx2.x + dy2.x,
|
|
||||||
base.y + dx2.y + dy2.y,
|
tessellator.addVertexWithUV(
|
||||||
base.z + dx2.z + dy2.z,
|
baseX + dx1X + dy2X,
|
||||||
u1 + rx / res * du,
|
baseY + dx1Y + dy2Y,
|
||||||
v2 - ry / res * dv);
|
baseZ + dx1Z + dy2Z,
|
||||||
|
u,
|
||||||
|
v + ry / res * dv);
|
||||||
|
tessellator.addVertexWithUV(
|
||||||
|
baseX + dx1X + dy1X,
|
||||||
|
baseY + dx1Y + dy1Y,
|
||||||
|
baseZ + dx1Z + dy1Z,
|
||||||
|
u,
|
||||||
|
v);
|
||||||
|
tessellator.addVertexWithUV(
|
||||||
|
baseX + dx2X + dy1X,
|
||||||
|
baseY + dx2Y + dy1Y,
|
||||||
|
baseZ + dx2Z + dy1Z,
|
||||||
|
u + rx / res * du,
|
||||||
|
v);
|
||||||
|
tessellator.addVertexWithUV(
|
||||||
|
baseX + dx2X + dy2X,
|
||||||
|
baseY + dx2Y + dy2Y,
|
||||||
|
baseZ + dx2Z + dy2Z,
|
||||||
|
u + rx / res * du,
|
||||||
|
v + ry / res * dv);
|
||||||
|
|
||||||
y += ry;
|
y += ry;
|
||||||
}
|
}
|
||||||
@@ -115,132 +159,130 @@ public class RenderUtils {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void translateToWorldCoords(Entity entity, float frame) {
|
public static void translateToWorldCoords(Entity entity, float partialTicks) {
|
||||||
double interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * frame;
|
double interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * partialTicks;
|
||||||
double interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * frame;
|
double interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * partialTicks;
|
||||||
double interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * frame;
|
double interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * partialTicks;
|
||||||
|
|
||||||
GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ);
|
GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void drawCuboidOutline(Cuboid6 c) {
|
public static void drawCuboidOutline(Cuboid6 c) {
|
||||||
Tessellator var2 = Tessellator.instance;
|
Tessellator tess = Tessellator.instance;
|
||||||
var2.startDrawing(3);
|
tess.startDrawing(3);
|
||||||
var2.addVertex(c.min.x, c.min.y, c.min.z);
|
tess.addVertex(c.min.x, c.min.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.min.y, c.min.z);
|
tess.addVertex(c.max.x, c.min.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.min.y, c.max.z);
|
tess.addVertex(c.max.x, c.min.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.min.y, c.max.z);
|
tess.addVertex(c.min.x, c.min.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.min.y, c.min.z);
|
tess.addVertex(c.min.x, c.min.y, c.min.z);
|
||||||
var2.draw();
|
tess.draw();
|
||||||
var2.startDrawing(3);
|
tess.startDrawing(3);
|
||||||
var2.addVertex(c.min.x, c.max.y, c.min.z);
|
tess.addVertex(c.min.x, c.max.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.max.y, c.min.z);
|
tess.addVertex(c.max.x, c.max.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.max.y, c.max.z);
|
tess.addVertex(c.max.x, c.max.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.max.y, c.max.z);
|
tess.addVertex(c.min.x, c.max.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.max.y, c.min.z);
|
tess.addVertex(c.min.x, c.max.y, c.min.z);
|
||||||
var2.draw();
|
tess.draw();
|
||||||
var2.startDrawing(1);
|
tess.startDrawing(1);
|
||||||
var2.addVertex(c.min.x, c.min.y, c.min.z);
|
tess.addVertex(c.min.x, c.min.y, c.min.z);
|
||||||
var2.addVertex(c.min.x, c.max.y, c.min.z);
|
tess.addVertex(c.min.x, c.max.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.min.y, c.min.z);
|
tess.addVertex(c.max.x, c.min.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.max.y, c.min.z);
|
tess.addVertex(c.max.x, c.max.y, c.min.z);
|
||||||
var2.addVertex(c.max.x, c.min.y, c.max.z);
|
tess.addVertex(c.max.x, c.min.y, c.max.z);
|
||||||
var2.addVertex(c.max.x, c.max.y, c.max.z);
|
tess.addVertex(c.max.x, c.max.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.min.y, c.max.z);
|
tess.addVertex(c.min.x, c.min.y, c.max.z);
|
||||||
var2.addVertex(c.min.x, c.max.y, c.max.z);
|
tess.addVertex(c.min.x, c.max.y, c.max.z);
|
||||||
var2.draw();
|
tess.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFluidCuboid(CCRenderState state, Cuboid6 bound, IIcon tex, double res) {
|
public static void renderFluidCuboid(CCRenderState state, Cuboid6 bound, IIcon tex, double res) {
|
||||||
renderFluidQuad( // bottom
|
renderFluidCuboid(bound, tex, res);
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.max.z),
|
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.max.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
renderFluidQuad( // top
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.min.z),
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.min.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
renderFluidQuad( // -x
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.min.z),
|
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.max.z),
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.max.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
renderFluidQuad( // +x
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.min.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
renderFluidQuad( // -z
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.min.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.min.z),
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.min.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
renderFluidQuad( // +z
|
|
||||||
new Vector3(bound.min.x, bound.max.y, bound.max.z),
|
|
||||||
new Vector3(bound.min.x, bound.min.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.min.y, bound.max.z),
|
|
||||||
new Vector3(bound.max.x, bound.max.y, bound.max.z),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFluidCuboid(Cuboid6 bound, IIcon tex, double res) {
|
public static void renderFluidCuboid(Cuboid6 bound, IIcon tex, double res) {
|
||||||
renderFluidCuboid(CCRenderState.instance(), bound, tex, res);
|
final double minX = bound.min.x;
|
||||||
|
final double minY = bound.min.y;
|
||||||
|
final double minZ = bound.min.z;
|
||||||
|
final double maxX = bound.max.x;
|
||||||
|
final double maxY = bound.max.y;
|
||||||
|
final double maxZ = bound.max.z;
|
||||||
|
renderFluidQuad( // bottom
|
||||||
|
minX, minY, minZ,
|
||||||
|
maxX - minX, 0, 0,
|
||||||
|
0, 0, maxZ - minZ,
|
||||||
|
tex, res);
|
||||||
|
renderFluidQuad( // top
|
||||||
|
minX, maxY, minZ,
|
||||||
|
0, 0, maxZ - minZ,
|
||||||
|
maxX - minX, 0, 0,
|
||||||
|
tex, res);
|
||||||
|
renderFluidQuad( // -x
|
||||||
|
minX, maxY, minZ,
|
||||||
|
0, minY - maxY, 0,
|
||||||
|
0, 0, maxZ - minZ,
|
||||||
|
tex, res);
|
||||||
|
renderFluidQuad( // +x
|
||||||
|
maxX, maxY, maxZ,
|
||||||
|
0, minY - maxY, 0,
|
||||||
|
0, 0, minZ - maxZ,
|
||||||
|
tex, res);
|
||||||
|
renderFluidQuad( // -z
|
||||||
|
maxX, maxY, minZ,
|
||||||
|
0, minY - maxY, 0,
|
||||||
|
minX - maxX, 0, 0,
|
||||||
|
tex, res);
|
||||||
|
renderFluidQuad( // +z
|
||||||
|
minX, maxY, maxZ,
|
||||||
|
0, minY - maxY, 0,
|
||||||
|
maxX - minX, 0, 0,
|
||||||
|
tex, res);
|
||||||
}
|
}
|
||||||
|
// spotless:on
|
||||||
|
|
||||||
public static void renderBlockOverlaySide(int x, int y, int z, int side, double tx1, double tx2, double ty1,
|
public static void renderBlockOverlaySide(int x, int y, int z, int side, double tx1, double tx2, double ty1,
|
||||||
double ty2) {
|
double ty2) {
|
||||||
double[] points = new double[] { x - 0.009, x + 1.009, y - 0.009, y + 1.009, z - 0.009, z + 1.009 };
|
|
||||||
|
|
||||||
Tessellator tessellator = Tessellator.instance;
|
Tessellator tessellator = Tessellator.instance;
|
||||||
|
final double minX = x - 0.009;
|
||||||
|
final double maxX = x + 1.009;
|
||||||
|
final double minY = y - 0.009;
|
||||||
|
final double maxY = y + 1.009;
|
||||||
|
final double minZ = z - 0.009;
|
||||||
|
final double maxZ = z + 1.009;
|
||||||
switch (side) {
|
switch (side) {
|
||||||
case 0:
|
case 0:
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[4], tx1, ty1);
|
tessellator.addVertexWithUV(minX, minY, minZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[4], tx2, ty1);
|
tessellator.addVertexWithUV(maxX, minY, minZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[5], tx2, ty2);
|
tessellator.addVertexWithUV(maxX, minY, maxZ, tx2, ty2);
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[5], tx1, ty2);
|
tessellator.addVertexWithUV(minX, minY, maxZ, tx1, ty2);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[4], tx2, ty1);
|
tessellator.addVertexWithUV(maxX, maxY, minZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[4], tx1, ty1);
|
tessellator.addVertexWithUV(minX, maxY, minZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[5], tx1, ty2);
|
tessellator.addVertexWithUV(minX, maxY, maxZ, tx1, ty2);
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[5], tx2, ty2);
|
tessellator.addVertexWithUV(maxX, maxY, maxZ, tx2, ty2);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[4], tx2, ty1);
|
tessellator.addVertexWithUV(minX, maxY, minZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[4], tx1, ty1);
|
tessellator.addVertexWithUV(maxX, maxY, minZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[4], tx1, ty2);
|
tessellator.addVertexWithUV(maxX, minY, minZ, tx1, ty2);
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[4], tx2, ty2);
|
tessellator.addVertexWithUV(minX, minY, minZ, tx2, ty2);
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[5], tx2, ty1);
|
tessellator.addVertexWithUV(maxX, maxY, maxZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[5], tx1, ty1);
|
tessellator.addVertexWithUV(minX, maxY, maxZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[5], tx1, ty2);
|
tessellator.addVertexWithUV(minX, minY, maxZ, tx1, ty2);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[5], tx2, ty2);
|
tessellator.addVertexWithUV(maxX, minY, maxZ, tx2, ty2);
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[5], tx2, ty1);
|
tessellator.addVertexWithUV(minX, maxY, maxZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[3], points[4], tx1, ty1);
|
tessellator.addVertexWithUV(minX, maxY, minZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[4], tx1, ty2);
|
tessellator.addVertexWithUV(minX, minY, minZ, tx1, ty2);
|
||||||
tessellator.addVertexWithUV(points[0], points[2], points[5], tx2, ty2);
|
tessellator.addVertexWithUV(minX, minY, maxZ, tx2, ty2);
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[4], tx2, ty1);
|
tessellator.addVertexWithUV(maxX, maxY, minZ, tx2, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[3], points[5], tx1, ty1);
|
tessellator.addVertexWithUV(maxX, maxY, maxZ, tx1, ty1);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[5], tx1, ty2);
|
tessellator.addVertexWithUV(maxX, minY, maxZ, tx1, ty2);
|
||||||
tessellator.addVertexWithUV(points[1], points[2], points[4], tx2, ty2);
|
tessellator.addVertexWithUV(maxX, minY, minZ, tx2, ty2);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -276,66 +318,76 @@ public class RenderUtils {
|
|||||||
GL11.glDisable(GL11.GL_BLEND);
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double fluidDensityToAlpha(double density) {
|
public static double fluidDensityToAlpha(double d) {
|
||||||
return Math.pow(density, 0.4);
|
return Math.pow(d, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders a fluid within a bounding box. If the fluid is a liquid it will render as a normal tank with height equal
|
* Renders a fluid within a bounding box. If the fluid is a liquid it will render as a normal tank with height equal
|
||||||
* to density/bound.height. If the fluid is a gas, it will render the full box with an alpha equal to density.
|
* to fillRate/bound.height. If the fluid is a gas, it will render the full box with an alpha equal to fillRate.
|
||||||
* Warning, bound will be mutated if the fluid is a liquid
|
* Warning, bound will be mutated if the fluid is a liquid
|
||||||
*
|
*
|
||||||
* @param stack The fluid to render.
|
* @param stack The fluid to render.
|
||||||
* @param bound The box within which the fluid is contained.
|
* @param bound The bounding box within which the fluid is contained.
|
||||||
* @param density The volume of fluid / the capacity of the tank. For gases this determines the alpha, for liquids
|
* @param fillRate The volume of fluid / the capacity of the tank. This is a double between 0 and 1.
|
||||||
* this determines the height.
|
* @param res The resolution to render at.
|
||||||
* @param res The resolution to render at.
|
|
||||||
*/
|
*/
|
||||||
public static void renderFluidCuboid(CCRenderState state, FluidStack stack, Cuboid6 bound, double density,
|
public static void renderFluidCuboid(CCRenderState state, FluidStack stack, Cuboid6 bound, double fillRate,
|
||||||
double res) {
|
double res) {
|
||||||
if (!shouldRenderFluid(stack)) return;
|
if (!shouldRenderFluid(stack)) return;
|
||||||
|
|
||||||
|
fillRate = MathHelper.clamp_double(fillRate, 0d, 1d);
|
||||||
int alpha = 255;
|
int alpha = 255;
|
||||||
if (stack.getFluid().isGaseous()) alpha = (int) (fluidDensityToAlpha(density) * 255);
|
if (stack.getFluid().isGaseous()) {
|
||||||
else bound.max.y = bound.min.y + (bound.max.y - bound.min.y) * density;
|
alpha = (int) (fluidDensityToAlpha(fillRate) * 255);
|
||||||
|
} else {
|
||||||
|
bound.max.y = bound.min.y + (bound.max.y - bound.min.y) * fillRate;
|
||||||
|
}
|
||||||
|
|
||||||
IIcon tex = prepareFluidRender(state, stack, alpha);
|
IIcon tex = prepareFluidRender(state, stack, alpha);
|
||||||
state.startDrawingInstance();
|
state.startDrawingInstance();
|
||||||
renderFluidCuboid(state, bound, tex, res);
|
renderFluidCuboid(bound, tex, res);
|
||||||
state.drawInstance();
|
state.drawInstance();
|
||||||
postFluidRender();
|
postFluidRender();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFluidCuboid(FluidStack stack, Cuboid6 bound, double density, double res) {
|
/**
|
||||||
renderFluidCuboid(CCRenderState.instance(), stack, bound, density, res);
|
* Renders a fluid within a bounding box. If the fluid is a liquid it will render as a normal tank with height equal
|
||||||
|
* to fillRate/bound.height. If the fluid is a gas, it will render the full box with an alpha equal to fillRate.
|
||||||
|
* Warning, bound will be mutated if the fluid is a liquid
|
||||||
|
*
|
||||||
|
* @param stack The fluid to render.
|
||||||
|
* @param bound The bounding box within which the fluid is contained.
|
||||||
|
* @param fillRate The volume of fluid / the capacity of the tank. This is a double between 0 and 1.
|
||||||
|
* @param res The resolution to render at.
|
||||||
|
*/
|
||||||
|
public static void renderFluidCuboid(FluidStack stack, Cuboid6 bound, double fillRate, double res) {
|
||||||
|
renderFluidCuboid(CCRenderState.instance(), stack, bound, fillRate, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFluidGauge(CCRenderState state, FluidStack stack, Rectangle4i rect, double density,
|
public static void renderFluidGauge(CCRenderState state, FluidStack stack, Rectangle4i rect, double fillRate,
|
||||||
double res) {
|
double res) {
|
||||||
if (!shouldRenderFluid(stack)) return;
|
if (!shouldRenderFluid(stack)) return;
|
||||||
|
|
||||||
|
fillRate = MathHelper.clamp_double(fillRate, 0d, 1d);
|
||||||
int alpha = 255;
|
int alpha = 255;
|
||||||
if (stack.getFluid().isGaseous()) alpha = (int) (fluidDensityToAlpha(density) * 255);
|
if (stack.getFluid().isGaseous()) {
|
||||||
else {
|
alpha = (int) (fluidDensityToAlpha(fillRate) * 255);
|
||||||
int height = (int) (rect.h * density);
|
} else {
|
||||||
|
int height = (int) (rect.h * fillRate);
|
||||||
rect.y += rect.h - height;
|
rect.y += rect.h - height;
|
||||||
rect.h = height;
|
rect.h = height;
|
||||||
}
|
}
|
||||||
|
|
||||||
IIcon tex = prepareFluidRender(state, stack, alpha);
|
IIcon tex = prepareFluidRender(state, stack, alpha);
|
||||||
state.startDrawingInstance();
|
state.startDrawingInstance();
|
||||||
renderFluidQuad(
|
renderFluidQuad(rect.x, rect.y + rect.h, 0, rect.w, 0, 0, 0, -rect.h, 0, tex, res);
|
||||||
new Vector3(rect.x, rect.y + rect.h, 0),
|
|
||||||
new Vector3(rect.w, 0, 0),
|
|
||||||
new Vector3(0, -rect.h, 0),
|
|
||||||
tex,
|
|
||||||
res);
|
|
||||||
state.drawInstance();
|
state.drawInstance();
|
||||||
postFluidRender();
|
postFluidRender();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderFluidGauge(FluidStack stack, Rectangle4i rect, double density, double res) {
|
public static void renderFluidGauge(FluidStack stack, Rectangle4i rect, double fillRate, double res) {
|
||||||
renderFluidGauge(CCRenderState.instance(), stack, rect, density, res);
|
renderFluidGauge(CCRenderState.instance(), stack, rect, fillRate, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -347,7 +399,7 @@ public class RenderUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders items and blocks in the world at 0,0,0 with transformations that size them appropriately
|
* Renders items and blocks in the world at 0,0,0 with transformations that size them appropriately
|
||||||
*
|
*
|
||||||
* @param spin The spin angle of the item around the y axis in degrees
|
* @param spin The spin angle of the item around the y axis in degrees
|
||||||
*/
|
*/
|
||||||
public static void renderItemUniform(ItemStack item, double spin) {
|
public static void renderItemUniform(ItemStack item, double spin) {
|
||||||
|
|||||||
@@ -19,7 +19,10 @@ public class Matrix4 extends Transformation implements Copyable<Matrix4> {
|
|||||||
.asDoubleBuffer();
|
.asDoubleBuffer();
|
||||||
|
|
||||||
// m<row><column>
|
// m<row><column>
|
||||||
public double m00, m01, m02, m03, m10, m11, m12, m13, m20, m21, m22, m23, m30, m31, m32, m33;
|
public double m00, m01, m02, m03;
|
||||||
|
public double m10, m11, m12, m13;
|
||||||
|
public double m20, m21, m22, m23;
|
||||||
|
public double m30, m31, m32, m33;
|
||||||
|
|
||||||
public Matrix4() {
|
public Matrix4() {
|
||||||
m00 = m11 = m22 = m33 = 1;
|
m00 = m11 = m22 = m33 = 1;
|
||||||
@@ -65,6 +68,15 @@ public class Matrix4 extends Transformation implements Copyable<Matrix4> {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Matrix4 translate(double x, double y, double z) {
|
||||||
|
m03 += m00 * x + m01 * y + m02 * z;
|
||||||
|
m13 += m10 * x + m11 * y + m12 * z;
|
||||||
|
m23 += m20 * x + m21 * y + m22 * z;
|
||||||
|
m33 += m30 * x + m31 * y + m32 * z;
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public Matrix4 scale(Vector3 vec) {
|
public Matrix4 scale(Vector3 vec) {
|
||||||
m00 *= vec.x;
|
m00 *= vec.x;
|
||||||
m10 *= vec.x;
|
m10 *= vec.x;
|
||||||
@@ -82,6 +94,22 @@ public class Matrix4 extends Transformation implements Copyable<Matrix4> {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Matrix4 scale(double scale) {
|
||||||
|
m00 *= scale;
|
||||||
|
m10 *= scale;
|
||||||
|
m20 *= scale;
|
||||||
|
m30 *= scale;
|
||||||
|
m01 *= scale;
|
||||||
|
m11 *= scale;
|
||||||
|
m21 *= scale;
|
||||||
|
m31 *= scale;
|
||||||
|
m02 *= scale;
|
||||||
|
m12 *= scale;
|
||||||
|
m22 *= scale;
|
||||||
|
m32 *= scale;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public Matrix4 rotate(double angle, Vector3 axis) {
|
public Matrix4 rotate(double angle, Vector3 axis) {
|
||||||
double c = Math.cos(angle);
|
double c = Math.cos(angle);
|
||||||
double s = Math.sin(angle);
|
double s = Math.sin(angle);
|
||||||
|
|||||||
@@ -29,10 +29,10 @@ public class Vector3 implements Copyable<Vector3> {
|
|||||||
|
|
||||||
public Vector3() {}
|
public Vector3() {}
|
||||||
|
|
||||||
public Vector3(double d, double d1, double d2) {
|
public Vector3(double x, double y, double z) {
|
||||||
x = d;
|
this.x = x;
|
||||||
y = d1;
|
this.y = y;
|
||||||
z = d2;
|
this.z = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Vector3(Vector3 vec) {
|
public Vector3(Vector3 vec) {
|
||||||
@@ -398,7 +398,7 @@ public class Vector3 implements Copyable<Vector3> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Equals method with tolerance
|
* Equals method with tolerance
|
||||||
*
|
*
|
||||||
* @return true if this is equal to v within +-1E-5
|
* @return true if this is equal to v within +-1E-5
|
||||||
*/
|
*/
|
||||||
public boolean equalsT(Vector3 v) {
|
public boolean equalsT(Vector3 v) {
|
||||||
|
|||||||
Reference in new issue
Block a user