mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
Update forge mappings to 20201028-1.16.3 (#7435)
This commit is contained in:
1 parent
6e0e67b14d
commit
53eedb0f10
93 files changed
+598
-588
No files matched your search
@@ -63,7 +63,7 @@ public class BakedItemModel implements IBakedModel
|
||||
|
||||
@Override public boolean isAmbientOcclusion() { return true; }
|
||||
@Override public boolean isGui3d() { return false; }
|
||||
@Override public boolean func_230044_c_() { return isSideLit; }
|
||||
@Override public boolean isSideLit() { return isSideLit; }
|
||||
@Override public boolean isBuiltInRenderer() { return false; }
|
||||
@Override public TextureAtlasSprite getParticleTexture() { return particle; }
|
||||
@Override public ItemOverrideList getOverrides() { return overrides; }
|
||||
|
||||
@@ -70,9 +70,9 @@ public abstract class BakedModelWrapper<T extends IBakedModel> implements IBaked
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_230044_c_()
|
||||
public boolean isSideLit()
|
||||
{
|
||||
return originalModel.func_230044_c_();
|
||||
return originalModel.isSideLit();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -112,7 +112,7 @@ public class BlockModelConfiguration implements IModelConfiguration
|
||||
@Override
|
||||
public boolean isSideLit()
|
||||
{
|
||||
return owner.func_230176_c_().func_230178_a_();
|
||||
return owner.getGuiLight().isSideLit();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -100,7 +100,7 @@ public class CompositeModel implements IDynamicBakedModel
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_230044_c_()
|
||||
public boolean isSideLit()
|
||||
{
|
||||
return isSideLit;
|
||||
}
|
||||
|
||||
@@ -259,9 +259,9 @@ public final class DynamicBucketModel implements IModelGeometry<DynamicBucketMod
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
|
||||
public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
|
||||
{
|
||||
IBakedModel overriden = nested.func_239290_a_(originalModel, stack, world, entity);
|
||||
IBakedModel overriden = nested.getOverrideModel(originalModel, stack, world, entity);
|
||||
if (overriden != originalModel) return overriden;
|
||||
return FluidUtil.getFluidContained(stack)
|
||||
.map(fluidStack -> {
|
||||
|
||||
@@ -439,7 +439,7 @@ public final class FluidModel implements IModelGeometry<FluidModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_230044_c_()
|
||||
public boolean isSideLit()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ public class ItemMultiLayerBakedModel implements IDynamicBakedModel
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_230044_c_()
|
||||
public boolean isSideLit()
|
||||
{
|
||||
return sideLit;
|
||||
}
|
||||
|
||||
@@ -182,7 +182,7 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_230044_c_()
|
||||
public boolean isSideLit()
|
||||
{
|
||||
return isSideLit;
|
||||
}
|
||||
@@ -245,7 +245,7 @@ public final class MultiLayerModel implements IModelGeometry<MultiLayerModel>
|
||||
.put("cutout", RenderType.getCutout())
|
||||
.put("cutout_mipped", RenderType.getCutoutMipped())
|
||||
.put("translucent", RenderType.getTranslucent())
|
||||
.put("tripwire", RenderType.func_241715_r_())
|
||||
.put("tripwire", RenderType.getTripwire())
|
||||
.build();
|
||||
|
||||
public static final Loader INSTANCE = new Loader();
|
||||
|
||||
@@ -128,7 +128,7 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
|
||||
@Override public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); }
|
||||
@Override public boolean isAmbientOcclusion(BlockState state) { return parent.isAmbientOcclusion(state); }
|
||||
@Override public boolean isGui3d() { return parent.isGui3d(); }
|
||||
@Override public boolean func_230044_c_() { return parent.func_230044_c_(); }
|
||||
@Override public boolean isSideLit() { return parent.isSideLit(); }
|
||||
@Override public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); }
|
||||
@Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); }
|
||||
@SuppressWarnings("deprecation")
|
||||
@@ -165,9 +165,9 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public IBakedModel func_239290_a_(IBakedModel model, ItemStack stack, @Nullable ClientWorld worldIn, @Nullable LivingEntity entityIn)
|
||||
public IBakedModel getOverrideModel(IBakedModel model, ItemStack stack, @Nullable ClientWorld worldIn, @Nullable LivingEntity entityIn)
|
||||
{
|
||||
model = parent.getOverrides().func_239290_a_(parent, stack, worldIn, entityIn);
|
||||
model = parent.getOverrides().getOverrideModel(parent, stack, worldIn, entityIn);
|
||||
return new PerspectiveMapWrapper(model, transforms);
|
||||
}
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@ public class QuadTransformer
|
||||
int[] outData = Arrays.copyOf(inData, inData.length);
|
||||
processVertices(inData, outData);
|
||||
|
||||
return new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.func_187508_a(), input.func_239287_f_());
|
||||
return new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.getSprite(), input.applyDiffuseLighting());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -208,7 +208,7 @@ public class QuadTransformer
|
||||
int[] outData = Arrays.copyOf(inData, inData.length);
|
||||
processVertices(inData, outData);
|
||||
|
||||
outputs.add(new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.func_187508_a(), input.func_239287_f_()));
|
||||
outputs.add(new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.getSprite(), input.applyDiffuseLighting()));
|
||||
}
|
||||
return outputs;
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ public class SeparatePerspectiveModel implements IModelGeometry<SeparatePerspect
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_230044_c_()
|
||||
public boolean isSideLit()
|
||||
{
|
||||
return isSideLit;
|
||||
}
|
||||
|
||||
+2
-2
@@ -63,7 +63,7 @@ public final class AnimationItemOverrideList extends ItemOverrideList
|
||||
|
||||
@SuppressWarnings("resource")
|
||||
@Override
|
||||
public IBakedModel func_239290_a_(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
|
||||
public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity)
|
||||
{
|
||||
return stack.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY, null)
|
||||
.map(asm ->
|
||||
@@ -82,6 +82,6 @@ public final class AnimationItemOverrideList extends ItemOverrideList
|
||||
})
|
||||
// TODO where should uvlock data come from?
|
||||
.map(state -> model.bakeModel(bakery, bakedTextureGetter, new ModelTransformComposition(state, this.state), modelLoc))
|
||||
.orElseGet(() -> super.func_239290_a_(originalModel, stack, world, entity));
|
||||
.orElseGet(() -> super.getOverrideModel(originalModel, stack, world, entity));
|
||||
}
|
||||
}
|
||||
@@ -800,7 +800,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_230044_c_()
|
||||
public boolean isSideLit()
|
||||
{
|
||||
return isSideLit;
|
||||
}
|
||||
|
||||
@@ -425,10 +425,10 @@ public abstract class BlockStateProvider implements IDataProvider {
|
||||
}
|
||||
|
||||
public static final ImmutableMap<Direction, Property<WallHeight>> WALL_PROPS = ImmutableMap.<Direction, Property<WallHeight>>builder()
|
||||
.put(Direction.EAST, BlockStateProperties.field_235908_S_)
|
||||
.put(Direction.NORTH, BlockStateProperties.field_235909_T_)
|
||||
.put(Direction.SOUTH, BlockStateProperties.field_235910_U_)
|
||||
.put(Direction.WEST, BlockStateProperties.field_235911_V_)
|
||||
.put(Direction.EAST, BlockStateProperties.WALL_HEIGHT_EAST)
|
||||
.put(Direction.NORTH, BlockStateProperties.WALL_HEIGHT_NORTH)
|
||||
.put(Direction.SOUTH, BlockStateProperties.WALL_HEIGHT_SOUTH)
|
||||
.put(Direction.WEST, BlockStateProperties.WALL_HEIGHT_WEST)
|
||||
.build();
|
||||
|
||||
public void wallBlock(WallBlock block, ModelFile post, ModelFile side, ModelFile sideTall) {
|
||||
|
||||
@@ -249,7 +249,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
if (part.partRotation != null) {
|
||||
JsonObject rotation = new JsonObject();
|
||||
rotation.add("origin", serializeVector3f(part.partRotation.origin));
|
||||
rotation.addProperty("axis", part.partRotation.axis.func_176610_l());
|
||||
rotation.addProperty("axis", part.partRotation.axis.getString());
|
||||
rotation.addProperty("angle", part.partRotation.angle);
|
||||
if (part.partRotation.rescale) {
|
||||
rotation.addProperty("rescale", part.partRotation.rescale);
|
||||
@@ -272,7 +272,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
faceObj.add("uv", new Gson().toJsonTree(face.blockFaceUV.uvs));
|
||||
}
|
||||
if (face.cullFace != null) {
|
||||
faceObj.addProperty("cullface", face.cullFace.func_176610_l());
|
||||
faceObj.addProperty("cullface", face.cullFace.getString());
|
||||
}
|
||||
if (face.blockFaceUV.rotation != 0) {
|
||||
faceObj.addProperty("rotation", face.blockFaceUV.rotation);
|
||||
@@ -280,7 +280,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
|
||||
if (face.tintIndex != -1) {
|
||||
faceObj.addProperty("tintindex", face.tintIndex);
|
||||
}
|
||||
faces.add(dir.func_176610_l(), faceObj);
|
||||
faces.add(dir.getString(), faceObj);
|
||||
}
|
||||
if (!part.mapFaces.isEmpty()) {
|
||||
partObj.add("faces", faces);
|
||||
|
||||
@@ -87,13 +87,13 @@ public class LightUtil
|
||||
|
||||
public static void putBakedQuad(IVertexConsumer consumer, BakedQuad quad)
|
||||
{
|
||||
consumer.setTexture(quad.func_187508_a());
|
||||
consumer.setTexture(quad.getSprite());
|
||||
consumer.setQuadOrientation(quad.getFace());
|
||||
if(quad.hasTintIndex())
|
||||
{
|
||||
consumer.setQuadTint(quad.getTintIndex());
|
||||
}
|
||||
consumer.setApplyDiffuseLighting(quad.func_239287_f_());
|
||||
consumer.setApplyDiffuseLighting(quad.applyDiffuseLighting());
|
||||
float[] data = new float[4];
|
||||
VertexFormat formatFrom = consumer.getVertexFormat();
|
||||
VertexFormat formatTo = DefaultVertexFormats.BLOCK;
|
||||
|
||||
Reference in new issue
Block a user