Update mappings to 09/21 snapshots.

Conflict with getMatrix in ITransformation, so renamed to getMatrixVec.
This commit is contained in:
LexManos committed 2018-09-22 03:40:22 -07:00
1 parent 5ed03945a0
commit 94e1a8e0a4
210 files changed
+1052 -978

No files matched your search

@@ -18,6 +18,8 @@
*/
package net.minecraftforge.fml.common;
import net.minecraftforge.fml.common.EnhancedRuntimeException.WrappedPrintStream;
public class LoaderException extends EnhancedRuntimeException
{
@@ -34,6 +34,8 @@ import net.minecraftforge.fml.client.gui.GuiModsMissing;
import net.minecraftforge.fml.client.IDisplayableError;
import net.minecraftforge.fml.common.versioning.ArtifactVersion;
import net.minecraftforge.fml.common.EnhancedRuntimeException.WrappedPrintStream;
public class MissingModsException extends EnhancedRuntimeException implements IDisplayableError
{
private static final long serialVersionUID = 1L;
@@ -27,6 +27,8 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.client.IDisplayableError;
import net.minecraftforge.fml.client.gui.GuiMultipleModsErrored;
import net.minecraftforge.fml.common.EnhancedRuntimeException.WrappedPrintStream;
public class MultipleModsErrored extends EnhancedRuntimeException implements IDisplayableError
{
public final List<MissingModsException> missingModsExceptions;
@@ -159,4 +159,4 @@ public class ProgressManager
this.timeEachStep = true;
}
}
}
}
@@ -167,4 +167,4 @@ public class SoundEngineFixTransformer implements IClassTransformer
}
}
*/
*/
@@ -38,6 +38,6 @@ public class FMLServerStartingEvent extends ServerLifecycleEvent
}
public CommandDispatcher<CommandSource> getCommandDispatcher() {
return server.func_195571_aL().func_197054_a();
return server.getCommandManager().getDispatcher();
}
}
@@ -320,7 +320,7 @@ public class VillagerRegistry
public static void setRandomProfession(EntityVillager entity, Random rand)
{
entity.setProfession(INSTANCE.REGISTRY.getRandomObject(rand));
entity.setProfession(INSTANCE.REGISTRY.getRandom(rand));
}
@@ -333,8 +333,8 @@ public class VillagerRegistry
//Below this is INTERNAL USE ONLY DO NOT USE MODDERS
public static void onSetProfession(EntityVillager entity, int network)
{
VillagerProfession prof = INSTANCE.REGISTRY.getObjectById(network);
if (prof == null || INSTANCE.REGISTRY.getIDForObject(prof) != network)
VillagerProfession prof = INSTANCE.REGISTRY.get(network);
if (prof == null || INSTANCE.REGISTRY.getId(prof) != network)
{
throw new RuntimeException("Attempted to set villager profession to unregistered profession: " + network + " " + prof);
}
@@ -345,8 +345,8 @@ public class VillagerRegistry
public static void onSetProfession(EntityZombieVillager entity, int network)
{
VillagerProfession prof = INSTANCE.REGISTRY.getObjectById(network);
if (prof == null && network != -1 || INSTANCE.REGISTRY.getIDForObject(prof) != network)
VillagerProfession prof = INSTANCE.REGISTRY.get(network);
if (prof == null && network != -1 || INSTANCE.REGISTRY.getId(prof) != network)
{
throw new RuntimeException("Attempted to set villager profession to unregistered profession: " + network + " " + prof);
}
@@ -355,8 +355,8 @@ public class VillagerRegistry
entity.setForgeProfession(prof);
}
@Deprecated public static VillagerProfession getById(int network){ return INSTANCE.REGISTRY.getObjectById(network); }
@Deprecated public static int getId(@Nullable VillagerProfession prof){ return INSTANCE.REGISTRY.getIDForObject(prof); }
@Deprecated public static VillagerProfession getById(int network){ return INSTANCE.REGISTRY.get(network); }
@Deprecated public static int getId(@Nullable VillagerProfession prof){ return INSTANCE.REGISTRY.getId(prof); }
//TODO: Figure out a good generic system for this. Put on hold for Patches.
@@ -29,6 +29,8 @@ import net.minecraftforge.fml.client.IDisplayableError;
import net.minecraftforge.fml.client.gui.GuiSortingProblem;
import net.minecraftforge.fml.common.EnhancedRuntimeException;
import net.minecraftforge.fml.common.EnhancedRuntimeException.WrappedPrintStream;
public class ModSortingException extends EnhancedRuntimeException implements IDisplayableError
{
private static final long serialVersionUID = 1L;
@@ -33,6 +33,8 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
import com.google.common.base.Joiner;
/**
* Construct a version range from a specification.
*