mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 12:42:26 +00:00
Fix naming conflicts with official names.
This commit is contained in:
1 parent
4dc34b7d5b
commit
e1863383ff
24 files changed
+72
-55
No files matched your search
@@ -132,7 +132,7 @@ public class Tags
|
||||
public static final Tag<Item> CROPS_BEETROOT = tag("crops/beetroot");
|
||||
public static final Tag<Item> CROPS_CARROT = tag("crops/carrot");
|
||||
public static final Tag<Item> CROPS_NETHER_WART = tag("crops/nether_wart");
|
||||
public static final Tag<Item> CROPS_POTATOE = tag("crops/potatoe");
|
||||
public static final Tag<Item> CROPS_POTATO = tag("crops/potato");
|
||||
public static final Tag<Item> CROPS_WHEAT = tag("crops/wheat");
|
||||
public static final Tag<Item> DUSTS = tag("dusts");
|
||||
public static final Tag<Item> DUSTS_PRISMARINE = tag("dusts/prismarine");
|
||||
|
||||
@@ -59,11 +59,11 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
|
||||
copy(Tags.Blocks.CHESTS_TRAPPED, Tags.Items.CHESTS_TRAPPED);
|
||||
copy(Tags.Blocks.CHESTS_WOODEN, Tags.Items.CHESTS_WOODEN);
|
||||
copy(Tags.Blocks.COBBLESTONE, Tags.Items.COBBLESTONE);
|
||||
getBuilder(Tags.Items.CROPS).add(Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CARROT, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATOE, Tags.Items.CROPS_WHEAT);
|
||||
getBuilder(Tags.Items.CROPS).add(Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CARROT, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATO, Tags.Items.CROPS_WHEAT);
|
||||
getBuilder(Tags.Items.CROPS_BEETROOT).add(Items.BEETROOT);
|
||||
getBuilder(Tags.Items.CROPS_CARROT).add(Items.CARROT);
|
||||
getBuilder(Tags.Items.CROPS_NETHER_WART).add(Items.NETHER_WART);
|
||||
getBuilder(Tags.Items.CROPS_POTATOE).add(Items.POTATO);
|
||||
getBuilder(Tags.Items.CROPS_POTATO).add(Items.POTATO);
|
||||
getBuilder(Tags.Items.CROPS_WHEAT).add(Items.WHEAT);
|
||||
getBuilder(Tags.Items.DUSTS).add(Tags.Items.DUSTS_GLOWSTONE, Tags.Items.DUSTS_PRISMARINE, Tags.Items.DUSTS_REDSTONE);
|
||||
getBuilder(Tags.Items.DUSTS_GLOWSTONE).add(Items.GLOWSTONE_DUST);
|
||||
|
||||
@@ -74,7 +74,7 @@ public interface IForgeEntity extends ICapabilitySerializable<CompoundNBT>
|
||||
* It will be written, and read from disc, so it persists over world saves.
|
||||
* @return A NBTTagCompound
|
||||
*/
|
||||
CompoundNBT getEntityData();
|
||||
CompoundNBT getPersistantData();
|
||||
|
||||
/**
|
||||
* Used in model rendering to determine if the entity riding this entity should be in the 'sitting' position.
|
||||
|
||||
@@ -62,7 +62,7 @@ public interface IForgeEntityMinecart
|
||||
return pos;
|
||||
}
|
||||
|
||||
double getMaxSpeed();
|
||||
double getMaxSpeedWithRail();
|
||||
|
||||
/**
|
||||
* Moved to allow overrides.
|
||||
|
||||
@@ -31,7 +31,7 @@ public interface ITransformation
|
||||
{
|
||||
Matrix4f getMatrixVec();
|
||||
|
||||
Direction rotate(Direction facing);
|
||||
Direction rotateTransform(Direction facing);
|
||||
|
||||
int rotate(Direction facing, int vertexIndex);
|
||||
}
|
||||
@@ -589,7 +589,7 @@ public final class TRSRTransformation implements IModelState, ITransformation
|
||||
}
|
||||
|
||||
@Override
|
||||
public Direction rotate(Direction facing)
|
||||
public Direction rotateTransform(Direction facing)
|
||||
{
|
||||
return rotate(matrix, facing);
|
||||
}
|
||||
@@ -836,7 +836,7 @@ public final class TRSRTransformation implements IModelState, ITransformation
|
||||
|
||||
public TRSRTransformation getUVLockTransform(Direction originalSide)
|
||||
{
|
||||
Direction newSide = rotate(originalSide);
|
||||
Direction newSide = rotateTransform(originalSide);
|
||||
try
|
||||
{
|
||||
return blockCenterToCorner(vanillaUvTransformGlobalToLocal.get(originalSide).compose(blockCornerToCenter(this.inverse())).compose(vanillaUvTransformLocalToGlobal.get(newSide)));
|
||||
|
||||
Reference in new issue
Block a user