v3.0.90

changelog.txt

@@ -1,3 +1,3 @@
-v3.0.89
+v3.0.90
 
-- Fixed Extended Entity Render of armor - DerToaster
+- Code clean up

gradle.properties

@@ -11,7 +11,7 @@ fabric_version=0.42.0+1.16
 
 
 # Mod Properties
-mod_version=3.0.89
+mod_version=3.0.90
 maven_group = software.bernie.geckolib
 archives_base_name = geckolib-fabric-1.16.5
 repsyUrl=https://repo.repsy.io/mvn/gandiber/geckolib

src/main/java/software/bernie/example/ClientListener.java

@@ -48,7 +48,6 @@
 
 public class ClientListener implements ClientModInitializer {
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public void onInitializeClient() {
 		if (FabricLoader.getInstance().isDevelopmentEnvironment() && !GeckoLibMod.DISABLE_IN_DEV) {
@@ -77,7 +76,6 @@ public void onInitializeClient() {
 	}
 
 	public static class EntityPacketOnClient {
-		@SuppressWarnings("resource")
 		@Environment(EnvType.CLIENT)
 		public static void onPacket(MinecraftClient context, PacketByteBuf byteBuf) {
 			EntityType<?> type = Registry.ENTITY_TYPE.get(byteBuf.readVarInt());

src/main/java/software/bernie/example/block/tile/BotariumTileEntity.java

@@ -17,7 +17,6 @@ public BotariumTileEntity() {
 		super(TileRegistry.BOTARIUM_TILE);
 	}
 
-	@SuppressWarnings("unchecked")
 	private <E extends BlockEntity & IAnimatable> PlayState predicate(AnimationEvent<E> event) {
 		event.getController().transitionLengthTicks = 0;
 		event.getController().setAnimation(new AnimationBuilder().addAnimation("Botarium.anim.deploy", true));

src/main/java/software/bernie/example/block/tile/FertilizerTileEntity.java

@@ -17,7 +17,6 @@ public FertilizerTileEntity() {
 		super(TileRegistry.FERTILIZER);
 	}
 
-	@SuppressWarnings("unchecked")
 	private <E extends BlockEntity & IAnimatable> PlayState predicate(AnimationEvent<E> event) {
 		event.getController().transitionLengthTicks = 0;
 		if (event.getAnimatable().getWorld().isRaining()) {

src/main/java/software/bernie/example/client/model/entity/ExampleEntityModel.java

@@ -24,7 +24,6 @@ public Identifier getTextureLocation(GeoExampleEntity entity) {
 		return new Identifier(GeckoLib.ModID, "textures/model/entity/bat.png");
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public void setLivingAnimations(GeoExampleEntity entity, Integer uniqueID, AnimationEvent customPredicate) {
 		super.setLivingAnimations(entity, uniqueID, customPredicate);

src/main/java/software/bernie/example/client/model/entity/ReplacedCreeperModel.java

@@ -4,7 +4,6 @@
 import software.bernie.geckolib3.GeckoLib;
 import software.bernie.geckolib3.model.AnimatedGeoModel;
 
-@SuppressWarnings("rawtypes")
 public class ReplacedCreeperModel extends AnimatedGeoModel {
 	@Override
 	public Identifier getModelLocation(Object object) {

src/main/java/software/bernie/example/client/renderer/entity/LERenderer.java

@@ -8,7 +8,6 @@
 
 public class LERenderer extends GeoEntityRenderer<LEEntity> {
 
-	@SuppressWarnings("unchecked")
 	public LERenderer(EntityRenderDispatcher renderDispatcher) {
 		super(renderDispatcher, new LEModel());
 		this.addLayer(new GeoExampleLayer(this));

src/main/java/software/bernie/example/client/renderer/entity/ReplacedCreeperRenderer.java

@@ -11,7 +11,6 @@
 
 public class ReplacedCreeperRenderer extends GeoReplacedEntityRenderer<ReplacedCreeperEntity> {
 
-	@SuppressWarnings("unchecked")
 	public ReplacedCreeperRenderer(EntityRenderDispatcher renderManager) {
 		super(renderManager, new ReplacedCreeperModel(), new ReplacedCreeperEntity());
 		GeoReplacedEntityRenderer.registerReplacedEntity(ReplacedCreeperEntity.class, this);

src/main/java/software/bernie/example/client/renderer/entity/layer/GeoExampleLayer.java

@@ -10,19 +10,16 @@
 import software.bernie.geckolib3.renderer.geo.GeoLayerRenderer;
 import software.bernie.geckolib3.renderer.geo.IGeoRenderer;
 
-@SuppressWarnings("rawtypes")
 public class GeoExampleLayer extends GeoLayerRenderer {
     // A resource location for the texture of the layer. This will be applied onto pre-existing cubes on the model
     private static final Identifier LAYER = new Identifier(GeckoLib.ModID, "textures/entity/le_glasses.png");
     // A resource location for the model of the entity. This model is put on top of the normal one, which is then given the texture
     private static final Identifier MODEL = new Identifier(GeckoLib.ModID, "geo/le.geo.json");
 
-    @SuppressWarnings("unchecked")
 	public GeoExampleLayer(IGeoRenderer<?> entityRendererIn) {
         super(entityRendererIn);
     }
 
-    @SuppressWarnings("unchecked")
 	@Override
     public void render(MatrixStack matrixStackIn, VertexConsumerProvider bufferIn, int packedLightIn, Entity entityLivingBaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
         RenderLayer cameo =  RenderLayer.getArmorCutoutNoCull(LAYER);

src/main/java/software/bernie/example/item/JackInTheBoxItem.java

@@ -41,7 +41,6 @@ private <P extends Item & IAnimatable> PlayState predicate(AnimationEvent<P> eve
 
 	@Override
 	public void registerControllers(AnimationData data) {
-		@SuppressWarnings({ "unchecked", "rawtypes" })
 		AnimationController<JackInTheBoxItem> controller = new AnimationController(this, controllerName, 20,
 				this::predicate);
 
@@ -54,7 +53,6 @@ public void registerControllers(AnimationData data) {
 		data.addAnimationController(controller);
 	}
 
-	@SuppressWarnings("resource")
 	private <ENTITY extends IAnimatable> void soundListener(SoundKeyframeEvent<ENTITY> event) {
 		// The animation for the jackinthebox has a sound keyframe at time 0:00.
 		// As soon as that keyframe gets hit this method fires and it starts playing the
@@ -85,13 +83,11 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
 		return super.use(world, user, hand);
 	}
 
-	@SuppressWarnings("resource")
 	@Override
 	public void onAnimationSync(int id, int state) {
 		if (state == ANIM_OPEN) {
 			// Always use GeckoLibUtil to get AnimationControllers when you don't have
 			// access to an AnimationEvent
-			@SuppressWarnings("rawtypes")
 			final AnimationController controller = GeckoLibUtil.getControllerForID(this.factory, id, controllerName);
 
 			if (controller.getAnimationState() == AnimationState.Stopped) {

src/main/java/software/bernie/example/item/PistolItem.java

@@ -98,7 +98,6 @@ public <P extends Item & IAnimatable> PlayState predicate(AnimationEvent<P> even
 		return PlayState.CONTINUE;
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void registerControllers(AnimationData data) {
 		data.addAnimationController(new AnimationController(this, controllerName, 1, this::predicate));

src/main/java/software/bernie/example/item/PotatoArmorItem.java

@@ -63,7 +63,6 @@ private <P extends IAnimatable> PlayState predicate(AnimationEvent<P> event) {
 
 	// All you need to do here is add your animation controllers to the
 	// AnimationData
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public void registerControllers(AnimationData data) {
 		data.addAnimationController(new AnimationController(this, "controller", 20, this::predicate));

src/main/java/software/bernie/example/registry/EntityRegistryBuilder.java

@@ -77,7 +77,6 @@ public EntityRegistryBuilder<E> dimensions(EntityDimensions size) {
 		return this;
 	}
 
-	@SuppressWarnings("deprecation")
 	public EntityType<E> build() {
 		EntityType.Builder<E> entityBuilder = EntityType.Builder.create(this.entityFactory, this.category)
 				.setDimensions(this.dimensions.width, this.dimensions.height);
@@ -86,7 +85,8 @@ public EntityType<E> build() {
 		}
 		if (this.alwaysUpdateVelocity && this.updateIntervalTicks != 0 & this.trackingDistance != 0) {
 			FabricEntityTypeBuilder.create(this.category, this.entityFactory).dimensions(this.dimensions)
-					.trackable(this.trackingDistance, this.updateIntervalTicks, this.alwaysUpdateVelocity).build();
+					.trackedUpdateRate(updateIntervalTicks).trackRangeBlocks(trackingDistance)
+					.forceTrackedVelocityUpdates(alwaysUpdateVelocity).build();
 		}
 
 		EntityType<E> entityType = Registry.register(Registry.ENTITY_TYPE, name, entityBuilder.build(name.getPath()));

src/main/java/software/bernie/geckolib3/compat/PatchouliCompat.java

@@ -10,7 +10,6 @@
 
 public class PatchouliCompat {
 
-	@SuppressWarnings("resource")
 	public static void patchouliLoaded(MatrixStack matrixStackIn) {
 		Class<GuiBook> patchouli = GuiBook.class;
 		boolean screen = MinecraftClient.getInstance().inGameHud.equals(patchouli);

src/main/java/software/bernie/geckolib3/file/AnimationFileLoader.java

@@ -48,7 +48,6 @@ private JsonObject loadFile(Identifier location, ResourceManager manager) {
 		return JsonHelper.deserialize(GSON, content, JsonObject.class);
 	}
 
-	@SuppressWarnings("deprecation")
 	public static String getResourceAsString(Identifier location, ResourceManager manager) {
 		try (InputStream inputStream = manager.getResource(location).getInputStream()) {
 			return IOUtils.toString(inputStream);

src/main/java/software/bernie/geckolib3/item/GeoArmorItem.java

@@ -17,15 +17,13 @@ public GeoArmorItem(ArmorMaterial materialIn, EquipmentSlot slot, Settings build
 		super(materialIn, slot, builder);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Environment(EnvType.CLIENT)
 	public BipedEntityModel<LivingEntity> getArmorModel(LivingEntity entityLiving, ItemStack itemStack,
 			EquipmentSlot armorSlot, BipedEntityModel<LivingEntity> _default) {
 		return GeoArmorRenderer.getRenderer(this.getClass()).applyEntityStats(_default).applySlot(armorSlot)
 				.setCurrentItem(entityLiving, itemStack, armorSlot, _default);
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public Identifier getArmorTexture(LivingEntity entity, ItemStack stack, EquipmentSlot slot,
 			Identifier defaultTexture) {

src/main/java/software/bernie/geckolib3/mixins/fabric/MixinArmorFeatureRenderer.java

@@ -1,5 +1,18 @@
 package software.bernie.geckolib3.mixins.fabric;
 
+import java.util.Map;
+import java.util.Objects;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.render.VertexConsumerProvider;
@@ -13,21 +26,8 @@
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 import software.bernie.geckolib3.ArmorRenderingRegistryImpl;
 
-import java.util.Map;
-import java.util.Objects;
-
-@SuppressWarnings({ "rawtypes", "unchecked" })
 @Mixin({ ArmorFeatureRenderer.class })
 @Environment(EnvType.CLIENT)
 public abstract class MixinArmorFeatureRenderer extends FeatureRenderer {

src/main/java/software/bernie/geckolib3/model/AnimatedGeoModel.java

@@ -27,7 +27,6 @@
 import software.bernie.geckolib3.util.AnimationTicker;
 import software.bernie.geckolib3.util.MolangUtils;
 
-@SuppressWarnings({ "rawtypes", "unchecked" })
 public abstract class AnimatedGeoModel<T extends IAnimatable> extends GeoModelProvider<T>
 		implements IAnimatableModel<T>, IAnimatableModelProvider<T> {
 	private final AnimationProcessor animationProcessor;
@@ -61,7 +60,8 @@ public void setLivingAnimations(T entity, Integer uniqueID, AnimationEvent custo
 
 		AnimationEvent<T> predicate;
 		if (customPredicate == null) {
-			predicate = new AnimationEvent<T>(entity, 0, 0, (float) (manager.tick - lastGameTickTime), false, Collections.emptyList());
+			predicate = new AnimationEvent<T>(entity, 0, 0, (float) (manager.tick - lastGameTickTime), false,
+					Collections.emptyList());
 		} else {
 			predicate = customPredicate;
 		}

src/main/java/software/bernie/geckolib3/model/AnimatedTickingGeoModel.java

@@ -11,7 +11,6 @@
 import software.bernie.geckolib3.core.manager.AnimationData;
 import software.bernie.geckolib3.resource.GeckoLibCache;
 
-@SuppressWarnings({ "rawtypes", "unchecked" })
 public abstract class AnimatedTickingGeoModel<T extends IAnimatable & IAnimationTickable> extends AnimatedGeoModel<T> {
 	public AnimatedTickingGeoModel() {
 	}

src/main/java/software/bernie/geckolib3/renderer/geo/ExtendedGeoEntityRenderer.java

@@ -233,7 +233,6 @@ protected void moveAndRotateMatrixToMatchBone(MatrixStack stack, GeoBone bone) {
 		stack.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(bone.getRotationZ()));
 	}
 
-	@SuppressWarnings("unchecked")
 	protected void handleArmorRenderingForBone(GeoBone bone, MatrixStack stack, VertexConsumer bufferIn,
 			int packedLightIn, int packedOverlayIn, Identifier currentTexture) {
 		final ItemStack armorForBone = this.getArmorForBone(bone.getName(), currentEntityBeingRendered);

src/main/java/software/bernie/geckolib3/renderer/geo/GeoArmorRenderer.java

@@ -27,7 +27,6 @@
 import software.bernie.geckolib3.model.AnimatedGeoModel;
 import software.bernie.geckolib3.util.GeoUtils;
 
-@SuppressWarnings({ "rawtypes", "unchecked" })
 public abstract class GeoArmorRenderer<T extends ArmorItem & IAnimatable> extends BipedEntityModel
 		implements IGeoRenderer<T> {
 	private static final Map<Class<? extends ArmorItem>, GeoArmorRenderer> renderers = new ConcurrentHashMap<>();

src/main/java/software/bernie/geckolib3/renderer/geo/GeoBlockRenderer.java

@@ -20,7 +20,7 @@
 import software.bernie.geckolib3.core.util.Color;
 import software.bernie.geckolib3.geo.render.built.GeoModel;
 import software.bernie.geckolib3.model.AnimatedGeoModel;
-@SuppressWarnings({ "rawtypes", "unchecked" })
+
 public abstract class GeoBlockRenderer<T extends BlockEntity & IAnimatable> extends BlockEntityRenderer
 		implements IGeoRenderer<T> {
 	static {

src/main/java/software/bernie/geckolib3/renderer/geo/GeoEntityRenderer.java

@@ -50,7 +50,6 @@
 import software.bernie.geckolib3.util.AnimationUtils;
 import software.bernie.geckolib3.util.RenderUtils;
 
-@SuppressWarnings({ "unchecked" })
 public abstract class GeoEntityRenderer<T extends LivingEntity & IAnimatable> extends EntityRenderer<T>
 		implements IGeoRenderer<T> {
 	static {
@@ -99,7 +98,6 @@ private static float getFacingAngle(Direction facingIn) {
 		}
 	}
 
-	@SuppressWarnings("resource")
 	@Override
 	public void render(T entity, float entityYaw, float partialTicks, MatrixStack stack,
 			VertexConsumerProvider bufferIn, int packedLightIn) {

src/main/java/software/bernie/geckolib3/renderer/geo/GeoItemRenderer.java

@@ -21,7 +21,7 @@
 import software.bernie.geckolib3.geo.render.built.GeoModel;
 import software.bernie.geckolib3.model.AnimatedGeoModel;
 import software.bernie.geckolib3.util.GeckoLibUtil;
-@SuppressWarnings({ "rawtypes", "unchecked" })
+
 public class GeoItemRenderer<T extends Item & IAnimatable>
 		implements IGeoRenderer<T>, BuiltinItemRendererRegistry.DynamicItemRenderer {
 	private static final Map<Class<? extends Item>, GeoItemRenderer> renderers = new ConcurrentHashMap<>();

src/main/java/software/bernie/geckolib3/renderer/geo/GeoLayerRenderer.java

@@ -42,7 +42,6 @@ public RenderLayer getRenderType(Identifier textureLocation) {
 		return RenderLayer.getEntityCutout(textureLocation);
 	}
 
-	@SuppressWarnings("unchecked")
 	public GeoModelProvider<T> getEntityModel() {
 		return this.entityRenderer.getGeoModelProvider();
 	}

src/main/java/software/bernie/geckolib3/renderer/geo/GeoProjectilesRenderer.java

@@ -24,7 +24,6 @@
 import software.bernie.geckolib3.model.provider.data.EntityModelData;
 import software.bernie.geckolib3.util.AnimationUtils;
 
-@SuppressWarnings({ "unchecked" })
 public class GeoProjectilesRenderer<T extends Entity & IAnimatable> extends EntityRenderer<T>
 		implements IGeoRenderer<T> {
 

src/main/java/software/bernie/geckolib3/renderer/geo/GeoReplacedEntityRenderer.java

@@ -43,7 +43,6 @@
 import software.bernie.geckolib3.model.AnimatedGeoModel;
 import software.bernie.geckolib3.model.provider.data.EntityModelData;
 
-@SuppressWarnings({ "rawtypes", "unchecked" })
 public abstract class GeoReplacedEntityRenderer<T extends IAnimatable> extends EntityRenderer implements IGeoRenderer {
 	private final AnimatedGeoModel<IAnimatable> modelProvider;
 	private final T animatable;
@@ -80,7 +79,6 @@ public void render(Entity entityIn, float entityYaw, float partialTicks, MatrixS
 		this.render(entityIn, this.animatable, entityYaw, partialTicks, matrixStackIn, bufferIn, packedLightIn);
 	}
 
-	@SuppressWarnings("resource")
 	public void render(Entity entity, IAnimatable animatable, float entityYaw, float partialTicks, MatrixStack stack,
 			VertexConsumerProvider bufferIn, int packedLightIn) {
 		this.currentAnimatable = animatable;

src/main/java/software/bernie/geckolib3/renderer/geo/IGeoRenderer.java

@@ -100,7 +100,6 @@ default void renderCube(GeoCube cube, MatrixStack stack, VertexConsumer bufferIn
 		}
 	}
 
-	@SuppressWarnings("rawtypes")
 	GeoModelProvider getGeoModelProvider();
 
 	Identifier getTextureLocation(T instance);

src/main/java/software/bernie/geckolib3/util/AnimationUtils.java

@@ -24,13 +24,11 @@ public static double convertSecondsToTicks(double seconds) {
 	/**
 	 * Gets the renderer for an entity
 	 */
-	@SuppressWarnings("unchecked")
 	public static <T extends Entity> EntityRenderer<T> getRenderer(T entity) {
 		EntityRenderDispatcher renderManager = MinecraftClient.getInstance().getEntityRenderDispatcher();
 		return (EntityRenderer<T>) renderManager.getRenderer(entity);
 	}
 
-	@SuppressWarnings("rawtypes")
 	public static <T extends Entity> GeoModelProvider getGeoModelForEntity(T entity) {
 		EntityRenderer<T> entityRenderer = getRenderer(entity);
 

src/main/java/software/bernie/geckolib3/util/GeckoLibUtil.java

@@ -72,13 +72,11 @@ public static boolean stackHasIDTag(ItemStack stack) {
 		return stack.hasTag() && stack.getTag().contains(GECKO_LIB_ID_NBT, 3);
 	}
 
-	@SuppressWarnings("rawtypes")
 	public static AnimationController getControllerForStack(AnimationFactory factory, ItemStack stack,
 			String controllerName) {
 		return getControllerForID(factory, getIDFromStack(stack), controllerName);
 	}
 
-	@SuppressWarnings("rawtypes")
 	public static AnimationController getControllerForID(AnimationFactory factory, Integer id, String controllerName) {
 		return factory.getOrCreateAnimationData(id).getAnimationControllers().get(controllerName);
 	}