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 #2

Merged
merged 2 commits 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,10 +1,10 @@
// Add your dependencies here

dependencies {
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.5:dev") {
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.3.0:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:ZenScript:master-SNAPSHOT") {
compileOnly("com.github.GTNewHorizons:ZenScript:1.0.0-GTNH") {
transitive = false
}
}
3 changes: 0 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,3 @@ usesShadowedDependencies = false
# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
# projects. New projects should not use this parameter.
customArchiveBaseName = WanionLib

# TODO: Remove when you modify this repository, it's been put in for automatic buildscript updates
disableCheckstyle = true
7 changes: 0 additions & 7 deletions repositories.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
// Add any additional repositories for your dependencies here

repositories {
maven {
name = "GTNH Maven"
url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
}
maven {
url = "https://jitpack.io"
}
}
9 changes: 6 additions & 3 deletions src/main/java/wanion/lib/WanionLib.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,22 @@
* http://mozilla.org/MPL/2.0/.
*/

import static wanion.lib.Reference.*;
import static wanion.lib.Reference.ACCEPTED_MINECRAFT;
import static wanion.lib.Reference.MOD_ID;
import static wanion.lib.Reference.MOD_NAME;
import static wanion.lib.Reference.MOD_VERSION;

import java.util.Map;

import org.apache.logging.log4j.Logger;

import wanion.lib.client.ClientTickHandler;
import wanion.lib.common.Dependencies;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import wanion.lib.client.ClientTickHandler;
import wanion.lib.common.Dependencies;

@Mod(modid = MOD_ID, name = MOD_NAME, version = MOD_VERSION, acceptedMinecraftVersions = ACCEPTED_MINECRAFT)
public final class WanionLib {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/wanion/lib/client/ClientTickHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

import javax.annotation.Nonnull;

import wanion.lib.WanionLib;
import wanion.lib.client.animation.Animation;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import wanion.lib.WanionLib;
import wanion.lib.client.animation.Animation;

@SideOnly(Side.CLIENT)
public final class ClientTickHandler implements WanionLib.IDependency {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/wanion/lib/common/MineTweakerHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
* http://mozilla.org/MPL/2.0/.
*/

import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;

import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import minetweaker.api.oredict.IOreDictEntry;

import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;

@SuppressWarnings("unused")
public final class MineTweakerHelper {

Expand Down
7 changes: 6 additions & 1 deletion src/main/java/wanion/lib/module/AbstractModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
* http://mozilla.org/MPL/2.0/.
*/

import java.util.*;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/wanion/lib/module/LoadStage.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@

import javax.annotation.Nonnull;

import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLStateEvent;

public enum LoadStage {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/wanion/lib/recipe/RecipeHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

import net.minecraft.item.ItemStack;

import wanion.lib.common.MetaItem;
import gnu.trove.map.TObjectCharMap;
import gnu.trove.map.hash.THashMap;
import gnu.trove.map.hash.TObjectCharHashMap;
import wanion.lib.common.MetaItem;

public final class RecipeHelper {

Expand Down