Porting Forge rendering code to 1.13 (#5132)

This commit is contained in:
tterrag authored and LexManos committed 2018-09-08 13:34:59 -07:00
1 parent eac693e785
commit dde7dccef1
57 files changed
+1186 -775

No files matched your search

@@ -98,7 +98,7 @@ public final class TRSRTransformation implements IModelState, ITransformation
@OnlyIn(Dist.CLIENT)
public static TRSRTransformation from(ItemTransformVec3f transform)
{
return transform.equals(ItemTransformVec3f.DEFAULT) ? identity : new TRSRTransformation(transform);
return transform.equals(ItemTransformVec3f.DEFAULT) ? identity : new TRSRTransformation(toVecmath(transform.translation), quatFromXYZDegrees(toVecmath(transform.rotation)), toVecmath(transform.scale), null);
}
@OnlyIn(Dist.CLIENT)
@@ -711,6 +711,10 @@ public final class TRSRTransformation implements IModelState, ITransformation
m.func_195885_a(0, 3), m.func_195885_a(1, 3), m.func_195885_a(2, 3), m.func_195885_a(3, 3));
}
public static Quat4f toVecmath(net.minecraft.client.renderer.Quaternion q)
{
return new Quat4f(q.func_195889_a(), q.func_195891_b(), q.func_195893_c(), q.func_195894_d());
}
@OnlyIn(Dist.CLIENT)
public static net.minecraft.client.renderer.Vector3f toMojang(Vector3f vec)
@@ -218,13 +218,13 @@ public final class AnimationStateMachine implements IAnimationStateMachine
@OnlyIn(Dist.CLIENT)
public static IAnimationStateMachine load(IResourceManager manager, ResourceLocation location, ImmutableMap<String, ITimeValue> customParameters)
{
try (IResource resource = manager.getResource(location))
try (IResource resource = manager.func_199002_a(location))
{
ClipResolver clipResolver = new ClipResolver();
ParameterResolver parameterResolver = new ParameterResolver(customParameters);
Clips.CommonClipTypeAdapterFactory.INSTANCE.setClipResolver(clipResolver);
TimeValues.CommonTimeValueTypeAdapterFactory.INSTANCE.setValueResolver(parameterResolver);
AnimationStateMachine asm = asmGson.fromJson(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8), AnimationStateMachine.class);
AnimationStateMachine asm = asmGson.fromJson(new InputStreamReader(resource.func_199027_b(), StandardCharsets.UTF_8), AnimationStateMachine.class);
clipResolver.asm = asm;
parameterResolver.asm = asm;
asm.initialize();
@@ -19,14 +19,13 @@
package net.minecraftforge.common.model.animation;
import java.util.concurrent.Callable;
import net.minecraft.nbt.INBTBase;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.capabilities.OptionalCapabilityInstance;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -60,15 +59,9 @@ public class CapabilityAnimation
this.asm = asm;
}
@Override
public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing)
{
return capability == ANIMATION_CAPABILITY;
}
@Override
@Nullable
public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing)
public <T> OptionalCapabilityInstance<T> getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing)
{
if(capability == ANIMATION_CAPABILITY)
{
@@ -21,6 +21,7 @@ package net.minecraftforge.common.model.animation;
import java.io.IOException;
import net.minecraft.client.renderer.block.model.IUnbakedModel;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.MathHelper;
@@ -33,11 +34,12 @@ import net.minecraftforge.common.animation.ITimeValue;
import net.minecraftforge.common.model.IModelPart;
import net.minecraftforge.common.model.IModelState;
import net.minecraftforge.common.model.TRSRTransformation;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.api.distmarker.Dist;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.function.Function;
import com.google.common.base.Objects;
@@ -59,6 +61,8 @@ import javax.annotation.Nullable;
*/
public final class Clips
{
private static final Logger LOGGER = LogManager.getLogger();
/**
* Clip that does nothing.
*/
@@ -91,13 +95,13 @@ public final class Clips
@OnlyIn(Dist.CLIENT)
public static IClip getModelClipNode(ResourceLocation modelLocation, String clipName)
{
IModel model = ModelLoaderRegistry.getModelOrMissing(modelLocation);
IUnbakedModel model = ModelLoaderRegistry.getModelOrMissing(modelLocation);
Optional<? extends IClip> clip = model.getClip(clipName);
if (clip.isPresent())
{
return new ModelClip(clip.get(), modelLocation, clipName);
}
FMLLog.log.error("Unable to find clip {} in the model {}", clipName, modelLocation);
LOGGER.error("Unable to find clip {} in the model {}", clipName, modelLocation);
// FIXME: missing clip?
return new ModelClip(IdentityClip.INSTANCE, modelLocation, clipName);
}