mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-27 07:27:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Catch up with renames II

Browse source
This commit is contained in:
simibubi 2023-02-25 01:47:03 +01:00
parent a5e19ee0e5
commit 77c0c14780
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/simibubi/create/content/curiosities/frames/CopycatBarsModel.java
View file

@ -4,8 +4,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import com.simibubi.create.foundation.block.render.QuadHelper;
import com.simibubi.create.foundation.block.render.SpriteShiftEntry; import com.simibubi.create.foundation.block.render.SpriteShiftEntry;
import com.simibubi.create.foundation.model.BakedQuadHelper;
import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@ -53,13 +53,13 @@ public class CopycatBarsModel extends CopycatModel {
for (int i = 0; i < superQuads.size(); i++) { for (int i = 0; i < superQuads.size(); i++) {
BakedQuad quad = superQuads.get(i); BakedQuad quad = superQuads.get(i);
TextureAtlasSprite original = quad.getSprite(); TextureAtlasSprite original = quad.getSprite();
BakedQuad newQuad = QuadHelper.clone(quad); BakedQuad newQuad = BakedQuadHelper.clone(quad);
int[] vertexData = newQuad.getVertices(); int[] vertexData = newQuad.getVertices();
for (int vertex = 0; vertex < 4; vertex++) { for (int vertex = 0; vertex < 4; vertex++) {
QuadHelper.setU(vertexData, vertex, targetSprite BakedQuadHelper.setU(vertexData, vertex, targetSprite
.getU(SpriteShiftEntry.getUnInterpolatedU(original, QuadHelper.getU(vertexData, vertex)))); .getU(SpriteShiftEntry.getUnInterpolatedU(original, BakedQuadHelper.getU(vertexData, vertex))));
QuadHelper.setV(vertexData, vertex, targetSprite BakedQuadHelper.setV(vertexData, vertex, targetSprite
.getV(SpriteShiftEntry.getUnInterpolatedV(original, QuadHelper.getV(vertexData, vertex)))); .getV(SpriteShiftEntry.getUnInterpolatedV(original, BakedQuadHelper.getV(vertexData, vertex))));
} }
quads.add(newQuad); quads.add(newQuad);
} }

3
src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java
View file

@ -1,5 +1,6 @@
package com.simibubi.create.foundation.data; package com.simibubi.create.foundation.data;
import static com.simibubi.create.Create.REGISTRATE;
import static net.minecraft.world.level.block.state.properties.BlockStateProperties.EAST; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.EAST;
import static net.minecraft.world.level.block.state.properties.BlockStateProperties.NORTH; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.NORTH;
import static net.minecraft.world.level.block.state.properties.BlockStateProperties.SOUTH; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.SOUTH;
@ -25,8 +26,6 @@ import net.minecraftforge.client.model.generators.ModelFile;
public class MetalBarsGen { public class MetalBarsGen {
private static final CreateRegistrate REGISTRATE = Create.registrate();
public static <P extends IronBarsBlock> NonNullBiConsumer<DataGenContext<Block, P>, RegistrateBlockstateProvider> barsBlockState( public static <P extends IronBarsBlock> NonNullBiConsumer<DataGenContext<Block, P>, RegistrateBlockstateProvider> barsBlockState(
String name, boolean specialEdge) { String name, boolean specialEdge) {
return (c, p) -> { return (c, p) -> {