Skip to content

Commit

Permalink
apply spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
BlueWeabo committed Jul 22, 2024
1 parent b4d528f commit c7b5e9f
Show file tree
Hide file tree
Showing 21 changed files with 64 additions and 60 deletions.
6 changes: 4 additions & 2 deletions src/main/java/com/gtnewhorizons/mutecore/MuTECore.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import com.cleanroommc.modularui.factory.GuiManager;
import com.gtnewhorizons.mutecore.api.data.Coordinates;
import com.gtnewhorizons.mutecore.api.data.GUIEvent;
import com.gtnewhorizons.mutecore.api.data.WorldStateValidator;
Expand All @@ -16,7 +17,6 @@
import com.gtnewhorizons.mutecore.api.tile.MultiTileEntity;
import com.gtnewhorizons.mutecore.api.utils.PlayerHelper;
import com.gtnewhorizons.mutecore.test.TestRegistry;
import com.cleanroommc.modularui.factory.GuiManager;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
Expand Down Expand Up @@ -44,7 +44,9 @@ public class MuTECore {
public static final Logger LOG = LogManager.getLogger(MODID);
public static final String DEPENDENCIES = "required-after:gtnhlib@[0.2.7,);" + "required-after:modularui2;"
+ "after:appliedenegistics2";
@SidedProxy(clientSide = "com.gtnewhorizons.mutecore.ClientProxy", serverSide = "com.gtnewhorizons.mutecore.CommonProxy")
@SidedProxy(
clientSide = "com.gtnewhorizons.mutecore.ClientProxy",
serverSide = "com.gtnewhorizons.mutecore.CommonProxy")
public static CommonProxy proxy;
public static Dominion ENGINE;
public static boolean ENABLE_TESTS;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gtnewhorizons/mutecore/MuTENetwork.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

import org.jetbrains.annotations.Nullable;

import com.cleanroommc.modularui.network.IPacket;
import com.gtnewhorizons.mutecore.api.block.MultiTileEntityBlock;
import com.gtnewhorizons.mutecore.api.data.Coordinates;
import com.gtnewhorizons.mutecore.api.data.WorldStateValidator;
import com.gtnewhorizons.mutecore.api.registry.MultiTileContainer;
import com.gtnewhorizons.mutecore.api.registry.MultiTileEntityRegistry;
import com.gtnewhorizons.mutecore.api.tile.MultiTileEntity;
import com.cleanroommc.modularui.network.IPacket;

import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ public static void registerSystems(Runnable... systems) {
* Register any amount of systems. The systems registered this way will be ran in parallel
*/
public static void registerSystemsParallel(Runnable... systems) {
int processors = Runtime.getRuntime().availableProcessors();
int processors = Runtime.getRuntime()
.availableProcessors();
Runnable[] parallel = new Runnable[processors];
int count = 0;
for (Runnable system : systems) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
import com.gtnewhorizons.mutecore.MuTENetwork;
import com.gtnewhorizons.mutecore.MuTENetwork.MuTEPacket;
import com.gtnewhorizons.mutecore.api.data.Coordinates;
import com.gtnewhorizons.mutecore.api.registry.EventRegistry;
import com.gtnewhorizons.mutecore.api.registry.MultiTileContainer.Id;
import com.gtnewhorizons.mutecore.api.registry.MultiTileEntityRegistry;
import com.gtnewhorizons.mutecore.api.event.BlockBreakEvent;
import com.gtnewhorizons.mutecore.api.event.BlockPlaceEvent;
import com.gtnewhorizons.mutecore.api.event.NeighborBlockChangeEvent;
import com.gtnewhorizons.mutecore.api.event.NeighborTileChangeEvent;
import com.gtnewhorizons.mutecore.api.event.PlayerInteractionEvent;
import com.gtnewhorizons.mutecore.api.registry.EventRegistry;
import com.gtnewhorizons.mutecore.api.registry.MultiTileContainer.Id;
import com.gtnewhorizons.mutecore.api.registry.MultiTileEntityRegistry;
import com.gtnewhorizons.mutecore.api.tile.MultiTileEntity;
import com.gtnewhorizons.mutecore.client.MultiTileBlockRenderer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@

import java.util.UUID;

import com.cleanroommc.modularui.api.IFluidTankLong;
import com.cleanroommc.modularui.utils.fluid.FluidTankLong;
import com.gtnewhorizons.mutecore.api.inventory.FluidInventory;

import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTUtil;
import net.minecraftforge.common.util.Constants.NBT;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;

import com.cleanroommc.modularui.api.IFluidTankLong;
import com.cleanroommc.modularui.utils.fluid.FluidTankLong;
import com.gtnewhorizons.mutecore.api.inventory.FluidInventory;

public class FluidInputInventory implements FluidInventory, WorldStateValidator {

private IFluidTankLong[] inv;
Expand Down Expand Up @@ -49,7 +47,11 @@ public void save(NBTTagCompound nbt) {
for (int i = 0; i < getSize(); i++) {
NBTTagCompound tankNBT = new NBTTagCompound();
IFluidTankLong tank = get(i);
tankNBT.setString("fluid", tank.getRealFluid() == null ? "" : tank.getRealFluid().getName());
tankNBT.setString(
"fluid",
tank.getRealFluid() == null ? ""
: tank.getRealFluid()
.getName());
tankNBT.setLong("amount", tank.getFluidAmountLong());
invNBT.appendTag(tankNBT);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@

import java.util.UUID;

import com.cleanroommc.modularui.api.IFluidTankLong;
import com.cleanroommc.modularui.utils.fluid.FluidTankLong;
import com.gtnewhorizons.mutecore.api.inventory.FluidInventory;

import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTUtil;
import net.minecraftforge.common.util.Constants.NBT;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;

import com.cleanroommc.modularui.api.IFluidTankLong;
import com.cleanroommc.modularui.utils.fluid.FluidTankLong;
import com.gtnewhorizons.mutecore.api.inventory.FluidInventory;

public class FluidOutputInventory implements FluidInventory, WorldStateValidator {

private IFluidTankLong[] inv;
Expand Down Expand Up @@ -49,7 +47,11 @@ public void save(NBTTagCompound nbt) {
for (int i = 0; i < getSize(); i++) {
NBTTagCompound tankNBT = new NBTTagCompound();
IFluidTankLong tank = get(i);
tankNBT.setString("fluid", tank.getRealFluid() == null ? "" : tank.getRealFluid().getName());
tankNBT.setString(
"fluid",
tank.getRealFluid() == null ? ""
: tank.getRealFluid()
.getName());
tankNBT.setLong("amount", tank.getFluidAmountLong());
invNBT.appendTag(tankNBT);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import java.util.UUID;

import com.cleanroommc.modularui.api.IItemStackLong;
import com.cleanroommc.modularui.utils.item.ItemStackLong;
import com.gtnewhorizons.mutecore.api.inventory.ItemInventory;

import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.util.Constants.NBT;

import com.cleanroommc.modularui.api.IItemStackLong;
import com.cleanroommc.modularui.utils.item.ItemStackLong;
import com.gtnewhorizons.mutecore.api.inventory.ItemInventory;

public class ItemInputInventory implements ItemInventory, WorldStateValidator {

private IItemStackLong[] inv;
Expand All @@ -24,7 +24,6 @@ public ItemInputInventory(int size, long limit) {
key = UUID.randomUUID();
}


@Override
public IItemStackLong get(int index) {
return inv[index];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import java.util.UUID;

import com.cleanroommc.modularui.api.IItemStackLong;
import com.cleanroommc.modularui.utils.item.ItemStackLong;
import com.gtnewhorizons.mutecore.api.inventory.ItemInventory;

import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.common.util.Constants.NBT;

import com.cleanroommc.modularui.api.IItemStackLong;
import com.cleanroommc.modularui.utils.item.ItemStackLong;
import com.gtnewhorizons.mutecore.api.inventory.ItemInventory;

public class ItemOutputInventory implements ItemInventory, WorldStateValidator {

private IItemStackLong[] inv;
Expand All @@ -24,7 +24,6 @@ public ItemOutputInventory(int size, long limit) {
key = UUID.randomUUID();
}


@Override
public IItemStackLong get(int index) {
return inv[index];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import dev.dominion.ecs.api.Entity;

public class BlockBreakEvent implements Comparable<BlockBreakEvent>{
public class BlockBreakEvent implements Comparable<BlockBreakEvent> {

private int priority;
private BlockBreak interaction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import dev.dominion.ecs.api.Entity;

public class BlockPlaceEvent implements Comparable<BlockPlaceEvent>{
public class BlockPlaceEvent implements Comparable<BlockPlaceEvent> {

private int priority;
private BlockPlace interaction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

import javax.annotation.Nonnull;

import dev.dominion.ecs.api.Entity;
import net.minecraft.block.Block;

public class NeighborBlockChangeEvent implements Comparable<NeighborBlockChangeEvent>{
import dev.dominion.ecs.api.Entity;

public class NeighborBlockChangeEvent implements Comparable<NeighborBlockChangeEvent> {

private int priority;
private NeighborBlockChange interaction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

import javax.annotation.Nonnull;

import dev.dominion.ecs.api.Entity;
import net.minecraft.tileentity.TileEntity;

public class NeighborTileChangeEvent implements Comparable<NeighborTileChangeEvent>{
import dev.dominion.ecs.api.Entity;

public class NeighborTileChangeEvent implements Comparable<NeighborTileChangeEvent> {

private int priority;
private NeighborTileChange interaction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

import org.jetbrains.annotations.NotNull;

import com.gtnewhorizons.mutecore.MuTECore;
import com.cleanroommc.modularui.api.IGuiHolder;
import com.cleanroommc.modularui.factory.AbstractUIFactory;
import com.cleanroommc.modularui.factory.GuiManager;
import com.gtnewhorizons.mutecore.MuTECore;

public class MultiTileEntityGuiFactory extends AbstractUIFactory<ComponentData> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.gtnewhorizons.mutecore.api.inventory;

import net.minecraftforge.fluids.Fluid;

import com.cleanroommc.modularui.api.IFluidTankLong;
import com.cleanroommc.modularui.utils.fluid.FluidTankLong;
import com.cleanroommc.modularui.utils.fluid.IFluidTanksHandler;

import net.minecraftforge.fluids.Fluid;

public class FluidComponentInventoryHandler implements IFluidTanksHandler {

private FluidInventory inventory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,14 @@
import javax.annotation.Nullable;

import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;

import com.gtnewhorizons.mutecore.MuTECore;
import com.gtnewhorizons.mutecore.api.data.FirstTickEvent;
import com.gtnewhorizons.mutecore.api.data.TickData;
import com.gtnewhorizons.mutecore.api.data.WorldStateValidator;
import com.gtnewhorizons.mutecore.api.gui.MuTEGUI;
import com.gtnewhorizons.mutecore.api.render.MuTERender;
import com.gtnewhorizons.mutecore.api.tile.MultiTileEntity;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dev.dominion.ecs.api.Entity;

public class MultiTileContainer {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@

import org.jetbrains.annotations.ApiStatus.Internal;

import com.cleanroommc.modularui.utils.item.ItemStackLong;
import com.google.common.primitives.Ints;
import com.gtnewhorizons.mutecore.MuTECore;
import com.gtnewhorizons.mutecore.api.block.MultiTileEntityBlock;
import com.gtnewhorizons.mutecore.api.render.MuTERender;
import com.gtnewhorizons.mutecore.api.tile.MultiTileEntity;

import com.cleanroommc.modularui.utils.item.ItemStackLong;
import com.google.common.primitives.Ints;

import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package com.gtnewhorizons.mutecore.api.render;

import com.gtnewhorizons.mutecore.api.registry.TextureRegistry;

import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;

import com.gtnewhorizons.mutecore.api.registry.TextureRegistry;

public class MuTEIcon implements IIcon {

private String iconPath;
private IIcon icon;


public MuTEIcon(String modid, String path) {
this(new ResourceLocation(modid, path).toString());
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.gtnewhorizons.mutecore.api.render;

import dev.dominion.ecs.api.Entity;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;

import dev.dominion.ecs.api.Entity;

public interface MuTERender {

void render(Entity entity, RenderBlocks render, int x, int y, int z, IBlockAccess world);
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

import org.jetbrains.annotations.ApiStatus.Internal;

import com.cleanroommc.modularui.api.IGuiHolder;
import com.cleanroommc.modularui.screen.ModularPanel;
import com.cleanroommc.modularui.value.sync.GuiSyncManager;
import com.gtnewhorizons.mutecore.MuTECore;
import com.gtnewhorizons.mutecore.MuTENetwork;
import com.gtnewhorizons.mutecore.MuTENetwork.MuTEPacket;
Expand All @@ -17,9 +20,6 @@
import com.gtnewhorizons.mutecore.api.registry.MultiTileContainer;
import com.gtnewhorizons.mutecore.api.registry.MultiTileContainer.Id;
import com.gtnewhorizons.mutecore.api.registry.MultiTileEntityRegistry;
import com.cleanroommc.modularui.api.IGuiHolder;
import com.cleanroommc.modularui.screen.ModularPanel;
import com.cleanroommc.modularui.value.sync.GuiSyncManager;

import dev.dominion.ecs.api.Entity;
import dev.dominion.ecs.engine.IntEntity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;

import com.gtnewhorizons.mutecore.api.block.MultiTileEntityBlock;
import com.gtnewhorizons.mutecore.api.registry.MultiTileContainer;
import com.gtnewhorizons.mutecore.api.registry.MultiTileEntityRegistry;
import com.gtnewhorizons.mutecore.api.registry.MultiTileContainer.Id;
import com.gtnewhorizons.mutecore.api.registry.MultiTileEntityRegistry;
import com.gtnewhorizons.mutecore.api.tile.MultiTileEntity;

import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
Expand Down Expand Up @@ -42,7 +40,10 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b

Entity entity = mute.getEntity();
MultiTileEntityRegistry reg = mublock.getRegistry();
reg.getRender(entity.get(Id.class).getId()).render(entity, renderer, x, y, z, world);
reg.getRender(
entity.get(Id.class)
.getId())
.render(entity, renderer, x, y, z, world);

return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

import net.minecraft.block.material.Material;

import com.cleanroommc.modularui.screen.ModularPanel;
import com.cleanroommc.modularui.utils.Alignment;
import com.gtnewhorizons.mutecore.api.block.MultiTileEntityBlock;
import com.gtnewhorizons.mutecore.api.item.MultiTileEntityItem;
import com.gtnewhorizons.mutecore.api.registry.MultiTileEntityRegistry;
import com.gtnewhorizons.mutecore.api.tile.MultiTileEntity;
import com.cleanroommc.modularui.screen.ModularPanel;
import com.cleanroommc.modularui.utils.Alignment;

import cpw.mods.fml.common.registry.GameRegistry;

Expand Down

0 comments on commit c7b5e9f

Please sign in to comment.