PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-03-14 23:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Migrate to jebrains annotations

Browse source
This commit is contained in:
Sollace 2021-06-10 19:32:21 +02:00
parent 165950a7b0
commit d2e5c65341
50 changed files with 36 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.gradle
View file

@ -4,8 +4,11 @@ plugins {
id 'maven-publish'
}
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_16
java {
toolchain {
languageVersion = JavaLanguageVersion.of(16)
}
}
def createVersion() {
def parts = []
@ -59,8 +62,6 @@ dependencies {
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modApi "net.fabricmc:fabric-loader:${project.loader_version}"
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
modApi fabricApi.module("fabric-api-base", project.fabric_version)
modApi fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version)
modApi fabricApi.module("fabric-resource-loader-v0", project.fabric_version)

2
src/main/java/com/minelittlepony/api/model/armour/IArmourTextureResolver.java
View file

@ -5,7 +5,7 @@ import net.minecraft.entity.EquipmentSlot;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
public interface IArmourTextureResolver {

4
src/main/java/com/minelittlepony/api/model/armour/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.api.model.armour;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/api/model/fabric/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.api.model.fabric;
import javax.annotation.ParametersAreNonnullByDefault;

2
src/main/java/com/minelittlepony/api/model/gear/IGear.java
View file

@ -11,7 +11,7 @@ import com.minelittlepony.api.model.IModel;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.client.render.entity.feature.GearFeature;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import java.util.UUID;
import java.util.function.Supplier;

4
src/main/java/com/minelittlepony/api/model/gear/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.api.model.gear;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/api/model/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.api.model;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/api/pony/meta/Race.java
View file

@ -2,7 +2,7 @@ package com.minelittlepony.api.pony.meta;
import com.minelittlepony.api.pony.TriggerPixelType;
import javax.annotation.Nonnull;
import org.jetbrains.annotations.NotNull;
public enum Race implements TriggerPixelType<Race> {
@ -73,7 +73,7 @@ public enum Race implements TriggerPixelType<Race> {
* Gets the original race that this one is an alias for, if one exists.
* Otherwise returns this race.
*/
@Nonnull
@NotNull
public Race getAlias() {
return original;
}

4
src/main/java/com/minelittlepony/api/pony/meta/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.api.pony.meta;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/api/pony/network/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.api.pony.network;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/api/pony/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.api.pony;
import javax.annotation.ParametersAreNonnullByDefault;

2
src/main/java/com/minelittlepony/client/GuiPonySettings.java
View file

@ -18,7 +18,7 @@ import com.minelittlepony.common.client.gui.element.Slider;
import com.minelittlepony.common.client.gui.element.Toggle;
import com.minelittlepony.common.util.settings.Setting;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
/**
* In-Game options menu.

2
src/main/java/com/minelittlepony/client/SkinsProxy.java
View file

@ -13,7 +13,7 @@ import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.texture.PlayerSkinProvider;
import net.minecraft.util.Identifier;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
public class SkinsProxy {

2
src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java
View file

@ -16,7 +16,7 @@ import com.minelittlepony.hdskins.profile.SkinType;
import com.mojang.authlib.GameProfile;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import net.fabricmc.api.ClientModInitializer;
import net.minecraft.client.MinecraftClient;

4
src/main/java/com/minelittlepony/client/hdskins/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.hdskins;
import javax.annotation.ParametersAreNonnullByDefault;

2
src/main/java/com/minelittlepony/client/mixin/MixinFirstPersonRenderer.java
View file

@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import com.minelittlepony.client.render.PonyRenderDispatcher;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import net.minecraft.client.render.item.HeldItemRenderer;
import net.minecraft.client.render.VertexConsumerProvider;

2
src/main/java/com/minelittlepony/client/mixin/MixinSkullBlockEntityRenderer.java
View file

@ -19,7 +19,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.minelittlepony.client.render.blockentity.skull.PonySkullRenderer;
import com.mojang.authlib.GameProfile;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
@Mixin(SkullBlockEntityRenderer.class)
abstract class MixinSkullBlockEntityRenderer implements BlockEntityRenderer<SkullBlockEntity> {

4
src/main/java/com/minelittlepony/client/mixin/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.mixin;
import javax.annotation.ParametersAreNonnullByDefault;

2
src/main/java/com/minelittlepony/client/model/ModelType.java
View file

@ -43,7 +43,7 @@ import com.minelittlepony.mson.api.ModelKey;
import com.minelittlepony.mson.api.Mson;
import com.minelittlepony.mson.api.MsonModel;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
import java.util.Map;

2
src/main/java/com/minelittlepony/client/model/armour/DefaultArmourTextureResolver.java
View file

@ -14,7 +14,7 @@ import com.minelittlepony.api.model.armour.ArmourVariant;
import com.minelittlepony.api.model.armour.IArmourTextureResolver;
import com.minelittlepony.util.ResourceUtil;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import java.nio.file.Path;
import java.nio.file.Paths;

4
src/main/java/com/minelittlepony/client/model/armour/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.model.armour;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/model/entity/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.model.entity;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/model/entity/race/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.model.entity.race;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/model/gear/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.model.gear;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/model/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.model;
import javax.annotation.ParametersAreNonnullByDefault;

2
src/main/java/com/minelittlepony/client/model/part/UnicornHorn.java
View file

@ -13,7 +13,7 @@ import com.minelittlepony.common.util.Color;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.mson.api.MsonModel;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import java.util.UUID;

4
src/main/java/com/minelittlepony/client/model/part/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.model.part;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/pony/NativePonyData.java
View file

@ -21,12 +21,12 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.UUID;
import javax.annotation.concurrent.Immutable;
import org.jetbrains.annotations.Unmodifiable;
/**
* Implementation for IPonyData.
*/
@Immutable
@Unmodifiable
class NativePonyData implements IPonyData {
private final TriggerPixelValue<Race> race;
private final TriggerPixelValue<TailLength> tailSize;

4
src/main/java/com/minelittlepony/client/pony/Pony.java
View file

@ -29,9 +29,9 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import javax.annotation.concurrent.Immutable;
import org.jetbrains.annotations.Unmodifiable;
@Immutable
@Unmodifiable
public class Pony implements IPony {
private final Identifier texture;

6
src/main/java/com/minelittlepony/client/pony/PonyData.java
View file

@ -22,13 +22,13 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.UUID;
import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.Unmodifiable;
/**
* Implementation for IPonyData.
*/
@Immutable
@Unmodifiable
public class PonyData implements IPonyData {
private static final PonyDataSerialiser SERIALISER = new PonyDataSerialiser();

2
src/main/java/com/minelittlepony/client/pony/PonyManager.java
View file

@ -8,7 +8,7 @@ import com.minelittlepony.api.pony.IPonyManager;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.settings.PonyConfig;
import com.minelittlepony.settings.PonyLevel;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
import net.minecraft.client.network.AbstractClientPlayerEntity;

4
src/main/java/com/minelittlepony/client/pony/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.pony;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/render/EquineRenderManager.java
View file

@ -12,7 +12,7 @@ import com.mojang.blaze3d.platform.GlStateManager.DstFactor;
import com.mojang.blaze3d.platform.GlStateManager.SrcFactor;
import com.mojang.blaze3d.systems.RenderSystem;
import javax.annotation.Nonnull;
import org.jetbrains.annotations.NotNull;
import net.minecraft.client.render.Frustum;
import net.minecraft.client.render.entity.model.EntityModel;
@ -107,7 +107,7 @@ public class EquineRenderManager<T extends LivingEntity, M extends EntityModel<T
((PonyPosture<T>) getPosture(player)).apply(player, getModel(), stack, yaw, ticks, -1);
}
@Nonnull
@NotNull
private PonyPosture<?> getPosture(T entity) {
if (entity.isFallFlying()) {
return PonyPosture.ELYTRA;

2
src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java
View file

@ -4,7 +4,7 @@ import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.common.util.Color;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.OverlayTexture;

2
src/main/java/com/minelittlepony/client/render/PonyRenderDispatcher.java
View file

@ -7,7 +7,7 @@ import com.google.common.collect.Maps;
import com.minelittlepony.client.model.IPonyModel;
import com.minelittlepony.client.model.entity.race.PlayerModels;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import com.minelittlepony.common.mixin.MixinEntityRenderDispatcher;
import com.minelittlepony.mson.api.Mson;

2
src/main/java/com/minelittlepony/client/render/blockentity/skull/MobSkull.java
View file

@ -5,7 +5,7 @@ import com.minelittlepony.settings.PonyConfig;
import com.mojang.authlib.GameProfile;
import net.minecraft.util.Identifier;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
public class MobSkull extends AbstractPonySkull {

2
src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkull.java
View file

@ -13,7 +13,7 @@ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.Identifier;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
public class PonySkull extends AbstractPonySkull {

2
src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkullRenderer.java
View file

@ -21,7 +21,7 @@ import net.minecraft.util.Util;
import net.minecraft.util.math.Direction;
import java.util.Map;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
/**
* PonySkullRenderer! It renders ponies as skulls, or something...

4
src/main/java/com/minelittlepony/client/render/blockentity/skull/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.render.blockentity.skull;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java
View file

@ -30,7 +30,7 @@ import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import java.util.List;
import javax.annotation.Nonnull;
import org.jetbrains.annotations.NotNull;
public abstract class PonyRenderer<T extends MobEntity, M extends EntityModel<T> & IPonyModel<T>> extends MobEntityRenderer<T, M> implements IPonyRenderContext<T, M> {
@ -113,7 +113,7 @@ public abstract class PonyRenderer<T extends MobEntity, M extends EntityModel<T>
@Deprecated
@Override
@Nonnull
@NotNull
public final Identifier getTexture(T entity) {
return findTexture(entity);
}

4
src/main/java/com/minelittlepony/client/render/entity/SeaponyRenderer.java
View file

@ -1,6 +1,6 @@
package com.minelittlepony.client.render.entity;
import javax.annotation.Nonnull;
import org.jetbrains.annotations.NotNull;
import com.minelittlepony.client.mixin.IResizeable;
import com.minelittlepony.client.model.ModelType;
@ -43,7 +43,7 @@ public class SeaponyRenderer extends GuardianEntityRenderer {
}
@Override
@Nonnull
@NotNull
public final Identifier getTexture(GuardianEntity entity) {
return ponyRenderer.getTextureFor(entity);
}

4
src/main/java/com/minelittlepony/client/render/entity/feature/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.render.entity.feature;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/render/entity/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.render.entity;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/render/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.render;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/settings/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.settings;
import javax.annotation.ParametersAreNonnullByDefault;

5
src/main/java/com/minelittlepony/client/transform/package-info.java
View file

@ -1,5 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.transform;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/client/util/render/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.client.util.render;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/settings/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.settings;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/minelittlepony/util/package-info.java
View file

@ -1,4 +0,0 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.util;
import javax.annotation.ParametersAreNonnullByDefault;