From 5e48243783bd584763b8f8ec319d136a2f47e011 Mon Sep 17 00:00:00 2001 From: AzureZhen <7415711+AzureDoom@users.noreply.github.com> Date: Mon, 5 Sep 2022 14:11:37 -0400 Subject: [PATCH] v3.0.90 --- changelog.txt | 4 +-- core | 2 +- gradle.properties | 2 +- .../bernie/example/ClientListener.java | 2 -- .../block/tile/BotariumTileEntity.java | 1 - .../block/tile/FertilizerTileEntity.java | 1 - .../model/entity/ExampleEntityModel.java | 1 - .../model/entity/ReplacedCreeperModel.java | 1 - .../client/renderer/entity/LERenderer.java | 1 - .../entity/ReplacedCreeperRenderer.java | 1 - .../entity/layer/GeoExampleLayer.java | 3 --- .../bernie/example/item/JackInTheBoxItem.java | 4 --- .../bernie/example/item/PistolItem.java | 1 - .../bernie/example/item/PotatoArmorItem.java | 1 - .../registry/EntityRegistryBuilder.java | 4 +-- .../geckolib3/compat/PatchouliCompat.java | 1 - .../geckolib3/file/AnimationFileLoader.java | 1 - .../bernie/geckolib3/item/GeoArmorItem.java | 2 -- .../fabric/MixinArmorFeatureRenderer.java | 26 +++++++++---------- .../geckolib3/model/AnimatedGeoModel.java | 4 +-- .../model/AnimatedTickingGeoModel.java | 1 - .../geo/ExtendedGeoEntityRenderer.java | 1 - .../renderer/geo/GeoArmorRenderer.java | 1 - .../renderer/geo/GeoBlockRenderer.java | 2 +- .../renderer/geo/GeoEntityRenderer.java | 2 -- .../renderer/geo/GeoItemRenderer.java | 2 +- .../renderer/geo/GeoLayerRenderer.java | 1 - .../renderer/geo/GeoProjectilesRenderer.java | 1 - .../geo/GeoReplacedEntityRenderer.java | 2 -- .../geckolib3/renderer/geo/IGeoRenderer.java | 1 - .../bernie/geckolib3/util/AnimationUtils.java | 2 -- .../bernie/geckolib3/util/GeckoLibUtil.java | 2 -- .../util/json/JsonAnimationUtils.java | 6 ----- .../util/json/JsonKeyFrameUtils.java | 2 -- 34 files changed, 23 insertions(+), 66 deletions(-) diff --git a/changelog.txt b/changelog.txt index 7afcd950d..23ee989ca 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,3 @@ -v3.0.89 +v3.0.90 -- Fixed Extended Entity Render of armor - DerToaster \ No newline at end of file +- Code clean up \ No newline at end of file diff --git a/core b/core index 18004fb80..a37122fe2 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 18004fb80514fbc8859cd7fde37b030cbae94227 +Subproject commit a37122fe23868aba1aabbea01744bf47f85af796 diff --git a/gradle.properties b/gradle.properties index c0a3b0a5f..c41b24ff1 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/software/bernie/example/ClientListener.java b/src/main/java/software/bernie/example/ClientListener.java index b2f59219b..cc3d407c5 100644 --- a/src/main/java/software/bernie/example/ClientListener.java +++ b/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()); diff --git a/src/main/java/software/bernie/example/block/tile/BotariumTileEntity.java b/src/main/java/software/bernie/example/block/tile/BotariumTileEntity.java index 412a24587..2f727bdcd 100644 --- a/src/main/java/software/bernie/example/block/tile/BotariumTileEntity.java +++ b/src/main/java/software/bernie/example/block/tile/BotariumTileEntity.java @@ -17,7 +17,6 @@ public BotariumTileEntity() { super(TileRegistry.BOTARIUM_TILE); } - @SuppressWarnings("unchecked") private PlayState predicate(AnimationEvent event) { event.getController().transitionLengthTicks = 0; event.getController().setAnimation(new AnimationBuilder().addAnimation("Botarium.anim.deploy", true)); diff --git a/src/main/java/software/bernie/example/block/tile/FertilizerTileEntity.java b/src/main/java/software/bernie/example/block/tile/FertilizerTileEntity.java index 329d4576b..3c883cc5d 100644 --- a/src/main/java/software/bernie/example/block/tile/FertilizerTileEntity.java +++ b/src/main/java/software/bernie/example/block/tile/FertilizerTileEntity.java @@ -17,7 +17,6 @@ public FertilizerTileEntity() { super(TileRegistry.FERTILIZER); } - @SuppressWarnings("unchecked") private PlayState predicate(AnimationEvent event) { event.getController().transitionLengthTicks = 0; if (event.getAnimatable().getWorld().isRaining()) { diff --git a/src/main/java/software/bernie/example/client/model/entity/ExampleEntityModel.java b/src/main/java/software/bernie/example/client/model/entity/ExampleEntityModel.java index 9ab44bf23..cc3f211bf 100644 --- a/src/main/java/software/bernie/example/client/model/entity/ExampleEntityModel.java +++ b/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); diff --git a/src/main/java/software/bernie/example/client/model/entity/ReplacedCreeperModel.java b/src/main/java/software/bernie/example/client/model/entity/ReplacedCreeperModel.java index 9d8fba69c..cd4fe4a6a 100644 --- a/src/main/java/software/bernie/example/client/model/entity/ReplacedCreeperModel.java +++ b/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) { diff --git a/src/main/java/software/bernie/example/client/renderer/entity/LERenderer.java b/src/main/java/software/bernie/example/client/renderer/entity/LERenderer.java index 8769d9c9f..83ee7444e 100644 --- a/src/main/java/software/bernie/example/client/renderer/entity/LERenderer.java +++ b/src/main/java/software/bernie/example/client/renderer/entity/LERenderer.java @@ -8,7 +8,6 @@ public class LERenderer extends GeoEntityRenderer { - @SuppressWarnings("unchecked") public LERenderer(EntityRenderDispatcher renderDispatcher) { super(renderDispatcher, new LEModel()); this.addLayer(new GeoExampleLayer(this)); diff --git a/src/main/java/software/bernie/example/client/renderer/entity/ReplacedCreeperRenderer.java b/src/main/java/software/bernie/example/client/renderer/entity/ReplacedCreeperRenderer.java index b566a703c..50c4adc70 100644 --- a/src/main/java/software/bernie/example/client/renderer/entity/ReplacedCreeperRenderer.java +++ b/src/main/java/software/bernie/example/client/renderer/entity/ReplacedCreeperRenderer.java @@ -11,7 +11,6 @@ public class ReplacedCreeperRenderer extends GeoReplacedEntityRenderer { - @SuppressWarnings("unchecked") public ReplacedCreeperRenderer(EntityRenderDispatcher renderManager) { super(renderManager, new ReplacedCreeperModel(), new ReplacedCreeperEntity()); GeoReplacedEntityRenderer.registerReplacedEntity(ReplacedCreeperEntity.class, this); diff --git a/src/main/java/software/bernie/example/client/renderer/entity/layer/GeoExampleLayer.java b/src/main/java/software/bernie/example/client/renderer/entity/layer/GeoExampleLayer.java index 93e4246d5..7576c061d 100644 --- a/src/main/java/software/bernie/example/client/renderer/entity/layer/GeoExampleLayer.java +++ b/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); diff --git a/src/main/java/software/bernie/example/item/JackInTheBoxItem.java b/src/main/java/software/bernie/example/item/JackInTheBoxItem.java index 93fc1cedb..e9bb86421 100644 --- a/src/main/java/software/bernie/example/item/JackInTheBoxItem.java +++ b/src/main/java/software/bernie/example/item/JackInTheBoxItem.java @@ -41,7 +41,6 @@ private

PlayState predicate(AnimationEvent

eve @Override public void registerControllers(AnimationData data) { - @SuppressWarnings({ "unchecked", "rawtypes" }) AnimationController controller = new AnimationController(this, controllerName, 20, this::predicate); @@ -54,7 +53,6 @@ public void registerControllers(AnimationData data) { data.addAnimationController(controller); } - @SuppressWarnings("resource") private void soundListener(SoundKeyframeEvent 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 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) { diff --git a/src/main/java/software/bernie/example/item/PistolItem.java b/src/main/java/software/bernie/example/item/PistolItem.java index 5dfeb92b9..537066fc7 100644 --- a/src/main/java/software/bernie/example/item/PistolItem.java +++ b/src/main/java/software/bernie/example/item/PistolItem.java @@ -98,7 +98,6 @@ public

PlayState predicate(AnimationEvent

even return PlayState.CONTINUE; } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void registerControllers(AnimationData data) { data.addAnimationController(new AnimationController(this, controllerName, 1, this::predicate)); diff --git a/src/main/java/software/bernie/example/item/PotatoArmorItem.java b/src/main/java/software/bernie/example/item/PotatoArmorItem.java index 4864ad72e..fc063bc00 100644 --- a/src/main/java/software/bernie/example/item/PotatoArmorItem.java +++ b/src/main/java/software/bernie/example/item/PotatoArmorItem.java @@ -63,7 +63,6 @@ private

PlayState predicate(AnimationEvent

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)); diff --git a/src/main/java/software/bernie/example/registry/EntityRegistryBuilder.java b/src/main/java/software/bernie/example/registry/EntityRegistryBuilder.java index f02ff4012..dcdf1d46e 100644 --- a/src/main/java/software/bernie/example/registry/EntityRegistryBuilder.java +++ b/src/main/java/software/bernie/example/registry/EntityRegistryBuilder.java @@ -77,7 +77,6 @@ public EntityRegistryBuilder dimensions(EntityDimensions size) { return this; } - @SuppressWarnings("deprecation") public EntityType build() { EntityType.Builder entityBuilder = EntityType.Builder.create(this.entityFactory, this.category) .setDimensions(this.dimensions.width, this.dimensions.height); @@ -86,7 +85,8 @@ public EntityType 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 entityType = Registry.register(Registry.ENTITY_TYPE, name, entityBuilder.build(name.getPath())); diff --git a/src/main/java/software/bernie/geckolib3/compat/PatchouliCompat.java b/src/main/java/software/bernie/geckolib3/compat/PatchouliCompat.java index 70f6a9ff1..0d6e5c8bd 100644 --- a/src/main/java/software/bernie/geckolib3/compat/PatchouliCompat.java +++ b/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 patchouli = GuiBook.class; boolean screen = MinecraftClient.getInstance().inGameHud.equals(patchouli); diff --git a/src/main/java/software/bernie/geckolib3/file/AnimationFileLoader.java b/src/main/java/software/bernie/geckolib3/file/AnimationFileLoader.java index 853138620..3e72e348c 100644 --- a/src/main/java/software/bernie/geckolib3/file/AnimationFileLoader.java +++ b/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); diff --git a/src/main/java/software/bernie/geckolib3/item/GeoArmorItem.java b/src/main/java/software/bernie/geckolib3/item/GeoArmorItem.java index aa4a8f884..30157ee64 100644 --- a/src/main/java/software/bernie/geckolib3/item/GeoArmorItem.java +++ b/src/main/java/software/bernie/geckolib3/item/GeoArmorItem.java @@ -17,7 +17,6 @@ public GeoArmorItem(ArmorMaterial materialIn, EquipmentSlot slot, Settings build super(materialIn, slot, builder); } - @SuppressWarnings("unchecked") @Environment(EnvType.CLIENT) public BipedEntityModel getArmorModel(LivingEntity entityLiving, ItemStack itemStack, EquipmentSlot armorSlot, BipedEntityModel _default) { @@ -25,7 +24,6 @@ public BipedEntityModel getArmorModel(LivingEntity entityLiving, I .setCurrentItem(entityLiving, itemStack, armorSlot, _default); } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public Identifier getArmorTexture(LivingEntity entity, ItemStack stack, EquipmentSlot slot, Identifier defaultTexture) { diff --git a/src/main/java/software/bernie/geckolib3/mixins/fabric/MixinArmorFeatureRenderer.java b/src/main/java/software/bernie/geckolib3/mixins/fabric/MixinArmorFeatureRenderer.java index eb4849b41..dc53c953b 100644 --- a/src/main/java/software/bernie/geckolib3/mixins/fabric/MixinArmorFeatureRenderer.java +++ b/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 { diff --git a/src/main/java/software/bernie/geckolib3/model/AnimatedGeoModel.java b/src/main/java/software/bernie/geckolib3/model/AnimatedGeoModel.java index 62df59710..39ed1a9e7 100644 --- a/src/main/java/software/bernie/geckolib3/model/AnimatedGeoModel.java +++ b/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 extends GeoModelProvider implements IAnimatableModel, IAnimatableModelProvider { private final AnimationProcessor animationProcessor; @@ -61,7 +60,8 @@ public void setLivingAnimations(T entity, Integer uniqueID, AnimationEvent custo AnimationEvent predicate; if (customPredicate == null) { - predicate = new AnimationEvent(entity, 0, 0, (float) (manager.tick - lastGameTickTime), false, Collections.emptyList()); + predicate = new AnimationEvent(entity, 0, 0, (float) (manager.tick - lastGameTickTime), false, + Collections.emptyList()); } else { predicate = customPredicate; } diff --git a/src/main/java/software/bernie/geckolib3/model/AnimatedTickingGeoModel.java b/src/main/java/software/bernie/geckolib3/model/AnimatedTickingGeoModel.java index f6898055d..8c6b7f79b 100644 --- a/src/main/java/software/bernie/geckolib3/model/AnimatedTickingGeoModel.java +++ b/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 extends AnimatedGeoModel { public AnimatedTickingGeoModel() { } diff --git a/src/main/java/software/bernie/geckolib3/renderer/geo/ExtendedGeoEntityRenderer.java b/src/main/java/software/bernie/geckolib3/renderer/geo/ExtendedGeoEntityRenderer.java index 0687f3f76..20c49c492 100644 --- a/src/main/java/software/bernie/geckolib3/renderer/geo/ExtendedGeoEntityRenderer.java +++ b/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); diff --git a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoArmorRenderer.java b/src/main/java/software/bernie/geckolib3/renderer/geo/GeoArmorRenderer.java index bd8fdd2ba..b00bf2365 100644 --- a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoArmorRenderer.java +++ b/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 extends BipedEntityModel implements IGeoRenderer { private static final Map, GeoArmorRenderer> renderers = new ConcurrentHashMap<>(); diff --git a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoBlockRenderer.java b/src/main/java/software/bernie/geckolib3/renderer/geo/GeoBlockRenderer.java index 633164d53..ed096588a 100644 --- a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoBlockRenderer.java +++ b/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 extends BlockEntityRenderer implements IGeoRenderer { static { diff --git a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoEntityRenderer.java b/src/main/java/software/bernie/geckolib3/renderer/geo/GeoEntityRenderer.java index f9837830a..5f6f49937 100644 --- a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoEntityRenderer.java +++ b/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 extends EntityRenderer implements IGeoRenderer { 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) { diff --git a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoItemRenderer.java b/src/main/java/software/bernie/geckolib3/renderer/geo/GeoItemRenderer.java index 5cfb28c75..e8054ebf6 100644 --- a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoItemRenderer.java +++ b/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 implements IGeoRenderer, BuiltinItemRendererRegistry.DynamicItemRenderer { private static final Map, GeoItemRenderer> renderers = new ConcurrentHashMap<>(); diff --git a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoLayerRenderer.java b/src/main/java/software/bernie/geckolib3/renderer/geo/GeoLayerRenderer.java index c4c0b92a9..43fef9355 100644 --- a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoLayerRenderer.java +++ b/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 getEntityModel() { return this.entityRenderer.getGeoModelProvider(); } diff --git a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoProjectilesRenderer.java b/src/main/java/software/bernie/geckolib3/renderer/geo/GeoProjectilesRenderer.java index b96044d63..4aed0e09d 100644 --- a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoProjectilesRenderer.java +++ b/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 extends EntityRenderer implements IGeoRenderer { diff --git a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoReplacedEntityRenderer.java b/src/main/java/software/bernie/geckolib3/renderer/geo/GeoReplacedEntityRenderer.java index b65245cc1..f0de9318e 100644 --- a/src/main/java/software/bernie/geckolib3/renderer/geo/GeoReplacedEntityRenderer.java +++ b/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 extends EntityRenderer implements IGeoRenderer { private final AnimatedGeoModel 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; diff --git a/src/main/java/software/bernie/geckolib3/renderer/geo/IGeoRenderer.java b/src/main/java/software/bernie/geckolib3/renderer/geo/IGeoRenderer.java index e6ffb6ae1..8ec657794 100644 --- a/src/main/java/software/bernie/geckolib3/renderer/geo/IGeoRenderer.java +++ b/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); diff --git a/src/main/java/software/bernie/geckolib3/util/AnimationUtils.java b/src/main/java/software/bernie/geckolib3/util/AnimationUtils.java index cbcd43616..127219062 100644 --- a/src/main/java/software/bernie/geckolib3/util/AnimationUtils.java +++ b/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 EntityRenderer getRenderer(T entity) { EntityRenderDispatcher renderManager = MinecraftClient.getInstance().getEntityRenderDispatcher(); return (EntityRenderer) renderManager.getRenderer(entity); } - @SuppressWarnings("rawtypes") public static GeoModelProvider getGeoModelForEntity(T entity) { EntityRenderer entityRenderer = getRenderer(entity); diff --git a/src/main/java/software/bernie/geckolib3/util/GeckoLibUtil.java b/src/main/java/software/bernie/geckolib3/util/GeckoLibUtil.java index e13f2e380..abb9fc75e 100644 --- a/src/main/java/software/bernie/geckolib3/util/GeckoLibUtil.java +++ b/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); } diff --git a/src/main/java/software/bernie/geckolib3/util/json/JsonAnimationUtils.java b/src/main/java/software/bernie/geckolib3/util/json/JsonAnimationUtils.java index 7a041871e..dd9271a00 100644 --- a/src/main/java/software/bernie/geckolib3/util/json/JsonAnimationUtils.java +++ b/src/main/java/software/bernie/geckolib3/util/json/JsonAnimationUtils.java @@ -67,7 +67,6 @@ public static List> getBones(JsonObject json) { * sure why the format stores the times as a string) and the JsonElement * is the object, which has all the rotation keyframes. */ - @SuppressWarnings({ "unchecked", "rawtypes" }) public static Set> getRotationKeyFrames(JsonObject json) { JsonElement rotationObject = json.get("rotation"); if (rotationObject.isJsonArray()) { @@ -90,7 +89,6 @@ public static Set> getRotationKeyFrames(JsonObjec * sure why the format stores the times as a string) and the JsonElement * is the object, which has all the position keyframes. */ - @SuppressWarnings({ "unchecked", "rawtypes" }) public static Set> getPositionKeyFrames(JsonObject json) { JsonElement positionObject = json.get("position"); if (positionObject.isJsonArray()) { @@ -113,7 +111,6 @@ public static Set> getPositionKeyFrames(JsonObjec * sure why the format stores the times as a string) and the JsonElement * is the object, which has all the scale keyframes. */ - @SuppressWarnings({ "unchecked", "rawtypes" }) public static Set> getScaleKeyFrames(JsonObject json) { JsonElement scaleObject = json.get("scale"); if (scaleObject.isJsonArray()) { @@ -182,7 +179,6 @@ private static JsonElement getObjectByKey(Set> js * @return the animation * @throws ShaderParseException the json exception */ - @SuppressWarnings({ "rawtypes", "unchecked" }) public static Map.Entry getAnimation(JsonObject animationFile, String animationName) throws ShaderParseException { return new AbstractMap.SimpleEntry(animationName, getObjectByKey(getAnimations(animationFile), animationName)); @@ -213,7 +209,6 @@ public static Set> getObjectListAsArray(JsonObjec * @throws IllegalStateException Throws this exception if the JSON is formatted * incorrectly */ - @SuppressWarnings({ "unchecked", "rawtypes" }) public static Animation deserializeJsonToAnimation(Map.Entry element, MolangParser parser) throws ClassCastException, IllegalStateException { Animation animation = new Animation(); @@ -316,7 +311,6 @@ private static double calculateLength(List boneAnimations) { return longestLength == 0 ? Double.MAX_VALUE : longestLength; } - @SuppressWarnings({ "unchecked" }) static List convertJsonArrayToList(JsonArray array) { return new Gson().fromJson(array, ArrayList.class); } diff --git a/src/main/java/software/bernie/geckolib3/util/json/JsonKeyFrameUtils.java b/src/main/java/software/bernie/geckolib3/util/json/JsonKeyFrameUtils.java index 99845cca4..d2f6df578 100644 --- a/src/main/java/software/bernie/geckolib3/util/json/JsonKeyFrameUtils.java +++ b/src/main/java/software/bernie/geckolib3/util/json/JsonKeyFrameUtils.java @@ -27,7 +27,6 @@ * Helper class to convert json to keyframes */ public class JsonKeyFrameUtils { - @SuppressWarnings({ "unchecked", "rawtypes" }) private static VectorKeyFrameList> convertJson(List> element, boolean isRotation, MolangParser parser) throws NumberFormatException, MolangException { IValue previousXValue = null; @@ -167,7 +166,6 @@ public static VectorKeyFrameList> convertJsonToKeyFrames( * @return the vector key frame list * @throws NumberFormatException */ - @SuppressWarnings({ "rawtypes", "unchecked" }) public static VectorKeyFrameList> convertJsonToRotationKeyFrames( List> element, MolangParser parser) throws NumberFormatException, MolangException {