Skip to content

Commit

Permalink
run spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
BlueWeabo committed Jun 7, 2024
1 parent 02fac3e commit 4446ecc
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 60 deletions.
3 changes: 1 addition & 2 deletions src/main/java/com/blueweabo/mutecore/CommonProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

public class CommonProxy {

public void preInit(FMLPreInitializationEvent event) {
}
public void preInit(FMLPreInitializationEvent event) {}

public void init(FMLInitializationEvent event) {}

Expand Down
6 changes: 1 addition & 5 deletions src/main/java/com/blueweabo/mutecore/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

import java.io.File;

import net.minecraftforge.common.config.Configuration;

public class Config {


public static void synchronizeConfiguration(File configFile) {
}
public static void synchronizeConfiguration(File configFile) {}
}
31 changes: 15 additions & 16 deletions src/main/java/com/blueweabo/mutecore/MuTECore.java
Original file line number Diff line number Diff line change
@@ -1,42 +1,39 @@
package com.blueweabo.mutecore;

import net.minecraft.launchwrapper.Launch;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.objectweb.asm.ClassReader;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
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 cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import dev.dominion.ecs.api.Composition;
import dev.dominion.ecs.api.Dominion;
import dev.dominion.ecs.api.Scheduler;
import net.minecraft.client.Minecraft;
import net.minecraft.launchwrapper.Launch;
import net.minecraft.launchwrapper.LaunchClassLoader;
import net.minecraftforge.common.MinecraftForge;

@Mod(modid = MuTECore.MODID, version = Tags.VERSION, name = "MuTECore", acceptedMinecraftVersions = "[1.7.10]", dependencies = MuTECore.DEPENDENCIES)
@Mod(
modid = MuTECore.MODID,
version = Tags.VERSION,
name = "MuTECore",
acceptedMinecraftVersions = "[1.7.10]",
dependencies = MuTECore.DEPENDENCIES)
public class MuTECore {

public static final String MODID = "mutecore";
public static final Logger LOG = LogManager.getLogger(MODID);
public static final String DEPENDENCIES = "required-after:gtnhlib@[0.2.7,);" +
"required-after:modularui;" +
"after:appliedenegistics2";
public static final String DEPENDENCIES = "required-after:gtnhlib@[0.2.7,);" + "required-after:modularui;"
+ "after:appliedenegistics2";
@SidedProxy(clientSide = "com.blueweabo.mutecore.ClientProxy", serverSide = "com.blueweabo.mutecore.CommonProxy")
public static CommonProxy proxy;
public static Dominion ENGINE;
public static Scheduler SYSTEMS;
public static boolean ENABLE_TESTS;

public MuTECore() {
}
public MuTECore() {}

@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
Expand All @@ -54,7 +51,9 @@ public void init(FMLInitializationEvent event) {
@Mod.EventHandler
public void postInit(FMLPostInitializationEvent event) {
proxy.postInit(event);
FMLCommonHandler.instance().bus().register(new Runner());
FMLCommonHandler.instance()
.bus()
.register(new Runner());
}

@Mod.EventHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
import java.util.ArrayList;
import java.util.List;

import com.blueweabo.mutecore.api.registry.MultiTileEntityRegistry;
import com.blueweabo.mutecore.api.tile.IMultiTileEntity;

import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
Expand All @@ -19,6 +16,9 @@
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;

import com.blueweabo.mutecore.api.registry.MultiTileEntityRegistry;
import com.blueweabo.mutecore.api.tile.IMultiTileEntity;

public class MultiTileEntityBlock extends BlockContainer {

MultiTileEntityRegistry registry;
Expand All @@ -33,8 +33,7 @@ public TileEntity createNewTileEntity(World worldIn, int meta) {
}

@Override
public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list) {
}
public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list) {}

@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
Expand All @@ -44,32 +43,31 @@ public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, i
@Override
public void onNeighborBlockChange(World worldIn, int x, int y, int z, Block neighbor) {
super.onNeighborBlockChange(worldIn, x, y, z, neighbor);
TileEntity te = worldIn.getTileEntity(x,y,z);
TileEntity te = worldIn.getTileEntity(x, y, z);
if (!(te instanceof IMultiTileEntity mute)) return;
mute.onNeighborBlockChange(neighbor);
}

@Override
public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) {
super.onNeighborChange(world, x, y, z, tileX, tileY, tileZ);
TileEntity te = world.getTileEntity(x,y,z);
TileEntity te = world.getTileEntity(x, y, z);
TileEntity changed = world.getTileEntity(tileX, tileY, tileZ);
if (!(te instanceof IMultiTileEntity mute) || !(changed instanceof IMultiTileEntity changedMute)) return;
mute.onNeighborChange(changedMute);
}


@Override
public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer player, int side, float subX,
float subY, float subZ) {
TileEntity te = worldIn.getTileEntity(x,y,z);
TileEntity te = worldIn.getTileEntity(x, y, z);
if (!(te instanceof IMultiTileEntity mute)) return false;
return mute.onBlockActivated(player, ForgeDirection.getOrientation(side) , subX, subY, subZ);
return mute.onBlockActivated(player, ForgeDirection.getOrientation(side), subX, subY, subZ);
}

@Override
public void breakBlock(World worldIn, int x, int y, int z, Block blockBroken, int meta) {
TileEntity te = worldIn.getTileEntity(x,y,z);
TileEntity te = worldIn.getTileEntity(x, y, z);
if (!(te instanceof IMultiTileEntity mute)) {
super.breakBlock(worldIn, x, y, z, blockBroken, meta);
return;
Expand All @@ -81,7 +79,7 @@ public void breakBlock(World worldIn, int x, int y, int z, Block blockBroken, in
@Override
public void onBlockAdded(World worldIn, int x, int y, int z) {
super.onBlockAdded(worldIn, x, y, z);
TileEntity te = worldIn.getTileEntity(x,y,z);
TileEntity te = worldIn.getTileEntity(x, y, z);
if (!(te instanceof IMultiTileEntity mute)) return;
mute.onBlockPlaced();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

import java.util.List;

import com.blueweabo.mutecore.api.block.MultiTileEntityBlock;

import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;

import com.blueweabo.mutecore.api.block.MultiTileEntityBlock;

public class MultiTileEntityItem extends ItemBlock implements IFluidContainerItem {

private final MultiTileEntityBlock block;
Expand All @@ -24,8 +24,7 @@ public MultiTileEntityItem(Block block) {
}

@Override
public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> tooltip,
boolean f3h) {
public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> tooltip, boolean f3h) {
super.addInformation(itemStack, player, tooltip, f3h);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public MultiTileContainer addComponent(Object component) {
}

public boolean register() {
return reg.get() != null && reg.get().register(id, this);
return reg.get() != null && reg.get()
.register(id, this);
}

public Entity createNewEntity() {
Expand All @@ -50,5 +51,6 @@ public Class<? extends MultiTileEntity> getTileEntityClass() {
return clazz;
}

private static class FakeEntity {}
private static class FakeEntity {
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.blueweabo.mutecore.api.registry;

import net.minecraft.tileentity.TileEntity;

import com.blueweabo.mutecore.MuTECore;
import com.blueweabo.mutecore.api.block.MultiTileEntityBlock;
import com.blueweabo.mutecore.api.tile.MultiTileEntity;

import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectMaps;
import net.minecraft.tileentity.TileEntity;

public class MultiTileEntityRegistry {

Expand All @@ -23,7 +24,8 @@ public MultiTileContainer create(long id, Class<? extends MultiTileEntity> clazz

public boolean register(long id, MultiTileContainer container) {
if (map.containsKey(id)) {
MuTECore.LOG.error("There already exists a MultiTileEntity for id: " + id + " and block: " + block.getUnlocalizedName());
MuTECore.LOG.error(
"There already exists a MultiTileEntity for id: " + id + " and block: " + block.getUnlocalizedName());
return false;
}
map.put(id, container);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@

public class TextureFactory {


}
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@

public interface IMultiTileEntity {

@Nonnull ForgeDirection getFacing();
@Nonnull
ForgeDirection getFacing();

@Nonnull World getWorld();
@Nonnull
World getWorld();

int getXCoord();

Expand All @@ -27,5 +29,6 @@ public interface IMultiTileEntity {

void onNeighborChange(@Nonnull IMultiTileEntity muteChanged);

boolean onBlockActivated(@Nonnull EntityPlayer player, @Nonnull ForgeDirection side, float subX, float subY, float subZ);
boolean onBlockActivated(@Nonnull EntityPlayer player, @Nonnull ForgeDirection side, float subX, float subY,
float subZ);
}
3 changes: 2 additions & 1 deletion src/main/java/com/blueweabo/mutecore/api/tile/Machine.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.blueweabo.mutecore.api.tile;

import dev.dominion.ecs.api.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.util.ForgeDirection;

import dev.dominion.ecs.api.Entity;

public abstract class Machine extends MultiTileEntity implements IMachine {

Entity entity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

import javax.annotation.Nonnull;

import dev.dominion.ecs.api.Entity;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;

import dev.dominion.ecs.api.Entity;

public class MultiTileEntity extends TileEntity implements IMultiTileEntity {

private @Nonnull ForgeDirection facing = ForgeDirection.WEST;
Expand Down Expand Up @@ -51,19 +52,20 @@ public int getZCoord() {
}

@Override
public void onBlockPlaced() { }
public void onBlockPlaced() {}

@Override
public void onBlockBroken() { }
public void onBlockBroken() {}

@Override
public void onNeighborBlockChange(@Nonnull Block neighbor) { }
public void onNeighborBlockChange(@Nonnull Block neighbor) {}

@Override
public void onNeighborChange(@Nonnull IMultiTileEntity muteChanged) { }
public void onNeighborChange(@Nonnull IMultiTileEntity muteChanged) {}

@Override
public boolean onBlockActivated(@Nonnull EntityPlayer player, @Nonnull ForgeDirection side, float subX, float subY, float subZ) {
public boolean onBlockActivated(@Nonnull EntityPlayer player, @Nonnull ForgeDirection side, float subX, float subY,
float subZ) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package com.blueweabo.mutecore.client;

import com.blueweabo.mutecore.api.block.MultiTileEntityBlock;

import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;

import com.blueweabo.mutecore.api.block.MultiTileEntityBlock;

import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;

public class MultiTileBlockRenderer implements ISimpleBlockRenderingHandler {

//public static final MultiTileRenderer INSTANCE = new MultiTileRenderer();
// public static final MultiTileRenderer INSTANCE = new MultiTileRenderer();

@Override
public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
Expand All @@ -18,7 +19,7 @@ public void renderInventoryBlock(Block block, int metadata, int modelId, RenderB

@Override
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
RenderBlocks renderer) {
RenderBlocks renderer) {
if (!(block instanceof MultiTileEntityBlock muBlock)) return false;

return true;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/blueweabo/mutecore/enums/LoadedMods.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
import cpw.mods.fml.common.Loader;

public class LoadedMods {

public static final boolean AE2 = Loader.isModLoaded("appliedenegistics2");
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.blueweabo.mutecore.registry;

import net.minecraft.block.material.Material;

import com.blueweabo.mutecore.api.block.MultiTileEntityBlock;
import com.blueweabo.mutecore.api.item.MultiTileEntityItem;
import com.blueweabo.mutecore.api.registry.MultiTileEntityRegistry;
import com.blueweabo.mutecore.api.tile.MultiTileEntity;

import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.material.Material;

public class TestRegistry implements Runnable {

Expand All @@ -18,6 +19,7 @@ public class TestRegistry implements Runnable {
GameRegistry.registerBlock(BLOCK, MultiTileEntityItem.class, "mutecore.testtiles");
REGISTRY = new MultiTileEntityRegistry(BLOCK);
}

@Override
public void run() {
REGISTRY.create(0, MultiTileEntity.class);
Expand Down

0 comments on commit 4446ecc

Please sign in to comment.