Tiniest of discrepancies

- Re-add default implementation of Model#createEBO
- Remove old commented methods in VirtualChunk
- Update Forge
This commit is contained in:
PepperCode1 2022-11-10 16:56:23 -08:00
parent 8c36613738
commit 88135d8715
6 changed files with 7 additions and 49 deletions

View file

@ -202,6 +202,6 @@ curseforge {
changelog = file('changelog.txt')
releaseType = project.curse_type
mainArtifact jar
addGameVersion '1.19'
addGameVersion '1.19.2'
}
}

View file

@ -6,7 +6,7 @@ mod_version = 0.6.8
artifact_minecraft_version = 1.19.2
minecraft_version = 1.19.2
forge_version = 43.0.8
forge_version = 43.1.23
# build dependency versions
forgegradle_version = 5.1.53

View file

@ -4,9 +4,7 @@ import java.util.List;
import com.jozufozu.flywheel.api.vertex.VertexList;
import com.jozufozu.flywheel.api.vertex.VertexType;
import com.jozufozu.flywheel.backend.model.ElementBuffer;
import com.jozufozu.flywheel.core.Formats;
import com.jozufozu.flywheel.core.QuadConverter;
import com.jozufozu.flywheel.core.model.Model;
import com.jozufozu.flywheel.core.vertex.PosTexNormalWriterUnsafe;
import com.mojang.blaze3d.platform.MemoryTracker;
@ -60,12 +58,6 @@ public class ModelPart implements Model {
return Formats.POS_TEX_NORMAL;
}
@Override
public ElementBuffer createEBO() {
return QuadConverter.getInstance()
.quads2Tris(vertices / 4);
}
@Override
public void delete() {
if (reader instanceof AutoCloseable closeable) {

View file

@ -32,7 +32,6 @@ public class BlockModel implements Model {
private final VertexList reader;
private final String name;
private final EBOSupplier eboSupplier;
public BlockModel(BlockState state) {

View file

@ -5,6 +5,7 @@ import java.nio.ByteBuffer;
import com.jozufozu.flywheel.api.vertex.VertexList;
import com.jozufozu.flywheel.api.vertex.VertexType;
import com.jozufozu.flywheel.backend.model.ElementBuffer;
import com.jozufozu.flywheel.core.QuadConverter;
/**
* A model that can be rendered by flywheel.
@ -53,7 +54,10 @@ public interface Model {
* </p>
* @return an element buffer object indexing this model's vertices.
*/
ElementBuffer createEBO();
default ElementBuffer createEBO() {
return QuadConverter.getInstance()
.quads2Tris(vertexCount() / 4);
}
void delete();

View file

@ -192,43 +192,6 @@ public class VirtualChunk extends ChunkAccess {
return null;
}
// @Override
// @Nullable
// public StructureStart getStartForFeature(ConfiguredStructureFeature<?, ?> pStructure) {
// return null;
// }
//
// @Override
// public void setStartForFeature(ConfiguredStructureFeature<?, ?> pStructure, StructureStart pStart) {
// }
//
// @Override
// public Map<ConfiguredStructureFeature<?, ?>, StructureStart> getAllStarts() {
// return Collections.emptyMap();
// }
//
// @Override
// public void setAllStarts(Map<ConfiguredStructureFeature<?, ?>, StructureStart> pStructureStarts) {
// }
//
// @Override
// public LongSet getReferencesForFeature(ConfiguredStructureFeature<?, ?> pStructure) {
// return LongSets.emptySet();
// }
//
// @Override
// public void addReferenceForFeature(ConfiguredStructureFeature<?, ?> pStructure, long pReference) {
// }
//
// @Override
// public Map<ConfiguredStructureFeature<?, ?>, LongSet> getAllReferences() {
// return Collections.emptyMap();
// }
//
// @Override
// public void setAllReferences(Map<ConfiguredStructureFeature<?, ?>, LongSet> pStructureReferences) {
// }
@Override
@Nullable
public StructureStart getStartForStructure(Structure structure) {