Fix naming conflicts with official names.

src/main/java/net/minecraftforge/client/model/ModelLoader.java

@@ -328,7 +328,7 @@ public final class ModelLoader extends ModelBakery
                     }
                     else
                     {
-                        builder.addFaceQuad(baseState.rotate(e.getValue().cullFace), BlockModel.makeBakedQuad(part, e.getValue(), textureatlassprite1, e.getKey(), new BasicState(transformation, uvLocked)));
+                        builder.addFaceQuad(baseState.rotateTransform(e.getValue().cullFace), BlockModel.makeBakedQuad(part, e.getValue(), textureatlassprite1, e.getKey(), new BasicState(transformation, uvLocked)));
                     }
                 }
             }

src/main/java/net/minecraftforge/common/Tags.java

@@ -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");

src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java

@@ -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);

src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java

@@ -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.

src/main/java/net/minecraftforge/common/extensions/IForgeEntityMinecart.java

@@ -62,7 +62,7 @@ public interface IForgeEntityMinecart
         return pos;
     }
 
-    double getMaxSpeed();
+    double getMaxSpeedWithRail();
 
     /**
      * Moved to allow overrides.

src/main/java/net/minecraftforge/common/model/ITransformation.java

@@ -31,7 +31,7 @@ public interface ITransformation
 {
     Matrix4f getMatrixVec();
 
-    Direction rotate(Direction facing);
+    Direction rotateTransform(Direction facing);
 
     int rotate(Direction facing, int vertexIndex);
 }

src/main/java/net/minecraftforge/common/model/TRSRTransformation.java

@@ -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)));

src/main/java/net/minecraftforge/fml/client/gui/GuiModList.java

@@ -19,8 +19,6 @@
 
 package net.minecraftforge.fml.client.gui;
 
-import static net.minecraft.util.StringUtils.stripControlCodes;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -75,6 +73,7 @@ import net.minecraftforge.forgespi.language.IModInfo;
 
 public class GuiModList extends Screen
 {
+    private static String stripControlCodes(String value) { return net.minecraft.util.StringUtils.stripControlCodes(value); }
     private static final Logger LOGGER = LogManager.getLogger();
     private enum SortType implements Comparator<ModInfo>
     {
@@ -172,7 +171,7 @@ public class GuiModList extends Screen
         }
 
         @Override
-        public int getContentHeight() 
+        public int getContentHeight()
         {
             int height = 50;
             height += (lines.size() * font.FONT_HEIGHT);

src/main/java/net/minecraftforge/fml/client/gui/GuiSlotModList.java

@@ -29,12 +29,11 @@ import net.minecraftforge.fml.MavenVersionStringHelper;
 import net.minecraftforge.fml.VersionChecker;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 
-import static net.minecraft.util.StringUtils.stripControlCodes;
-
 import com.mojang.blaze3d.platform.GlStateManager;
 
 public class GuiSlotModList extends ExtendedList<GuiSlotModList.ModEntry>
 {
+    private static String stripControlCodes(String value) { return net.minecraft.util.StringUtils.stripControlCodes(value); }
     private static final ResourceLocation VERSION_CHECK_ICONS = new ResourceLocation(ForgeVersion.MOD_ID, "textures/gui/version_check_icons.png");
     private final int listWidth;
 

src/main/java/net/minecraftforge/fml/network/ICustomPacket.java

@@ -73,7 +73,7 @@ public interface ICustomPacket<T extends IPacket<?>> {
         }
     }
 
-    default PacketBuffer getData() {
+    default PacketBuffer getInternalData() {
         return Fields.lookup.get(this.getClass()).data.map(f->UnsafeHacks.<PacketBuffer>getField(f, this)).orElse(null);
     }
 

src/main/java/net/minecraftforge/fml/network/NetworkEvent.java

@@ -46,7 +46,7 @@ public class NetworkEvent extends Event
 
     private NetworkEvent(final ICustomPacket<?> payload, final Supplier<Context> source)
     {
-        this.payload = payload.getData();
+        this.payload = payload.getInternalData();
         this.source = source;
         this.loginIndex = payload.getIndex();
     }