mirror of
https://github.com/GTNewHorizons/Mantle.git
synced 2026-11-18 11:19:20 +00:00
Update to the latest mappings and forge version.
This commit is contained in:
1 parent
22e142f94e
commit
3e255fb1cf
6 files changed
+18
-17
No files matched your search
@@ -42,8 +42,9 @@ public abstract class InventoryBlock extends ContainerBlock {
|
||||
protected abstract boolean openGui(PlayerEntity player, World world, BlockPos pos);
|
||||
|
||||
@Deprecated
|
||||
public ActionResultType func_225533_a_(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) {
|
||||
if (player.func_226272_bl_()) {
|
||||
@Override
|
||||
public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) {
|
||||
if (player.isSuppressingBounce()) {
|
||||
return ActionResultType.PASS;
|
||||
}
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ public class ModelHelper {
|
||||
|
||||
@Override
|
||||
public void put(int element, float... data) {
|
||||
VertexFormatElement.Usage usage = this.parent.getVertexFormat().func_227894_c_().get(element).getUsage();
|
||||
VertexFormatElement.Usage usage = this.parent.getVertexFormat().getElements().get(element).getUsage();
|
||||
|
||||
// transform normals and position
|
||||
if (usage == VertexFormatElement.Usage.COLOR && data.length >= 4) {
|
||||
|
||||
@@ -78,7 +78,7 @@ public class StructureBlockAccess implements IWorldReader {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Biome func_225604_a_(int p_225604_1_, int p_225604_2_, int p_225604_3_) {
|
||||
public Biome getNoiseBiomeRaw(int p_225604_1_, int p_225604_2_, int p_225604_3_) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ public class StructureBlockAccess implements IWorldReader {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int func_226659_b_(BlockPos pos, int amount) {
|
||||
public int getLightSubtracted(BlockPos pos, int amount) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ public class StructureBlockAccess implements IWorldReader {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean func_226660_f_(BlockPos pos) {
|
||||
public boolean canSeeSky(BlockPos pos) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -124,7 +124,7 @@ public class StructureBlockAccess implements IWorldReader {
|
||||
}
|
||||
|
||||
@Override
|
||||
public BiomeManager func_225523_d_() {
|
||||
public BiomeManager getBiomeManager() {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ public class BlockItemModelWrapper implements IBakedModel {
|
||||
}
|
||||
|
||||
if (transform != null) {
|
||||
mat.getLast().getPositionMatrix().multiply(transform.func_227988_c_());
|
||||
mat.getLast().getPositionMatrix().multiply(transform.getMatrix());
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -158,21 +158,21 @@ public class TRSRBakedModel implements IBakedModel {
|
||||
public Transformer(TransformationMatrix transformation, TextureAtlasSprite textureAtlasSprite) {
|
||||
super(new BakedQuadBuilder(textureAtlasSprite));
|
||||
// position transform
|
||||
this.transformation = transformation.func_227988_c_();
|
||||
this.transformation = transformation.getMatrix();
|
||||
// normal transform
|
||||
this.normalTransformation = new Matrix3f(this.transformation);
|
||||
this.normalTransformation.func_226123_f_();
|
||||
this.normalTransformation.func_226110_a_();
|
||||
this.normalTransformation.invert();
|
||||
this.normalTransformation.transpose();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void put(int element, float... data) {
|
||||
VertexFormatElement.Usage usage = this.parent.getVertexFormat().func_227894_c_().get(element).getUsage();
|
||||
VertexFormatElement.Usage usage = this.parent.getVertexFormat().getElements().get(element).getUsage();
|
||||
|
||||
// transform normals and position
|
||||
if (usage == VertexFormatElement.Usage.POSITION && data.length >= 3) {
|
||||
Vector4f vec = new Vector4f(data[0], data[1], data[2], 1f);
|
||||
vec.func_229372_a_(this.transformation);
|
||||
vec.transform(this.transformation);
|
||||
data = new float[4];
|
||||
data[0] = vec.getX();
|
||||
data[1] = vec.getY();
|
||||
@@ -181,8 +181,8 @@ public class TRSRBakedModel implements IBakedModel {
|
||||
}
|
||||
else if (usage == VertexFormatElement.Usage.NORMAL && data.length >= 3) {
|
||||
Vector3f vec = new Vector3f(data);
|
||||
vec.func_229188_a_(this.normalTransformation);
|
||||
vec.func_229194_d_();
|
||||
vec.transform(this.normalTransformation);
|
||||
vec.normalize();
|
||||
data = new float[4];
|
||||
data[0] = vec.getX();
|
||||
data[1] = vec.getY();
|
||||
|
||||
Reference in new issue
Block a user