TicTicBoooom-Mods/MasterfulMachinery
1
0
Fork 0
mirror of https://github.com/TicTicBoooom-Mods/MasterfulMachinery.git synced 2026-01-18 16:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Centered the render in JEI

Browse Source
This commit is contained in:
Quarris
2021-09-28 20:21:49 +01:00
parent a21d8534db
commit 18ca1529f8
5 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo_config/config/masterful_machinery/controllers/basic.json
View File

@@ -59,7 +59,7 @@
"name": "Rotation", "name": "Rotation",
"id": "simple", "id": "simple",
"data": { "data": {
"stress": 1 "stress": 32
} }
}, },
{ {

2
demo_config/config/masterful_machinery/controllers/mid.json
View File

@@ -65,7 +65,7 @@
"name": "Rotation", "name": "Rotation",
"id": "intermediate", "id": "intermediate",
"data": { "data": {
"stress": 3 "stress": 128
} }
}, },
{ {

44
src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java
View File

@@ -137,19 +137,19 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
} }
// Calculate distances // Calculate distances
int furthestX = Integer.MAX_VALUE; int minX = Integer.MAX_VALUE;
int nearestX = Integer.MIN_VALUE; int maxX = Integer.MIN_VALUE;
int furthestZ = Integer.MAX_VALUE; int minZ = Integer.MAX_VALUE;
int nearestZ = Integer.MIN_VALUE; int maxZ = Integer.MIN_VALUE;
int topY = Integer.MIN_VALUE; int minY = Integer.MAX_VALUE;
int bottomY = Integer.MAX_VALUE; int maxY = Integer.MIN_VALUE;
for (MachineStructureRecipeKeyModel part : recipe.getModels().get(0)) { for (MachineStructureRecipeKeyModel part : recipe.getModels().get(0)) {
furthestX = Math.min(part.getPos().getX(), furthestX); minX = Math.min(part.getPos().getX(), minX);
nearestX = Math.max(part.getPos().getX(), nearestX); maxX = Math.max(part.getPos().getX(), maxX);
furthestZ = Math.min(part.getPos().getZ(), furthestZ); minZ = Math.min(part.getPos().getZ(), minZ);
nearestZ = Math.max(part.getPos().getZ(), nearestZ); maxZ = Math.max(part.getPos().getZ(), maxZ);
topY = Math.max(part.getPos().getY(), topY); minY = Math.min(part.getPos().getY(), minY);
bottomY = Math.min(part.getPos().getY(), bottomY); maxY = Math.max(part.getPos().getY(), maxY);
} }
// Do mouse scroll zoom // Do mouse scroll zoom
@@ -160,11 +160,9 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
scaleFactor += (mouseY - yLastMousePosition) * 0.05; scaleFactor += (mouseY - yLastMousePosition) * 0.05;
scaleFactor = Math.max(0.003f, scaleFactor); scaleFactor = Math.max(0.003f, scaleFactor);
} }
nearestX++; float centreX = ((float) maxX - minX) / 2f;
nearestZ++; float centerY = ((float) maxY - minY) / 2f;
float centreX = ((float) nearestX - furthestX) / 2f; float centreZ = ((float) maxZ - minZ) / 2f;
float centerY = ((float) topY - bottomY) / 2f;
float centreZ = ((float) nearestZ - furthestZ) / 2f;
mc.fontRenderer.drawString(matrixStack, recipe.getName(), 2, 2, 0xFFFFFFFF); mc.fontRenderer.drawString(matrixStack, recipe.getName(), 2, 2, 0xFFFFFFFF);
// Get the block parts for the layer // Get the block parts for the layer
@@ -174,13 +172,13 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
} }
//float tx = 6.5f, ty = -5, tz = 10; //float tx = 6.5f, ty = -5, tz = 10;
float tx = 0, ty = 0, tz = 10; float tx = 6.75f, ty = -5, tz = 10;
Vector3f prePos = new Vector3f(tx, ty, tz); Vector3f prePos = new Vector3f(tx, ty, tz);
Vector3f offset = new Vector3f(centreX / 2, centerY / 2, centreZ / 2); Vector3f offset = new Vector3f(-minX - 0.5f - centreX, -minY - 0.5f - centerY, -minZ - 0.5f + centreZ);
// Render the block parts // Render the block parts
for (MachineStructureRecipeKeyModel part : parts) { for (MachineStructureRecipeKeyModel part : parts) {
variantIndices.putIfAbsent(part.getPos(), 0); this.variantIndices.putIfAbsent(part.getPos(), 0);
if (part.getBlock().isEmpty() && part.getTag().isEmpty() && part.getPort() == null) { if (part.getBlock().isEmpty() && part.getTag().isEmpty() && part.getPort() == null) {
continue; continue;
} }
@@ -202,7 +200,7 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
Block block = tag.getAllElements().get(index); Block block = tag.getAllElements().get(index);
if (this.tickTimer == 0) { if (this.tickTimer == 0) {
this.variantIndices.put(part.getPos(), (index+1) % tag.getAllElements().size()); this.variantIndices.put(part.getPos(), (index + 1) % tag.getAllElements().size());
} }
if (block != null) { if (block != null) {
@@ -216,7 +214,7 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
Integer index = this.variantIndices.get(part.getPos()); Integer index = this.variantIndices.get(part.getPos());
String controllerId = port.getControllerId().get(index); String controllerId = port.getControllerId().get(index);
if (this.tickTimer == 0) { if (this.tickTimer == 0) {
this.variantIndices.put(part.getPos(), (index+1) % port.getControllerId().size()); this.variantIndices.put(part.getPos(), (index + 1) % port.getControllerId().size());
} }
String type = port.getType(); String type = port.getType();
MachinePortBlock block = null; MachinePortBlock block = null;
@@ -242,7 +240,7 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
Integer index = this.variantIndices.get(controllerPos); Integer index = this.variantIndices.get(controllerPos);
String controller = recipe.getControllerId().get(index); String controller = recipe.getControllerId().get(index);
if (this.tickTimer == 0) { if (this.tickTimer == 0) {
this.variantIndices.put(controllerPos, (index+1) % recipe.getControllerId().size()); this.variantIndices.put(controllerPos, (index + 1) % recipe.getControllerId().size());
} }
for (RegistryObject<ControllerBlock> reg : MMLoader.BLOCKS) { for (RegistryObject<ControllerBlock> reg : MMLoader.BLOCKS) {
if (reg.get().getControllerId().equals(controller)) { if (reg.get().getControllerId().equals(controller)) {

40
src/test/resources/data/mm/recipes/test_rotation.json
View File

@@ -1,22 +1,22 @@
{ {
"type": "masterfulmachinery:machine_process", "type": "masterfulmachinery:machine_process",
"structureId": "test_rotation", "structureId": "test_rotation",
"controllerId": "basic", "controllerId": "basic",
"ticks": 200, "perTick": true,
"inputs": [ "inputs": [
{ {
"type": "masterfulmachinery:create_rotation", "type": "masterfulmachinery:create_rotation",
"data": { "data": {
"speed": 2 "speed": 2
} }
} }
], ],
"outputs":[ "outputs": [
{ {
"type": "masterfulmachinery:create_rotation", "type": "masterfulmachinery:create_rotation",
"data": { "data": {
"speed": 4 "speed": 64
} }
} }
] ]
} }

4
version.properties
View File

@@ -1,2 +1,2 @@
#Tue Sep 28 18:52:49 BST 2021 #Wed Sep 29 10:53:26 BST 2021
VERSION_CODE=785 VERSION_CODE=790