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

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,6 +1,6 @@
// Add your dependencies here

dependencies {
compile 'com.github.GTNewHorizons:Avaritia:1.37:dev'
compileOnly 'com.github.GTNewHorizons:NotEnoughItems:2.3.43-GTNH:dev'
api 'com.github.GTNewHorizons:Avaritia:1.48:dev'
compileOnly 'com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev'
}
3 changes: 0 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,3 @@ customArchiveBaseName = Universal-Singularities

# Optional parameter to prevent the source code from being published
# noPublishedSources =

# TODO: Remove when you modify this repository, it's been put in for automatic buildscript updates
disableCheckstyle = true
12 changes: 0 additions & 12 deletions repositories.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +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 {
name = "ChickenBones Maven"
url = "https://chickenbones.net/maven/"
}
maven {
name = "jitpack"
url = "https://jitpack.io"
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
package wealthyturtle.uiesingularities;

import static wealthyturtle.uiesingularities.Reference.*;
import static wealthyturtle.uiesingularities.Reference.CLIENT_PROXY;
import static wealthyturtle.uiesingularities.Reference.COMMON_PROXY;
import static wealthyturtle.uiesingularities.Reference.MC_VERSION;
import static wealthyturtle.uiesingularities.Reference.MOD_ID;
import static wealthyturtle.uiesingularities.Reference.MOD_NAME;
import static wealthyturtle.uiesingularities.Reference.MOD_VERSION;

import wealthyturtle.uiesingularities.proxy.CommonProxy;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import wealthyturtle.uiesingularities.proxy.CommonProxy;

@SuppressWarnings("unused")
@Mod(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
import static java.io.File.separatorChar;

import java.io.File;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.annotation.Nonnull;

Expand All @@ -13,15 +20,15 @@
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.oredict.OreDictionary;

import wealthyturtle.uiesingularities.NEI;
import wealthyturtle.uiesingularities.UniversalSingularity;
import wealthyturtle.uiesingularities.UniversalSingularityItem;
import wealthyturtle.uiesingularities.UniversalSingularityWrapper;
import cpw.mods.fml.common.IFuelHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import fox.spiteful.avaritia.crafting.CompressorManager;
import fox.spiteful.avaritia.crafting.Grinder;
import wealthyturtle.uiesingularities.NEI;
import wealthyturtle.uiesingularities.UniversalSingularity;
import wealthyturtle.uiesingularities.UniversalSingularityItem;
import wealthyturtle.uiesingularities.UniversalSingularityWrapper;

public class CommonProxy {

Expand Down