Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bs] spotless apply for jenkins #22

Merged
merged 1 commit into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//version: 1704650211
//version: 1704751096
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
Expand Down Expand Up @@ -786,7 +786,7 @@ dependencies {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.4.4')
}

java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
Expand Down
4 changes: 2 additions & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:waila:1.6.0:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.3.63-GTNH:dev")
api("com.github.GTNewHorizons:waila:1.6.5:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.5.3-GTNH:dev")

}
4 changes: 2 additions & 2 deletions src/main/java/toast/specialMobs/EventHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingHurtEvent;

import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import toast.specialMobs.entity.blaze.EntitySmolderBlaze;
import toast.specialMobs.entity.pigzombie.EntityPlaguePigZombie;
import toast.specialMobs.entity.skeleton.EntityPoisonSkeleton;
import toast.specialMobs.entity.witch.EntityUndeadWitch;
import toast.specialMobs.entity.zombie.EntityPlagueZombie;
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;

public class EventHandler {

Expand Down
18 changes: 9 additions & 9 deletions src/main/java/toast/specialMobs/_SpecialMobs.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.config.Configuration;

import toast.specialMobs.entity.EntityLavaMonster;
import toast.specialMobs.entity.EntitySpecialFishHook;
import toast.specialMobs.entity.EntitySpecialSpitball;
import toast.specialMobs.entity.SpawnLavaMonster;
import toast.specialMobs.entity.creeper.EntityEnderCreeper;
import toast.specialMobs.entity.creeper.EntityFireCreeper;
import toast.specialMobs.entity.ghast.EntityMiniGhast;
import toast.specialMobs.network.MessageExplosion;
import toast.specialMobs.network.MessageTexture;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
Expand All @@ -29,6 +20,15 @@
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.relauncher.Side;
import toast.specialMobs.entity.EntityLavaMonster;
import toast.specialMobs.entity.EntitySpecialFishHook;
import toast.specialMobs.entity.EntitySpecialSpitball;
import toast.specialMobs.entity.SpawnLavaMonster;
import toast.specialMobs.entity.creeper.EntityEnderCreeper;
import toast.specialMobs.entity.creeper.EntityFireCreeper;
import toast.specialMobs.entity.ghast.EntityMiniGhast;
import toast.specialMobs.network.MessageExplosion;
import toast.specialMobs.network.MessageTexture;

/**
* This is the mod class. Everything the mod does is initialized by this class.
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/toast/specialMobs/client/ClientProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.World;

import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.CommonProxy;
import toast.specialMobs.entity.EntityLavaMonster;
import toast.specialMobs.entity.EntitySpecialFishHook;
Expand All @@ -19,10 +23,6 @@
import toast.specialMobs.entity.spider.Entity_SpecialSpider;
import toast.specialMobs.entity.witch.Entity_SpecialWitch;
import toast.specialMobs.entity.zombie.Entity_SpecialZombie;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

@SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/toast/specialMobs/client/RenderLavaMonster.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

import org.lwjgl.opengl.GL11;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.Properties;
import toast.specialMobs._SpecialMobs;
import toast.specialMobs.entity.EntityLavaMonster;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

@SideOnly(Side.CLIENT)
public class RenderLavaMonster extends RenderLiving {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

import org.lwjgl.opengl.GL11;

import toast.specialMobs.entity.ISpecialMob;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.ISpecialMob;

@SideOnly(Side.CLIENT)
public class RenderSpecialBlaze extends RenderBlaze {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import org.lwjgl.opengl.GL11;

import toast.specialMobs.entity.ISpecialMob;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.ISpecialMob;

@SideOnly(Side.CLIENT)
public class RenderSpecialCreeper extends RenderCreeper {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import org.lwjgl.opengl.GL11;

import toast.specialMobs.entity.ISpecialMob;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.ISpecialMob;

@SideOnly(Side.CLIENT)
public class RenderSpecialEnderman extends RenderEnderman {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;

import toast.specialMobs.entity.EntitySpecialFishHook;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.EntitySpecialFishHook;

@SideOnly(Side.CLIENT)
public class RenderSpecialFishHook extends Render {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

import org.lwjgl.opengl.GL11;

import toast.specialMobs.entity.ISpecialMob;
import toast.specialMobs.entity.ghast.Entity_SpecialGhast;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.ISpecialMob;
import toast.specialMobs.entity.ghast.Entity_SpecialGhast;

@SideOnly(Side.CLIENT)
public class RenderSpecialGhast extends RenderGhast {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

import org.lwjgl.opengl.GL11;

import toast.specialMobs.entity.ISpecialMob;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.ISpecialMob;

@SideOnly(Side.CLIENT)
public class RenderSpecialSilverfish extends RenderSilverfish {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

import org.lwjgl.opengl.GL11;

import toast.specialMobs.entity.INinja;
import toast.specialMobs.entity.ISpecialMob;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.INinja;
import toast.specialMobs.entity.ISpecialMob;

@SideOnly(Side.CLIENT)
public class RenderSpecialSkeleton extends RenderSkeleton {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

import org.lwjgl.opengl.GL11;

import toast.specialMobs.entity.ISpecialMob;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.ISpecialMob;

@SideOnly(Side.CLIENT)
public class RenderSpecialSlime extends RenderSlime {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import org.lwjgl.opengl.GL11;

import toast.specialMobs.entity.ISpecialMob;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.ISpecialMob;

@SideOnly(Side.CLIENT)
public class RenderSpecialSpider extends RenderSpider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;

import toast.specialMobs._SpecialMobs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs._SpecialMobs;

@SideOnly(Side.CLIENT)
public class RenderSpecialSpitball extends Render {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

import org.lwjgl.opengl.GL11;

import toast.specialMobs.entity.ISpecialMob;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.ISpecialMob;

@SideOnly(Side.CLIENT)
public class RenderSpecialWitch extends RenderWitch {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

import org.lwjgl.opengl.GL11;

import toast.specialMobs.entity.INinja;
import toast.specialMobs.entity.ISpecialMob;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.entity.INinja;
import toast.specialMobs.entity.ISpecialMob;

@SideOnly(Side.CLIENT)
public class RenderSpecialZombie extends RenderZombie {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/toast/specialMobs/entity/ISpecialMob.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import net.minecraft.util.StatCollector;
import net.minecraftforge.common.util.FakePlayer;

import toast.specialMobs.Properties;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import toast.specialMobs.Properties;

/**
* This interface is implemented by all monsters in this mod. It allows for commonly used data to be stored conveniently
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/toast/specialMobs/entity/SpawnLavaMonster.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.event.ForgeEventFactory;

import toast.specialMobs.Properties;
import toast.specialMobs._SpecialMobs;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import toast.specialMobs.Properties;
import toast.specialMobs._SpecialMobs;

public class SpawnLavaMonster {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.DataWatcherHelper;
import toast.specialMobs.Properties;
import toast.specialMobs._SpecialMobs;
import toast.specialMobs.entity.ISpecialMob;
import toast.specialMobs.entity.SpecialMobData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class Entity_SpecialCreeper extends EntityCreeper implements ISpecialMob {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import toast.specialMobs.EffectHelper;
import toast.specialMobs.Properties;
import toast.specialMobs._SpecialMobs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class EntityFaintGhast extends EntityMeleeGhast {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import net.minecraft.world.Explosion;
import net.minecraft.world.World;

import toast.specialMobs._SpecialMobs;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import io.netty.buffer.ByteBuf;
import toast.specialMobs._SpecialMobs;

public class MessageExplosion implements IMessage {

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/toast/specialMobs/network/MessageTexture.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;

import toast.specialMobs._SpecialMobs;
import toast.specialMobs.entity.ISpecialMob;
import toast.specialMobs.entity.SpecialMobData;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import io.netty.buffer.ByteBuf;
import toast.specialMobs._SpecialMobs;
import toast.specialMobs.entity.ISpecialMob;
import toast.specialMobs.entity.SpecialMobData;

public class MessageTexture implements IMessage {

Expand Down
9 changes: 4 additions & 5 deletions src/main/java/toast/specialMobs/waila/WailaCompat.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@

import java.util.List;

import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaEntityAccessor;
import mcp.mobius.waila.api.IWailaEntityProvider;
import mcp.mobius.waila.api.IWailaRegistrar;

import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;

import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaEntityAccessor;
import mcp.mobius.waila.api.IWailaEntityProvider;
import mcp.mobius.waila.api.IWailaRegistrar;
import toast.specialMobs.entity.ISpecialMob;

public class WailaCompat implements IWailaEntityProvider {
Expand Down