fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added spotless back and reformatted

Browse Source
This commit is contained in:
Sebastian Hartte
2020-07-27 20:07:27 +02:00
parent 49296915c9
commit 780f68952b
593 changed files with 4192 additions and 3969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java
+18 -16
View File
@@ -18,6 +18,24 @@
package appeng.bootstrap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.function.BiFunction;
import java.util.function.Supplier;
import javax.annotation.Nullable;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.block.Block;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.features.AEFeature;
import appeng.block.AEBaseBlock;
@@ -29,22 +47,6 @@ import appeng.core.CreativeTab;
import appeng.core.features.BlockDefinition;
import appeng.core.features.TileDefinition;
import appeng.util.Platform;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.block.Block;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.function.BiFunction;
import java.util.function.Supplier;
class BlockDefinitionBuilder implements IBlockBuilder {
src/main/java/appeng/bootstrap/BlockEntityBuilder.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class BlockEntityBuilder<T extends AEBaseBlockEntity> {
private final EnumSet<AEFeature> features = EnumSet.noneOf(AEFeature.class);
public BlockEntityBuilder(FeatureFactory factory, String id, Class<T> tileClass,
Function<BlockEntityType<T>, T> supplier) {
Function<BlockEntityType<T>, T> supplier) {
this.factory = factory;
this.id = AppEng.makeId(id);
this.tileClass = tileClass;
src/main/java/appeng/bootstrap/BlockRendering.java
+1 -1
View File
@@ -20,7 +20,6 @@ package appeng.bootstrap;
import java.util.function.BiFunction;
import appeng.client.render.model.AutoRotatingBakedModel;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
@@ -33,6 +32,7 @@ import net.minecraft.util.Identifier;
import appeng.block.AEBaseTileBlock;
import appeng.bootstrap.components.BlockColorComponent;
import appeng.bootstrap.components.RenderTypeComponent;
import appeng.client.render.model.AutoRotatingBakedModel;
class BlockRendering implements IBlockRendering {
src/main/java/appeng/bootstrap/EntityBuilder.java
+5 -4
View File
@@ -1,6 +1,9 @@
package appeng.bootstrap;
import appeng.api.features.AEFeature;
import java.util.Collections;
import java.util.EnumSet;
import java.util.function.Consumer;
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
import net.fabricmc.fabric.impl.object.builder.FabricEntityType;
import net.minecraft.entity.Entity;
@@ -8,9 +11,7 @@ import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.util.registry.Registry;
import java.util.Collections;
import java.util.EnumSet;
import java.util.function.Consumer;
import appeng.api.features.AEFeature;
/**
* Helper to register a custom Entity with Minecraft.
src/main/java/appeng/bootstrap/FeatureFactory.java
+4 -4
View File
@@ -29,16 +29,16 @@ import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Supplier;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.block.Block;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.entity.Entity;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.item.Item;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.util.Identifier;
import net.fabricmc.api.EnvType;
import appeng.api.features.AEFeature;
import appeng.bootstrap.components.ModelOverrideComponent;
@@ -86,7 +86,7 @@ public class FeatureFactory {
}
public <T extends AEBaseBlockEntity> BlockEntityBuilder<T> tileEntity(String id, Class<T> teClass,
Function<BlockEntityType<T>, T> factory) {
Function<BlockEntityType<T>, T> factory) {
return new BlockEntityBuilder<>(this, id, teClass, factory).features(this.defaultFeatures);
}
src/main/java/appeng/bootstrap/IItemRendering.java
+1 -1
View File
@@ -18,9 +18,9 @@
package appeng.bootstrap;
import net.minecraft.client.color.item.ItemColorProvider;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.color.item.ItemColorProvider;
/**
* Allows the rendering of an item to be customized.
src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java
+4 -4
View File
@@ -26,12 +26,14 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.block.DispenserBlock;
import net.minecraft.block.dispenser.DispenserBehavior;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import appeng.api.features.AEFeature;
import appeng.bootstrap.components.IInitComponent;
@@ -39,8 +41,6 @@ import appeng.core.AppEng;
import appeng.core.CreativeTab;
import appeng.core.features.ItemDefinition;
import appeng.util.Platform;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
class ItemDefinitionBuilder implements IItemBuilder {
src/main/java/appeng/bootstrap/ItemRendering.java
+1 -1
View File
@@ -18,10 +18,10 @@
package appeng.bootstrap;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.color.item.ItemColorProvider;
import net.minecraft.item.Item;
import net.fabricmc.api.EnvType;
import appeng.bootstrap.components.ItemColorComponent;
src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java
+1 -1
View File
@@ -18,8 +18,8 @@
package appeng.bootstrap;
import net.fabricmc.api.Environment;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
/**
* A callback that allows the rendering of a item to be customized. Sadly this
src/main/java/appeng/bootstrap/ModelsReloadCallback.java
+2 -2
View File
@@ -1,12 +1,12 @@
package appeng.bootstrap;
import java.util.Map;
import net.fabricmc.fabric.api.event.Event;
import net.fabricmc.fabric.api.event.EventFactory;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.util.Identifier;
import java.util.Map;
@FunctionalInterface
public interface ModelsReloadCallback {
src/main/java/appeng/bootstrap/TileEntityRendering.java
+2 -2
View File
@@ -20,10 +20,10 @@ package appeng.bootstrap;
import java.util.function.Function;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import appeng.tile.AEBaseBlockEntity;
src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java
+5 -5
View File
@@ -21,15 +21,15 @@ package appeng.bootstrap;
import appeng.tile.AEBaseBlockEntity;
/**
* A callback that allows the rendering of a block entity to be customized. Sadly
* this class is required and no lambdas can be used due to them not being able
* to be annotated with @OnlyIn(CLIENT).
* A callback that allows the rendering of a block entity to be customized.
* Sadly this class is required and no lambdas can be used due to them not being
* able to be annotated with @OnlyIn(CLIENT).
*/
public interface TileEntityRenderingCustomizer<T extends AEBaseBlockEntity> {
/**
* Declared as a default method because we will carve out the implementations that
* override this method on the Server side.
* Declared as a default method because we will carve out the implementations
* that override this method on the Server side.
*/
default void customize(TileEntityRendering<T> rendering) {
}
src/main/java/appeng/bootstrap/components/IModelBakeComponent.java
+2 -2
View File
@@ -1,12 +1,12 @@
package appeng.bootstrap.components;
import java.util.Map;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.util.Identifier;
import appeng.bootstrap.IBootstrapComponent;
import java.util.Map;
public interface IModelBakeComponent extends IBootstrapComponent {
void onModelsReloaded(Map<Identifier, BakedModel> loadedModels);
src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java
-1
View File
@@ -1,6 +1,5 @@
package appeng.bootstrap.components;
import appeng.bootstrap.IBootstrapComponent;
@FunctionalInterface
src/main/java/appeng/bootstrap/components/RenderTypeComponent.java
+1
View File
@@ -1,6 +1,7 @@
package appeng.bootstrap.components;
import com.google.common.base.Preconditions;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.minecraft.block.Block;
import net.minecraft.client.render.RenderLayer;