Skip to content

Commit

Permalink
Add new cocoa model and a system property to switch back to the old o…
Browse files Browse the repository at this point in the history 
…ne (#1762)

* Update cocoa plant model.

* Add system property to change the cocoa plant model.

* Update system property name for the old cocoa model.

* Change property name.
  • Loading branch information
@leMaik
leMaik authored Sep 18, 2024
1 parent 3a1f78a commit 16b409c
Show file tree
Hide file tree
Showing 3 changed files with 223 additions and 2 deletions.
5 changes: 4 additions & 1 deletion chunky/src/java/se/llbit/chunky/block/minecraft/Cocoa.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import se.llbit.chunky.block.AbstractModelBlock;
import se.llbit.chunky.model.minecraft.CocoaPlantModel;
import se.llbit.chunky.model.minecraft.CocoaPlantModel119;
import se.llbit.chunky.resources.Texture;

public class Cocoa extends AbstractModelBlock {
Expand All @@ -45,7 +46,9 @@ public Cocoa(String facingString, int age) {
facing = 3;
break;
}
model = new CocoaPlantModel(facing, age);
model = System.getProperty("chunky.blockModels.cocoa", "1.19").equals("pre-1.19")
? new CocoaPlantModel(facing, age)
: new CocoaPlantModel119(facing, age);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion chunky/src/java/se/llbit/chunky/model/minecraft/CocoaPlantModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import java.util.Arrays;

/**
* Renders the Cocoa Plant
* Cocoa Plant model used before Minecraft 1.19 (22w11a).
*
* @author Jesper Öqvist <[email protected]>
*/
Expand Down
218 changes: 218 additions & 0 deletions chunky/src/java/se/llbit/chunky/model/minecraft/CocoaPlantModel119.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
/*
* Copyright (c) 2012-2024 Chunky contributors
*
* This file is part of Chunky.
*
* Chunky is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Chunky is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with Chunky. If not, see <http://www.gnu.org/licenses/>.
*/
package se.llbit.chunky.model.minecraft;

import se.llbit.chunky.model.Model;
import se.llbit.chunky.model.QuadModel;
import se.llbit.chunky.resources.Texture;
import se.llbit.math.Quad;
import se.llbit.math.Transform;
import se.llbit.math.Vector3;
import se.llbit.math.Vector4;

import java.util.Arrays;

/**
* The new Cocoa Plant model introduced in Minecraft 1.19 (22w11a).
*/
public class CocoaPlantModel119 extends QuadModel {
//region Large
private static final Quad[] large = new Quad[]{
new Quad(
new Vector3(4 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(12 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(4 / 16.0, 12 / 16.0, 7 / 16.0),
new Vector4(0 / 16.0, 8 / 16.0, 8 / 16.0, 16 / 16.0)
),
new Quad(
new Vector3(4 / 16.0, 3 / 16.0, 7 / 16.0),
new Vector3(12 / 16.0, 3 / 16.0, 7 / 16.0),
new Vector3(4 / 16.0, 3 / 16.0, 15 / 16.0),
new Vector4(0 / 16.0, 8 / 16.0, 8 / 16.0, 16 / 16.0)
),
new Quad(
new Vector3(4 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(4 / 16.0, 12 / 16.0, 7 / 16.0),
new Vector3(4 / 16.0, 3 / 16.0, 15 / 16.0),
new Vector4(16 / 16.0, 8 / 16.0, 12 / 16.0, 3 / 16.0)
),
new Quad(
new Vector3(12 / 16.0, 12 / 16.0, 7 / 16.0),
new Vector3(12 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(12 / 16.0, 3 / 16.0, 7 / 16.0),
new Vector4(16 / 16.0, 8 / 16.0, 12 / 16.0, 3 / 16.0)
),
new Quad(
new Vector3(4 / 16.0, 12 / 16.0, 7 / 16.0),
new Vector3(12 / 16.0, 12 / 16.0, 7 / 16.0),
new Vector3(4 / 16.0, 3 / 16.0, 7 / 16.0),
new Vector4(16 / 16.0, 8 / 16.0, 12 / 16.0, 3 / 16.0)
),
new Quad(
new Vector3(12 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(4 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(12 / 16.0, 3 / 16.0, 15 / 16.0),
new Vector4(16 / 16.0, 8 / 16.0, 12 / 16.0, 3 / 16.0)
),
new Quad(
new Vector3(8 / 16.0, 16 / 16.0, 16 / 16.0),
new Vector3(8 / 16.0, 16 / 16.0, 12 / 16.0),
new Vector3(8 / 16.0, 12 / 16.0, 16 / 16.0),
new Vector4(16 / 16.0, 12 / 16.0, 16 / 16.0, 12 / 16.0)
)
};
//endregion

//region Medium
private static final Quad[] medium = new Quad[]{
new Quad(
new Vector3(5 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(11 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(5 / 16.0, 12 / 16.0, 9 / 16.0),
new Vector4(0 / 16.0, 6 / 16.0, 10 / 16.0, 16 / 16.0)
),
new Quad(
new Vector3(5 / 16.0, 5 / 16.0, 9 / 16.0),
new Vector3(11 / 16.0, 5 / 16.0, 9 / 16.0),
new Vector3(5 / 16.0, 5 / 16.0, 15 / 16.0),
new Vector4(0 / 16.0, 6 / 16.0, 10 / 16.0, 16 / 16.0)
),
new Quad(
new Vector3(5 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(5 / 16.0, 12 / 16.0, 9 / 16.0),
new Vector3(5 / 16.0, 5 / 16.0, 15 / 16.0),
new Vector4(15 / 16.0, 9 / 16.0, 12 / 16.0, 5 / 16.0)
),
new Quad(
new Vector3(11 / 16.0, 12 / 16.0, 9 / 16.0),
new Vector3(11 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(11 / 16.0, 5 / 16.0, 9 / 16.0),
new Vector4(15 / 16.0, 9 / 16.0, 12 / 16.0, 5 / 16.0)
),
new Quad(
new Vector3(5 / 16.0, 12 / 16.0, 9 / 16.0),
new Vector3(11 / 16.0, 12 / 16.0, 9 / 16.0),
new Vector3(5 / 16.0, 5 / 16.0, 9 / 16.0),
new Vector4(15 / 16.0, 9 / 16.0, 12 / 16.0, 5 / 16.0)
),
new Quad(
new Vector3(11 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(5 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(11 / 16.0, 5 / 16.0, 15 / 16.0),
new Vector4(15 / 16.0, 9 / 16.0, 12 / 16.0, 5 / 16.0)
),
new Quad(
new Vector3(8 / 16.0, 16 / 16.0, 16 / 16.0),
new Vector3(8 / 16.0, 16 / 16.0, 12 / 16.0),
new Vector3(8 / 16.0, 12 / 16.0, 16 / 16.0),
new Vector4(16 / 16.0, 12 / 16.0, 16 / 16.0, 12 / 16.0)
)
};
//endregion

//region Small
private static final Quad[] small = new Quad[]{
new Quad(
new Vector3(6 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(10 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(6 / 16.0, 12 / 16.0, 11 / 16.0),
new Vector4(0 / 16.0, 4 / 16.0, 12 / 16.0, 16 / 16.0)
),
new Quad(
new Vector3(6 / 16.0, 7 / 16.0, 11 / 16.0),
new Vector3(10 / 16.0, 7 / 16.0, 11 / 16.0),
new Vector3(6 / 16.0, 7 / 16.0, 15 / 16.0),
new Vector4(0 / 16.0, 4 / 16.0, 12 / 16.0, 16 / 16.0)
),
new Quad(
new Vector3(6 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(6 / 16.0, 12 / 16.0, 11 / 16.0),
new Vector3(6 / 16.0, 7 / 16.0, 15 / 16.0),
new Vector4(15 / 16.0, 11 / 16.0, 12 / 16.0, 7 / 16.0)
),
new Quad(
new Vector3(10 / 16.0, 12 / 16.0, 11 / 16.0),
new Vector3(10 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(10 / 16.0, 7 / 16.0, 11 / 16.0),
new Vector4(15 / 16.0, 11 / 16.0, 12 / 16.0, 7 / 16.0)
),
new Quad(
new Vector3(6 / 16.0, 12 / 16.0, 11 / 16.0),
new Vector3(10 / 16.0, 12 / 16.0, 11 / 16.0),
new Vector3(6 / 16.0, 7 / 16.0, 11 / 16.0),
new Vector4(15 / 16.0, 11 / 16.0, 12 / 16.0, 7 / 16.0)
),
new Quad(
new Vector3(10 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(6 / 16.0, 12 / 16.0, 15 / 16.0),
new Vector3(10 / 16.0, 7 / 16.0, 15 / 16.0),
new Vector4(15 / 16.0, 11 / 16.0, 12 / 16.0, 7 / 16.0)
),
new Quad(
new Vector3(8 / 16.0, 16 / 16.0, 16 / 16.0),
new Vector3(8 / 16.0, 16 / 16.0, 12 / 16.0),
new Vector3(8 / 16.0, 12 / 16.0, 16 / 16.0),
new Vector4(16 / 16.0, 12 / 16.0, 16 / 16.0, 12 / 16.0)
)
};
//endregion

private static final Quad stemNorth = new Quad(
new Vector3(.5, 12 / 16., .5), new Vector3(.5, 12 / 16., 1),
new Vector3(.5, 1, .5), new Vector4(.5, 1, 12 / 16., 1), true);

private static final Quad[][][] fruit = new Quad[3][4][];
private static final Quad[] stem = new Quad[4];

static {
fruit[0][0] = small;
fruit[1][0] = medium;
fruit[2][0] = large;

stem[0] = stemNorth;
for (int i = 1; i < 4; ++i) {
stem[i] = stem[i - 1].transform(Transform.NONE.rotateY());
fruit[0][i] = Model.rotateY(fruit[0][i - 1]);
fruit[1][i] = Model.rotateY(fruit[1][i - 1]);
fruit[2][i] = Model.rotateY(fruit[2][i - 1]);
}
}

private static final Texture[] tex = {Texture.cocoaPlantSmall, Texture.cocoaPlantMedium, Texture.cocoaPlantLarge};

private final Quad[] quads;
private final Texture[] textures;

public CocoaPlantModel119(int facing, int age) {
quads = new Quad[fruit[age][facing].length + 1];
System.arraycopy(fruit[age][facing], 0, quads, 0, quads.length - 1);
quads[quads.length - 1] = stem[facing];
textures = new Texture[quads.length];
Arrays.fill(textures, tex[age]);
}

@Override
public Quad[] getQuads() {
return quads;
}

@Override
public Texture[] getTextures() {
return textures;
}
}

0 comments on commit 16b409c

Please sign in to comment.