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

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
3 changes: 0 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,3 @@ containsMixinsAndOrCoreModOnly = false
# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
# responsibility check the licence and request permission for distribution, if required.
usesShadowedDependencies = false

# TODO: Remove when you modify this repository, it's been put in for automatic buildscript updates
disableCheckstyle = true
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Arcade/ArcadeGame.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.Helpers.Localization;
import vswe.stevescarts.Helpers.SoundHandler;
import vswe.stevescarts.Interfaces.GuiMinecart;
import vswe.stevescarts.Modules.Realtimers.ModuleArcade;
import vswe.stevescarts.StevesCarts;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public abstract class ArcadeGame {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Arcade/ArcadeInvaders.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

import org.lwjgl.input.Keyboard;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Arcade.Unit.UPDATE_RESULT;
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.Helpers.Localization;
import vswe.stevescarts.Helpers.ResourceHelper;
import vswe.stevescarts.Interfaces.GuiMinecart;
import vswe.stevescarts.Modules.Realtimers.ModuleArcade;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class ArcadeInvaders extends ArcadeGame {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Arcade/ArcadeMonopoly.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

import org.lwjgl.opengl.GL11;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Arcade.Piece.CONTROLLED_BY;
import vswe.stevescarts.Arcade.Place.PLACE_STATE;
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.Helpers.Localization;
import vswe.stevescarts.Helpers.ResourceHelper;
import vswe.stevescarts.Interfaces.GuiMinecart;
import vswe.stevescarts.Modules.Realtimers.ModuleArcade;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class ArcadeMonopoly extends ArcadeGame {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Arcade/ArcadeSweeper.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Arcade.Tile.TILE_OPEN_RESULT;
import vswe.stevescarts.Arcade.Tile.TILE_STATE;
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.Helpers.Localization;
import vswe.stevescarts.Helpers.ResourceHelper;
import vswe.stevescarts.Interfaces.GuiMinecart;
import vswe.stevescarts.Modules.Realtimers.ModuleArcade;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class ArcadeSweeper extends ArcadeGame {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Arcade/ArcadeTetris.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Arcade.TetrisPiece.MOVE_RESULT;
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.Helpers.Localization;
import vswe.stevescarts.Helpers.ResourceHelper;
import vswe.stevescarts.Interfaces.GuiMinecart;
import vswe.stevescarts.Modules.Realtimers.ModuleArcade;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class ArcadeTetris extends ArcadeGame {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Arcade/ArcadeTracks.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Arcade.TrackOrientation.DIRECTION;
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.Helpers.Localization;
import vswe.stevescarts.Helpers.ResourceHelper;
import vswe.stevescarts.Interfaces.GuiMinecart;
import vswe.stevescarts.Modules.Realtimers.ModuleArcade;
import vswe.stevescarts.StevesCarts;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class ArcadeTracks extends ArcadeGame {

Expand Down
1 change: 0 additions & 1 deletion src/main/java/vswe/stevescarts/Arcade/Building.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package vswe.stevescarts.Arcade;

import vswe.stevescarts.Arcade.Unit.UPDATE_RESULT;
import vswe.stevescarts.Interfaces.GuiMinecart;

public class Building extends Unit {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/vswe/stevescarts/Arcade/Community.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.EnumSet;

import vswe.stevescarts.Arcade.Place.PLACE_STATE;
import vswe.stevescarts.Interfaces.GuiMinecart;

public class Community extends CardPlace {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/vswe/stevescarts/Arcade/CornerPlace.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.EnumSet;

import vswe.stevescarts.Arcade.Place.PLACE_STATE;
import vswe.stevescarts.Interfaces.GuiMinecart;

public class CornerPlace extends Place {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/vswe/stevescarts/Arcade/Go.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.EnumSet;

import vswe.stevescarts.Arcade.Place.PLACE_STATE;
import vswe.stevescarts.Interfaces.GuiMinecart;

public class Go extends CornerPlace {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/vswe/stevescarts/Arcade/InvaderGhast.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package vswe.stevescarts.Arcade;

import vswe.stevescarts.Arcade.Unit.UPDATE_RESULT;
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.Interfaces.GuiMinecart;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/vswe/stevescarts/Arcade/Player.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package vswe.stevescarts.Arcade;

import vswe.stevescarts.Arcade.Unit.UPDATE_RESULT;
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.Interfaces.GuiMinecart;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/vswe/stevescarts/Arcade/Property.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.EnumSet;

import vswe.stevescarts.Arcade.Place.PLACE_STATE;
import vswe.stevescarts.Interfaces.GuiMinecart;

public abstract class Property extends Place {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/vswe/stevescarts/Arcade/Station.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.EnumSet;

import vswe.stevescarts.Arcade.Place.PLACE_STATE;
import vswe.stevescarts.Interfaces.GuiMinecart;

public class Station extends Property {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/vswe/stevescarts/Arcade/Street.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import org.lwjgl.opengl.GL11;

import vswe.stevescarts.Arcade.Place.PLACE_STATE;
import vswe.stevescarts.Interfaces.GuiMinecart;

public class Street extends Property {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Arcade/TrackLevel.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

import net.minecraft.client.Minecraft;

import vswe.stevescarts.Arcade.TrackOrientation.DIRECTION;
import vswe.stevescarts.Helpers.Localization;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Arcade.TrackOrientation.DIRECTION;
import vswe.stevescarts.Helpers.Localization;

public class TrackLevel {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.ArrayList;

import vswe.stevescarts.Arcade.TrackOrientation.DIRECTION;
import vswe.stevescarts.Interfaces.GuiBase.RENDER_ROTATION;

public abstract class TrackOrientation {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Blocks/BlockActivator.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
import net.minecraft.util.IIcon;
import net.minecraft.world.World;

import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityActivator;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityActivator;

public class BlockActivator extends BlockContainerBase {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Blocks/BlockCargoManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
import net.minecraft.util.IIcon;
import net.minecraft.world.World;

import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityCargo;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityCargo;

public class BlockCargoManager extends BlockContainerBase {

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/vswe/stevescarts/Blocks/BlockCartAssembler.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
import net.minecraft.util.IIcon;
import net.minecraft.world.World;

import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.PacketHandler;
import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityCartAssembler;
import vswe.stevescarts.TileEntities.TileEntityUpgrade;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class BlockCartAssembler extends BlockContainerBase {

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/vswe/stevescarts/Blocks/BlockDetector.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;

import vswe.stevescarts.Helpers.DetectorType;
import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityDetector;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Helpers.DetectorType;
import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityDetector;

public class BlockDetector extends BlockContainerBase {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Blocks/BlockDistributor.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
import net.minecraft.util.IIcon;
import net.minecraft.world.World;

import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityDistributor;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityDistributor;

public class BlockDistributor extends BlockContainerBase {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Blocks/BlockLiquidManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
import net.minecraft.util.IIcon;
import net.minecraft.world.World;

import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityLiquid;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityLiquid;

public class BlockLiquidManager extends BlockContainerBase {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Blocks/BlockMetalStorage.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;

import vswe.stevescarts.Items.ModItems;
import vswe.stevescarts.StevesCarts;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Items.ModItems;
import vswe.stevescarts.StevesCarts;

public class BlockMetalStorage extends Block implements IBlockBase {

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

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.Helpers.DetectorType;
import vswe.stevescarts.ModuleData.ModuleData;
Expand All @@ -21,8 +23,6 @@
import vswe.stevescarts.Upgrades.BaseEffect;
import vswe.stevescarts.Upgrades.Disassemble;
import vswe.stevescarts.Upgrades.Transposer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class BlockRailAdvDetector extends BlockSpecialRailBase {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/vswe/stevescarts/Blocks/BlockRailJunction.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;

import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.StevesCarts;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Carts.MinecartModular;
import vswe.stevescarts.StevesCarts;

public class BlockRailJunction extends BlockSpecialRailBase {

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/vswe/stevescarts/Blocks/BlockUpgrade.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;

import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import vswe.stevescarts.Items.ModItems;
import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.TileEntityCartAssembler;
import vswe.stevescarts.TileEntities.TileEntityUpgrade;
import vswe.stevescarts.Upgrades.AssemblerUpgrade;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class BlockUpgrade extends BlockContainerBase {

Expand Down
10 changes: 8 additions & 2 deletions src/main/java/vswe/stevescarts/Blocks/ModBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,21 @@
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;

import cpw.mods.fml.common.registry.GameRegistry;
import vswe.stevescarts.Helpers.ComponentTypes;
import vswe.stevescarts.Helpers.RecipeHelper;
import vswe.stevescarts.Items.ItemBlockDetector;
import vswe.stevescarts.Items.ItemBlockStorage;
import vswe.stevescarts.Items.ItemUpgrade;
import vswe.stevescarts.Items.ModItems;
import vswe.stevescarts.StevesCarts;
import vswe.stevescarts.TileEntities.*;
import cpw.mods.fml.common.registry.GameRegistry;
import vswe.stevescarts.TileEntities.TileEntityActivator;
import vswe.stevescarts.TileEntities.TileEntityCargo;
import vswe.stevescarts.TileEntities.TileEntityCartAssembler;
import vswe.stevescarts.TileEntities.TileEntityDetector;
import vswe.stevescarts.TileEntities.TileEntityDistributor;
import vswe.stevescarts.TileEntities.TileEntityLiquid;
import vswe.stevescarts.TileEntities.TileEntityUpgrade;

public enum ModBlocks {

Expand Down
Loading