diff --git a/build.gradle b/build.gradle index 24a8cacf5..3470f0de1 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'java' id 'fabric-loom' id 'maven-publish' - id "com.matthewprenger.cursegradle" version "1.4.0" + id "com.diffplug.gradle.spotless" version "4.3.0" id "org.sonarqube" version "2.8" id "jacoco" } @@ -60,8 +60,7 @@ group = artifact_group archivesBaseName = artifact_basename sourceSets { - api { - } + api main { compileClasspath += sourceSets.api.output runtimeClasspath += sourceSets.api.output @@ -94,6 +93,8 @@ configurations { unportedCompile.extendsFrom(compileClasspath) } +apply from: 'gradle/scripts/spotless.gradle' + minecraft { accessWidener "src/main/resources/appliedenergistics2.accesswidener" } diff --git a/src/api/java/appeng/api/client/ICellModelRegistry.java b/src/api/java/appeng/api/client/ICellModelRegistry.java index 371f06089..bcd5f35d9 100644 --- a/src/api/java/appeng/api/client/ICellModelRegistry.java +++ b/src/api/java/appeng/api/client/ICellModelRegistry.java @@ -45,23 +45,25 @@ public interface ICellModelRegistry { * the game. See * {@see net.minecraftforge.client.model.ModelLoader#addSpecialModel}. * - * This method only maps an {@link Item} to a {@link Identifier} which can - * be looked up from the {@link net.minecraft.client.render.model.BakedModelManager}. No validation about missing models - * will be done. + * This method only maps an {@link Item} to a {@link Identifier} which can be + * looked up from the + * {@link net.minecraft.client.render.model.BakedModelManager}. No validation + * about missing models will be done. * * Will throw an exception in case a model is already registered for an item. * * For examples look at our cell part models within the drive model directory. * * @param item The cell item - * @param model The {@link net.minecraft.util.Identifier} representing the model. + * @param model The {@link net.minecraft.util.Identifier} representing the + * model. * @return */ void registerModel(@Nonnull Item item, @Nonnull Identifier model); /** - * The {@link Identifier} of the model used to render the given storage - * cell {@link Item} when inserted into a drive or similar. + * The {@link Identifier} of the model used to render the given storage cell + * {@link Item} when inserted into a drive or similar. * * @param item * @return null, if no model is registered. diff --git a/src/api/java/appeng/api/config/SecurityPermissions.java b/src/api/java/appeng/api/config/SecurityPermissions.java index f13350639..e81a23507 100644 --- a/src/api/java/appeng/api/config/SecurityPermissions.java +++ b/src/api/java/appeng/api/config/SecurityPermissions.java @@ -75,7 +75,6 @@ public enum SecurityPermissions { return this.translationKey + ".tip"; } - public Text tooltipText() { return new TranslatableText(getTranslatedTip()); } diff --git a/src/api/java/appeng/api/crafting/ICraftingHelper.java b/src/api/java/appeng/api/crafting/ICraftingHelper.java index b55f2a68e..6e3c55aeb 100644 --- a/src/api/java/appeng/api/crafting/ICraftingHelper.java +++ b/src/api/java/appeng/api/crafting/ICraftingHelper.java @@ -75,7 +75,7 @@ public interface ICraftingHelper { * equivalent items to craft this recipe. */ ItemStack encodeCraftingPattern(@Nullable ItemStack stack, CraftingRecipe recipe, ItemStack[] in, ItemStack out, - boolean allowSubstitutes); + boolean allowSubstitutes); /** * Same as {@link #decodePattern(ItemStack, World, boolean)} with no auto diff --git a/src/api/java/appeng/api/definitions/IItemDefinition.java b/src/api/java/appeng/api/definitions/IItemDefinition.java index c6e93414a..c2954f4a1 100644 --- a/src/api/java/appeng/api/definitions/IItemDefinition.java +++ b/src/api/java/appeng/api/definitions/IItemDefinition.java @@ -29,8 +29,8 @@ import java.util.Set; import javax.annotation.Nonnull; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemStack; import appeng.api.features.AEFeature; diff --git a/src/api/java/appeng/api/events/LocatableEventAnnounce.java b/src/api/java/appeng/api/events/LocatableEventAnnounce.java index ce76ab837..12096fd4b 100644 --- a/src/api/java/appeng/api/events/LocatableEventAnnounce.java +++ b/src/api/java/appeng/api/events/LocatableEventAnnounce.java @@ -23,10 +23,11 @@ package appeng.api.events; -import appeng.api.features.ILocatable; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; +import appeng.api.features.ILocatable; + /** * Input Event: *

@@ -34,11 +35,12 @@ import net.fabricmc.fabric.api.event.EventFactory; */ public interface LocatableEventAnnounce { - Event EVENT = EventFactory.createArrayBacked(LocatableEventAnnounce.class, listeners -> (ILocatable target, LocatableEvent change) -> { - for (LocatableEventAnnounce listener : listeners) { - listener.onLocatableAnnounce(target, change); - } - }); + Event EVENT = EventFactory.createArrayBacked(LocatableEventAnnounce.class, + listeners -> (ILocatable target, LocatableEvent change) -> { + for (LocatableEventAnnounce listener : listeners) { + listener.onLocatableAnnounce(target, change); + } + }); void onLocatableAnnounce(final ILocatable target, final LocatableEvent change); diff --git a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java index bf6a206b0..061e36a86 100644 --- a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java +++ b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java @@ -26,9 +26,10 @@ package appeng.api.features; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import alexiil.mc.lib.attributes.Attribute; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.Attribute; + import appeng.api.config.TunnelType; /** diff --git a/src/api/java/appeng/api/parts/IDynamicPartBakedModel.java b/src/api/java/appeng/api/parts/IDynamicPartBakedModel.java index 1a8313abc..d388bfc5b 100644 --- a/src/api/java/appeng/api/parts/IDynamicPartBakedModel.java +++ b/src/api/java/appeng/api/parts/IDynamicPartBakedModel.java @@ -1,6 +1,12 @@ package appeng.api.parts; -import appeng.api.util.AEPartLocation; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; import net.minecraft.block.BlockState; import net.minecraft.client.render.model.BakedModel; @@ -12,33 +18,32 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import java.util.function.Supplier; +import appeng.api.util.AEPartLocation; /** - * This interface can be implemented by baked models returned by {@link IPart#getStaticModels()} to indicate that - * they would like to use the model data returned by {@link IPart#getModelData()}. + * This interface can be implemented by baked models returned by + * {@link IPart#getStaticModels()} to indicate that they would like to use the + * model data returned by {@link IPart#getModelData()}. */ public interface IDynamicPartBakedModel extends BakedModel { /** - * See {@link net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel#emitBlockQuads(BlockRenderView, BlockState, BlockPos, Supplier, RenderContext)} + * See + * {@link net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel#emitBlockQuads(BlockRenderView, BlockState, BlockPos, Supplier, RenderContext)} * for context. *

- * The given context will already have been transformed so that the model renders from the - * rotated location the part is attached to. + * The given context will already have been transformed so that the + * model renders from the rotated location the part is attached to. * - * @param partSide The side of the cable bus that the part is attached to. + * @param partSide The side of the cable bus that the part is attached to. * @param modelData The model data returned by {@link IPart#getModelData()} */ - void emitQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context, - Direction partSide, @Nullable Object modelData); + void emitQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, + RenderContext context, Direction partSide, @Nullable Object modelData); /** - * Unless you use your dynamic model for other purposes, this method will not be called. + * Unless you use your dynamic model for other purposes, this method will not be + * called. */ @Override default List getQuads(@Nullable BlockState state, @Nullable Direction face, Random random) { diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java index f7eb4696e..ca4a11bf1 100644 --- a/src/api/java/appeng/api/parts/IPart.java +++ b/src/api/java/appeng/api/parts/IPart.java @@ -23,11 +23,13 @@ package appeng.api.parts; -import alexiil.mc.lib.attributes.AttributeList; -import appeng.api.networking.IGridNode; -import appeng.api.util.AECableType; -import appeng.api.util.AEColor; -import appeng.api.util.AEPartLocation; +import java.io.IOException; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.block.entity.BlockEntity; @@ -46,11 +48,12 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.io.IOException; -import java.util.List; -import java.util.Random; +import alexiil.mc.lib.attributes.AttributeList; + +import appeng.api.networking.IGridNode; +import appeng.api.util.AECableType; +import appeng.api.util.AEColor; +import appeng.api.util.AEPartLocation; public interface IPart extends ICustomCableConnection { @@ -343,14 +346,14 @@ public interface IPart extends ICustomCableConnection { * * @see alexiil.mc.lib.attributes.AttributeProvider */ - default void addAllAttributes(AttributeList to) {} - + default void addAllAttributes(AttributeList to) { + } /** * Additional rendering data to be passed to the models for rendering this part. * - * @return The rendering data to pass to the model. Only useful if custom models are - * used. Can be null to not pass anything. + * @return The rendering data to pass to the model. Only useful if custom models + * are used. Can be null to not pass anything. */ @Nullable default Object getModelData() { diff --git a/src/api/java/appeng/api/parts/IPartHelper.java b/src/api/java/appeng/api/parts/IPartHelper.java index a17f202fc..534f94bb2 100644 --- a/src/api/java/appeng/api/parts/IPartHelper.java +++ b/src/api/java/appeng/api/parts/IPartHelper.java @@ -26,9 +26,9 @@ package appeng.api.parts; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; public interface IPartHelper { diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java index 9a8988eb9..725d4e451 100644 --- a/src/api/java/appeng/api/parts/IPartHost.java +++ b/src/api/java/appeng/api/parts/IPartHost.java @@ -25,16 +25,16 @@ package appeng.api.parts; import java.util.Set; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; -import net.minecraft.util.math.Vec3d; /** * Implemented on AE's TileEntity. @@ -115,8 +115,8 @@ public interface IPartHost extends ICustomCableConnection { DimensionalCoord getLocation(); /** - * @return the block entity for the host, this can either be an FMP tile, or a AE - * tile + * @return the block entity for the host, this can either be an FMP tile, or a + * AE tile */ BlockEntity getTile(); diff --git a/src/api/java/appeng/api/parts/IPartModel.java b/src/api/java/appeng/api/parts/IPartModel.java index 723a30305..cb80a3940 100644 --- a/src/api/java/appeng/api/parts/IPartModel.java +++ b/src/api/java/appeng/api/parts/IPartModel.java @@ -31,8 +31,8 @@ import javax.annotation.Nonnull; import net.minecraft.util.Identifier; /** - * A container to store a collection of {@link Identifier} as models for a - * part as well as other properties. + * A container to store a collection of {@link Identifier} as models for a part + * as well as other properties. */ public interface IPartModel { diff --git a/src/api/java/appeng/api/storage/ISpatialDimension.java b/src/api/java/appeng/api/storage/ISpatialDimension.java index e7e50e628..a96352e2e 100644 --- a/src/api/java/appeng/api/storage/ISpatialDimension.java +++ b/src/api/java/appeng/api/storage/ISpatialDimension.java @@ -22,12 +22,12 @@ import java.util.List; import javax.annotation.Nullable; -import net.minecraft.util.math.BlockPos; +import net.minecraft.server.world.ServerWorld; import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; -import net.minecraft.server.world.ServerWorld; public interface ISpatialDimension { ServerWorld getWorld(RegistryKey cellDim); diff --git a/src/api/java/appeng/api/storage/IStorageHelper.java b/src/api/java/appeng/api/storage/IStorageHelper.java index 83c30204d..05f3b5f96 100644 --- a/src/api/java/appeng/api/storage/IStorageHelper.java +++ b/src/api/java/appeng/api/storage/IStorageHelper.java @@ -115,11 +115,11 @@ public interface IStorageHelper { /** * Inserts items into a {@link IMEInventory} respecting power requirements. * - * @param energy Energy source. - * @param inv Inventory to insert into. - * @param input Items to insert. - * @param src Action source. - * @param mode Simulate or modulate + * @param energy Energy source. + * @param inv Inventory to insert into. + * @param input Items to insert. + * @param src Action source. + * @param mode Simulate or modulate * @return items not inserted or {@code null} if everything was inserted. */ > T poweredInsert(final IEnergySource energy, final IMEInventory inv, final T input, diff --git a/src/api/java/appeng/api/storage/cells/ICellInventory.java b/src/api/java/appeng/api/storage/cells/ICellInventory.java index baf1d4b9b..04190558d 100644 --- a/src/api/java/appeng/api/storage/cells/ICellInventory.java +++ b/src/api/java/appeng/api/storage/cells/ICellInventory.java @@ -23,9 +23,10 @@ package appeng.api.storage.cells; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.FuzzyMode; import appeng.api.storage.IMEInventory; import appeng.api.storage.data.IAEStack; diff --git a/src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java b/src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java index 3fa9fa52d..90871f866 100644 --- a/src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java +++ b/src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java @@ -23,9 +23,10 @@ package appeng.api.storage.cells; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.FuzzyMode; public interface ICellWorkbenchItem { diff --git a/src/datagen/java/appeng/data/Entrypoint.java b/src/datagen/java/appeng/data/Entrypoint.java index 1534fdc39..7a8e5f369 100644 --- a/src/datagen/java/appeng/data/Entrypoint.java +++ b/src/datagen/java/appeng/data/Entrypoint.java @@ -1,20 +1,21 @@ package appeng.data; +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; + +import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint; +import net.minecraft.Bootstrap; +import net.minecraft.data.DataGenerator; + import appeng.core.AEConfig; import appeng.core.Api; import appeng.core.CreativeTab; import appeng.data.providers.loot.BlockDropProvider; import appeng.data.providers.recipes.SlabStairRecipes; import appeng.data.providers.tags.ConventionTagProvider; -import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint; -import net.minecraft.Bootstrap; -import net.minecraft.data.DataGenerator; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Collections; public class Entrypoint implements PreLaunchEntrypoint { diff --git a/src/datagen/java/appeng/data/providers/loot/BlockDropProvider.java b/src/datagen/java/appeng/data/providers/loot/BlockDropProvider.java index b277305b9..24370cf79 100644 --- a/src/datagen/java/appeng/data/providers/loot/BlockDropProvider.java +++ b/src/datagen/java/appeng/data/providers/loot/BlockDropProvider.java @@ -7,7 +7,6 @@ import java.util.function.Function; import javax.annotation.Nonnull; -import appeng.data.providers.IAE2DataProvider; import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -26,11 +25,12 @@ import net.minecraft.loot.entry.LeafEntry; import net.minecraft.loot.function.ApplyBonusLootFunction; import net.minecraft.loot.function.SetCountLootFunction; import net.minecraft.util.Identifier; - -import appeng.core.AppEng; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; +import appeng.core.AppEng; +import appeng.data.providers.IAE2DataProvider; + public class BlockDropProvider extends BlockLootTableGenerator implements IAE2DataProvider { private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); @@ -40,17 +40,15 @@ public class BlockDropProvider extends BlockLootTableGenerator implements IAE2Da private Map> overrides = ImmutableMap.>builder() .put(BLOCKS.matrixFrame().block(), $ -> LootTable.builder()) .put(BLOCKS.quartzOre().block(), - b -> dropsWithSilkTouch(BLOCKS.quartzOre().block(), - applyExplosionDecay(BLOCKS.quartzOre().block(), - ItemEntry.builder(MATERIALS.certusQuartzCrystal().item()) - .apply(SetCountLootFunction.builder(UniformLootTableRange.between(1.0F, 2.0F))) - .apply(ApplyBonusLootFunction.uniformBonusCount(Enchantments.FORTUNE))))) - .put(BLOCKS.quartzOreCharged().block(), - b -> dropsWithSilkTouch(BLOCKS.quartzOreCharged().block(), - applyExplosionDecay(BLOCKS.quartzOreCharged().block(), - ItemEntry.builder(MATERIALS.certusQuartzCrystalCharged().item()) - .apply(SetCountLootFunction.builder(UniformLootTableRange.between(1.0F, 2.0F))) - .apply(ApplyBonusLootFunction.uniformBonusCount(Enchantments.FORTUNE))))) + b -> dropsWithSilkTouch(BLOCKS.quartzOre().block(), applyExplosionDecay(BLOCKS.quartzOre().block(), + ItemEntry.builder(MATERIALS.certusQuartzCrystal().item()) + .apply(SetCountLootFunction.builder(UniformLootTableRange.between(1.0F, 2.0F))) + .apply(ApplyBonusLootFunction.uniformBonusCount(Enchantments.FORTUNE))))) + .put(BLOCKS.quartzOreCharged().block(), b -> dropsWithSilkTouch(BLOCKS.quartzOreCharged().block(), + applyExplosionDecay(BLOCKS.quartzOreCharged().block(), + ItemEntry.builder(MATERIALS.certusQuartzCrystalCharged().item()) + .apply(SetCountLootFunction.builder(UniformLootTableRange.between(1.0F, 2.0F))) + .apply(ApplyBonusLootFunction.uniformBonusCount(Enchantments.FORTUNE))))) .build(); public BlockDropProvider(Path outputFolder) { diff --git a/src/datagen/java/appeng/data/providers/recipes/SlabStairRecipes.java b/src/datagen/java/appeng/data/providers/recipes/SlabStairRecipes.java index 02a07b829..38330c9ba 100644 --- a/src/datagen/java/appeng/data/providers/recipes/SlabStairRecipes.java +++ b/src/datagen/java/appeng/data/providers/recipes/SlabStairRecipes.java @@ -1,9 +1,14 @@ package appeng.data.providers.recipes; -import appeng.api.definitions.IBlockDefinition; -import appeng.core.AppEng; -import appeng.data.providers.IAE2DataProvider; +import static net.minecraft.data.server.RecipesProvider.conditionsFromItem; +import static net.minecraft.data.server.RecipesProvider.saveRecipe; +import static net.minecraft.data.server.RecipesProvider.saveRecipeAdvancement; + +import java.nio.file.Path; +import java.util.function.Consumer; + import com.google.gson.JsonObject; + import net.minecraft.block.Block; import net.minecraft.data.DataCache; import net.minecraft.data.server.recipe.RecipeJsonProvider; @@ -12,23 +17,20 @@ import net.minecraft.data.server.recipe.SingleItemRecipeJsonFactory; import net.minecraft.recipe.Ingredient; import net.minecraft.util.Identifier; -import java.nio.file.Path; -import java.util.function.Consumer; - -import static net.minecraft.data.server.RecipesProvider.conditionsFromItem; -import static net.minecraft.data.server.RecipesProvider.saveRecipe; -import static net.minecraft.data.server.RecipesProvider.saveRecipeAdvancement; +import appeng.api.definitions.IBlockDefinition; +import appeng.core.AppEng; +import appeng.data.providers.IAE2DataProvider; public class SlabStairRecipes implements IAE2DataProvider { - IBlockDefinition[][] blocks = {{BLOCKS.skyStoneBlock(), BLOCKS.skyStoneSlab(), BLOCKS.skyStoneStairs()}, - {BLOCKS.smoothSkyStoneBlock(), BLOCKS.smoothSkyStoneSlab(), BLOCKS.smoothSkyStoneStairs()}, - {BLOCKS.skyStoneBrick(), BLOCKS.skyStoneBrickSlab(), BLOCKS.skyStoneBrickStairs()}, - {BLOCKS.skyStoneSmallBrick(), BLOCKS.skyStoneSmallBrickSlab(), BLOCKS.skyStoneSmallBrickStairs()}, - {BLOCKS.fluixBlock(), BLOCKS.fluixSlab(), BLOCKS.fluixStairs()}, - {BLOCKS.quartzBlock(), BLOCKS.quartzSlab(), BLOCKS.quartzStairs()}, - {BLOCKS.chiseledQuartzBlock(), BLOCKS.chiseledQuartzSlab(), BLOCKS.chiseledQuartzStairs()}, - {BLOCKS.quartzPillar(), BLOCKS.quartzPillarSlab(), BLOCKS.quartzPillarStairs()},}; + IBlockDefinition[][] blocks = { { BLOCKS.skyStoneBlock(), BLOCKS.skyStoneSlab(), BLOCKS.skyStoneStairs() }, + { BLOCKS.smoothSkyStoneBlock(), BLOCKS.smoothSkyStoneSlab(), BLOCKS.smoothSkyStoneStairs() }, + { BLOCKS.skyStoneBrick(), BLOCKS.skyStoneBrickSlab(), BLOCKS.skyStoneBrickStairs() }, + { BLOCKS.skyStoneSmallBrick(), BLOCKS.skyStoneSmallBrickSlab(), BLOCKS.skyStoneSmallBrickStairs() }, + { BLOCKS.fluixBlock(), BLOCKS.fluixSlab(), BLOCKS.fluixStairs() }, + { BLOCKS.quartzBlock(), BLOCKS.quartzSlab(), BLOCKS.quartzStairs() }, + { BLOCKS.chiseledQuartzBlock(), BLOCKS.chiseledQuartzSlab(), BLOCKS.chiseledQuartzStairs() }, + { BLOCKS.quartzPillar(), BLOCKS.quartzPillarSlab(), BLOCKS.quartzPillarStairs() }, }; private final Path outputPath; @@ -77,10 +79,14 @@ public class SlabStairRecipes implements IAE2DataProvider { } private void provideRecipe(RecipeJsonProvider recipeJsonProvider) { - saveRecipe(cache, recipeJsonProvider.toJson(), outputPath.resolve("data/" + recipeJsonProvider.getRecipeId().getNamespace() + "/recipes/" + recipeJsonProvider.getRecipeId().getPath() + ".json")); + saveRecipe(cache, recipeJsonProvider.toJson(), + outputPath.resolve("data/" + recipeJsonProvider.getRecipeId().getNamespace() + "/recipes/" + + recipeJsonProvider.getRecipeId().getPath() + ".json")); JsonObject jsonObject = recipeJsonProvider.toAdvancementJson(); if (jsonObject != null) { - saveRecipeAdvancement(cache, jsonObject, outputPath.resolve("data/" + recipeJsonProvider.getRecipeId().getNamespace() + "/advancements/" + recipeJsonProvider.getAdvancementId().getPath() + ".json")); + saveRecipeAdvancement(cache, jsonObject, + outputPath.resolve("data/" + recipeJsonProvider.getRecipeId().getNamespace() + "/advancements/" + + recipeJsonProvider.getAdvancementId().getPath() + ".json")); } } diff --git a/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java b/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java index 202cdbbe7..f8734b568 100644 --- a/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java +++ b/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java @@ -1,12 +1,13 @@ package appeng.data.providers.tags; -import appeng.core.AppEng; -import net.minecraft.block.Blocks; -import net.minecraft.item.Items; - import java.io.IOException; import java.nio.file.Path; +import net.minecraft.block.Blocks; +import net.minecraft.item.Items; + +import appeng.core.AppEng; + public class ConventionTagProvider extends TagProvider { public ConventionTagProvider(Path outputPath) { @@ -47,61 +48,24 @@ public class ConventionTagProvider extends TagProvider { addItemTag("wheat_crops", Items.WHEAT); addItemTag("redstone_dusts", Items.REDSTONE); addItemTag("ender_pearls", Items.ENDER_PEARL); - addItemTag("terracotta_blocks", Items.TERRACOTTA, - Items.WHITE_TERRACOTTA, - Items.ORANGE_TERRACOTTA, - Items.MAGENTA_TERRACOTTA, - Items.LIGHT_BLUE_TERRACOTTA, - Items.YELLOW_TERRACOTTA, - Items.LIME_TERRACOTTA, - Items.PINK_TERRACOTTA, - Items.GRAY_TERRACOTTA, - Items.LIGHT_GRAY_TERRACOTTA, - Items.CYAN_TERRACOTTA, - Items.PURPLE_TERRACOTTA, - Items.BLUE_TERRACOTTA, - Items.BROWN_TERRACOTTA, - Items.GREEN_TERRACOTTA, - Items.RED_TERRACOTTA, - Items.BLACK_TERRACOTTA - ); - addItemTag("glass_blocks", Items.GLASS, - Items.WHITE_STAINED_GLASS, - Items.ORANGE_STAINED_GLASS, - Items.MAGENTA_STAINED_GLASS, - Items.LIGHT_BLUE_STAINED_GLASS, - Items.YELLOW_STAINED_GLASS, - Items.LIME_STAINED_GLASS, - Items.PINK_STAINED_GLASS, - Items.GRAY_STAINED_GLASS, - Items.LIGHT_GRAY_STAINED_GLASS, - Items.CYAN_STAINED_GLASS, - Items.PURPLE_STAINED_GLASS, - Items.BLUE_STAINED_GLASS, - Items.BROWN_STAINED_GLASS, - Items.GREEN_STAINED_GLASS, - Items.RED_STAINED_GLASS, - Items.BLACK_STAINED_GLASS - ); + addItemTag("terracotta_blocks", Items.TERRACOTTA, Items.WHITE_TERRACOTTA, Items.ORANGE_TERRACOTTA, + Items.MAGENTA_TERRACOTTA, Items.LIGHT_BLUE_TERRACOTTA, Items.YELLOW_TERRACOTTA, Items.LIME_TERRACOTTA, + Items.PINK_TERRACOTTA, Items.GRAY_TERRACOTTA, Items.LIGHT_GRAY_TERRACOTTA, Items.CYAN_TERRACOTTA, + Items.PURPLE_TERRACOTTA, Items.BLUE_TERRACOTTA, Items.BROWN_TERRACOTTA, Items.GREEN_TERRACOTTA, + Items.RED_TERRACOTTA, Items.BLACK_TERRACOTTA); + addItemTag("glass_blocks", Items.GLASS, Items.WHITE_STAINED_GLASS, Items.ORANGE_STAINED_GLASS, + Items.MAGENTA_STAINED_GLASS, Items.LIGHT_BLUE_STAINED_GLASS, Items.YELLOW_STAINED_GLASS, + Items.LIME_STAINED_GLASS, Items.PINK_STAINED_GLASS, Items.GRAY_STAINED_GLASS, + Items.LIGHT_GRAY_STAINED_GLASS, Items.CYAN_STAINED_GLASS, Items.PURPLE_STAINED_GLASS, + Items.BLUE_STAINED_GLASS, Items.BROWN_STAINED_GLASS, Items.GREEN_STAINED_GLASS, Items.RED_STAINED_GLASS, + Items.BLACK_STAINED_GLASS); - addBlockTag("glass_blocks", Blocks.GLASS, - Blocks.WHITE_STAINED_GLASS, - Blocks.ORANGE_STAINED_GLASS, - Blocks.MAGENTA_STAINED_GLASS, - Blocks.LIGHT_BLUE_STAINED_GLASS, - Blocks.YELLOW_STAINED_GLASS, - Blocks.LIME_STAINED_GLASS, - Blocks.PINK_STAINED_GLASS, - Blocks.GRAY_STAINED_GLASS, - Blocks.LIGHT_GRAY_STAINED_GLASS, - Blocks.CYAN_STAINED_GLASS, - Blocks.PURPLE_STAINED_GLASS, - Blocks.BLUE_STAINED_GLASS, - Blocks.BROWN_STAINED_GLASS, - Blocks.GREEN_STAINED_GLASS, - Blocks.RED_STAINED_GLASS, - Blocks.BLACK_STAINED_GLASS - ); + addBlockTag("glass_blocks", Blocks.GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, + Blocks.MAGENTA_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS, + Blocks.LIME_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, + Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, + Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, + Blocks.RED_STAINED_GLASS, Blocks.BLACK_STAINED_GLASS); } @Override diff --git a/src/datagen/java/appeng/data/providers/tags/TagProvider.java b/src/datagen/java/appeng/data/providers/tags/TagProvider.java index f05d6fbe8..95f728e3a 100644 --- a/src/datagen/java/appeng/data/providers/tags/TagProvider.java +++ b/src/datagen/java/appeng/data/providers/tags/TagProvider.java @@ -1,11 +1,16 @@ package appeng.data.providers.tags; -import appeng.core.AppEng; -import appeng.data.providers.IAE2DataProvider; +import java.io.IOException; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonObject; + import net.minecraft.block.Block; import net.minecraft.data.DataCache; import net.minecraft.data.DataProvider; @@ -13,11 +18,8 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import java.io.IOException; -import java.nio.file.Path; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; +import appeng.core.AppEng; +import appeng.data.providers.IAE2DataProvider; public abstract class TagProvider implements IAE2DataProvider { @@ -47,23 +49,19 @@ public abstract class TagProvider implements IAE2DataProvider { protected abstract void generate() throws IOException; protected void addItemTag(String name, ItemConvertible... items) throws IOException { - List itemIds = Arrays.stream(items) - .map(ItemConvertible::asItem) - .map(Registry.ITEM::getId) - .map(Identifier::toString) - .collect(Collectors.toList()); + List itemIds = Arrays.stream(items).map(ItemConvertible::asItem).map(Registry.ITEM::getId) + .map(Identifier::toString).collect(Collectors.toList()); writeTagFile(CONVENTION_NAMESPACE, TYPE_ITEMS, name, itemIds); } protected void addBlockTag(String name, Block... blocks) throws IOException { - List itemIds = Arrays.stream(blocks) - .map(Registry.BLOCK::getId) - .map(Identifier::toString) + List itemIds = Arrays.stream(blocks).map(Registry.BLOCK::getId).map(Identifier::toString) .collect(Collectors.toList()); writeTagFile(CONVENTION_NAMESPACE, TYPE_BLOCKS, name, itemIds); } - protected void writeTagFile(String namespace, String tagType, String tagName, List entries) throws IOException { + protected void writeTagFile(String namespace, String tagType, String tagName, List entries) + throws IOException { JsonObject rootObj = new JsonObject(); JsonArray valuesArr = new JsonArray(); for (String entry : entries) { diff --git a/src/datagen/resources/fabric.mod.json b/src/datagen/resources/fabric.mod.json index 817d573fc..51ac029ab 100644 --- a/src/datagen/resources/fabric.mod.json +++ b/src/datagen/resources/fabric.mod.json @@ -4,9 +4,7 @@ "version": "1.0.0", "name": "Applied Energistics 2 Datagen", "description": "", - "authors": [ - "TeamAppliedEnergistics" - ], + "authors": ["TeamAppliedEnergistics"], "contact": { "homepage": "https://ae-mod.info/", "sources": "https://github.com/AppliedEnergistics/Applied-Energistics-2/" @@ -17,9 +15,7 @@ "environment": "*", "entrypoints": { - "preLaunch": [ - "appeng.data.Entrypoint" - ] + "preLaunch": ["appeng.data.Entrypoint"] }, "depends": { "fabricloader": ">=0.7.1", diff --git a/src/main/java/appeng/attributes/MEAttributes.java b/src/main/java/appeng/attributes/MEAttributes.java index 91e86d961..1bfa035d3 100644 --- a/src/main/java/appeng/attributes/MEAttributes.java +++ b/src/main/java/appeng/attributes/MEAttributes.java @@ -18,17 +18,19 @@ package appeng.attributes; -import alexiil.mc.lib.attributes.Attribute; -import alexiil.mc.lib.attributes.Attributes; -import alexiil.mc.lib.attributes.SearchOptions; -import appeng.api.storage.IStorageMonitorableAccessor; -import appeng.parts.AEBasePart; import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.Attribute; +import alexiil.mc.lib.attributes.Attributes; +import alexiil.mc.lib.attributes.SearchOptions; + +import appeng.api.storage.IStorageMonitorableAccessor; +import appeng.parts.AEBasePart; + /** * Utility class that holds various attributes, both by AE2 and other Mods. */ @@ -37,8 +39,8 @@ public final class MEAttributes { private MEAttributes() { } - public static Attribute STORAGE_MONITORABLE_ACCESSOR - = Attributes.createDefaulted(IStorageMonitorableAccessor.class, new NullMENetworkAccessor()); + public static Attribute STORAGE_MONITORABLE_ACCESSOR = Attributes + .createDefaulted(IStorageMonitorableAccessor.class, new NullMENetworkAccessor()); public static T getFirstAttributeOnSide(Attribute attribute, BlockEntity be, Direction side) { World world = be.getWorld(); @@ -49,7 +51,8 @@ public final class MEAttributes { return attribute.getFirstOrNull(world, be.getPos().offset(side), SearchOptions.inDirection(side.getOpposite())); } - // Convenience function to get an attribute of the block that is in front of a part + // Convenience function to get an attribute of the block that is in front of a + // part public static T getAttributeInFrontOfPart(Attribute attribute, AEBasePart part) { BlockEntity self = part.getHost().getTile(); Direction direction = part.getSide().getFacing(); diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 4a582ce91..561408295 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -21,24 +21,24 @@ package appeng.block; import javax.annotation.Nullable; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.sound.BlockSoundGroup; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.ActionResult; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.registry.Registry; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldAccess; import net.minecraft.world.World; -import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.world.WorldAccess; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; @@ -68,8 +68,7 @@ public abstract class AEBaseBlock extends Block { public static FabricBlockSettings defaultProps(Material material, MaterialColor color) { return FabricBlockSettings.of(material, color) // These values previousls were encoded in AEBaseBlock - .strength(2.2f, 11.f) - .breakByTool(FabricToolTags.PICKAXES, 0) + .strength(2.2f, 11.f).breakByTool(FabricToolTags.PICKAXES, 0) .sounds(getDefaultSoundByMaterial(material)); } diff --git a/src/main/java/appeng/block/AEBaseBlockItem.java b/src/main/java/appeng/block/AEBaseBlockItem.java index 5151673dc..75fe118fe 100644 --- a/src/main/java/appeng/block/AEBaseBlockItem.java +++ b/src/main/java/appeng/block/AEBaseBlockItem.java @@ -20,24 +20,24 @@ package appeng.block; import java.util.List; -import appeng.block.networking.WirelessBlock; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; -import net.minecraft.text.Text; import net.minecraft.world.World; -import net.fabricmc.api.Environment; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; import appeng.block.misc.LightDetectorBlock; import appeng.block.misc.SkyCompassBlock; +import appeng.block.networking.WirelessBlock; import appeng.me.helpers.IGridProxyable; import appeng.tile.AEBaseBlockEntity; diff --git a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java index 7ed99ba84..011ca6577 100644 --- a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java +++ b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java @@ -18,14 +18,9 @@ package appeng.block; -import appeng.core.Api; -import appeng.api.config.AccessRestriction; -import appeng.api.config.Actionable; -import appeng.api.config.PowerUnits; -import appeng.api.definitions.IBlockDefinition; -import appeng.api.implementations.items.IAEItemPowerStorage; -import appeng.core.AppEng; -import appeng.core.localization.GuiText; +import java.text.MessageFormat; +import java.util.List; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; @@ -38,24 +33,27 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; import net.minecraft.world.World; -import java.text.MessageFormat; -import java.util.List; +import appeng.api.config.AccessRestriction; +import appeng.api.config.Actionable; +import appeng.api.config.PowerUnits; +import appeng.api.definitions.IBlockDefinition; +import appeng.api.implementations.items.IAEItemPowerStorage; +import appeng.core.Api; +import appeng.core.AppEng; +import appeng.core.localization.GuiText; public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEItemPowerStorage { public AEBaseBlockItemChargeable(Block id, Settings props) { super(id, props); - FabricModelPredicateProviderRegistry.register( - this, - new Identifier(AppEng.MOD_ID, "fill_level"), + FabricModelPredicateProviderRegistry.register(this, new Identifier(AppEng.MOD_ID, "fill_level"), (is, world, entity) -> { double curPower = getAECurrentPower(is); double maxPower = getAEMaxPower(is); return (int) Math.round(100 * curPower / maxPower); - } - ); + }); } @Override @@ -73,8 +71,7 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte final double percent = internalCurrentPower / internalMaxPower; - lines.add(GuiText.StoredEnergy.text() - .copy() + lines.add(GuiText.StoredEnergy.text().copy() .append(':' + MessageFormat.format(" {0,number,#} ", internalCurrentPower)) .append(new TranslatableText(PowerUnits.AE.unlocalizedName)) .append(" - " + MessageFormat.format("{0,number,#.##%}", percent))); diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 8d2b7482a..d61080cf0 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -25,11 +25,6 @@ import java.util.function.Supplier; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import alexiil.mc.lib.attributes.AttributeList; -import alexiil.mc.lib.attributes.AttributeProvider; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.block.networking.CableBusBlock; -import appeng.tile.networking.CableBusBlockEntity; import com.google.common.collect.Lists; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents; @@ -39,28 +34,35 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.text.LiteralText; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.ActionResult; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; +import net.minecraft.text.LiteralText; import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.BlockView; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.AttributeList; +import alexiil.mc.lib.attributes.AttributeProvider; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; import appeng.api.util.IOrientable; -import appeng.tile.AEBaseInvBlockEntity; +import appeng.block.networking.CableBusBlock; import appeng.tile.AEBaseBlockEntity; +import appeng.tile.AEBaseInvBlockEntity; +import appeng.tile.networking.CableBusBlockEntity; import appeng.tile.storage.SkyChestBlockEntity; import appeng.util.Platform; import appeng.util.SettingsFrom; -public abstract class AEBaseTileBlock extends AEBaseBlock implements BlockEntityProvider, AttributeProvider { +public abstract class AEBaseTileBlock extends AEBaseBlock + implements BlockEntityProvider, AttributeProvider { @Nonnull private Class blockEntityClass; @@ -141,22 +143,21 @@ public abstract class AEBaseTileBlock extends AEBas } /** - * Calculate redstone output level. - * 0 if completely empty, 1 if _any_ item is present, up to 15 if all slots are full. + * Calculate redstone output level. 0 if completely empty, 1 if _any_ item is + * present, up to 15 if all slots are full. */ private int getRedstoneFromFixedItemInv(FixedItemInv inv) { boolean foundAnything = false; // ANY slots non-empty? float fillRatio = 0; - for (int i = 0; i < inv.getSlotCount(); ++i) - { + for (int i = 0; i < inv.getSlotCount(); ++i) { ItemStack stack = inv.getInvStack(i); if (stack.isEmpty()) { continue; } int slotMaxCount = inv.getMaxAmount(i, stack); - fillRatio += stack.getCount() / (float)Math.min(slotMaxCount, stack.getMaxCount()); + fillRatio += stack.getCount() / (float) Math.min(slotMaxCount, stack.getMaxCount()); foundAnything = true; } @@ -192,8 +193,8 @@ public abstract class AEBaseTileBlock extends AEBas } @Override - public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, - Hand hand, BlockHitResult hit) { + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, + BlockHitResult hit) { ItemStack heldItem; if (player != null && !player.getStackInHand(hand).isEmpty()) { heldItem = player.getStackInHand(hand); @@ -271,7 +272,7 @@ public abstract class AEBaseTileBlock extends AEBas } public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, - final @Nullable ItemStack heldItem, final BlockHitResult hit) { + final @Nullable ItemStack heldItem, final BlockHitResult hit) { return ActionResult.PASS; } diff --git a/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java b/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java index bc7f643b7..3a68d427c 100644 --- a/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java +++ b/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java @@ -18,11 +18,6 @@ package appeng.block.crafting; -import appeng.block.AEBaseTileBlock; -import appeng.container.ContainerLocator; -import appeng.container.ContainerOpener; -import appeng.container.implementations.CraftingCPUContainer; -import appeng.tile.crafting.CraftingBlockEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -34,6 +29,12 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import appeng.block.AEBaseTileBlock; +import appeng.container.ContainerLocator; +import appeng.container.ContainerOpener; +import appeng.container.implementations.CraftingCPUContainer; +import appeng.tile.crafting.CraftingBlockEntity; + public abstract class AbstractCraftingUnitBlock extends AEBaseTileBlock { public static final BooleanProperty FORMED = BooleanProperty.of("formed"); public static final BooleanProperty POWERED = BooleanProperty.of("powered"); @@ -77,8 +78,7 @@ public abstract class AbstractCraftingUnitBlock e } @Override - public ActionResult onUse(BlockState state, World w, BlockPos pos, PlayerEntity p, Hand hand, - BlockHitResult hit) { + public ActionResult onUse(BlockState state, World w, BlockPos pos, PlayerEntity p, Hand hand, BlockHitResult hit) { final CraftingBlockEntity tg = this.getBlockEntity(w, pos); if (tg != null && !p.isInSneakingPose() && tg.isFormed() && tg.isActive()) { diff --git a/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java b/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java index 26ad70102..b92193f0a 100644 --- a/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java +++ b/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java @@ -21,8 +21,8 @@ package appeng.block.crafting; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; @@ -56,8 +56,7 @@ public class MolecularAssemblerBlock extends AEBaseTileBlock { @@ -79,8 +79,8 @@ public class CrankBlock extends AEBaseTileBlock { } @Override - public void onPlaced(final World world, final BlockPos pos, final BlockState state, - final LivingEntity placer, final ItemStack stack) { + public void onPlaced(final World world, final BlockPos pos, final BlockState state, final LivingEntity placer, + final ItemStack stack) { final AEBaseBlockEntity tile = this.getBlockEntity(world, pos); if (tile != null) { final Direction mnt = this.findCrankable(world, pos); @@ -95,7 +95,8 @@ public class CrankBlock extends AEBaseTileBlock { } @Override - public boolean isValidOrientation(final WorldAccess w, final BlockPos pos, final Direction forward, final Direction up) { + public boolean isValidOrientation(final WorldAccess w, final BlockPos pos, final Direction forward, + final Direction up) { final BlockEntity te = w.getBlockEntity(pos); return !(te instanceof CrankBlockEntity) || this.isCrankable(w, pos, up.getOpposite()); } @@ -155,8 +156,8 @@ public class CrankBlock extends AEBaseTileBlock { final double xOff = -0.15 * up.getOffsetX(); final double yOff = -0.15 * up.getOffsetY(); final double zOff = -0.15 * up.getOffsetZ(); - return VoxelShapes.cuboid( - new Box(xOff + 0.15, yOff + 0.15, zOff + 0.15, xOff + 0.85, yOff + 0.85, zOff + 0.85)); + return VoxelShapes + .cuboid(new Box(xOff + 0.15, yOff + 0.15, zOff + 0.15, xOff + 0.85, yOff + 0.85, zOff + 0.85)); } } diff --git a/src/main/java/appeng/block/grindstone/GrinderBlock.java b/src/main/java/appeng/block/grindstone/GrinderBlock.java index d10b70c10..b726f98d3 100644 --- a/src/main/java/appeng/block/grindstone/GrinderBlock.java +++ b/src/main/java/appeng/block/grindstone/GrinderBlock.java @@ -21,8 +21,8 @@ package appeng.block.grindstone; import javax.annotation.Nullable; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; diff --git a/src/main/java/appeng/block/misc/CellWorkbenchBlock.java b/src/main/java/appeng/block/misc/CellWorkbenchBlock.java index c04136f86..dc57bbe4b 100644 --- a/src/main/java/appeng/block/misc/CellWorkbenchBlock.java +++ b/src/main/java/appeng/block/misc/CellWorkbenchBlock.java @@ -25,8 +25,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/block/misc/ChargerBlock.java b/src/main/java/appeng/block/misc/ChargerBlock.java index 5c4efd5f4..dbd445a88 100644 --- a/src/main/java/appeng/block/misc/ChargerBlock.java +++ b/src/main/java/appeng/block/misc/ChargerBlock.java @@ -23,28 +23,28 @@ import java.util.function.Function; import javax.annotation.Nullable; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.model.json.Transformation; -import net.minecraft.client.util.math.AffineTransformation; -import net.minecraft.util.math.Box; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.block.Material; +import net.minecraft.block.ShapeContext; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.util.math.Vector3f; -import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.model.json.Transformation; +import net.minecraft.client.util.math.AffineTransformation; +import net.minecraft.client.util.math.Vector3f; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.block.ShapeContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; +import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; @@ -110,8 +110,9 @@ public class ChargerBlock extends AEBaseTileBlock { for (int bolts = 0; bolts < 3; bolts++) { if (AppEng.instance().shouldAddParticles(r)) { - MinecraftClient.getInstance().particleManager.addParticle(ParticleTypes.LIGHTNING, xOff + 0.5 + pos.getX(), - yOff + 0.5 + pos.getY(), zOff + 0.5 + pos.getZ(), 0.0, 0.0, 0.0); + MinecraftClient.getInstance().particleManager.addParticle(ParticleTypes.LIGHTNING, + xOff + 0.5 + pos.getX(), yOff + 0.5 + pos.getY(), zOff + 0.5 + pos.getZ(), 0.0, 0.0, + 0.0); } } } @@ -171,8 +172,7 @@ public class ChargerBlock extends AEBaseTileBlock { } @Override - public VoxelShape getCollisionShape(BlockState state, BlockView worldIn, BlockPos pos, - ShapeContext context) { + public VoxelShape getCollisionShape(BlockState state, BlockView worldIn, BlockPos pos, ShapeContext context) { return VoxelShapes.cuboid(new Box(0.0, 0.0, 0.0, 1.0, 1.0, 1.0)); } @@ -183,7 +183,8 @@ public class ChargerBlock extends AEBaseTileBlock { @Environment(EnvType.CLIENT) private static Pair getRenderedItem(ChargerBlockEntity tile) { - Transformation transform = new Transformation(new Vector3f(), new Vector3f(0.5f, 0.375f, 0.5f), new Vector3f(1f, 1f, 1f)); + Transformation transform = new Transformation(new Vector3f(), new Vector3f(0.5f, 0.375f, 0.5f), + new Vector3f(1f, 1f, 1f)); return new ImmutablePair<>(tile.getInternalInventory().getInvStack(0), transform); } diff --git a/src/main/java/appeng/block/misc/InterfaceBlock.java b/src/main/java/appeng/block/misc/InterfaceBlock.java index daae28158..b879999ae 100644 --- a/src/main/java/appeng/block/misc/InterfaceBlock.java +++ b/src/main/java/appeng/block/misc/InterfaceBlock.java @@ -25,13 +25,13 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.ActionResult; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; import appeng.api.util.IOrientable; diff --git a/src/main/java/appeng/block/misc/LightDetectorBlock.java b/src/main/java/appeng/block/misc/LightDetectorBlock.java index bf090f08a..929d3b5d8 100644 --- a/src/main/java/appeng/block/misc/LightDetectorBlock.java +++ b/src/main/java/appeng/block/misc/LightDetectorBlock.java @@ -19,18 +19,18 @@ package appeng.block.misc; import net.minecraft.block.*; -import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; +import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -import net.minecraft.world.World; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; @@ -56,7 +56,8 @@ public class LightDetectorBlock extends AEBaseTileBlock not required, but not sure... are quartz // fixtures rotateable??? return this.canPlaceAt(w, pos, up.getOpposite()); diff --git a/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java b/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java index 994395ae0..17a803f31 100644 --- a/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java +++ b/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java @@ -21,17 +21,17 @@ package appeng.block.misc; import java.util.Random; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.sound.BlockSoundGroup; import net.minecraft.block.Material; import net.minecraft.client.MinecraftClient; -import net.minecraft.state.property.BooleanProperty; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; -import net.minecraft.util.math.Direction; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import net.fabricmc.api.Environment; import appeng.api.util.IOrientableBlock; import appeng.block.AEBaseTileBlock; @@ -52,7 +52,8 @@ public class QuartzGrowthAcceleratorBlock extends AEBaseTileBlock { } @Override - public boolean isValidOrientation(final WorldAccess w, final BlockPos pos, final Direction forward, final Direction up) { + public boolean isValidOrientation(final WorldAccess w, final BlockPos pos, final Direction forward, + final Direction up) { final SkyCompassBlockEntity sc = this.getBlockEntity(w, pos); if (sc != null) { return false; @@ -145,8 +146,7 @@ public class SkyCompassBlock extends AEBaseTileBlock { } @Override - public VoxelShape getCollisionShape(BlockState state, BlockView worldIn, BlockPos pos, - ShapeContext context) { + public VoxelShape getCollisionShape(BlockState state, BlockView worldIn, BlockPos pos, ShapeContext context) { return VoxelShapes.empty(); } diff --git a/src/main/java/appeng/block/misc/TinyTNTBlock.java b/src/main/java/appeng/block/misc/TinyTNTBlock.java index 202f45156..f8215af48 100644 --- a/src/main/java/appeng/block/misc/TinyTNTBlock.java +++ b/src/main/java/appeng/block/misc/TinyTNTBlock.java @@ -20,33 +20,32 @@ package appeng.block.misc; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.PersistentProjectileEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.sound.SoundCategory; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.block.ShapeContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; -import net.minecraft.world.explosion.Explosion; import net.minecraft.world.BlockView; import net.minecraft.world.World; +import net.minecraft.world.explosion.Explosion; import appeng.block.AEBaseBlock; import appeng.entity.TinyTNTPrimedEntity; public class TinyTNTBlock extends AEBaseBlock { - private static final VoxelShape SHAPE = VoxelShapes - .cuboid(new Box(0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f)); + private static final VoxelShape SHAPE = VoxelShapes.cuboid(new Box(0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f)); public TinyTNTBlock(Settings props) { super(props); @@ -80,16 +79,17 @@ public class TinyTNTBlock extends AEBaseBlock { public void startFuse(final World w, final BlockPos pos, final LivingEntity igniter) { if (!w.isClient) { - final TinyTNTPrimedEntity primedTinyTNTEntity = new TinyTNTPrimedEntity(w, pos.getX() + 0.5F, - pos.getY(), pos.getZ() + 0.5F, igniter); + final TinyTNTPrimedEntity primedTinyTNTEntity = new TinyTNTPrimedEntity(w, pos.getX() + 0.5F, pos.getY(), + pos.getZ() + 0.5F, igniter); w.spawnEntity(primedTinyTNTEntity); - w.playSound(null, primedTinyTNTEntity.getX(), primedTinyTNTEntity.getY(), - primedTinyTNTEntity.getZ(), SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1, 1); + w.playSound(null, primedTinyTNTEntity.getX(), primedTinyTNTEntity.getY(), primedTinyTNTEntity.getZ(), + SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1, 1); } } @Override - public void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean notify) { + public void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, + boolean notify) { if (world.isReceivingRedstonePower(pos)) { this.startFuse(world, pos, null); world.removeBlock(pos, false); diff --git a/src/main/java/appeng/block/misc/VibrationChamberBlock.java b/src/main/java/appeng/block/misc/VibrationChamberBlock.java index 9abfc635d..c93f19a55 100644 --- a/src/main/java/appeng/block/misc/VibrationChamberBlock.java +++ b/src/main/java/appeng/block/misc/VibrationChamberBlock.java @@ -28,13 +28,13 @@ import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.particle.ParticleTypes; -import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.ActionResult; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/block/networking/CableBusBlock.java b/src/main/java/appeng/block/networking/CableBusBlock.java index 211c9d544..13a858345 100644 --- a/src/main/java/appeng/block/networking/CableBusBlock.java +++ b/src/main/java/appeng/block/networking/CableBusBlock.java @@ -18,25 +18,11 @@ package appeng.block.networking; -import appeng.api.parts.IFacadeContainer; -import appeng.api.parts.IFacadePart; -import appeng.api.parts.PartItemStack; -import appeng.api.parts.SelectedPart; -import appeng.api.util.AEColor; -import appeng.api.util.AEPartLocation; -import appeng.block.AEBaseTileBlock; -import appeng.client.render.cablebus.CableBusBakedModel; -import appeng.client.render.cablebus.CableBusBreakingParticle; -import appeng.client.render.cablebus.CableBusRenderState; -import appeng.core.AppEng; -import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.ClickPacket; -import appeng.helpers.AEMaterials; -import appeng.integration.abstraction.IAEFacade; -import appeng.parts.ICableBusContainer; -import appeng.parts.NullCableBusContainer; -import appeng.tile.networking.CableBusBlockEntity; -import appeng.util.Platform; +import java.util.List; +import java.util.Random; + +import javax.annotation.Nullable; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.event.client.player.ClientPickBlockGatherCallback; @@ -70,19 +56,32 @@ import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.util.List; -import java.util.Random; +import appeng.api.parts.IFacadeContainer; +import appeng.api.parts.IFacadePart; +import appeng.api.parts.PartItemStack; +import appeng.api.parts.SelectedPart; +import appeng.api.util.AEColor; +import appeng.api.util.AEPartLocation; +import appeng.block.AEBaseTileBlock; +import appeng.client.render.cablebus.CableBusBakedModel; +import appeng.client.render.cablebus.CableBusBreakingParticle; +import appeng.client.render.cablebus.CableBusRenderState; +import appeng.core.AppEng; +import appeng.core.sync.network.NetworkHandler; +import appeng.core.sync.packets.ClickPacket; +import appeng.helpers.AEMaterials; +import appeng.integration.abstraction.IAEFacade; +import appeng.parts.ICableBusContainer; +import appeng.parts.NullCableBusContainer; +import appeng.tile.networking.CableBusBlockEntity; +import appeng.util.Platform; public class CableBusBlock extends AEBaseTileBlock implements IAEFacade { private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer(); public CableBusBlock() { - super(defaultProps(AEMaterials.GLASS) - .nonOpaque() - .dropsNothing() - .dynamicBounds()); + super(defaultProps(AEMaterials.GLASS).nonOpaque().dropsNothing().dynamicBounds()); } static { @@ -92,8 +91,7 @@ public class CableBusBlock extends AEBaseTileBlock implemen BlockState blockState = player.world.getBlockState(((BlockHitResult) result).getBlockPos()); if (blockState.getBlock() instanceof CableBusBlock) { CableBusBlock cableBus = (CableBusBlock) blockState.getBlock(); - return cableBus.getPickBlock(blockState, - result, player.world, blockResult.getBlockPos(), player); + return cableBus.getPickBlock(blockState, result, player.world, blockResult.getBlockPos(), player); } } return ItemStack.EMPTY; @@ -112,7 +110,8 @@ public class CableBusBlock extends AEBaseTileBlock implemen } @Override - public int getWeakRedstonePower(final BlockState state, final BlockView w, final BlockPos pos, final Direction side) { + public int getWeakRedstonePower(final BlockState state, final BlockView w, final BlockPos pos, + final Direction side) { return this.cb(w, pos).isProvidingWeakPower(side.getOpposite()); // TODO: // IS // OPPOSITE!? @@ -144,21 +143,18 @@ public class CableBusBlock extends AEBaseTileBlock implemen // FIXME FABRIC return this.cb(world, pos).getLightValue(); // FIXME FABRIC } - // FIXME: Must hook isClimbing ourselves // FIXME FABRIC @Override // FIXME FABRIC public boolean isLadder(BlockState state, WorldView world, BlockPos pos, LivingEntity entity) { // FIXME FABRIC return this.cb(world, pos).isLadder(entity); // FIXME FABRIC } - @Override public boolean canReplace(BlockState state, ItemPlacementContext context) { // FIXME: Potentially check the fluid one too return super.canReplace(state, context) && this.cb(context.getWorld(), context.getBlockPos()).isEmpty(); } - // FIXME FABRIC Hook does not exist // FIXME FABRIC @Override // FIXME FABRIC public boolean removedByPlayer(BlockState state, World world, BlockPos pos, PlayerEntity player, @@ -185,7 +181,7 @@ public class CableBusBlock extends AEBaseTileBlock implemen // FIXME FABRIC } public ItemStack getPickBlock(BlockState state, HitResult target, BlockView world, BlockPos pos, - PlayerEntity player) { + PlayerEntity player) { final Vec3d v3 = target.getPos().subtract(pos.getX(), pos.getY(), pos.getZ()); final SelectedPart sp = this.cb(world, pos).selectPart(v3); @@ -198,11 +194,11 @@ public class CableBusBlock extends AEBaseTileBlock implemen return ItemStack.EMPTY; } - - // FIXME FABRIC MIXIN net.minecraft.client.particle.ParticleManager.addBlockBreakingParticles + // FIXME FABRIC MIXIN + // net.minecraft.client.particle.ParticleManager.addBlockBreakingParticles @Environment(EnvType.CLIENT) public boolean addHitEffects(final BlockState state, final World world, final HitResult target, - final ParticleManager effectRenderer) { + final ParticleManager effectRenderer) { // Half the particle rate. Since we're spawning concentrated on a specific spot, // our particle effect otherwise looks too strong @@ -218,8 +214,7 @@ public class CableBusBlock extends AEBaseTileBlock implemen ICableBusContainer cb = this.cb(world, blockPos); // Our built-in model has the actual baked sprites we need - BakedModel model = MinecraftClient.getInstance().getBlockRenderManager() - .getModel(this.getDefaultState()); + BakedModel model = MinecraftClient.getInstance().getBlockRenderManager().getModel(this.getDefaultState()); // We cannot add the effect if we don't have the model if (!(model instanceof CableBusBakedModel)) { @@ -238,21 +233,20 @@ public class CableBusBlock extends AEBaseTileBlock implemen double z = target.getPos().z; // FIXME: Check how this looks, probably like shit, maybe provide parts the // ability to supply particle textures??? - effectRenderer - .addParticle(new CableBusBreakingParticle((ClientWorld) world, x, y, z, texture).scale(0.8F)); + effectRenderer.addParticle(new CableBusBreakingParticle((ClientWorld) world, x, y, z, texture).scale(0.8F)); } return true; } - // FIXME FABRIC: Mixin to net.minecraft.client.particle.ParticleManager.addBlockBreakParticles + // FIXME FABRIC: Mixin to + // net.minecraft.client.particle.ParticleManager.addBlockBreakParticles @Environment(EnvType.CLIENT) public boolean addDestroyEffects(BlockState state, World world, BlockPos pos, ParticleManager effectRenderer) { ICableBusContainer cb = this.cb(world, pos); // Our built-in model has the actual baked sprites we need - BakedModel model = MinecraftClient.getInstance().getBlockRenderManager() - .getModel(this.getDefaultState()); + BakedModel model = MinecraftClient.getInstance().getBlockRenderManager().getModel(this.getDefaultState()); // We cannot add the effect if we dont have the model if (!(model instanceof CableBusBakedModel)) { @@ -280,8 +274,8 @@ public class CableBusBlock extends AEBaseTileBlock implemen // FIXME: Check how this looks, probably like shit, maybe provide parts the // ability to supply particle textures??? - Particle effect = new CableBusBreakingParticle((ClientWorld) world, x, y, z, x - pos.getX() - 0.5D, - y - pos.getY() - 0.5D, z - pos.getZ() - 0.5D, texture); + Particle effect = new CableBusBreakingParticle((ClientWorld) world, x, y, z, + x - pos.getX() - 0.5D, y - pos.getY() - 0.5D, z - pos.getZ() - 0.5D, texture); effectRenderer.addParticle(effect); } } @@ -293,7 +287,7 @@ public class CableBusBlock extends AEBaseTileBlock implemen @Override public void neighborUpdate(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos, - boolean isMoving) { + boolean isMoving) { if (Platform.isServer()) { this.cb(world, pos).onneighborUpdate(world, pos, fromPos); } @@ -334,7 +328,7 @@ public class CableBusBlock extends AEBaseTileBlock implemen if (this.cb(worldIn, pos).clicked(player, Hand.MAIN_HAND, hitVec)) { NetworkHandler.instance().sendToServer(new ClickPacket(pos, brtr.getSide(), (float) hitVec.x, - (float) hitVec.y, (float) hitVec.z, Hand.MAIN_HAND, true)); + (float) hitVec.y, (float) hitVec.z, Hand.MAIN_HAND, true)); } } } @@ -347,15 +341,15 @@ public class CableBusBlock extends AEBaseTileBlock implemen @Override public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, - final @Nullable ItemStack heldItem, final BlockHitResult hit) { + final @Nullable ItemStack heldItem, final BlockHitResult hit) { // Transform from world into block space Vec3d hitVec = hit.getPos(); Vec3d hitInBlock = new Vec3d(hitVec.x - pos.getX(), hitVec.y - pos.getY(), hitVec.z - pos.getZ()); return this.cb(w, pos).activate(player, hand, hitInBlock) ? ActionResult.SUCCESS : ActionResult.PASS; } - public boolean recolorBlock(final BlockView world, final BlockPos pos, final Direction side, - final DyeColor color, final PlayerEntity who) { + public boolean recolorBlock(final BlockView world, final BlockPos pos, final Direction side, final DyeColor color, + final PlayerEntity who) { try { return this.cb(world, pos).recolourBlock(side, AEColor.values()[color.ordinal()], who); } catch (final Throwable ignored) { @@ -399,7 +393,8 @@ public class CableBusBlock extends AEBaseTileBlock implemen return VoxelShapes.empty(); } else { Entity entity = null; - // FIXME FABRIC: even EntityShapeContext doesn't give us the actual entity we're colliding with :| + // FIXME FABRIC: even EntityShapeContext doesn't give us the actual entity we're + // colliding with :| return te.getCableBus().getCollisionShape(entity); } } diff --git a/src/main/java/appeng/block/networking/CableBusColor.java b/src/main/java/appeng/block/networking/CableBusColor.java index 98f1dfc2a..7e3586cc8 100644 --- a/src/main/java/appeng/block/networking/CableBusColor.java +++ b/src/main/java/appeng/block/networking/CableBusColor.java @@ -20,13 +20,13 @@ package appeng.block.networking; import javax.annotation.Nullable; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockRenderView; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import appeng.api.util.AEColor; import appeng.parts.CableBusContainer; diff --git a/src/main/java/appeng/block/networking/CableBusRendering.java b/src/main/java/appeng/block/networking/CableBusRendering.java index d86c5e041..afd32717c 100644 --- a/src/main/java/appeng/block/networking/CableBusRendering.java +++ b/src/main/java/appeng/block/networking/CableBusRendering.java @@ -20,11 +20,11 @@ package appeng.block.networking; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.render.RenderLayer; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; import appeng.bootstrap.IItemRendering; -import net.minecraft.client.render.RenderLayer; /** * Customizes the rendering behavior for cable busses, which are the biggest @@ -35,7 +35,8 @@ public class CableBusRendering extends BlockRenderingCustomizer { @Override @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { - // FIXME This is straight up impossible in Vanilla, and questionable if it's actually needed. + // FIXME This is straight up impossible in Vanilla, and questionable if it's + // actually needed. // FIXME rendering.renderType(rt -> true); rendering.renderType(RenderLayer.getCutout()); diff --git a/src/main/java/appeng/block/networking/ControllerBlock.java b/src/main/java/appeng/block/networking/ControllerBlock.java index b410bea35..f1b634504 100644 --- a/src/main/java/appeng/block/networking/ControllerBlock.java +++ b/src/main/java/appeng/block/networking/ControllerBlock.java @@ -18,19 +18,19 @@ package appeng.block.networking; -import appeng.tile.networking.ControllerBlockEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; -import net.minecraft.state.property.EnumProperty; import net.minecraft.state.StateManager; +import net.minecraft.state.property.EnumProperty; import net.minecraft.util.StringIdentifiable; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldAccess; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; import appeng.block.AEBaseTileBlock; +import appeng.tile.networking.ControllerBlockEntity; public class ControllerBlock extends AEBaseTileBlock { @@ -86,8 +86,8 @@ public class ControllerBlock extends AEBaseTileBlock { * texture feel for the controller based on how it is placed. */ @Override - public BlockState getStateForNeighborUpdate(BlockState state, Direction facing, BlockState facingState, WorldAccess world, - BlockPos pos, BlockPos facingPos) { + public BlockState getStateForNeighborUpdate(BlockState state, Direction facing, BlockState facingState, + WorldAccess world, BlockPos pos, BlockPos facingPos) { // FIXME: this might work, or might _NOT_ work, but needs to be investigated diff --git a/src/main/java/appeng/block/networking/WirelessBlock.java b/src/main/java/appeng/block/networking/WirelessBlock.java index 9e4da6b5d..11d581bd1 100644 --- a/src/main/java/appeng/block/networking/WirelessBlock.java +++ b/src/main/java/appeng/block/networking/WirelessBlock.java @@ -20,17 +20,17 @@ package appeng.block.networking; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.state.property.EnumProperty; import net.minecraft.state.StateManager; +import net.minecraft.state.property.EnumProperty; import net.minecraft.util.ActionResult; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.StringIdentifiable; -import net.minecraft.util.math.Box; +import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; -import net.minecraft.block.ShapeContext; +import net.minecraft.util.math.Box; +import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; @@ -83,7 +83,7 @@ public class WirelessBlock extends AEBaseTileBlock { @Override public ActionResult onUse(BlockState state, World w, BlockPos pos, PlayerEntity player, Hand hand, - BlockHitResult hit) { + BlockHitResult hit) { final WirelessBlockEntity tg = this.getBlockEntity(w, pos); if (tg != null && !player.isInSneakingPose()) { diff --git a/src/main/java/appeng/block/networking/WirelessRendering.java b/src/main/java/appeng/block/networking/WirelessRendering.java index 0492185ef..f492f9a80 100644 --- a/src/main/java/appeng/block/networking/WirelessRendering.java +++ b/src/main/java/appeng/block/networking/WirelessRendering.java @@ -1,9 +1,9 @@ package appeng.block.networking; -import net.minecraft.client.render.RenderLayer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.render.RenderLayer; import appeng.api.util.AEColor; import appeng.bootstrap.BlockRenderingCustomizer; diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java index 650f05b69..e9d673189 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java @@ -1,10 +1,16 @@ package appeng.block.paint; -import appeng.client.render.cablebus.CubeBuilder; -import appeng.core.AppEng; -import appeng.helpers.Splotch; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.function.Function; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + import com.google.common.collect.ImmutableList; + import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachedBlockView; @@ -22,12 +28,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import java.util.function.Function; -import java.util.function.Supplier; +import appeng.client.render.cablebus.CubeBuilder; +import appeng.core.AppEng; +import appeng.helpers.Splotch; /** * Renders paint blocks, which render multiple "splotches" that have been @@ -56,7 +59,8 @@ class PaintSplotchesBakedModel implements BakedModel, FabricBakedModel { } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { Object renderAttachment = ((RenderAttachedBlockView) blockView).getBlockEntityRenderAttachment(pos); if (!(renderAttachment instanceof PaintSplotches)) { diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java index d01fdf3c8..1139b2b10 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java @@ -18,23 +18,23 @@ package appeng.block.paint; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; +import net.minecraft.block.ShapeContext; import net.minecraft.fluid.Fluid; -import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; -import net.minecraft.block.ShapeContext; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import appeng.block.AEBaseTileBlock; import appeng.tile.misc.PaintSplotchesBlockEntity; diff --git a/src/main/java/appeng/block/paint/PaintSplotchesModel.java b/src/main/java/appeng/block/paint/PaintSplotchesModel.java index 65b33f548..35e0d9175 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesModel.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesModel.java @@ -1,7 +1,15 @@ package appeng.block.paint; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; +import java.util.function.Function; + +import javax.annotation.Nullable; + import com.mojang.datafixers.util.Pair; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -10,22 +18,18 @@ import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; -import java.util.function.Function; - public class PaintSplotchesModel implements UnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { return new PaintSplotchesBakedModel(textureGetter); } @Override - public Collection getTextureDependencies(Function unbakedModelGetter, Set> unresolvedTextureReferences) { + public Collection getTextureDependencies(Function unbakedModelGetter, + Set> unresolvedTextureReferences) { return PaintSplotchesBakedModel.getRequiredTextures(); } diff --git a/src/main/java/appeng/block/paint/PaintSplotchesRendering.java b/src/main/java/appeng/block/paint/PaintSplotchesRendering.java index 076779988..a9efd807b 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesRendering.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesRendering.java @@ -1,9 +1,9 @@ package appeng.block.paint; -import net.minecraft.client.render.RenderLayer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.render.RenderLayer; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index d675b20f9..eb6804731 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -1,10 +1,17 @@ package appeng.block.qnb; -import appeng.client.render.cablebus.CubeBuilder; -import appeng.core.Api; -import appeng.core.AppEng; +import java.util.EnumSet; +import java.util.List; +import java.util.Random; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + import com.google.common.collect.ImmutableList; + import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; @@ -24,13 +31,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; -import javax.annotation.Nullable; -import java.util.EnumSet; -import java.util.List; -import java.util.Random; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Supplier; +import appeng.client.render.cablebus.CubeBuilder; +import appeng.core.Api; +import appeng.core.AppEng; class QnbFormedBakedModel implements BakedModel, FabricBakedModel { @@ -40,12 +43,12 @@ class QnbFormedBakedModel implements BakedModel, FabricBakedModel { new Identifier(AppEng.MOD_ID, "block/quantum_ring")); private static final SpriteIdentifier TEXTURE_RING_LIGHT = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, new Identifier(AppEng.MOD_ID, "block/quantum_ring_light")); - private static final SpriteIdentifier TEXTURE_RING_LIGHT_CORNER = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, - new Identifier(AppEng.MOD_ID, "block/quantum_ring_light_corner")); + private static final SpriteIdentifier TEXTURE_RING_LIGHT_CORNER = new SpriteIdentifier( + SpriteAtlasTexture.BLOCK_ATLAS_TEX, new Identifier(AppEng.MOD_ID, "block/quantum_ring_light_corner")); private static final SpriteIdentifier TEXTURE_CABLE_GLASS = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, new Identifier(AppEng.MOD_ID, "part/cable/glass/transparent")); - private static final SpriteIdentifier TEXTURE_COVERED_CABLE = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, - new Identifier(AppEng.MOD_ID, "part/cable/covered/transparent")); + private static final SpriteIdentifier TEXTURE_COVERED_CABLE = new SpriteIdentifier( + SpriteAtlasTexture.BLOCK_ATLAS_TEX, new Identifier(AppEng.MOD_ID, "part/cable/covered/transparent")); private static final float DEFAULT_RENDER_MIN = 2.0f; private static final float DEFAULT_RENDER_MAX = 14.0f; @@ -89,7 +92,8 @@ class QnbFormedBakedModel implements BakedModel, FabricBakedModel { } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { QnbFormedState formedState = getState(blockView, pos); if (formedState == null) { @@ -185,7 +189,7 @@ class QnbFormedBakedModel implements BakedModel, FabricBakedModel { } private void renderCableAt(CubeBuilder builder, float thickness, Sprite texture, float pull, - Set connections) { + Set connections) { builder.setTexture(texture); if (connections.contains(Direction.WEST)) { diff --git a/src/main/java/appeng/block/qnb/QnbFormedModel.java b/src/main/java/appeng/block/qnb/QnbFormedModel.java index 68cec3930..988158649 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedModel.java @@ -1,9 +1,14 @@ package appeng.block.qnb; -import appeng.client.render.BasicUnbakedModel; -import appeng.core.AppEng; +import java.util.Collection; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.annotation.Nullable; + import com.google.common.collect.ImmutableSet; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -11,10 +16,8 @@ import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.function.Function; -import java.util.stream.Stream; +import appeng.client.render.BasicUnbakedModel; +import appeng.core.AppEng; public class QnbFormedModel implements BasicUnbakedModel { @@ -22,7 +25,8 @@ public class QnbFormedModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { BakedModel ringModel = loader.bake(MODEL_RING, rotationContainer); return new QnbFormedBakedModel(ringModel, textureGetter); } diff --git a/src/main/java/appeng/block/qnb/QuantumBaseBlock.java b/src/main/java/appeng/block/qnb/QuantumBaseBlock.java index 085476692..28bf30547 100644 --- a/src/main/java/appeng/block/qnb/QuantumBaseBlock.java +++ b/src/main/java/appeng/block/qnb/QuantumBaseBlock.java @@ -20,11 +20,11 @@ package appeng.block.qnb; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.StateManager; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.BlockPos; import net.minecraft.block.ShapeContext; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; diff --git a/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java b/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java index 30a7c2d8d..63149decf 100644 --- a/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java +++ b/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java @@ -1,9 +1,9 @@ package appeng.block.qnb; -import net.minecraft.client.render.RenderLayer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.render.RenderLayer; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; diff --git a/src/main/java/appeng/block/qnb/QuantumLinkChamberBlock.java b/src/main/java/appeng/block/qnb/QuantumLinkChamberBlock.java index 7304e105b..bb136da35 100644 --- a/src/main/java/appeng/block/qnb/QuantumLinkChamberBlock.java +++ b/src/main/java/appeng/block/qnb/QuantumLinkChamberBlock.java @@ -23,14 +23,14 @@ import java.util.Random; import javax.annotation.Nullable; import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.block.ShapeContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; @@ -51,8 +51,8 @@ public class QuantumLinkChamberBlock extends QuantumBaseBlock { static { final double onePixel = 2.0 / 16.0; - SHAPE = VoxelShapes.cuboid( - new Box(onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel)); + SHAPE = VoxelShapes + .cuboid(new Box(onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel)); } public QuantumLinkChamberBlock() { @@ -65,8 +65,8 @@ public class QuantumLinkChamberBlock extends QuantumBaseBlock { if (bridge != null) { if (bridge.hasQES()) { if (AppEng.instance().shouldAddParticles(rand)) { - AppEng.instance().spawnEffect(EffectType.Energy, w, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, - null); + AppEng.instance().spawnEffect(EffectType.Energy, w, pos.getX() + 0.5, pos.getY() + 0.5, + pos.getZ() + 0.5, null); } } } diff --git a/src/main/java/appeng/block/qnb/QuantumRingBlock.java b/src/main/java/appeng/block/qnb/QuantumRingBlock.java index 3964da958..decb3957a 100644 --- a/src/main/java/appeng/block/qnb/QuantumRingBlock.java +++ b/src/main/java/appeng/block/qnb/QuantumRingBlock.java @@ -20,9 +20,9 @@ package appeng.block.qnb; import net.minecraft.block.BlockState; import net.minecraft.block.Material; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.BlockPos; import net.minecraft.block.ShapeContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; @@ -51,7 +51,7 @@ public class QuantumRingBlock extends QuantumBaseBlock { } private static VoxelShape createShape(double onePixel) { - return VoxelShapes.cuboid( - new Box(onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel)); + return VoxelShapes + .cuboid(new Box(onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel)); } } diff --git a/src/main/java/appeng/block/spatial/MatrixFrameBlock.java b/src/main/java/appeng/block/spatial/MatrixFrameBlock.java index e484188cd..7935eca20 100644 --- a/src/main/java/appeng/block/spatial/MatrixFrameBlock.java +++ b/src/main/java/appeng/block/spatial/MatrixFrameBlock.java @@ -18,7 +18,6 @@ package appeng.block.spatial; -import appeng.block.AEBaseBlock; import net.minecraft.block.*; import net.minecraft.block.piston.PistonBehavior; import net.minecraft.item.ItemGroup; @@ -32,13 +31,16 @@ import net.minecraft.world.World; import net.minecraft.world.WorldView; import net.minecraft.world.explosion.Explosion; +import appeng.block.AEBaseBlock; + /** * This block is used to fill empty space in spatial dimensions and delinates * the border of a spatial dimensions's usable space. */ public class MatrixFrameBlock extends AEBaseBlock { - private static final Material MATERIAL = new Material(MaterialColor.CLEAR, false, true, true, false, false, false, PistonBehavior.PUSH_ONLY); + private static final Material MATERIAL = new Material(MaterialColor.CLEAR, false, true, true, false, false, false, + PistonBehavior.PUSH_ONLY); public MatrixFrameBlock() { super(Settings.of(MATERIAL).strength(-1.0F, 6000000.0F).nonOpaque().dropsNothing()); @@ -55,8 +57,7 @@ public class MatrixFrameBlock extends AEBaseBlock { } @Override - public VoxelShape getCollisionShape(BlockState state, BlockView worldIn, BlockPos pos, - ShapeContext context) { + public VoxelShape getCollisionShape(BlockState state, BlockView worldIn, BlockPos pos, ShapeContext context) { return VoxelShapes.fullCube(); } diff --git a/src/main/java/appeng/block/spatial/SpatialIOPortBlock.java b/src/main/java/appeng/block/spatial/SpatialIOPortBlock.java index 5993cedc1..8cb76bc4f 100644 --- a/src/main/java/appeng/block/spatial/SpatialIOPortBlock.java +++ b/src/main/java/appeng/block/spatial/SpatialIOPortBlock.java @@ -27,8 +27,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/block/storage/ChestBlock.java b/src/main/java/appeng/block/storage/ChestBlock.java index c9bfbbee7..271196054 100644 --- a/src/main/java/appeng/block/storage/ChestBlock.java +++ b/src/main/java/appeng/block/storage/ChestBlock.java @@ -20,24 +20,24 @@ package appeng.block.storage; import javax.annotation.Nullable; -import appeng.container.ContainerLocator; -import appeng.container.ContainerOpener; -import appeng.container.implementations.ChestContainer; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.Util; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; +import appeng.container.ContainerLocator; +import appeng.container.ContainerOpener; +import appeng.container.implementations.ChestContainer; import appeng.core.localization.PlayerMessages; import appeng.tile.storage.ChestBlockEntity; diff --git a/src/main/java/appeng/block/storage/DriveBlock.java b/src/main/java/appeng/block/storage/DriveBlock.java index 0351b10a4..2b6de8eb3 100644 --- a/src/main/java/appeng/block/storage/DriveBlock.java +++ b/src/main/java/appeng/block/storage/DriveBlock.java @@ -25,8 +25,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/block/storage/SkyChestBlock.java b/src/main/java/appeng/block/storage/SkyChestBlock.java index 34b0aa97c..8e7910606 100644 --- a/src/main/java/appeng/block/storage/SkyChestBlock.java +++ b/src/main/java/appeng/block/storage/SkyChestBlock.java @@ -20,26 +20,26 @@ package appeng.block.storage; import javax.annotation.Nullable; -import appeng.container.ContainerLocator; -import appeng.container.ContainerOpener; -import appeng.container.implementations.SkyChestContainer; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.block.ShapeContext; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; +import appeng.container.ContainerLocator; +import appeng.container.ContainerOpener; +import appeng.container.implementations.SkyChestContainer; import appeng.tile.storage.SkyChestBlockEntity; import appeng.util.Platform; diff --git a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java index 1e2f21571..02b3efebd 100644 --- a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java @@ -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 { diff --git a/src/main/java/appeng/bootstrap/BlockEntityBuilder.java b/src/main/java/appeng/bootstrap/BlockEntityBuilder.java index 4464039f2..680ec8644 100644 --- a/src/main/java/appeng/bootstrap/BlockEntityBuilder.java +++ b/src/main/java/appeng/bootstrap/BlockEntityBuilder.java @@ -55,7 +55,7 @@ public class BlockEntityBuilder { private final EnumSet features = EnumSet.noneOf(AEFeature.class); public BlockEntityBuilder(FeatureFactory factory, String id, Class tileClass, - Function, T> supplier) { + Function, T> supplier) { this.factory = factory; this.id = AppEng.makeId(id); this.tileClass = tileClass; diff --git a/src/main/java/appeng/bootstrap/BlockRendering.java b/src/main/java/appeng/bootstrap/BlockRendering.java index ef0369ab8..c75a801be 100644 --- a/src/main/java/appeng/bootstrap/BlockRendering.java +++ b/src/main/java/appeng/bootstrap/BlockRendering.java @@ -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 { diff --git a/src/main/java/appeng/bootstrap/EntityBuilder.java b/src/main/java/appeng/bootstrap/EntityBuilder.java index 1c8be9918..5fe60461f 100644 --- a/src/main/java/appeng/bootstrap/EntityBuilder.java +++ b/src/main/java/appeng/bootstrap/EntityBuilder.java @@ -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. diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index 96518faa2..1c4fa90e5 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -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 BlockEntityBuilder tileEntity(String id, Class teClass, - Function, T> factory) { + Function, T> factory) { return new BlockEntityBuilder<>(this, id, teClass, factory).features(this.defaultFeatures); } diff --git a/src/main/java/appeng/bootstrap/IItemRendering.java b/src/main/java/appeng/bootstrap/IItemRendering.java index 18b3a72ec..d643e1a8b 100644 --- a/src/main/java/appeng/bootstrap/IItemRendering.java +++ b/src/main/java/appeng/bootstrap/IItemRendering.java @@ -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. diff --git a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java index 50455683f..dab923d6a 100644 --- a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java @@ -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 { diff --git a/src/main/java/appeng/bootstrap/ItemRendering.java b/src/main/java/appeng/bootstrap/ItemRendering.java index 84e43310e..b702e5fe1 100644 --- a/src/main/java/appeng/bootstrap/ItemRendering.java +++ b/src/main/java/appeng/bootstrap/ItemRendering.java @@ -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; diff --git a/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java b/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java index 0ec135187..a5e325b68 100644 --- a/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java +++ b/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java @@ -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 diff --git a/src/main/java/appeng/bootstrap/ModelsReloadCallback.java b/src/main/java/appeng/bootstrap/ModelsReloadCallback.java index 616e9dc54..61f208e54 100644 --- a/src/main/java/appeng/bootstrap/ModelsReloadCallback.java +++ b/src/main/java/appeng/bootstrap/ModelsReloadCallback.java @@ -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 { diff --git a/src/main/java/appeng/bootstrap/TileEntityRendering.java b/src/main/java/appeng/bootstrap/TileEntityRendering.java index dc1ecdf21..3cd45f85c 100644 --- a/src/main/java/appeng/bootstrap/TileEntityRendering.java +++ b/src/main/java/appeng/bootstrap/TileEntityRendering.java @@ -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; diff --git a/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java b/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java index 6965118e2..5155f8c35 100644 --- a/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java +++ b/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java @@ -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 { /** - * 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 rendering) { } diff --git a/src/main/java/appeng/bootstrap/components/IModelBakeComponent.java b/src/main/java/appeng/bootstrap/components/IModelBakeComponent.java index 4466ce2b4..5f68db189 100644 --- a/src/main/java/appeng/bootstrap/components/IModelBakeComponent.java +++ b/src/main/java/appeng/bootstrap/components/IModelBakeComponent.java @@ -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 loadedModels); diff --git a/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java index b6312bbf1..222ca5e4b 100644 --- a/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java +++ b/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java @@ -1,6 +1,5 @@ package appeng.bootstrap.components; - import appeng.bootstrap.IBootstrapComponent; @FunctionalInterface diff --git a/src/main/java/appeng/bootstrap/components/RenderTypeComponent.java b/src/main/java/appeng/bootstrap/components/RenderTypeComponent.java index 538ba6908..c17321659 100644 --- a/src/main/java/appeng/bootstrap/components/RenderTypeComponent.java +++ b/src/main/java/appeng/bootstrap/components/RenderTypeComponent.java @@ -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; diff --git a/src/main/java/appeng/client/AppEngClient.java b/src/main/java/appeng/client/AppEngClient.java index 085c1eee8..80954a9c5 100644 --- a/src/main/java/appeng/client/AppEngClient.java +++ b/src/main/java/appeng/client/AppEngClient.java @@ -1,5 +1,38 @@ package appeng.client; +import java.util.Collection; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import javax.annotation.Nonnull; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; +import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry; +import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; +import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; +import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry; +import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.render.entity.ItemEntityRenderer; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.UnbakedModel; +import net.minecraft.client.util.SpriteIdentifier; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.integrated.IntegratedServer; +import net.minecraft.util.Identifier; +import net.minecraft.util.hit.HitResult; +import net.minecraft.world.World; + import appeng.api.parts.CableRenderMode; import appeng.block.crafting.AbstractCraftingUnitBlock; import appeng.block.paint.PaintSplotchesModel; @@ -124,37 +157,6 @@ import appeng.hooks.ClientTickHandler; import appeng.parts.automation.PlaneModel; import appeng.tile.crafting.MolecularAssemblerRenderer; import appeng.util.Platform; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; -import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry; -import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; -import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; -import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry; -import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.options.KeyBinding; -import net.minecraft.client.render.entity.ItemEntityRenderer; -import net.minecraft.client.render.model.BakedModel; -import net.minecraft.client.render.model.UnbakedModel; -import net.minecraft.client.util.SpriteIdentifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.integrated.IntegratedServer; -import net.minecraft.util.Identifier; -import net.minecraft.util.hit.HitResult; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import java.util.Collection; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.Stream; @Environment(EnvType.CLIENT) public final class AppEngClient extends AppEngBase { @@ -182,8 +184,7 @@ public final class AppEngClient extends AppEngBase { ModelsReloadCallback.EVENT.register(this::onModelsReloaded); - callDeferredBootstrapComponents(IClientSetupComponent.class, - IClientSetupComponent::setup); + callDeferredBootstrapComponents(IClientSetupComponent.class, IClientSetupComponent::setup); registerModelProviders(); registerParticleRenderers(); registerEntityRenderers(); @@ -191,7 +192,8 @@ public final class AppEngClient extends AppEngBase { registerTextures(); registerScreens(); - // On the client, we'll register for server startup/shutdown to properly setup WorldData + // On the client, we'll register for server startup/shutdown to properly setup + // WorldData // each time the integrated server starts&stops ServerLifecycleEvents.SERVER_STARTED.register(WorldData::onServerStarting); ServerLifecycleEvents.SERVER_STOPPING.register(server -> WorldData.instance().onServerStopping()); @@ -265,8 +267,7 @@ public final class AppEngClient extends AppEngBase { final int range = 16 * 16; - client.worldRenderer.scheduleBlockRenders(x - range, y - range, z - range, x + range, y + range, - z + range); + client.worldRenderer.scheduleBlockRenders(x - range, y - range, z - range, x + range, y + range, z + range); } @Override @@ -295,7 +296,8 @@ public final class AppEngClient extends AppEngBase { registry.register(TinyTNTPrimedEntity.TYPE, (dispatcher, context) -> new TinyTNTPrimedRenderer(dispatcher)); - EntityRendererRegistry.Factory itemEntityFactory = (dispatcher, context) -> new ItemEntityRenderer(dispatcher, context.getItemRenderer()); + EntityRendererRegistry.Factory itemEntityFactory = (dispatcher, context) -> new ItemEntityRenderer(dispatcher, + context.getItemRenderer()); registry.register(SingularityEntity.TYPE, itemEntityFactory); registry.register(GrowingCrystalEntity.TYPE, itemEntityFactory); registry.register(ChargedQuartzEntity.TYPE, itemEntityFactory); @@ -316,10 +318,7 @@ public final class AppEngClient extends AppEngBase { } public void registerTextures() { - Stream> sprites = Stream.of( - SkyChestTESR.SPRITES, - InscriberTESR.SPRITES - ); + Stream> sprites = Stream.of(SkyChestTESR.SPRITES, InscriberTESR.SPRITES); // Group every needed sprite by atlas, since every atlas has their own event Map> groupedByAtlas = sprites.flatMap(Collection::stream) @@ -327,12 +326,11 @@ public final class AppEngClient extends AppEngBase { // Register to the stitch event for each atlas for (Map.Entry> entry : groupedByAtlas.entrySet()) { - ClientSpriteRegistryCallback.event(entry.getKey()) - .register((spriteAtlasTexture, registry) -> { - for (SpriteIdentifier spriteIdentifier : entry.getValue()) { - registry.register(spriteIdentifier.getTextureId()); - } - }); + ClientSpriteRegistryCallback.event(entry.getKey()).register((spriteAtlasTexture, registry) -> { + for (SpriteIdentifier spriteIdentifier : entry.getValue()) { + registry.register(spriteIdentifier.getTextureId()); + } + }); } } @@ -344,27 +342,30 @@ public final class AppEngClient extends AppEngBase { ModelLoadingRegistry.INSTANCE.registerVariantProvider((resourceManager) -> { return (modelIdentifier, modelProviderContext) -> { if (MolecularAssemblerRenderer.LIGHTS_MODEL.equals(modelIdentifier)) { - return modelProviderContext.loadModel(new Identifier(modelIdentifier.getNamespace(), modelIdentifier.getPath())); + return modelProviderContext + .loadModel(new Identifier(modelIdentifier.getNamespace(), modelIdentifier.getPath())); } return null; }; }); - ModelLoadingRegistry.INSTANCE.registerResourceProvider(rm -> new CableBusModelLoader((PartModels) Api.INSTANCE.registries().partModels())); + ModelLoadingRegistry.INSTANCE.registerResourceProvider( + rm -> new CableBusModelLoader((PartModels) Api.INSTANCE.registries().partModels())); - addBuiltInModel("block/quartz_glass", GlassModel::new); - addBuiltInModel("block/sky_compass", SkyCompassModel::new); - addBuiltInModel("item/sky_compass", SkyCompassModel::new); + addBuiltInModel("block/quartz_glass", GlassModel::new); + addBuiltInModel("block/sky_compass", SkyCompassModel::new); + addBuiltInModel("item/sky_compass", SkyCompassModel::new); // FIXME FABRIC addBuiltInModel("item/dummy_fluid_item", DummyFluidItemModel::new); - addBuiltInModel("item/memory_card", MemoryCardModel::new); - addBuiltInModel("item/biometric_card", BiometricCardModel::new); - addBuiltInModel("block/drive", DriveModel::new); - addBuiltInModel("color_applicator", ColorApplicatorModel::new); // FIXME need to wire this up (this might just not be needed) - addBuiltInModel("block/spatial_pylon", SpatialPylonModel::new); - addBuiltInModel("block/paint", PaintSplotchesModel::new); - addBuiltInModel("block/qnb/qnb_formed", QnbFormedModel::new); - addBuiltInModel("part/p2p/p2p_tunnel_frequency", P2PTunnelFrequencyModel::new); - addBuiltInModel("item/facade", FacadeItemModel::new); + addBuiltInModel("item/memory_card", MemoryCardModel::new); + addBuiltInModel("item/biometric_card", BiometricCardModel::new); + addBuiltInModel("block/drive", DriveModel::new); + addBuiltInModel("color_applicator", ColorApplicatorModel::new); // FIXME need to wire this up (this might just + // not be needed) + addBuiltInModel("block/spatial_pylon", SpatialPylonModel::new); + addBuiltInModel("block/paint", PaintSplotchesModel::new); + addBuiltInModel("block/qnb/qnb_formed", QnbFormedModel::new); + addBuiltInModel("part/p2p/p2p_tunnel_frequency", P2PTunnelFrequencyModel::new); + addBuiltInModel("item/facade", FacadeItemModel::new); addPlaneModel("part/annihilation_plane", "part/annihilation_plane"); addPlaneModel("part/annihilation_plane_on", "part/annihilation_plane_on"); @@ -377,13 +378,20 @@ public final class AppEngClient extends AppEngBase { addPlaneModel("part/formation_plane", "part/formation_plane"); addPlaneModel("part/formation_plane_on", "part/formation_plane_on"); - addBuiltInModel("block/crafting/1k_storage_formed", () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.STORAGE_1K)); - addBuiltInModel("block/crafting/4k_storage_formed", () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.STORAGE_4K)); - addBuiltInModel("block/crafting/16k_storage_formed", () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.STORAGE_16K)); - addBuiltInModel("block/crafting/64k_storage_formed", () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.STORAGE_64K)); - addBuiltInModel("block/crafting/accelerator_formed", () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.ACCELERATOR)); - addBuiltInModel("block/crafting/monitor_formed", () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.MONITOR)); - addBuiltInModel("block/crafting/unit_formed", () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.UNIT)); + addBuiltInModel("block/crafting/1k_storage_formed", + () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.STORAGE_1K)); + addBuiltInModel("block/crafting/4k_storage_formed", + () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.STORAGE_4K)); + addBuiltInModel("block/crafting/16k_storage_formed", + () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.STORAGE_16K)); + addBuiltInModel("block/crafting/64k_storage_formed", + () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.STORAGE_64K)); + addBuiltInModel("block/crafting/accelerator_formed", + () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.ACCELERATOR)); + addBuiltInModel("block/crafting/monitor_formed", + () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.MONITOR)); + addBuiltInModel("block/crafting/unit_formed", + () -> new CraftingCubeModel(AbstractCraftingUnitBlock.CraftingUnitType.UNIT)); // FIXME FABRIC ModelLoaderRegistry.registerLoader(new Identifier(AppEng.MOD_ID, "uvlightmap"), UVLModelLoader.INSTANCE); } @@ -395,9 +403,8 @@ public final class AppEngClient extends AppEngBase { } private static void addBuiltInModel(String id, Supplier modelFactory) { - ModelLoadingRegistry.INSTANCE.registerResourceProvider( - resourceManager -> new SimpleModelLoader<>(AppEng.makeId(id), modelFactory) - ); + ModelLoadingRegistry.INSTANCE + .registerResourceProvider(resourceManager -> new SimpleModelLoader<>(AppEng.makeId(id), modelFactory)); } private void registerScreens() { @@ -406,43 +413,43 @@ public final class AppEngClient extends AppEngBase { ScreenRegistry.register(SkyChestContainer.TYPE, SkyChestScreen::new); ScreenRegistry.register(ChestContainer.TYPE, ChestScreen::new); ScreenRegistry.register(WirelessContainer.TYPE, WirelessScreen::new); - ScreenRegistry.>register( - MEMonitorableContainer.TYPE, MEMonitorableScreen::new); - ScreenRegistry.register(MEPortableCellContainer.TYPE, MEPortableCellScreen::new); - ScreenRegistry.register(WirelessTermContainer.TYPE, WirelessTermScreen::new); - ScreenRegistry.register(NetworkStatusContainer.TYPE, NetworkStatusScreen::new); - ScreenRegistry.>register( - CraftingCPUContainer.TYPE, CraftingCPUScreen::new); - ScreenRegistry.register(NetworkToolContainer.TYPE, NetworkToolScreen::new); - ScreenRegistry.register(QuartzKnifeContainer.TYPE, QuartzKnifeScreen::new); - ScreenRegistry.register(DriveContainer.TYPE, DriveScreen::new); - ScreenRegistry.register(VibrationChamberContainer.TYPE, VibrationChamberScreen::new); - ScreenRegistry.register(CondenserContainer.TYPE, CondenserScreen::new); - ScreenRegistry.register(InterfaceContainer.TYPE, InterfaceScreen::new); - ScreenRegistry.register(FluidInterfaceContainer.TYPE, FluidInterfaceScreen::new); - ScreenRegistry.>register( - UpgradeableContainer.TYPE, UpgradeableScreen::new); - ScreenRegistry.register(FluidIOContainer.TYPE, FluidIOScreen::new); - ScreenRegistry.register(IOPortContainer.TYPE, IOPortScreen::new); - ScreenRegistry.register(StorageBusContainer.TYPE, StorageBusScreen::new); - ScreenRegistry.register(FluidStorageBusContainer.TYPE, FluidStorageBusScreen::new); - ScreenRegistry.register(FormationPlaneContainer.TYPE, FormationPlaneScreen::new); - ScreenRegistry.register(FluidFormationPlaneContainer.TYPE, FluidFormationPlaneScreen::new); - ScreenRegistry.register(PriorityContainer.TYPE, PriorityScreen::new); - ScreenRegistry.register(SecurityStationContainer.TYPE, SecurityStationScreen::new); - ScreenRegistry.register(CraftingTermContainer.TYPE, CraftingTermScreen::new); - ScreenRegistry.register(PatternTermContainer.TYPE, PatternTermScreen::new); - ScreenRegistry.register(FluidTerminalContainer.TYPE, FluidTerminalScreen::new); - ScreenRegistry.register(LevelEmitterContainer.TYPE, LevelEmitterScreen::new); - ScreenRegistry.register(FluidLevelEmitterContainer.TYPE, FluidLevelEmitterScreen::new); - ScreenRegistry.register(SpatialIOPortContainer.TYPE, SpatialIOPortScreen::new); - ScreenRegistry.register(InscriberContainer.TYPE, InscriberScreen::new); - ScreenRegistry.register(CellWorkbenchContainer.TYPE, CellWorkbenchScreen::new); - ScreenRegistry.register(MolecularAssemblerContainer.TYPE, MolecularAssemblerScreen::new); - ScreenRegistry.register(CraftAmountContainer.TYPE, CraftAmountScreen::new); - ScreenRegistry.register(CraftConfirmContainer.TYPE, CraftConfirmScreen::new); - ScreenRegistry.register(InterfaceTerminalContainer.TYPE, InterfaceTerminalScreen::new); - ScreenRegistry.register(CraftingStatusContainer.TYPE, CraftingStatusScreen::new); + ScreenRegistry.>register( + MEMonitorableContainer.TYPE, MEMonitorableScreen::new); + ScreenRegistry.register(MEPortableCellContainer.TYPE, MEPortableCellScreen::new); + ScreenRegistry.register(WirelessTermContainer.TYPE, WirelessTermScreen::new); + ScreenRegistry.register(NetworkStatusContainer.TYPE, NetworkStatusScreen::new); + ScreenRegistry.>register( + CraftingCPUContainer.TYPE, CraftingCPUScreen::new); + ScreenRegistry.register(NetworkToolContainer.TYPE, NetworkToolScreen::new); + ScreenRegistry.register(QuartzKnifeContainer.TYPE, QuartzKnifeScreen::new); + ScreenRegistry.register(DriveContainer.TYPE, DriveScreen::new); + ScreenRegistry.register(VibrationChamberContainer.TYPE, VibrationChamberScreen::new); + ScreenRegistry.register(CondenserContainer.TYPE, CondenserScreen::new); + ScreenRegistry.register(InterfaceContainer.TYPE, InterfaceScreen::new); + ScreenRegistry.register(FluidInterfaceContainer.TYPE, FluidInterfaceScreen::new); + ScreenRegistry.>register( + UpgradeableContainer.TYPE, UpgradeableScreen::new); + ScreenRegistry.register(FluidIOContainer.TYPE, FluidIOScreen::new); + ScreenRegistry.register(IOPortContainer.TYPE, IOPortScreen::new); + ScreenRegistry.register(StorageBusContainer.TYPE, StorageBusScreen::new); + ScreenRegistry.register(FluidStorageBusContainer.TYPE, FluidStorageBusScreen::new); + ScreenRegistry.register(FormationPlaneContainer.TYPE, FormationPlaneScreen::new); + ScreenRegistry.register(FluidFormationPlaneContainer.TYPE, FluidFormationPlaneScreen::new); + ScreenRegistry.register(PriorityContainer.TYPE, PriorityScreen::new); + ScreenRegistry.register(SecurityStationContainer.TYPE, SecurityStationScreen::new); + ScreenRegistry.register(CraftingTermContainer.TYPE, CraftingTermScreen::new); + ScreenRegistry.register(PatternTermContainer.TYPE, PatternTermScreen::new); + ScreenRegistry.register(FluidTerminalContainer.TYPE, FluidTerminalScreen::new); + ScreenRegistry.register(LevelEmitterContainer.TYPE, LevelEmitterScreen::new); + ScreenRegistry.register(FluidLevelEmitterContainer.TYPE, FluidLevelEmitterScreen::new); + ScreenRegistry.register(SpatialIOPortContainer.TYPE, SpatialIOPortScreen::new); + ScreenRegistry.register(InscriberContainer.TYPE, InscriberScreen::new); + ScreenRegistry.register(CellWorkbenchContainer.TYPE, CellWorkbenchScreen::new); + ScreenRegistry.register(MolecularAssemblerContainer.TYPE, MolecularAssemblerScreen::new); + ScreenRegistry.register(CraftAmountContainer.TYPE, CraftAmountScreen::new); + ScreenRegistry.register(CraftConfirmContainer.TYPE, CraftConfirmScreen::new); + ScreenRegistry.register(InterfaceTerminalContainer.TYPE, InterfaceTerminalScreen::new); + ScreenRegistry.register(CraftingStatusContainer.TYPE, CraftingStatusScreen::new); } } diff --git a/src/main/java/appeng/client/gui/AEBaseMEScreen.java b/src/main/java/appeng/client/gui/AEBaseMEScreen.java index 8a58a96b0..344696a32 100644 --- a/src/main/java/appeng/client/gui/AEBaseMEScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseMEScreen.java @@ -24,8 +24,8 @@ import java.util.Locale; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.slot.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -61,8 +61,7 @@ public abstract class AEBaseMEScreen extends AEBaseSc if (myStack.getStackSize() > bigNumber || (myStack.getStackSize() > 1 && stack.isDamaged())) { final String formattedAmount = NumberFormat.getNumberInstance(Locale.US) .format(myStack.getStackSize()); - currentToolTip.add(ButtonToolTips.ItemsStored.text(formattedAmount) - .formatted(Formatting.GRAY)); + currentToolTip.add(ButtonToolTips.ItemsStored.text(formattedAmount).formatted(Formatting.GRAY)); } if (myStack.getCountRequestable() > 0) { diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index f0e34bd8e..457ea97f6 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -18,9 +18,47 @@ package appeng.client.gui; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.mojang.blaze3d.systems.RenderSystem; + +import org.lwjgl.glfw.GLFW; +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.widget.AbstractButtonWidget; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.util.InputUtil; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.minecraft.screen.slot.SlotActionType; +import net.minecraft.text.LiteralText; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; + import alexiil.mc.lib.attributes.fluid.render.FluidRenderFace; import alexiil.mc.lib.attributes.fluid.render.FluidVolumeRenderer; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; + import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.client.gui.widgets.CustomSlotWidget; @@ -52,40 +90,6 @@ import appeng.fluids.client.render.FluidStackSizeRenderer; import appeng.fluids.container.slots.IMEFluidSlot; import appeng.helpers.InventoryAction; import appeng.mixins.SlotMixin; -import com.google.common.base.Preconditions; -import com.google.common.base.Stopwatch; -import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.screen.ingame.HandledScreen; -import net.minecraft.client.gui.widget.AbstractButtonWidget; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.Tessellator; -import net.minecraft.client.render.VertexFormats; -import net.minecraft.client.util.InputUtil; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.screen.slot.Slot; -import net.minecraft.screen.slot.SlotActionType; -import net.minecraft.text.LiteralText; -import net.minecraft.text.Style; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import net.minecraft.util.Identifier; -import org.lwjgl.glfw.GLFW; -import org.lwjgl.opengl.GL11; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; public abstract class AEBaseScreen extends HandledScreen { @@ -161,7 +165,8 @@ public abstract class AEBaseScreen extends HandledScr } } - protected void drawGuiSlot(MatrixStack matrices, CustomSlotWidget slot, int mouseX, int mouseY, float partialTicks) { + protected void drawGuiSlot(MatrixStack matrices, CustomSlotWidget slot, int mouseX, int mouseY, + float partialTicks) { if (slot.isSlotEnabled()) { final int left = slot.xPos(); final int top = slot.yPos(); @@ -252,13 +257,13 @@ public abstract class AEBaseScreen extends HandledScr if (optionalSlot.isRenderDisabled()) { final AppEngSlot aeSlot = (AppEngSlot) slot; if (aeSlot.isSlotEnabled()) { - drawTexture(matrices, ox + aeSlot.x - 1, oy + aeSlot.y - 1, - optionalSlot.getSourceX() - 1, optionalSlot.getSourceY() - 1, 18, 18); + drawTexture(matrices, ox + aeSlot.x - 1, oy + aeSlot.y - 1, optionalSlot.getSourceX() - 1, + optionalSlot.getSourceY() - 1, 18, 18); } else { RenderSystem.color4f(1.0F, 1.0F, 1.0F, 0.4F); RenderSystem.enableBlend(); - drawTexture(matrices, ox + aeSlot.x - 1, oy + aeSlot.y - 1, - optionalSlot.getSourceX() - 1, optionalSlot.getSourceY() - 1, 18, 18); + drawTexture(matrices, ox + aeSlot.x - 1, oy + aeSlot.y - 1, optionalSlot.getSourceX() - 1, + optionalSlot.getSourceY() - 1, 18, 18); RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); } } @@ -314,8 +319,8 @@ public abstract class AEBaseScreen extends HandledScr if (this.drag_click.size() > 1) { for (final Slot dr : this.drag_click) { final InventoryActionPacket p = new InventoryActionPacket( - mouseButton == 0 ? InventoryAction.PICKUP_OR_SET_DOWN : InventoryAction.PLACE_SINGLE, - dr.id, 0); + mouseButton == 0 ? InventoryAction.PICKUP_OR_SET_DOWN : InventoryAction.PLACE_SINGLE, dr.id, + 0); NetworkHandler.instance().sendToServer(p); } } @@ -329,7 +334,7 @@ public abstract class AEBaseScreen extends HandledScr // TODO 1.9.4 aftermath - Whole SlotActionType thing, to be checked. @Override protected void onMouseClick(final Slot slot, final int slotIdx, final int mouseButton, - final SlotActionType clickType) { + final SlotActionType clickType) { final PlayerEntity player = getPlayer(); if (slot instanceof FakeSlot) { @@ -534,10 +539,8 @@ public abstract class AEBaseScreen extends HandledScr return true; } else { for (final Slot s : slots) { - if (getSlotIndex(s) == j - && s.inventory == this.handler.getPlayerInv()) { - NetworkHandler.instance() - .sendToServer(new SwapSlotsPacket(s.id, theSlot.id)); + if (getSlotIndex(s) == j && s.inventory == this.handler.getPlayerInv()) { + NetworkHandler.instance().sendToServer(new SwapSlotsPacket(s.id, theSlot.id)); return true; } } @@ -566,7 +569,8 @@ public abstract class AEBaseScreen extends HandledScr return null; } - public abstract void drawBG(MatrixStack matrices, int offsetX, int offsetY, int mouseX, int mouseY, float partialTicks); + public abstract void drawBG(MatrixStack matrices, int offsetX, int offsetY, int mouseX, int mouseY, + float partialTicks); @Override public boolean mouseScrolled(double x, double y, double wheelDelta) { @@ -702,21 +706,16 @@ public abstract class AEBaseScreen extends HandledScr final float par6 = 16; vb.vertex(par1 + 0, par2 + par6, getZOffset()) .color(1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon()) - .texture((par3 + 0) * f, (par4 + par6) * f1) - .next(); + .texture((par3 + 0) * f, (par4 + par6) * f1).next(); final float par5 = 16; vb.vertex(par1 + par5, par2 + par6, getZOffset()) .color(1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon()) - .texture((par3 + par5) * f, (par4 + par6) * f1) - .next(); + .texture((par3 + par5) * f, (par4 + par6) * f1).next(); vb.vertex(par1 + par5, par2 + 0, getZOffset()) .color(1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon()) - .texture((par3 + par5) * f, (par4 + 0) * f1) - .next(); - vb.vertex(par1 + 0, par2 + 0, getZOffset()) - .color(1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon()) - .texture((par3 + 0) * f, (par4 + 0) * f1) - .next(); + .texture((par3 + par5) * f, (par4 + 0) * f1).next(); + vb.vertex(par1 + 0, par2 + 0, getZOffset()).color(1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon()) + .texture((par3 + 0) * f, (par4 + 0) * f1).next(); tessellator.draw(); } catch (final Exception err) { @@ -728,9 +727,8 @@ public abstract class AEBaseScreen extends HandledScr if (!is.isEmpty() && s instanceof AppEngSlot) { AppEngSlot aeSlot = (AppEngSlot) s; if (aeSlot.getIsValid() == CalculatedValidity.NotAvailable) { - boolean isValid = s.canInsert(is) || s instanceof OutputSlot - || s instanceof AppEngCraftingSlot || s instanceof DisabledSlot - || s instanceof InaccessibleSlot || s instanceof FakeSlot + boolean isValid = s.canInsert(is) || s instanceof OutputSlot || s instanceof AppEngCraftingSlot + || s instanceof DisabledSlot || s instanceof InaccessibleSlot || s instanceof FakeSlot || s instanceof RestrictedInputSlot || s instanceof SlotDisconnected; if (isValid && s instanceof RestrictedInputSlot) { try { diff --git a/src/main/java/appeng/client/gui/Size1Slot.java b/src/main/java/appeng/client/gui/Size1Slot.java index 7fcbdf739..3298ad0a2 100644 --- a/src/main/java/appeng/client/gui/Size1Slot.java +++ b/src/main/java/appeng/client/gui/Size1Slot.java @@ -4,15 +4,17 @@ package appeng.client.gui; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import appeng.client.me.SlotME; import com.mojang.datafixers.util.Pair; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.slot.Slot; -import net.minecraft.item.ItemStack; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; import net.minecraft.util.Identifier; +import appeng.client.me.SlotME; + /** * A proxy for a slot that will always return an itemstack with size 1, if there * is an item in the slot. Used to prevent the default item count from diff --git a/src/main/java/appeng/client/gui/implementations/AESubScreen.java b/src/main/java/appeng/client/gui/implementations/AESubScreen.java index 1d993a8e1..ea7f99e3e 100644 --- a/src/main/java/appeng/client/gui/implementations/AESubScreen.java +++ b/src/main/java/appeng/client/gui/implementations/AESubScreen.java @@ -5,8 +5,9 @@ import java.util.function.Consumer; import javax.annotation.Nullable; import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.text.Text; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IParts; @@ -26,7 +27,6 @@ import appeng.parts.reporting.CraftingTerminalPart; import appeng.parts.reporting.PatternTerminalPart; import appeng.parts.reporting.TerminalPart; import appeng.tile.storage.ChestBlockEntity; -import net.minecraft.text.Text; /** * Utility class for sub-screens of other containers that allow returning to the @@ -99,8 +99,8 @@ final class AESubScreen { label = previousContainerIcon.getName(); } ItemRenderer itemRenderer = gui.getClient().getItemRenderer(); - TabButton button = new TabButton(gui.getX() + x, gui.getY() + y, previousContainerIcon, label, - itemRenderer, btn -> goBack()); + TabButton button = new TabButton(gui.getX() + x, gui.getY() + y, previousContainerIcon, label, itemRenderer, + btn -> goBack()); buttonAdder.accept(button); return button; } diff --git a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java index 9aee3ff83..05560e642 100644 --- a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java @@ -43,35 +43,33 @@ public class CellWorkbenchScreen extends UpgradeableScreen(this.x - 18, this.y + 68, - Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL, this::toggleFuzzyMode)); - this.addButton( - new ActionButton(this.x - 18, this.y + 28, ActionItems.WRENCH, act1 -> action("Partition"))); + this.fuzzyMode = this.addButton(new SettingToggleButton<>(this.x - 18, this.y + 68, Settings.FUZZY_MODE, + FuzzyMode.IGNORE_ALL, this::toggleFuzzyMode)); + this.addButton(new ActionButton(this.x - 18, this.y + 28, ActionItems.WRENCH, act1 -> action("Partition"))); this.addButton(new ActionButton(this.x - 18, this.y + 8, ActionItems.CLOSE, act -> action("Clear"))); this.copyMode = this.addButton(new ToggleButton(this.x - 18, this.y + 48, 11 * 16 + 5, 12 * 16 + 5, GuiText.CopyMode.text(), GuiText.CopyModeDesc.text(), act -> action("CopyMode"))); } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.handleButtonVisibility(); this.bindTexture(this.getBackground()); drawTexture(matrices, offsetX, offsetY, 0, 0, 211 - 34, this.backgroundHeight); if (this.drawUpgrades()) { if (this.handler.availableUpgrades() <= 8) { - drawTexture(matrices, offsetX + 177, offsetY, 177, 0, 35, - 7 + this.handler.availableUpgrades() * 18); - drawTexture(matrices, offsetX + 177, offsetY + (7 + (this.handler.availableUpgrades()) * 18), - 177, 151, 35, 7); + drawTexture(matrices, offsetX + 177, offsetY, 177, 0, 35, 7 + this.handler.availableUpgrades() * 18); + drawTexture(matrices, offsetX + 177, offsetY + (7 + (this.handler.availableUpgrades()) * 18), 177, 151, + 35, 7); } else if (this.handler.availableUpgrades() <= 16) { drawTexture(matrices, offsetX + 177, offsetY, 177, 0, 35, 7 + 8 * 18); drawTexture(matrices, offsetX + 177, offsetY + (7 + (8) * 18), 177, 151, 35, 7); @@ -81,8 +79,7 @@ public class CellWorkbenchScreen extends UpgradeableScreen { public void init() { super.init(); - this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), - this.itemRenderer, btn -> openPriority())); + this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), this.itemRenderer, + btn -> openPriority())); } private void openPriority() { @@ -57,7 +56,8 @@ public class ChestScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/chest.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); } diff --git a/src/main/java/appeng/client/gui/implementations/CondenserScreen.java b/src/main/java/appeng/client/gui/implementations/CondenserScreen.java index 69cd29a93..b84807185 100644 --- a/src/main/java/appeng/client/gui/implementations/CondenserScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CondenserScreen.java @@ -22,7 +22,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; - import appeng.api.config.CondenserOutput; import appeng.api.config.Settings; import appeng.client.gui.AEBaseScreen; @@ -49,8 +48,8 @@ public class CondenserScreen extends AEBaseScreen { this.mode = new ServerSettingToggleButton<>(128 + this.x, 52 + this.y, Settings.CONDENSER_OUTPUT, this.handler.getOutput()); - this.addButton(new ProgressBar(this.handler, "guis/condenser.png", 120 + this.x, 25 + this.y, 178, - 25, 6, 18, Direction.VERTICAL, GuiText.StoredEnergy.text())); + this.addButton(new ProgressBar(this.handler, "guis/condenser.png", 120 + this.x, 25 + this.y, 178, 25, 6, 18, + Direction.VERTICAL, GuiText.StoredEnergy.text())); this.addButton(this.mode); } @@ -64,7 +63,8 @@ public class CondenserScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/condenser.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); diff --git a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java index cae418983..e0e6abaa1 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java @@ -23,7 +23,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; - import appeng.client.gui.AEBaseScreen; import appeng.client.gui.NumberEntryType; import appeng.container.implementations.CraftAmountContainer; @@ -54,8 +53,8 @@ public class CraftAmountScreen extends AEBaseScreen { this.amountToCraft.setMinValue(1); this.amountToCraft.addButtons(children::add, this::addButton); - this.next = this.addButton( - new ButtonWidget(this.x + 128, this.y + 51, 38, 20, GuiText.Next.text(), this::confirm)); + this.next = this + .addButton(new ButtonWidget(this.x + 128, this.y + 51, 38, 20, GuiText.Next.text(), this::confirm)); subGui.addBackButton(this::addButton, 154, 0); } @@ -71,7 +70,8 @@ public class CraftAmountScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.next.setMessage(hasShiftDown() ? GuiText.Start.text() : GuiText.Next.text()); this.bindTexture("guis/craft_amt.png"); diff --git a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java index 9efd63a43..f48493142 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java @@ -33,7 +33,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; - import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; @@ -171,8 +170,8 @@ public class CraftConfirmScreen extends AEBaseScreen { dsp = GuiText.Simulation.text(); } else { dsp = this.handler.getCpuAvailableBytes() > 0 - ? (GuiText.Bytes.withSuffix(": " + this.handler.getCpuAvailableBytes() + " : ").append( - GuiText.CoProcessors.text()).append(": " + this.handler.getCpuCoProcessors())) + ? (GuiText.Bytes.withSuffix(": " + this.handler.getCpuAvailableBytes() + " : ") + .append(GuiText.CoProcessors.text()).append(": " + this.handler.getCpuCoProcessors())) : GuiText.Bytes.withSuffix(": N/A : ").append(GuiText.CoProcessors.text()).append(": N/A"); } @@ -326,7 +325,8 @@ public class CraftConfirmScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.setScrollBar(); this.bindTexture("guis/craftingreport.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); diff --git a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java index 2817a8ba0..60680d7f7 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java @@ -26,15 +26,14 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Joiner; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.util.math.MatrixStack; import org.apache.commons.lang3.time.DurationFormatUtils; import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; - import appeng.api.config.SortDir; import appeng.api.config.SortOrder; import appeng.api.config.ViewItems; @@ -307,7 +306,8 @@ public class CraftingCPUScreen extends AEBaseScr } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/craftingcpu.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); } diff --git a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java index 14eb9068d..042980ba0 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java @@ -34,8 +34,7 @@ public class CraftingStatusScreen extends CraftingCPUScreen { public void init() { super.init(); - this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), - this.itemRenderer, btn -> openPriorityGui())); + this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), this.itemRenderer, + btn -> openPriorityGui())); } private void openPriorityGui() { @@ -57,7 +56,8 @@ public class DriveScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/drive.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); } diff --git a/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java b/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java index 07b952888..cf984b0cd 100644 --- a/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java +++ b/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java @@ -38,21 +38,19 @@ public class FormationPlaneScreen extends UpgradeableScreen placeMode; - public FormationPlaneScreen(FormationPlaneContainer container, PlayerInventory playerInventory, - Text title) { + public FormationPlaneScreen(FormationPlaneContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.backgroundHeight = 251; } @Override protected void addButtons() { - this.placeMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 28, Settings.PLACE_BLOCK, - YesNo.YES); + this.placeMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 28, Settings.PLACE_BLOCK, YesNo.YES); this.fuzzyMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 48, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); - this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), - this.itemRenderer, btn -> openPriorityGui())); + this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), this.itemRenderer, + btn -> openPriorityGui())); this.addButton(this.placeMode); this.addButton(this.fuzzyMode); diff --git a/src/main/java/appeng/client/gui/implementations/GrinderScreen.java b/src/main/java/appeng/client/gui/implementations/GrinderScreen.java index 94afb5cbb..f0d64f991 100644 --- a/src/main/java/appeng/client/gui/implementations/GrinderScreen.java +++ b/src/main/java/appeng/client/gui/implementations/GrinderScreen.java @@ -22,7 +22,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; - import appeng.client.gui.AEBaseScreen; import appeng.container.implementations.GrinderContainer; import appeng.core.localization.GuiText; @@ -41,7 +40,8 @@ public class GrinderScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/grinder.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); } diff --git a/src/main/java/appeng/client/gui/implementations/IOPortScreen.java b/src/main/java/appeng/client/gui/implementations/IOPortScreen.java index 313994488..eb88f76d6 100644 --- a/src/main/java/appeng/client/gui/implementations/IOPortScreen.java +++ b/src/main/java/appeng/client/gui/implementations/IOPortScreen.java @@ -47,13 +47,13 @@ public class IOPortScreen extends UpgradeableScreen { protected void addButtons() { this.fullMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 8, Settings.FULLNESS_MODE, FullnessMode.EMPTY); - this.operationMode = new ServerSettingToggleButton<>(this.x + 80, this.y + 17, - Settings.OPERATION_MODE, OperationMode.EMPTY); + this.operationMode = new ServerSettingToggleButton<>(this.x + 80, this.y + 17, Settings.OPERATION_MODE, + OperationMode.EMPTY); this.addButton(this.operationMode); this.addButton(this.fullMode); - this.redstoneMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 28, - Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); + this.redstoneMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 28, Settings.REDSTONE_CONTROLLED, + RedstoneMode.IGNORE); addButton(this.redstoneMode); } @@ -76,7 +76,8 @@ public class IOPortScreen extends UpgradeableScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { super.drawBG(matrices, offsetX, offsetY, mouseX, mouseY, partialTicks); final IDefinitions definitions = Api.instance().definitions(); diff --git a/src/main/java/appeng/client/gui/implementations/InscriberScreen.java b/src/main/java/appeng/client/gui/implementations/InscriberScreen.java index fde9fa2f6..3aa79c16e 100644 --- a/src/main/java/appeng/client/gui/implementations/InscriberScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InscriberScreen.java @@ -23,7 +23,6 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; - import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.ProgressBar; import appeng.client.gui.widgets.ProgressBar.Direction; @@ -54,14 +53,16 @@ public class InscriberScreen extends AEBaseScreen { @Override public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.pb.setFullMsg(new LiteralText(this.handler.getCurrentProgress() * 100 / this.handler.getMaxProgress() + "%")); + this.pb.setFullMsg( + new LiteralText(this.handler.getCurrentProgress() * 100 / this.handler.getMaxProgress() + "%")); this.textRenderer.draw(matrices, this.getGuiDisplayName(GuiText.Inscriber.text()), 8, 6, 4210752); this.textRenderer.draw(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752); } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/inscriber.png"); this.pb.x = 135 + this.x; this.pb.y = 39 + this.y; @@ -69,11 +70,11 @@ public class InscriberScreen extends AEBaseScreen { drawTexture(matrices, offsetX, offsetY, 0, 0, 211 - 34, this.backgroundHeight); if (this.drawUpgrades()) { - drawTexture(matrices, offsetX + 177, offsetY, 177, 0, 35, - 14 + this.handler.availableUpgrades() * 18); + drawTexture(matrices, offsetX + 177, offsetY, 177, 0, 35, 14 + this.handler.availableUpgrades() * 18); } if (this.hasToolbox()) { - drawTexture(matrices, offsetX + 178, offsetY + this.backgroundHeight - 90, 178, this.backgroundHeight - 90, 68, 68); + drawTexture(matrices, offsetX + 178, offsetY + this.backgroundHeight - 90, 178, this.backgroundHeight - 90, + 68, 68); } } diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java index 744222b64..d5a6f0738 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java @@ -47,15 +47,14 @@ public class InterfaceScreen extends UpgradeableScreen { @Override protected void addButtons() { - this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), - this.itemRenderer, btn -> openPriorityGui())); + this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), this.itemRenderer, + btn -> openPriorityGui())); this.blockMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 8, Settings.BLOCK, YesNo.NO); this.addButton(this.blockMode); - this.interfaceMode = new ToggleButton(this.x - 18, this.y + 26, 84, 85, - GuiText.InterfaceTerminal.text(), GuiText.InterfaceTerminalHint.text(), - btn -> selectNextInterfaceMode()); + this.interfaceMode = new ToggleButton(this.x - 18, this.y + 26, 84, 85, GuiText.InterfaceTerminal.text(), + GuiText.InterfaceTerminalHint.text(), btn -> selectNextInterfaceMode()); this.addButton(this.interfaceMode); } diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java index c7707c653..dd93d23c0 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java @@ -27,20 +27,20 @@ import java.util.Map; import java.util.Set; import java.util.WeakHashMap; -import alexiil.mc.lib.attributes.Simulation; import com.google.common.collect.HashMultimap; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.util.InputUtil; -import net.minecraft.client.util.math.MatrixStack; import org.lwjgl.glfw.GLFW; +import net.minecraft.client.util.InputUtil; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.text.Text; +import alexiil.mc.lib.attributes.Simulation; import appeng.api.storage.channels.IItemStorageChannel; import appeng.client.ActionKey; @@ -69,8 +69,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen protected void addButtons() { this.levelMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 8, Settings.LEVEL_TYPE, LevelType.ITEM_LEVEL); - this.redstoneMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 28, - Settings.REDSTONE_EMITTER, RedstoneMode.LOW_SIGNAL); + this.redstoneMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 28, Settings.REDSTONE_EMITTER, + RedstoneMode.LOW_SIGNAL); this.fuzzyMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 48, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); - this.craftingMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 48, - Settings.CRAFT_VIA_REDSTONE, YesNo.NO); + this.craftingMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 48, Settings.CRAFT_VIA_REDSTONE, + YesNo.NO); this.addButton(this.levelMode); this.addButton(this.redstoneMode); this.addButton(this.craftingMode); @@ -100,14 +100,16 @@ public class LevelEmitterScreen extends UpgradeableScreen if (notCraftingMode) { if (currentLevelMode == LevelType.ENERGY_LEVEL) { - this.textRenderer.draw(matrices, PowerUnits.AE.textComponent().getString(), 110, 44, COLOR_DARK_GRAY); + this.textRenderer.draw(matrices, PowerUnits.AE.textComponent().getString(), 110, 44, + COLOR_DARK_GRAY); } } } } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { super.drawBG(matrices, offsetX, offsetY, mouseX, mouseY, partialTicks); this.level.render(matrices, mouseX, mouseY, partialTicks); } diff --git a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java index a21335a2f..9c1b0b9cb 100644 --- a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java +++ b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java @@ -20,13 +20,12 @@ package appeng.client.gui.implementations; import java.util.List; -import appeng.mixins.SlotMixin; -import net.minecraft.client.util.math.MatrixStack; import org.lwjgl.glfw.GLFW; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.slot.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; import net.minecraft.text.Text; import appeng.api.config.SearchBoxMode; @@ -63,6 +62,7 @@ import appeng.core.sync.packets.ConfigValuePacket; import appeng.core.sync.packets.SwitchGuisPacket; import appeng.helpers.WirelessTerminalGuiObject; import appeng.integration.abstraction.ReiFacade; +import appeng.mixins.SlotMixin; import appeng.parts.reporting.AbstractTerminalPart; import appeng.tile.misc.SecurityStationBlockEntity; import appeng.util.IConfigManagerHost; @@ -205,13 +205,13 @@ public class MEMonitorableScreen extends AEBas } if (this.viewCell || this instanceof WirelessTermScreen) { - this.viewModeToggle = this.addButton(new SettingToggleButton<>(this.x - 18, offset, - Settings.VIEW_MODE, getSortDisplay(), this::toggleServerSetting)); + this.viewModeToggle = this.addButton(new SettingToggleButton<>(this.x - 18, offset, Settings.VIEW_MODE, + getSortDisplay(), this::toggleServerSetting)); offset += 20; } - this.addButton(this.sortDirToggle = new SettingToggleButton<>(this.x - 18, offset, - Settings.SORT_DIRECTION, getSortDir(), this::toggleServerSetting)); + this.addButton(this.sortDirToggle = new SettingToggleButton<>(this.x - 18, offset, Settings.SORT_DIRECTION, + getSortDir(), this::toggleServerSetting)); offset += 20; SearchBoxMode searchMode = AEConfig.instance().getTerminalSearchMode(); @@ -225,8 +225,7 @@ public class MEMonitorableScreen extends AEBas this::toggleTerminalStyle)); } - this.searchField = new AETextField(this.textRenderer, this.x + Math.max(80, this.offsetX), this.y + 4, 90, - 12); + this.searchField = new AETextField(this.textRenderer, this.x + Math.max(80, this.offsetX), this.y + 4, 90, 12); this.searchField.setHasBorder(false); this.searchField.setMaxLength(25); this.searchField.setEditableColor(0xFFFFFF); @@ -319,7 +318,8 @@ public class MEMonitorableScreen extends AEBas } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture(this.getBackground()); final int x_width = 197; @@ -333,8 +333,8 @@ public class MEMonitorableScreen extends AEBas drawTexture(matrices, offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18); } - drawTexture(matrices, offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, x_width, - 99 + this.reservedSpace - this.lowerTextureOffset); + drawTexture(matrices, offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, + x_width, 99 + this.reservedSpace - this.lowerTextureOffset); if (this.viewCell) { boolean update = false; diff --git a/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java b/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java index 41ff82311..d1a315663 100644 --- a/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java +++ b/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java @@ -25,8 +25,7 @@ import appeng.container.implementations.MEPortableCellContainer; public class MEPortableCellScreen extends MEMonitorableScreen { - public MEPortableCellScreen(MEPortableCellContainer container, PlayerInventory playerInventory, - Text title) { + public MEPortableCellScreen(MEPortableCellContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java b/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java index ddb029c36..f52edc245 100644 --- a/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java +++ b/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java @@ -52,8 +52,8 @@ public class MolecularAssemblerScreen extends UpgradeableScreen(this.x - 18, this.y + 8, - Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); + this.redstoneMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 8, Settings.REDSTONE_CONTROLLED, + RedstoneMode.IGNORE); addButton(this.redstoneMode); } @@ -64,7 +64,8 @@ public class MolecularAssemblerScreen extends UpgradeableScreen im private final int rows = 4; private int tooltip = -1; - public NetworkStatusScreen(NetworkStatusContainer container, PlayerInventory playerInventory, - Text title) { + public NetworkStatusScreen(NetworkStatusContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); final Scrollbar scrollbar = new Scrollbar(); @@ -106,17 +104,18 @@ public class NetworkStatusScreen extends AEBaseScreen im this.textRenderer.draw(matrices, GuiText.NetworkDetails.text(), 8, 6, 4210752); this.textRenderer.draw(matrices, - GuiText.StoredPower.text() + ": " + Platform.formatPowerLong(handler.getCurrentPower(), false), - 13, 16, 4210752); + GuiText.StoredPower.text() + ": " + Platform.formatPowerLong(handler.getCurrentPower(), false), 13, 16, + 4210752); this.textRenderer.draw(matrices, GuiText.MaxPower.text() + ": " + Platform.formatPowerLong(handler.getMaxPower(), false), 13, 26, 4210752); - this.textRenderer.draw(matrices, GuiText.PowerInputRate.text() + ": " - + Platform.formatPowerLong(handler.getAverageAddition(), true), 13, 143 - 10, 4210752); this.textRenderer.draw(matrices, - GuiText.PowerUsageRate.text() + ": " + Platform.formatPowerLong(handler.getPowerUsage(), true), - 13, 143 - 20, 4210752); + GuiText.PowerInputRate.text() + ": " + Platform.formatPowerLong(handler.getAverageAddition(), true), 13, + 143 - 10, 4210752); + this.textRenderer.draw(matrices, + GuiText.PowerUsageRate.text() + ": " + Platform.formatPowerLong(handler.getPowerUsage(), true), 13, + 143 - 20, 4210752); final int sectionLength = 30; @@ -143,8 +142,9 @@ public class NetworkStatusScreen extends AEBaseScreen im } final int w = this.textRenderer.getWidth(str); - this.textRenderer.draw(matrices, str, (int) ((x * sectionLength + xo + sectionLength - 19 - (w * 0.5)) * 2), - (y * 18 + yo + 6) * 2, 4210752); + this.textRenderer.draw(matrices, str, + (int) ((x * sectionLength + xo + sectionLength - 19 - (w * 0.5)) * 2), (y * 18 + yo + 6) * 2, + 4210752); RenderSystem.popMatrix(); final int posX = x * sectionLength + xo + sectionLength - 18; @@ -155,8 +155,8 @@ public class NetworkStatusScreen extends AEBaseScreen im toolTip.add(GuiText.Installed.withSuffix(": " + (refStack.getStackSize()))); if (refStack.getCountRequestable() > 0) { - toolTip.add(GuiText.EnergyDrain.withSuffix(": " - + Platform.formatPowerLong(refStack.getCountRequestable(), true))); + toolTip.add(GuiText.EnergyDrain + .withSuffix(": " + Platform.formatPowerLong(refStack.getCountRequestable(), true))); } toolPosX = x * sectionLength + xo + sectionLength - 8; @@ -180,7 +180,8 @@ public class NetworkStatusScreen extends AEBaseScreen im } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/networkstatus.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); } @@ -223,8 +224,8 @@ public class NetworkStatusScreen extends AEBaseScreen im } currentToolTip.add(GuiText.Installed.withSuffix(": " + myStack.getStackSize())); - currentToolTip.add(GuiText.EnergyDrain.withSuffix(": " - + Platform.formatPowerLong(myStack.getCountRequestable(), true))); + currentToolTip.add(GuiText.EnergyDrain + .withSuffix(": " + Platform.formatPowerLong(myStack.getCountRequestable(), true))); this.drawTooltip(matrices, x, y, currentToolTip); } diff --git a/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java b/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java index 53c54e807..19f3ca409 100644 --- a/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java +++ b/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java @@ -22,7 +22,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; - import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.ToggleButton; import appeng.container.implementations.NetworkToolContainer; @@ -43,9 +42,8 @@ public class NetworkToolScreen extends AEBaseScreen { public void init() { super.init(); - this.tFacades = new ToggleButton(this.x - 18, this.y + 8, 23, 22, - GuiText.TransparentFacades.text(), GuiText.TransparentFacadesHint.text(), - btn -> toggleFacades()); + this.tFacades = new ToggleButton(this.x - 18, this.y + 8, 23, 22, GuiText.TransparentFacades.text(), + GuiText.TransparentFacadesHint.text(), btn -> toggleFacades()); this.addButton(this.tFacades); } @@ -65,7 +63,8 @@ public class NetworkToolScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/toolbox.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); } diff --git a/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java b/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java index 26b8ccd80..457c8af80 100644 --- a/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java +++ b/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java @@ -6,14 +6,14 @@ import java.util.function.LongConsumer; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.LiteralText; import appeng.client.gui.AEBaseScreen; import appeng.client.gui.NumberEntryType; import appeng.client.gui.widgets.ITickingWidget; import appeng.client.gui.widgets.NumberBox; import appeng.core.AEConfig; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.LiteralText; /** * A utility widget that consists of a text-field to enter a number with @@ -88,17 +88,24 @@ public class NumberEntryWidget implements ITickingWidget { int top = parent.getY() + y; addButton.accept(this.plus1 = new ButtonWidget(left, top, 22, 20, new LiteralText("+" + a), btn -> addQty(a))); - addButton.accept(this.plus10 = new ButtonWidget(left + 28, top, 28, 20, new LiteralText("+" + b), btn -> addQty(b))); - addButton.accept(this.plus100 = new ButtonWidget(left + 62, top, 32, 20, new LiteralText("+" + c), btn -> addQty(c))); - addButton.accept(this.plus1000 = new ButtonWidget(left + 100, top, 38, 20, new LiteralText("+" + d), btn -> addQty(d))); + addButton.accept( + this.plus10 = new ButtonWidget(left + 28, top, 28, 20, new LiteralText("+" + b), btn -> addQty(b))); + addButton.accept( + this.plus100 = new ButtonWidget(left + 62, top, 32, 20, new LiteralText("+" + c), btn -> addQty(c))); + addButton.accept( + this.plus1000 = new ButtonWidget(left + 100, top, 38, 20, new LiteralText("+" + d), btn -> addQty(d))); // Placing this here will give a sensible tab order addChildren.accept(this.level); - addButton.accept(this.minus1 = new ButtonWidget(left, top + 42, 22, 20, new LiteralText("-" + a), btn -> addQty(-a))); - addButton.accept(this.minus10 = new ButtonWidget(left + 28, top + 42, 28, 20, new LiteralText("-" + b), btn -> addQty(-b))); - addButton.accept(this.minus100 = new ButtonWidget(left + 62, top + 42, 32, 20, new LiteralText("-" + c), btn -> addQty(-c))); - addButton.accept(this.minus1000 = new ButtonWidget(left + 100, top + 42, 38, 20, new LiteralText("-" + d), btn -> addQty(-d))); + addButton.accept( + this.minus1 = new ButtonWidget(left, top + 42, 22, 20, new LiteralText("-" + a), btn -> addQty(-a))); + addButton.accept(this.minus10 = new ButtonWidget(left + 28, top + 42, 28, 20, new LiteralText("-" + b), + btn -> addQty(-b))); + addButton.accept(this.minus100 = new ButtonWidget(left + 62, top + 42, 32, 20, new LiteralText("-" + c), + btn -> addQty(-c))); + addButton.accept(this.minus1000 = new ButtonWidget(left + 100, top + 42, 38, 20, new LiteralText("-" + d), + btn -> addQty(-d))); } private void addQty(final long i) { diff --git a/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java b/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java index 28c327d69..6af652727 100644 --- a/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java +++ b/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java @@ -18,7 +18,6 @@ package appeng.client.gui.implementations; -import appeng.mixins.SlotMixin; import net.minecraft.block.Blocks; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; @@ -33,6 +32,7 @@ import appeng.container.slot.AppEngSlot; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; +import appeng.mixins.SlotMixin; public class PatternTermScreen extends MEMonitorableScreen { @@ -126,8 +126,8 @@ public class PatternTermScreen extends MEMonitorableScreen } super.drawFG(matrices, offsetX, offsetY, mouseX, mouseY); - this.textRenderer.draw(matrices, GuiText.PatternTerminal.text(), 8, this.backgroundHeight - 96 + 2 - this.getReservedSpace(), - 4210752); + this.textRenderer.draw(matrices, GuiText.PatternTerminal.text(), 8, + this.backgroundHeight - 96 + 2 - this.getReservedSpace(), 4210752); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java index c53129556..98a94772c 100644 --- a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java +++ b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java @@ -66,7 +66,8 @@ public class PriorityScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture(getBackground()); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); diff --git a/src/main/java/appeng/client/gui/implementations/QNBScreen.java b/src/main/java/appeng/client/gui/implementations/QNBScreen.java index c5d05b310..bd89f9621 100644 --- a/src/main/java/appeng/client/gui/implementations/QNBScreen.java +++ b/src/main/java/appeng/client/gui/implementations/QNBScreen.java @@ -22,7 +22,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; - import appeng.client.gui.AEBaseScreen; import appeng.container.implementations.QNBContainer; import appeng.core.localization.GuiText; @@ -41,7 +40,8 @@ public class QNBScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/chest.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); } diff --git a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java index c6712d7d0..5e059fd42 100644 --- a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java +++ b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java @@ -18,16 +18,15 @@ package appeng.client.gui.implementations; -import net.minecraft.client.util.InputUtil; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.LiteralText; import org.lwjgl.glfw.GLFW; import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.client.util.InputUtil; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.text.LiteralText; import net.minecraft.text.Text; - import appeng.client.ActionKey; import appeng.client.gui.AEBaseScreen; import appeng.container.implementations.QuartzKnifeContainer; @@ -49,7 +48,8 @@ public class QuartzKnifeScreen extends AEBaseScreen { public void init() { super.init(); - this.name = new TextFieldWidget(this.textRenderer, this.x + 24, this.y + 32, 79, this.textRenderer.fontHeight, LiteralText.EMPTY); + this.name = new TextFieldWidget(this.textRenderer, this.x + 24, this.y + 32, 79, this.textRenderer.fontHeight, + LiteralText.EMPTY); this.name.setHasBorder(false); this.name.setMaxLength(32); this.name.setEditableColor(0xFFFFFF); @@ -64,7 +64,8 @@ public class QuartzKnifeScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/quartzknife.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); this.name.render(matrices, mouseX, mouseY, partialTicks); diff --git a/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java b/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java index 07a39dc9c..bbd518532 100644 --- a/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java +++ b/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java @@ -38,8 +38,7 @@ public class SecurityStationScreen extends MEMonitorableScreen toggleOption(SecurityPermissions.INJECT))); + this.inject = this + .addButton(new ToggleButton(this.x + 56, top, 11 * 16, 12 * 16, SecurityPermissions.INJECT.nameText(), + SecurityPermissions.INJECT.tooltipText(), btn -> toggleOption(SecurityPermissions.INJECT))); this.extract = this.addButton(new ToggleButton(this.x + 56 + 18, top, 11 * 16 + 1, 12 * 16 + 1, SecurityPermissions.EXTRACT.nameText(), SecurityPermissions.EXTRACT.tooltipText(), @@ -83,8 +82,8 @@ public class SecurityStationScreen extends MEMonitorableScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { bindTexture(TEXTURE); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); } diff --git a/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java b/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java index 553d908f2..d3e21f851 100644 --- a/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java +++ b/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java @@ -22,7 +22,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; - import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.CommonButtons; import appeng.container.implementations.SpatialIOPortContainer; @@ -31,8 +30,7 @@ import appeng.util.Platform; public class SpatialIOPortScreen extends AEBaseScreen { - public SpatialIOPortScreen(SpatialIOPortContainer container, PlayerInventory playerInventory, - Text title) { + public SpatialIOPortScreen(SpatialIOPortContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.backgroundHeight = 199; } @@ -45,13 +43,14 @@ public class SpatialIOPortScreen extends AEBaseScreen { @Override public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.textRenderer.draw(matrices, GuiText.StoredPower.withSuffix(": " - + Platform.formatPowerLong(this.handler.getCurrentPower(), false)), 13, 21, 4210752); this.textRenderer.draw(matrices, - GuiText.MaxPower.withSuffix(": " + Platform.formatPowerLong(this.handler.getMaxPower(), false)), 13, - 31, 4210752); - this.textRenderer.draw(matrices, GuiText.RequiredPower.withSuffix(": " - + Platform.formatPowerLong(this.handler.getRequiredPower(), false)), 13, 73, 4210752); + GuiText.StoredPower.withSuffix(": " + Platform.formatPowerLong(this.handler.getCurrentPower(), false)), + 13, 21, 4210752); + this.textRenderer.draw(matrices, + GuiText.MaxPower.withSuffix(": " + Platform.formatPowerLong(this.handler.getMaxPower(), false)), 13, 31, + 4210752); + this.textRenderer.draw(matrices, GuiText.RequiredPower + .withSuffix(": " + Platform.formatPowerLong(this.handler.getRequiredPower(), false)), 13, 73, 4210752); this.textRenderer.draw(matrices, GuiText.Efficiency.withSuffix(": " + (((float) this.handler.getEfficency()) / 100) + '%'), 13, 83, 4210752); @@ -60,17 +59,19 @@ public class SpatialIOPortScreen extends AEBaseScreen { this.textRenderer.draw(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96, 4210752); if (this.handler.xSize != 0 && this.handler.ySize != 0 && this.handler.zSize != 0) { - final Text text = GuiText.SCSSize.withSuffix(": " + this.handler.xSize + "x" + this.handler.ySize - + "x" + this.handler.zSize); + final Text text = GuiText.SCSSize + .withSuffix(": " + this.handler.xSize + "x" + this.handler.ySize + "x" + this.handler.zSize); this.textRenderer.draw(matrices, text, 13, 93, 4210752); } else { - this.textRenderer.draw(matrices, GuiText.SCSSize.withSuffix(": ").append(GuiText.SCSInvalid.text()), 13, 93, 4210752); + this.textRenderer.draw(matrices, GuiText.SCSSize.withSuffix(": ").append(GuiText.SCSInvalid.text()), 13, 93, + 4210752); } } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/spatialio.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); } diff --git a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java index 9264259f5..2f5ae3615 100644 --- a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java +++ b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java @@ -54,13 +54,13 @@ public class StorageBusScreen extends UpgradeableScreen { addButton(new ActionButton(this.x - 18, this.y + 28, ActionItems.WRENCH, btn -> partition())); this.rwMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 48, Settings.ACCESS, AccessRestriction.READ_WRITE); - this.storageFilter = new ServerSettingToggleButton<>(this.x - 18, this.y + 68, - Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY); + this.storageFilter = new ServerSettingToggleButton<>(this.x - 18, this.y + 68, Settings.STORAGE_FILTER, + StorageFilter.EXTRACTABLE_ONLY); this.fuzzyMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 88, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); - this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), - this.itemRenderer, btn -> openPriorityGui())); + this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), this.itemRenderer, + btn -> openPriorityGui())); this.addButton(this.storageFilter); this.addButton(this.fuzzyMode); diff --git a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java index 5ba022c91..eb87574fd 100644 --- a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java +++ b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java @@ -22,7 +22,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; - import appeng.api.config.FuzzyMode; import appeng.api.config.RedstoneMode; import appeng.api.config.SchedulingMode; @@ -68,17 +67,16 @@ public class UpgradeableScreen extends AEBaseScr } protected void addButtons() { - this.redstoneMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 8, - Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE); + this.redstoneMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 8, Settings.REDSTONE_CONTROLLED, + RedstoneMode.IGNORE); addButton(this.redstoneMode); this.fuzzyMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 28, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); addButton(this.fuzzyMode); - this.craftMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 48, Settings.CRAFT_ONLY, - YesNo.NO); + this.craftMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 48, Settings.CRAFT_ONLY, YesNo.NO); addButton(this.craftMode); - this.schedulingMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 68, - Settings.SCHEDULING_MODE, SchedulingMode.DEFAULT); + this.schedulingMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 68, Settings.SCHEDULING_MODE, + SchedulingMode.DEFAULT); addButton(this.schedulingMode); } @@ -105,7 +103,8 @@ public class UpgradeableScreen extends AEBaseScr } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.handleButtonVisibility(); this.bindTexture(this.getBackground()); @@ -114,7 +113,8 @@ public class UpgradeableScreen extends AEBaseScr drawTexture(matrices, offsetX + 177, offsetY, 177, 0, 35, 14 + this.cvb.availableUpgrades() * 18); } if (this.hasToolbox()) { - drawTexture(matrices, offsetX + 178, offsetY + this.backgroundHeight - 90, 178, this.backgroundHeight - 90, 68, 68); + drawTexture(matrices, offsetX + 178, offsetY + this.backgroundHeight - 90, 178, this.backgroundHeight - 90, + 68, 68); } } diff --git a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java index c913ca6c2..389d6e5a4 100644 --- a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java +++ b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java @@ -25,7 +25,6 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; - import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.ProgressBar; import appeng.client.gui.widgets.ProgressBar.Direction; @@ -37,8 +36,7 @@ public class VibrationChamberScreen extends AEBaseScreen 0) { final int i1 = this.handler.getRemainingBurnTime() * 12 / 100; @@ -70,7 +68,8 @@ public class VibrationChamberScreen extends AEBaseScreen { } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { this.bindTexture("guis/wireless.png"); drawTexture(matrices, offsetX, offsetY, 0, 0, this.backgroundWidth, this.backgroundHeight); } diff --git a/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java b/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java index 056edaad0..d63b17ca6 100644 --- a/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java +++ b/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java @@ -26,8 +26,7 @@ import appeng.container.implementations.MEPortableCellContainer; // FIXME: Extended from GuiPortableCell before... Why? public class WirelessTermScreen extends MEMonitorableScreen { - public WirelessTermScreen(MEPortableCellContainer container, PlayerInventory playerInventory, - Text title) { + public WirelessTermScreen(MEPortableCellContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/widgets/AETextField.java b/src/main/java/appeng/client/gui/widgets/AETextField.java index fb13e7661..62df6e1aa 100644 --- a/src/main/java/appeng/client/gui/widgets/AETextField.java +++ b/src/main/java/appeng/client/gui/widgets/AETextField.java @@ -53,7 +53,7 @@ public class AETextField extends TextFieldWidget { * @param height absolute height */ public AETextField(final TextRenderer fontRenderer, final int xPos, final int yPos, final int width, - final int height) { + final int height) { super(fontRenderer, xPos + PADDING, yPos + PADDING, width - 2 * PADDING - (int) fontRenderer.getWidth("_"), height - 2 * PADDING, LiteralText.EMPTY); @@ -87,11 +87,13 @@ public class AETextField extends TextFieldWidget { public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float partial) { if (this.isVisible()) { if (this.isFocused()) { - fill(matrices, this.x - PADDING + 1, this.y - PADDING + 1, this.x + this.width + this._fontPad + PADDING - 1, - this.y + this.height + PADDING - 1, 0xFF606060); + fill(matrices, this.x - PADDING + 1, this.y - PADDING + 1, + this.x + this.width + this._fontPad + PADDING - 1, this.y + this.height + PADDING - 1, + 0xFF606060); } else { - fill(matrices, this.x - PADDING + 1, this.y - PADDING + 1, this.x + this.width + this._fontPad + PADDING - 1, - this.y + this.height + PADDING - 1, 0xFFA8A8A8); + fill(matrices, this.x - PADDING + 1, this.y - PADDING + 1, + this.x + this.width + this._fontPad + PADDING - 1, this.y + this.height + PADDING - 1, + 0xFFA8A8A8); } super.renderButton(matrices, mouseX, mouseY, partial); } diff --git a/src/main/java/appeng/client/gui/widgets/ActionButton.java b/src/main/java/appeng/client/gui/widgets/ActionButton.java index f07d5d8f4..80e08d114 100644 --- a/src/main/java/appeng/client/gui/widgets/ActionButton.java +++ b/src/main/java/appeng/client/gui/widgets/ActionButton.java @@ -21,11 +21,12 @@ package appeng.client.gui.widgets; import java.util.function.Consumer; import java.util.regex.Pattern; -import appeng.api.config.ActionItems; -import appeng.core.localization.ButtonToolTips; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; +import appeng.api.config.ActionItems; +import appeng.core.localization.ButtonToolTips; + public class ActionButton extends IconButton implements ITooltip { private static final Pattern PATTERN_NEW_LINE = Pattern.compile("\\n", Pattern.LITERAL); private final int iconIndex; diff --git a/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java b/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java index 952fa471b..0b90b2e50 100644 --- a/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java +++ b/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java @@ -30,7 +30,8 @@ public abstract class CustomSlotWidget extends DrawableHelper implements IToolti public void slotClicked(final ItemStack clickStack, final int mouseButton) { } - public abstract void drawContent(final MinecraftClient mc, final int mouseX, final int mouseY, final float partialTicks); + public abstract void drawContent(final MinecraftClient mc, final int mouseX, final int mouseY, + final float partialTicks); public void drawBackground(MatrixStack matrices, int guileft, int guitop, int currentZIndex) { } diff --git a/src/main/java/appeng/client/gui/widgets/IconButton.java b/src/main/java/appeng/client/gui/widgets/IconButton.java index e819b762d..5434ee8e1 100644 --- a/src/main/java/appeng/client/gui/widgets/IconButton.java +++ b/src/main/java/appeng/client/gui/widgets/IconButton.java @@ -28,8 +28,7 @@ import net.minecraft.text.LiteralText; import net.minecraft.util.Identifier; public abstract class IconButton extends ButtonWidget implements ITooltip { - public static final Identifier TEXTURE_STATES = new Identifier("appliedenergistics2", - "textures/guis/states.png"); + public static final Identifier TEXTURE_STATES = new Identifier("appliedenergistics2", "textures/guis/states.png"); private boolean halfSize = false; diff --git a/src/main/java/appeng/client/gui/widgets/NumberBox.java b/src/main/java/appeng/client/gui/widgets/NumberBox.java index 24240d076..82b63565f 100644 --- a/src/main/java/appeng/client/gui/widgets/NumberBox.java +++ b/src/main/java/appeng/client/gui/widgets/NumberBox.java @@ -35,7 +35,7 @@ public class NumberBox extends TextFieldWidget { private long maxValue; public NumberBox(final TextRenderer fontRenderer, final int x, final int y, final int width, final int height, - final Class type, LongConsumer changeListener) { + final Class type, LongConsumer changeListener) { super(fontRenderer, x, y, width, height, new LiteralText("0")); this.setText("0"); setChangedListener(this::handleTextChanged); diff --git a/src/main/java/appeng/client/gui/widgets/ProgressBar.java b/src/main/java/appeng/client/gui/widgets/ProgressBar.java index 2f72514b7..fa2001368 100644 --- a/src/main/java/appeng/client/gui/widgets/ProgressBar.java +++ b/src/main/java/appeng/client/gui/widgets/ProgressBar.java @@ -18,8 +18,6 @@ package appeng.client.gui.widgets; -import appeng.container.interfaces.IProgressProvider; -import appeng.core.localization.GuiText; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.widget.AbstractButtonWidget; import net.minecraft.client.util.math.MatrixStack; @@ -27,6 +25,9 @@ import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import appeng.container.interfaces.IProgressProvider; +import appeng.core.localization.GuiText; + public class ProgressBar extends AbstractButtonWidget implements ITooltip { private final IProgressProvider source; @@ -66,8 +67,7 @@ public class ProgressBar extends AbstractButtonWidget implements ITooltip { this.height - diff); } else { final int diff = this.width - (max > 0 ? (this.width * current) / max : 0); - drawTexture(matrices, this.x, this.y, this.fill_u + diff, this.fill_v, this.width - diff, - this.height); + drawTexture(matrices, this.x, this.y, this.fill_u + diff, this.fill_v, this.width - diff, this.height); } } } @@ -83,8 +83,7 @@ public class ProgressBar extends AbstractButtonWidget implements ITooltip { } Text text = this.titleName != null ? this.titleName : LiteralText.EMPTY; - return text.copy().append("\n" + this.source.getCurrentProgress() + " ") - .append(GuiText.Of.text()) + return text.copy().append("\n" + this.source.getCurrentProgress() + " ").append(GuiText.Of.text()) .append(" " + this.source.getMaxProgress()); } diff --git a/src/main/java/appeng/client/gui/widgets/Scrollbar.java b/src/main/java/appeng/client/gui/widgets/Scrollbar.java index ab3cac0bd..ab6eb2b24 100644 --- a/src/main/java/appeng/client/gui/widgets/Scrollbar.java +++ b/src/main/java/appeng/client/gui/widgets/Scrollbar.java @@ -20,10 +20,11 @@ package appeng.client.gui.widgets; import com.mojang.blaze3d.systems.RenderSystem; -import appeng.client.gui.AEBaseScreen; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.util.math.MatrixStack; +import appeng.client.gui.AEBaseScreen; + public class Scrollbar implements IScrollSource { private int displayX = 0; @@ -36,7 +37,8 @@ public class Scrollbar implements IScrollSource { private int minScroll = 0; private int currentScroll = 0; - private final DrawableHelper drawable = new DrawableHelper(){}; + private final DrawableHelper drawable = new DrawableHelper() { + }; public void draw(MatrixStack matrices, final AEBaseScreen g) { g.bindTexture("minecraft", "gui/container/creative_inventory/tabs.png"); diff --git a/src/main/java/appeng/client/gui/widgets/TabButton.java b/src/main/java/appeng/client/gui/widgets/TabButton.java index ac3878830..4bbf5f8c9 100644 --- a/src/main/java/appeng/client/gui/widgets/TabButton.java +++ b/src/main/java/appeng/client/gui/widgets/TabButton.java @@ -29,15 +29,14 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; public class TabButton extends ButtonWidget implements ITooltip { - public static final Identifier TEXTURE_STATES = new Identifier("appliedenergistics2", - "textures/guis/states.png"); + public static final Identifier TEXTURE_STATES = new Identifier("appliedenergistics2", "textures/guis/states.png"); private final ItemRenderer itemRenderer; private int hideEdge = 0; private int myIcon = -1; private ItemStack myItem; public TabButton(final int x, final int y, final int ico, final Text message, final ItemRenderer ir, - PressAction onPress) { + PressAction onPress) { super(x, y, 22, 22, message, onPress); this.myIcon = ico; diff --git a/src/main/java/appeng/client/gui/widgets/ToggleButton.java b/src/main/java/appeng/client/gui/widgets/ToggleButton.java index 6c9154f7d..9958210fd 100644 --- a/src/main/java/appeng/client/gui/widgets/ToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/ToggleButton.java @@ -30,8 +30,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; public class ToggleButton extends ButtonWidget implements ITooltip { - public static final Identifier TEXTURE_STATES = new Identifier("appliedenergistics2", - "textures/guis/states.png"); + public static final Identifier TEXTURE_STATES = new Identifier("appliedenergistics2", "textures/guis/states.png"); private static final Pattern PATTERN_NEW_LINE = Pattern.compile("\\n", Pattern.LITERAL); private final int iconIdxOn; private final int iconIdxOff; diff --git a/src/main/java/appeng/client/render/BakedModelUnwrapper.java b/src/main/java/appeng/client/render/BakedModelUnwrapper.java index 9e0bd5556..fb4f657fb 100644 --- a/src/main/java/appeng/client/render/BakedModelUnwrapper.java +++ b/src/main/java/appeng/client/render/BakedModelUnwrapper.java @@ -1,8 +1,9 @@ package appeng.client.render; -import appeng.client.render.model.AutoRotatingBakedModel; import net.minecraft.client.render.model.BakedModel; +import appeng.client.render.model.AutoRotatingBakedModel; + public final class BakedModelUnwrapper { private BakedModelUnwrapper() { diff --git a/src/main/java/appeng/client/render/BasicUnbakedModel.java b/src/main/java/appeng/client/render/BasicUnbakedModel.java index d5f42f562..42faff30b 100644 --- a/src/main/java/appeng/client/render/BasicUnbakedModel.java +++ b/src/main/java/appeng/client/render/BasicUnbakedModel.java @@ -1,10 +1,5 @@ package appeng.client.render; -import com.mojang.datafixers.util.Pair; -import net.minecraft.client.render.model.UnbakedModel; -import net.minecraft.client.util.SpriteIdentifier; -import net.minecraft.util.Identifier; - import java.util.Collection; import java.util.Collections; import java.util.Set; @@ -12,9 +7,15 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; +import com.mojang.datafixers.util.Pair; + +import net.minecraft.client.render.model.UnbakedModel; +import net.minecraft.client.util.SpriteIdentifier; +import net.minecraft.util.Identifier; + /** - * An unbaked model that has standard models as a dependency and produces a custom baked model - * as a result. + * An unbaked model that has standard models as a dependency and produces a + * custom baked model as a result. */ public interface BasicUnbakedModel extends UnbakedModel { @@ -28,13 +29,12 @@ public interface BasicUnbakedModel extends UnbakedModel { } @Override - default Collection getTextureDependencies(Function unbakedModelGetter, Set> unresolvedTextureReferences) { + default Collection getTextureDependencies(Function unbakedModelGetter, + Set> unresolvedTextureReferences) { return Stream.concat( - getModelDependencies().stream() - .map(unbakedModelGetter) - .flatMap(ubm -> ubm.getTextureDependencies(unbakedModelGetter, unresolvedTextureReferences).stream()), - getAdditionalTextures() - ).collect(Collectors.toList()); + getModelDependencies().stream().map(unbakedModelGetter).flatMap( + ubm -> ubm.getTextureDependencies(unbakedModelGetter, unresolvedTextureReferences).stream()), + getAdditionalTextures()).collect(Collectors.toList()); } } diff --git a/src/main/java/appeng/client/render/DummyFluidBakedModel.java b/src/main/java/appeng/client/render/DummyFluidBakedModel.java index c2921ae82..a6e7688df 100644 --- a/src/main/java/appeng/client/render/DummyFluidBakedModel.java +++ b/src/main/java/appeng/client/render/DummyFluidBakedModel.java @@ -18,7 +18,13 @@ package appeng.client.render; -import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; import net.minecraft.block.BlockState; @@ -32,11 +38,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import java.util.function.Supplier; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; /** * @author DrummerMC @@ -57,7 +59,8 @@ public class DummyFluidBakedModel implements BakedModel, FabricBakedModel { } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { // Not used as an item model } diff --git a/src/main/java/appeng/client/render/FacadeBakedItemModel.java b/src/main/java/appeng/client/render/FacadeBakedItemModel.java index fd230e181..e91b9596c 100644 --- a/src/main/java/appeng/client/render/FacadeBakedItemModel.java +++ b/src/main/java/appeng/client/render/FacadeBakedItemModel.java @@ -18,10 +18,10 @@ package appeng.client.render; -import appeng.client.render.cablebus.FacadeBuilder; -import appeng.items.parts.FacadeItem; -import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import java.util.Objects; +import java.util.Random; +import java.util.function.Supplier; + import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; @@ -30,9 +30,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; -import java.util.Objects; -import java.util.Random; -import java.util.function.Supplier; +import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; + +import appeng.client.render.cablebus.FacadeBuilder; +import appeng.items.parts.FacadeItem; /** * This baked model class is used as a dispatcher to redirect the renderer to diff --git a/src/main/java/appeng/client/render/FacadeItemModel.java b/src/main/java/appeng/client/render/FacadeItemModel.java index 9b26dbac0..4b896c1c0 100644 --- a/src/main/java/appeng/client/render/FacadeItemModel.java +++ b/src/main/java/appeng/client/render/FacadeItemModel.java @@ -18,8 +18,12 @@ package appeng.client.render; -import appeng.client.render.cablebus.FacadeBuilder; -import appeng.core.AppEng; +import java.util.Collection; +import java.util.Collections; +import java.util.function.Function; + +import javax.annotation.Nullable; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -27,10 +31,8 @@ import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Collections; -import java.util.function.Function; +import appeng.client.render.cablebus.FacadeBuilder; +import appeng.core.AppEng; /** * The model class for facades. Since facades wrap existing models, they don't @@ -43,7 +45,8 @@ public class FacadeItemModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { BakedModel bakedBaseModel = loader.bake(MODEL_BASE, rotationContainer); FacadeBuilder facadeBuilder = new FacadeBuilder(loader); diff --git a/src/main/java/appeng/client/render/FacingToRotation.java b/src/main/java/appeng/client/render/FacingToRotation.java index 5b037cbff..e0c72bfe3 100644 --- a/src/main/java/appeng/client/render/FacingToRotation.java +++ b/src/main/java/appeng/client/render/FacingToRotation.java @@ -19,13 +19,12 @@ package appeng.client.render; import net.minecraft.client.util.math.MatrixStack; - -import net.minecraft.client.util.math.Vector4f; -import net.minecraft.util.math.Matrix4f; -import net.minecraft.util.math.Quaternion; import net.minecraft.client.util.math.Vector3f; +import net.minecraft.client.util.math.Vector4f; import net.minecraft.util.StringIdentifiable; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Matrix4f; +import net.minecraft.util.math.Quaternion; import net.minecraft.util.math.Vec3i; /** diff --git a/src/main/java/appeng/client/render/SimpleModelLoader.java b/src/main/java/appeng/client/render/SimpleModelLoader.java index 8434afbee..c8c20cda4 100644 --- a/src/main/java/appeng/client/render/SimpleModelLoader.java +++ b/src/main/java/appeng/client/render/SimpleModelLoader.java @@ -1,14 +1,15 @@ package appeng.client.render; +import java.util.function.Supplier; + import net.fabricmc.fabric.api.client.model.ModelProviderContext; import net.fabricmc.fabric.api.client.model.ModelResourceProvider; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.util.Identifier; -import java.util.function.Supplier; - /** - * A quaint model provider that provides a single model with a single given resource identifier. + * A quaint model provider that provides a single model with a single given + * resource identifier. */ public class SimpleModelLoader implements ModelResourceProvider { diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java index 92fde5979..10289670d 100644 --- a/src/main/java/appeng/client/render/SpatialSkyRender.java +++ b/src/main/java/appeng/client/render/SpatialSkyRender.java @@ -20,15 +20,15 @@ package appeng.client.render; import java.util.Random; -import net.minecraft.client.render.VertexFormats; -import net.minecraft.client.util.math.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import org.lwjgl.opengl.GL11; import net.minecraft.client.render.BufferBuilder; -import net.minecraft.util.math.Quaternion; import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.math.Quaternion; public class SpatialSkyRender { @@ -46,9 +46,10 @@ public class SpatialSkyRender { return INSTANCE; } - private static final Quaternion[] SKYBOX_SIDE_ROTATIONS = { Quaternion.IDENTITY, new Quaternion(90.0F, 0.0F, 0.0F, true), - new Quaternion(-90.0F, 0.0F, 0.0F, true), new Quaternion(180.0F, 0.0F, 0.0F, true), - new Quaternion(0.0F, 0.0F, 90.0F, true), new Quaternion(0.0F, 0.0F, -90.0F, true), }; + private static final Quaternion[] SKYBOX_SIDE_ROTATIONS = { Quaternion.IDENTITY, + new Quaternion(90.0F, 0.0F, 0.0F, true), new Quaternion(-90.0F, 0.0F, 0.0F, true), + new Quaternion(180.0F, 0.0F, 0.0F, true), new Quaternion(0.0F, 0.0F, 90.0F, true), + new Quaternion(0.0F, 0.0F, -90.0F, true), }; public void render(MatrixStack matrixStack) { final long now = System.currentTimeMillis(); diff --git a/src/main/java/appeng/client/render/StackSizeRenderer.java b/src/main/java/appeng/client/render/StackSizeRenderer.java index 85c843967..6d53c906a 100644 --- a/src/main/java/appeng/client/render/StackSizeRenderer.java +++ b/src/main/java/appeng/client/render/StackSizeRenderer.java @@ -21,9 +21,9 @@ package appeng.client.render; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.util.math.AffineTransformation; -import net.minecraft.client.render.Tessellator; import net.minecraft.client.util.math.Vector3f; import appeng.api.storage.data.IAEItemStack; @@ -72,10 +72,10 @@ public class StackSizeRenderer { null, new Vector3f(scaleFactor, scaleFactor, scaleFactor), null); RenderSystem.disableBlend(); - final int X = (int) ((xPos + offset + 16.0f - fontRenderer.getWidth(text) * scaleFactor) - * inverseScaleFactor); + final int X = (int) ((xPos + offset + 16.0f - fontRenderer.getWidth(text) * scaleFactor) * inverseScaleFactor); final int Y = (int) ((yPos + offset + 16.0f - 7.0f * scaleFactor) * inverseScaleFactor); - VertexConsumerProvider.Immediate buffer = VertexConsumerProvider.immediate(Tessellator.getInstance().getBuffer()); + VertexConsumerProvider.Immediate buffer = VertexConsumerProvider + .immediate(Tessellator.getInstance().getBuffer()); fontRenderer.draw(text, X, Y, 16777215, true, tm.getMatrix(), buffer, false, 0, 15728880); buffer.draw(); RenderSystem.enableBlend(); diff --git a/src/main/java/appeng/client/render/TesrRenderHelper.java b/src/main/java/appeng/client/render/TesrRenderHelper.java index c6d33c113..7d5b18ca1 100644 --- a/src/main/java/appeng/client/render/TesrRenderHelper.java +++ b/src/main/java/appeng/client/render/TesrRenderHelper.java @@ -19,13 +19,12 @@ package appeng.client.render; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.util.math.MatrixStack; - -import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.util.math.Vector3f; import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; @@ -82,7 +81,7 @@ public class TesrRenderHelper { * Render an item in 2D. */ public static void renderItem2d(MatrixStack matrixStack, VertexConsumerProvider buffers, ItemStack itemStack, - float scale, int combinedLightIn, int combinedOverlayIn) { + float scale, int combinedLightIn, int combinedOverlayIn) { if (!itemStack.isEmpty()) { matrixStack.push(); // Push it out of the block face a bit to avoid z-fighting @@ -127,8 +126,7 @@ public class TesrRenderHelper { matrixStack.scale(1.0f / 62.0f, -1.0f / 62.0f, 1.0f / 62.0f); matrixStack.scale(0.5f, 0.5f, 0); matrixStack.translate(-0.5f * width, 0.0f, 0.5f); - fr.draw(renderedStackSize, 0, 0, -1, false, matrixStack.peek().getModel(), buffers, false, 0, - 15728880); + fr.draw(renderedStackSize, 0, 0, -1, false, matrixStack.peek().getModel(), buffers, false, 0, 15728880); matrixStack.pop(); } diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java index 53594d158..008902be3 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java @@ -28,11 +28,11 @@ import java.util.function.Function; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; -import net.minecraft.client.util.SpriteIdentifier; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.texture.Sprite; -import net.minecraft.util.math.Direction; +import net.minecraft.client.texture.SpriteAtlasTexture; +import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; +import net.minecraft.util.math.Direction; import appeng.api.util.AECableType; import appeng.api.util.AEColor; @@ -216,7 +216,7 @@ class CableBuilder { } public void addConstrainedGlassConnection(Direction facing, AEColor cableColor, int distanceFromEdge, - QuadEmitter emitter) { + QuadEmitter emitter) { // Glass connections reach only 6 voxels from the edge if (distanceFromEdge >= 6) { @@ -307,7 +307,7 @@ class CableBuilder { } public void addConstrainedCoveredConnection(Direction facing, AEColor cableColor, int distanceFromEdge, - QuadEmitter emitter) { + QuadEmitter emitter) { // The core of a covered cable reaches up to 5 voxels from the block edge, so // drawing a connection can only occur from there onwards if (distanceFromEdge >= 5) { @@ -374,8 +374,7 @@ class CableBuilder { addCoveredCableSizedCube(facing, cubeBuilder); } - public void addStraightSmartConnection(Direction facing, AEColor cableColor, int channels, - QuadEmitter emitter) { + public void addStraightSmartConnection(Direction facing, AEColor cableColor, int channels, QuadEmitter emitter) { CubeBuilder cubeBuilder = new CubeBuilder(emitter); Sprite texture = this.connectionTextures.get(AECableType.SMART).get(cableColor); @@ -401,7 +400,7 @@ class CableBuilder { } public void addConstrainedSmartConnection(Direction facing, AEColor cableColor, int distanceFromEdge, int channels, - QuadEmitter emitter) { + QuadEmitter emitter) { // Same as with covered cables, the smart cable's core extends up to 5 voxels // away from the edge. // Drawing a connection to any point before that point is fruitless @@ -515,7 +514,7 @@ class CableBuilder { } public void addStraightDenseSmartConnection(Direction facing, AEColor cableColor, int channels, - QuadEmitter emitter) { + QuadEmitter emitter) { CubeBuilder cubeBuilder = new CubeBuilder(emitter); Sprite texture = this.connectionTextures.get(AECableType.DENSE_SMART).get(cableColor); diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java index af3604be2..4f2c1937d 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java @@ -18,10 +18,18 @@ package appeng.client.render.cablebus; -import appeng.api.parts.IDynamicPartBakedModel; -import appeng.api.parts.IPartModel; -import appeng.api.util.AECableType; -import appeng.api.util.AEColor; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Random; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.renderer.v1.Renderer; @@ -45,16 +53,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; -import java.util.function.Supplier; +import appeng.api.parts.IDynamicPartBakedModel; +import appeng.api.parts.IPartModel; +import appeng.api.util.AECableType; +import appeng.api.util.AEColor; @Environment(EnvType.CLIENT) public class CableBusBakedModel implements BakedModel, FabricBakedModel { @@ -72,8 +74,8 @@ public class CableBusBakedModel implements BakedModel, FabricBakedModel { private final Sprite particleTexture; - CableBusBakedModel(CableBuilder cableBuilder, FacadeBuilder facadeBuilder, - Map partModels, Sprite particleTexture) { + CableBusBakedModel(CableBuilder cableBuilder, FacadeBuilder facadeBuilder, Map partModels, + Sprite particleTexture) { this.cableBuilder = cableBuilder; this.facadeBuilder = facadeBuilder; this.partModels = partModels; @@ -97,7 +99,8 @@ public class CableBusBakedModel implements BakedModel, FabricBakedModel { } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { CableBusRenderState renderState = getRenderState(blockView, pos); @@ -131,8 +134,7 @@ public class CableBusBakedModel implements BakedModel, FabricBakedModel { if (bakedModel instanceof IDynamicPartBakedModel) { ((IDynamicPartBakedModel) bakedModel).emitQuads(blockView, state, pos, randomSupplier, context, facing, partModelData); - } - else if (bakedModel instanceof FabricBakedModel) { + } else if (bakedModel instanceof FabricBakedModel) { ((FabricBakedModel) bakedModel).emitBlockQuads(blockView, state, pos, randomSupplier, context); } else { context.fallbackConsumer().accept(bakedModel); @@ -253,8 +255,7 @@ public class CableBusBakedModel implements BakedModel, FabricBakedModel { switch (cableType) { case GLASS: - this.cableBuilder.addGlassConnection(facing, cableColor, connectionType, cableBusAdjacent, - emitter); + this.cableBuilder.addGlassConnection(facing, cableColor, connectionType, cableBusAdjacent, emitter); break; case COVERED: this.cableBuilder.addCoveredConnection(facing, cableColor, connectionType, cableBusAdjacent, @@ -323,7 +324,6 @@ public class CableBusBakedModel implements BakedModel, FabricBakedModel { return particleTexture instanceof MissingSprite; } - @Override public boolean useAmbientOcclusion() { return true; diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java b/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java index ed32364c2..19fe4bdc4 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java @@ -1,11 +1,11 @@ package appeng.client.render.cablebus; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.particle.ParticleTextureSheet; import net.minecraft.client.particle.SpriteBillboardParticle; import net.minecraft.client.texture.Sprite; import net.minecraft.client.world.ClientWorld; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; // Derived from Vanilla's BreakingParticle, but allows // a texture to be specified directly rather than via an itemstack @@ -16,7 +16,7 @@ public class CableBusBreakingParticle extends SpriteBillboardParticle { private final float field_217572_F; public CableBusBreakingParticle(ClientWorld world, double x, double y, double z, double speedX, double speedY, - double speedZ, Sprite sprite) { + double speedZ, Sprite sprite) { super(world, x, y, z, speedX, speedY, speedZ); this.setSprite(sprite); this.gravityStrength = 1.0F; diff --git a/src/main/java/appeng/client/render/cablebus/CableBusModel.java b/src/main/java/appeng/client/render/cablebus/CableBusModel.java index af9207b3e..ac5609e15 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusModel.java @@ -18,11 +18,15 @@ package appeng.client.render.cablebus; -import appeng.api.util.AEColor; -import appeng.client.render.BasicUnbakedModel; -import appeng.core.AELog; -import appeng.core.features.registries.PartModels; +import java.util.Collection; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.annotation.Nullable; + import com.google.common.collect.ImmutableMap; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.model.BakedModel; @@ -32,11 +36,10 @@ import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Stream; +import appeng.api.util.AEColor; +import appeng.client.render.BasicUnbakedModel; +import appeng.core.AELog; +import appeng.core.features.registries.PartModels; /** * The built-in model for the cable bus block. @@ -63,7 +66,8 @@ public class CableBusModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { Map partModels = this.loadPartModels(loader, rotationContainer); CableBuilder cableBuilder = new CableBuilder(textureGetter); @@ -77,9 +81,7 @@ public class CableBusModel implements BasicUnbakedModel { return new CableBusBakedModel(cableBuilder, facadeBuilder, partModels, particleTexture); } - - private Map loadPartModels(ModelLoader loader, - ModelBakeSettings rotationContainer) { + private Map loadPartModels(ModelLoader loader, ModelBakeSettings rotationContainer) { ImmutableMap.Builder result = ImmutableMap.builder(); for (Identifier location : this.partModels.getModels()) { diff --git a/src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java b/src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java index 1b48a0380..618976192 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java @@ -1,13 +1,14 @@ package appeng.client.render.cablebus; -import appeng.core.AppEng; -import appeng.core.features.registries.PartModels; import net.fabricmc.fabric.api.client.model.ModelProviderContext; import net.fabricmc.fabric.api.client.model.ModelProviderException; import net.fabricmc.fabric.api.client.model.ModelResourceProvider; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.util.Identifier; +import appeng.core.AppEng; +import appeng.core.features.registries.PartModels; + public class CableBusModelLoader implements ModelResourceProvider { private static final Identifier CABLE_BUS_MODEL = AppEng.makeId("block/cable_bus"); @@ -19,7 +20,8 @@ public class CableBusModelLoader implements ModelResourceProvider { } @Override - public UnbakedModel loadModelResource(Identifier resourceId, ModelProviderContext context) throws ModelProviderException { + public UnbakedModel loadModelResource(Identifier resourceId, ModelProviderContext context) + throws ModelProviderException { if (CABLE_BUS_MODEL.equals(resourceId)) { CableBusBakedModel.clearCache(); return new CableBusModel(partModels); diff --git a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java index f525ef325..9076b2446 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java @@ -25,9 +25,9 @@ import java.util.EnumSet; import java.util.List; import java.util.Objects; -import net.minecraft.util.math.Direction; -import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; import appeng.api.parts.IPartModel; diff --git a/src/main/java/appeng/client/render/cablebus/CableCoreType.java b/src/main/java/appeng/client/render/cablebus/CableCoreType.java index 1fa993c74..6f3caac80 100644 --- a/src/main/java/appeng/client/render/cablebus/CableCoreType.java +++ b/src/main/java/appeng/client/render/cablebus/CableCoreType.java @@ -23,8 +23,8 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; -import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.client.texture.SpriteAtlasTexture; +import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import appeng.api.util.AECableType; diff --git a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java index bffee6c10..fa15814fd 100644 --- a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java @@ -26,8 +26,8 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; import net.minecraft.client.render.*; -import net.minecraft.client.util.math.Vector4f; import net.minecraft.client.texture.Sprite; +import net.minecraft.client.util.math.Vector4f; import net.minecraft.util.math.Direction; /** @@ -87,8 +87,7 @@ public class CubeBuilder { Sprite texture = this.textures.get(face); QuadEmitter emitter = this.emitter; - emitter.colorIndex(-1) - .nominalFace(face); + emitter.colorIndex(-1).nominalFace(face); UvVector uv = new UvVector(); @@ -155,8 +154,8 @@ public class CubeBuilder { this.vertexIndex = 0; } - private UvVector getDefaultUv(Direction face, Sprite texture, float x1, float y1, float z1, float x2, - float y2, float z2) { + private UvVector getDefaultUv(Direction face, Sprite texture, float x1, float y1, float z1, float x2, float y2, + float z2) { UvVector uv = new UvVector(); @@ -202,8 +201,8 @@ public class CubeBuilder { return uv; } - private UvVector getStandardUv(Direction face, Sprite texture, float x1, float y1, float z1, float x2, - float y2, float z2) { + private UvVector getStandardUv(Direction face, Sprite texture, float x1, float y1, float z1, float x2, float y2, + float z2) { UvVector uv = new UvVector(); switch (face) { case DOWN: @@ -376,8 +375,7 @@ public class CubeBuilder { } } - public void setTextures(Sprite up, Sprite down, Sprite north, - Sprite south, Sprite east, Sprite west) { + public void setTextures(Sprite up, Sprite down, Sprite north, Sprite south, Sprite east, Sprite west) { this.textures.put(Direction.UP, up); this.textures.put(Direction.DOWN, down); this.textures.put(Direction.NORTH, north); diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java b/src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java index ee56789e4..f39659187 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java @@ -23,8 +23,8 @@ import javax.annotation.Nullable; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.fluid.FluidState; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; import net.minecraft.world.chunk.light.LightingProvider; import net.minecraft.world.level.ColorResolver; diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index f4e346f6f..7e37d9a63 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -18,15 +18,19 @@ package appeng.client.render.cablebus; -import appeng.api.util.AEAxisAlignedBB; -import appeng.core.Api; -import appeng.mixins.MinecraftClientAccessor; -import appeng.parts.misc.CableAnchorPart; -import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadClamper; -import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadCornerKicker; -import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadFaceStripper; -import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadReInterpolator; -import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadTinter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Random; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.RendererAccess; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; @@ -51,17 +55,15 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction.Axis; import net.minecraft.world.BlockRenderView; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Supplier; +import appeng.api.util.AEAxisAlignedBB; +import appeng.core.Api; +import appeng.mixins.MinecraftClientAccessor; +import appeng.parts.misc.CableAnchorPart; +import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadClamper; +import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadCornerKicker; +import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadFaceStripper; +import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadReInterpolator; +import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadTinter; /** * The FacadeBuilder builds for facades.. @@ -75,21 +77,15 @@ public class FacadeBuilder { public static final double THICK_THICKNESS = 2D / 16D; public static final double THIN_THICKNESS = 1D / 16D; - public static final Box[] THICK_FACADE_BOXES = new Box[]{ - new Box(0.0, 0.0, 0.0, 1.0, THICK_THICKNESS, 1.0), - new Box(0.0, 1.0 - THICK_THICKNESS, 0.0, 1.0, 1.0, 1.0), - new Box(0.0, 0.0, 0.0, 1.0, 1.0, THICK_THICKNESS), - new Box(0.0, 0.0, 1.0 - THICK_THICKNESS, 1.0, 1.0, 1.0), - new Box(0.0, 0.0, 0.0, THICK_THICKNESS, 1.0, 1.0), - new Box(1.0 - THICK_THICKNESS, 0.0, 0.0, 1.0, 1.0, 1.0)}; + public static final Box[] THICK_FACADE_BOXES = new Box[] { new Box(0.0, 0.0, 0.0, 1.0, THICK_THICKNESS, 1.0), + new Box(0.0, 1.0 - THICK_THICKNESS, 0.0, 1.0, 1.0, 1.0), new Box(0.0, 0.0, 0.0, 1.0, 1.0, THICK_THICKNESS), + new Box(0.0, 0.0, 1.0 - THICK_THICKNESS, 1.0, 1.0, 1.0), new Box(0.0, 0.0, 0.0, THICK_THICKNESS, 1.0, 1.0), + new Box(1.0 - THICK_THICKNESS, 0.0, 0.0, 1.0, 1.0, 1.0) }; - public static final Box[] THIN_FACADE_BOXES = new Box[]{ - new Box(0.0, 0.0, 0.0, 1.0, THIN_THICKNESS, 1.0), - new Box(0.0, 1.0 - THIN_THICKNESS, 0.0, 1.0, 1.0, 1.0), - new Box(0.0, 0.0, 0.0, 1.0, 1.0, THIN_THICKNESS), - new Box(0.0, 0.0, 1.0 - THIN_THICKNESS, 1.0, 1.0, 1.0), - new Box(0.0, 0.0, 0.0, THIN_THICKNESS, 1.0, 1.0), - new Box(1.0 - THIN_THICKNESS, 0.0, 0.0, 1.0, 1.0, 1.0)}; + public static final Box[] THIN_FACADE_BOXES = new Box[] { new Box(0.0, 0.0, 0.0, 1.0, THIN_THICKNESS, 1.0), + new Box(0.0, 1.0 - THIN_THICKNESS, 0.0, 1.0, 1.0, 1.0), new Box(0.0, 0.0, 0.0, 1.0, 1.0, THIN_THICKNESS), + new Box(0.0, 0.0, 1.0 - THIN_THICKNESS, 1.0, 1.0, 1.0), new Box(0.0, 0.0, 0.0, THIN_THICKNESS, 1.0, 1.0), + new Box(1.0 - THIN_THICKNESS, 0.0, 0.0, 1.0, 1.0, 1.0) }; private final Map cableAnchorStilts; @@ -98,8 +94,8 @@ public class FacadeBuilder { } /** - * Build a map of pre-rotated cable anchor stilts, which are the shortened cable anchors that - * will still be visible for facades attached to a cable. + * Build a map of pre-rotated cable anchor stilts, which are the shortened cable + * anchors that will still be visible for facades attached to a cable. */ private Map buildCableAnchorStems(ModelLoader modelLoader) { Map stems = new EnumMap<>(Direction.class); @@ -139,9 +135,8 @@ public class FacadeBuilder { return stems; } - public Mesh getFacadeMesh(CableBusRenderState renderState, - Supplier rand, - Function modelLookup) { + public Mesh getFacadeMesh(CableBusRenderState renderState, Supplier rand, + Function modelLookup) { boolean transparent = Api.instance().partHelper().getCableRenderMode().transparentFacades; Map facadeStates = renderState.getFacades(); List partBoxes = renderState.getBoundingBoxes(); @@ -257,7 +252,8 @@ public class FacadeBuilder { // Prebake the color tint into the quad if (quad.getColorIndex() != -1) { - quadTinter = new QuadTinter(blockColors.getColor(blockState, facadeAccess, pos, quad.getColorIndex())); + quadTinter = new QuadTinter( + blockColors.getColor(blockState, facadeAccess, pos, quad.getColorIndex())); } for (Box box : holeStrips) { @@ -311,15 +307,15 @@ public class FacadeBuilder { MeshBuilder meshBuilder = renderer.meshBuilder(); QuadEmitter emitter = meshBuilder.getEmitter(); - BakedModel model = MinecraftClient.getInstance().getItemRenderer().getHeldItemModel(textureItem, null, - null); + BakedModel model = MinecraftClient.getInstance().getItemRenderer().getHeldItemModel(textureItem, null, null); List modelQuads = model.getQuads(null, null, new Random()); - //FIXME BakedPipeline pipeline = this.pipelines.get(); + // FIXME BakedPipeline pipeline = this.pipelines.get(); //FIXME Quad collectorQuad = this.collectors.get(); // Grab pipeline elements. - // FIXME QuadClamper clamper = pipeline.getElement("clamper", QuadClamper.class); + // FIXME QuadClamper clamper = pipeline.getElement("clamper", + // QuadClamper.class); // FIXME QuadTinter tinter = pipeline.getElement("tinter", QuadTinter.class); QuadReInterpolator interpolator = new QuadReInterpolator(); @@ -362,15 +358,18 @@ public class FacadeBuilder { for (BakedQuad quad : modelQuads) { // Lookup the CachedFormat for this quads format. - // FIXME CachedFormat format = CachedFormat.lookup(VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL); + // FIXME CachedFormat format = + // CachedFormat.lookup(VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL); // Reset the pipeline. // FIXME pipeline.reset(format); // Reset the collector. - //FIXME collectorQuad.reset(format); + // FIXME collectorQuad.reset(format); // If we have a tint index, setup the tinter and enable it. // FIXME if (quad.hasTintIndex()) { - // FIXME tinter.setTint(MinecraftClient.getInstance().getItemColors().getColor(textureItem, quad.getColorIndex())); - // FIXME pipeline.enableElement("tinter"); + // FIXME + // tinter.setTint(MinecraftClient.getInstance().getItemColors().getColor(textureItem, + // quad.getColorIndex())); + // FIXME pipeline.enableElement("tinter"); // FIXME } // Disable elements we don't need for items. // FIXME pipeline.disableElement("face_stripper"); @@ -383,7 +382,7 @@ public class FacadeBuilder { // FIXME quad.pipe(pipeline); // FIXME // Check the collector for data and add the quad if there was. // FIXME if (collectorQuad.full) { - // FIXME facadeQuads.add(collectorQuad.bake()); + // FIXME facadeQuads.add(collectorQuad.bake()); // FIXME } } return meshBuilder.build(); diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java index 2272e4a6c..7d983d902 100644 --- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java +++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java @@ -1,11 +1,15 @@ package appeng.client.render.cablebus; -import appeng.api.parts.IDynamicPartBakedModel; -import appeng.api.util.AEColor; -import appeng.util.Platform; +import java.util.Random; +import java.util.concurrent.ExecutionException; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; + import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.RendererAccess; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; @@ -19,10 +23,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; -import javax.annotation.Nullable; -import java.util.Random; -import java.util.concurrent.ExecutionException; -import java.util.function.Supplier; +import appeng.api.parts.IDynamicPartBakedModel; +import appeng.api.util.AEColor; +import appeng.util.Platform; public class P2PTunnelFrequencyBakedModel implements IDynamicPartBakedModel { @@ -32,15 +35,15 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicPartBakedModel { private final static Cache modelCache = CacheBuilder.newBuilder().maximumSize(100).build(); - private static final int[][] QUAD_OFFSETS = new int[][]{{4, 10, 2}, {10, 10, 2}, {4, 4, 2}, {10, 4, 2}}; + private static final int[][] QUAD_OFFSETS = new int[][] { { 4, 10, 2 }, { 10, 10, 2 }, { 4, 4, 2 }, { 10, 4, 2 } }; public P2PTunnelFrequencyBakedModel(final Sprite texture) { this.texture = texture; } @Override - public void emitQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context, - Direction partSide, @Nullable Object modelData) { + public void emitQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, + RenderContext context, Direction partSide, @Nullable Object modelData) { if (!(modelData instanceof Long)) { return; } diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java index 1a0e7c543..89c9e0f92 100644 --- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java +++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java @@ -1,7 +1,10 @@ package appeng.client.render.cablebus; -import appeng.client.render.BasicUnbakedModel; -import appeng.core.AppEng; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.annotation.Nullable; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -10,9 +13,8 @@ import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.function.Function; -import java.util.stream.Stream; +import appeng.client.render.BasicUnbakedModel; +import appeng.core.AppEng; public class P2PTunnelFrequencyModel implements BasicUnbakedModel { @@ -21,7 +23,8 @@ public class P2PTunnelFrequencyModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { final Sprite texture = textureGetter.apply(TEXTURE); return new P2PTunnelFrequencyBakedModel(texture); } diff --git a/src/main/java/appeng/client/render/cablebus/QuadRotator.java b/src/main/java/appeng/client/render/cablebus/QuadRotator.java index 37413bf77..2b020eb62 100644 --- a/src/main/java/appeng/client/render/cablebus/QuadRotator.java +++ b/src/main/java/appeng/client/render/cablebus/QuadRotator.java @@ -18,7 +18,8 @@ package appeng.client.render.cablebus; -import appeng.client.render.FacingToRotation; +import java.util.EnumMap; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; @@ -28,7 +29,7 @@ import net.minecraft.client.util.math.Vector3f; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Quaternion; -import java.util.EnumMap; +import appeng.client.render.FacingToRotation; /** * Assuming a default-orientation of forward=NORTH and up=UP, this class rotates @@ -39,8 +40,8 @@ public class QuadRotator implements RenderContext.QuadTransform { public static final RenderContext.QuadTransform NULL_TRANSFORM = quad -> true; - private static final EnumMap TRANSFORMS - = new EnumMap<>(FacingToRotation.class); + private static final EnumMap TRANSFORMS = new EnumMap<>( + FacingToRotation.class); static { for (FacingToRotation rotation : FacingToRotation.values()) { diff --git a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java index fd0f95f5f..84b21627d 100644 --- a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java +++ b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java @@ -23,9 +23,9 @@ import java.util.function.Function; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.util.SpriteIdentifier; -import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.texture.Sprite; +import net.minecraft.client.texture.SpriteAtlasTexture; +import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import appeng.core.AppEng; diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java index 65d69fdf4..8f8b0d7de 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java @@ -40,7 +40,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; - import appeng.client.render.cablebus.CubeBuilder; import appeng.tile.crafting.CraftingCubeModelData; import appeng.util.Platform; @@ -71,7 +70,8 @@ abstract class CraftingCubeBakedModel implements BakedModel, FabricBakedModel { } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { CraftingCubeModelData modelData = getModelData(blockView, pos); EnumSet connections = modelData.getConnections(); @@ -275,8 +275,8 @@ abstract class CraftingCubeBakedModel implements BakedModel, FabricBakedModel { return null; } - protected abstract void addInnerCube(Direction facing, BlockState state, CraftingCubeModelData modelData, CubeBuilder builder, - float x1, float y1, float z1, float x2, float y2, float z2); + protected abstract void addInnerCube(Direction facing, BlockState state, CraftingCubeModelData modelData, + CubeBuilder builder, float x1, float y1, float z1, float x2, float y2, float z2); @Override public boolean useAmbientOcclusion() { diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java index b0c6bc48f..41e33c4ab 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java @@ -18,9 +18,11 @@ package appeng.client.render.crafting; -import appeng.block.crafting.AbstractCraftingUnitBlock; -import appeng.client.render.BasicUnbakedModel; -import appeng.core.AppEng; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.annotation.Nullable; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -29,9 +31,9 @@ import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.function.Function; -import java.util.stream.Stream; +import appeng.block.crafting.AbstractCraftingUnitBlock; +import appeng.client.render.BasicUnbakedModel; +import appeng.core.AppEng; /** * The built-in model for the connected texture crafting cube. @@ -68,7 +70,8 @@ public class CraftingCubeModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { // Retrieve our textures and pass them on to the baked model Sprite ringCorner = textureGetter.apply(RING_CORNER); Sprite ringSideHor = textureGetter.apply(RING_SIDE_HOR); @@ -94,7 +97,7 @@ public class CraftingCubeModel implements BasicUnbakedModel { } private static Sprite getLightTexture(Function textureGetter, - AbstractCraftingUnitBlock.CraftingUnitType type) { + AbstractCraftingUnitBlock.CraftingUnitType type) { switch (type) { case ACCELERATOR: return textureGetter.apply(ACCELERATOR_LIGHT); diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java b/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java index 99268f4ef..e8ec30923 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java @@ -18,9 +18,9 @@ package appeng.client.render.crafting; +import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.render.RenderLayer; -import net.fabricmc.api.EnvType; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; diff --git a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java b/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java index be0cedb20..413e8ed96 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java +++ b/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java @@ -18,14 +18,13 @@ package appeng.client.render.crafting; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; -import net.minecraft.client.util.math.MatrixStack; - -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.render.block.entity.BlockEntityRenderer; -import net.minecraft.util.math.Direction; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.math.Direction; import appeng.api.storage.data.IAEItemStack; import appeng.client.render.TesrRenderHelper; @@ -43,7 +42,7 @@ public class CraftingMonitorTESR extends BlockEntityRenderer DESERIALIZER = new Factory() { @Override - public LightningArcParticleData read(ParticleType particleTypeIn, - StringReader reader) throws CommandSyntaxException { + public LightningArcParticleData read(ParticleType particleTypeIn, StringReader reader) + throws CommandSyntaxException { reader.expect(' '); float x = reader.readFloat(); reader.expect(' '); diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index b12156c4d..8d2e4ad9c 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -20,14 +20,13 @@ package appeng.client.render.effects; import java.util.Random; -import net.minecraft.client.render.VertexConsumer; - import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.particle.*; import net.minecraft.client.particle.ParticleTextureSheet; import net.minecraft.client.render.Camera; +import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.particle.DefaultParticleType; @@ -46,14 +45,14 @@ public class LightningFX extends SpriteBillboardParticle { private final double[] verticesWithUV = new double[3]; private boolean hasData = false; - private LightningFX(ClientWorld world, final double x, final double y, final double z, final double r, final double g, - final double b) { + private LightningFX(ClientWorld world, final double x, final double y, final double z, final double r, + final double g, final double b) { this(world, x, y, z, r, g, b, 6); this.regen(); } - protected LightningFX(ClientWorld world, final double x, final double y, final double z, final double r, final double g, - final double b, final int maxAge) { + protected LightningFX(ClientWorld world, final double x, final double y, final double z, final double r, + final double g, final double b, final int maxAge) { super(world, x, y, z, r, g, b); this.precomputedSteps = new double[LightningFX.STEPS][3]; this.velocityX = 0; @@ -219,7 +218,7 @@ public class LightningFX extends SpriteBillboardParticle { } private void draw(float red, float green, float blue, final VertexConsumer tess, final double[] a, final double[] b, - final float u, final float v) { + final float u, final float v) { if (this.hasData) { tess.vertex(a[0], a[1], a[2]).texture(u, v).color(red, green, blue, this.colorAlpha) .light(BRIGHTNESS, BRIGHTNESS).next(); @@ -251,7 +250,7 @@ public class LightningFX extends SpriteBillboardParticle { @Override public Particle createParticle(DefaultParticleType type, ClientWorld world, double x, double y, double z, - double xSpeed, double ySpeed, double zSpeed) { + double xSpeed, double ySpeed, double zSpeed) { LightningFX lightningFX = new LightningFX(world, x, y, z, xSpeed, ySpeed, zSpeed); lightningFX.setSprite(this.spriteSet); return lightningFX; diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java index 49a4092d5..796c95092 100644 --- a/src/main/java/appeng/client/render/effects/MatterCannonFX.java +++ b/src/main/java/appeng/client/render/effects/MatterCannonFX.java @@ -19,17 +19,16 @@ package appeng.client.render.effects; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.particle.*; import net.minecraft.client.world.ClientWorld; import net.minecraft.particle.DefaultParticleType; -import net.fabricmc.api.Environment; import appeng.api.util.AEPartLocation; public class MatterCannonFX extends SpriteBillboardParticle { - public MatterCannonFX(ClientWorld world, final double x, final double y, final double z, - SpriteProvider sprite) { + public MatterCannonFX(ClientWorld world, final double x, final double y, final double z, SpriteProvider sprite) { super(world, x, y, z); this.gravityStrength = 0; this.colorBlue = 1; @@ -81,8 +80,8 @@ public class MatterCannonFX extends SpriteBillboardParticle { } @Override - public Particle createParticle(DefaultParticleType effect, ClientWorld world, double x, double y, double z, double xSpeed, - double ySpeed, double zSpeed) { + public Particle createParticle(DefaultParticleType effect, ClientWorld world, double x, double y, double z, + double xSpeed, double ySpeed, double zSpeed) { return new MatterCannonFX(world, x, y, z, spriteSet); } } diff --git a/src/main/java/appeng/client/render/effects/ParticleTypes.java b/src/main/java/appeng/client/render/effects/ParticleTypes.java index 8baeb1286..449d029a3 100644 --- a/src/main/java/appeng/client/render/effects/ParticleTypes.java +++ b/src/main/java/appeng/client/render/effects/ParticleTypes.java @@ -8,9 +8,9 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.particle.ParticleManager; import net.minecraft.particle.DefaultParticleType; import net.minecraft.particle.ParticleType; +import net.minecraft.util.registry.Registry; import appeng.core.AppEng; -import net.minecraft.util.registry.Registry; public final class ParticleTypes { @@ -30,5 +30,4 @@ public final class ParticleTypes { public static void registerClient() { } - } diff --git a/src/main/java/appeng/client/render/effects/VibrantFX.java b/src/main/java/appeng/client/render/effects/VibrantFX.java index be8a305fc..004b5dc80 100644 --- a/src/main/java/appeng/client/render/effects/VibrantFX.java +++ b/src/main/java/appeng/client/render/effects/VibrantFX.java @@ -88,7 +88,7 @@ public class VibrantFX extends SpriteBillboardParticle { @Override public Particle createParticle(DefaultParticleType effect, ClientWorld world, double x, double y, double z, - double xSpeed, double ySpeed, double zSpeed) { + double xSpeed, double ySpeed, double zSpeed) { return new VibrantFX(world, x, y, z, xSpeed, ySpeed, zSpeed, spriteSet); } } diff --git a/src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java b/src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java index fb1e617f7..806ed9383 100644 --- a/src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java +++ b/src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java @@ -1,6 +1,8 @@ package appeng.client.render.model; -import appeng.client.render.cablebus.QuadRotator; +import java.util.Random; +import java.util.function.Supplier; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; @@ -13,8 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockRenderView; -import java.util.Random; -import java.util.function.Supplier; +import appeng.client.render.cablebus.QuadRotator; @Environment(EnvType.CLIENT) public class AutoRotatingBakedModel extends ForwardingBakedModel implements FabricBakedModel { @@ -33,7 +34,8 @@ public class AutoRotatingBakedModel extends ForwardingBakedModel implements Fabr } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { RenderContext.QuadTransform transform = getTransform(blockView, pos); if (transform != null) { diff --git a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java index ac7976758..419bd7017 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java @@ -1,9 +1,13 @@ package appeng.client.render.model; -import appeng.api.implementations.items.IBiometricCard; -import appeng.api.util.AEColor; -import appeng.client.render.cablebus.CubeBuilder; +import java.util.List; +import java.util.Random; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + import com.mojang.authlib.GameProfile; + import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; @@ -18,10 +22,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; -import javax.annotation.Nullable; -import java.util.List; -import java.util.Random; -import java.util.function.Supplier; +import appeng.api.implementations.items.IBiometricCard; +import appeng.api.util.AEColor; +import appeng.client.render.cablebus.CubeBuilder; class BiometricCardBakedModel implements BakedModel, FabricBakedModel { @@ -40,7 +43,8 @@ class BiometricCardBakedModel implements BakedModel, FabricBakedModel { } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { // Not intended as a block } diff --git a/src/main/java/appeng/client/render/model/BiometricCardModel.java b/src/main/java/appeng/client/render/model/BiometricCardModel.java index 1cc1eebfa..c72451a72 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardModel.java @@ -1,7 +1,12 @@ package appeng.client.render.model; -import appeng.client.render.BasicUnbakedModel; -import appeng.core.AppEng; +import java.util.Collection; +import java.util.Collections; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.annotation.Nullable; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -10,11 +15,8 @@ import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Collections; -import java.util.function.Function; -import java.util.stream.Stream; +import appeng.client.render.BasicUnbakedModel; +import appeng.core.AppEng; /** * Model wrapper for the biometric card item model, which combines a base card @@ -38,7 +40,8 @@ public class BiometricCardModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { Sprite texture = textureGetter.apply(TEXTURE); BakedModel baseModel = loader.bake(MODEL_BASE, rotationContainer); diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java index f1700b0bb..e29ed024b 100644 --- a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java +++ b/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java @@ -7,22 +7,23 @@ import java.util.Random; import javax.annotation.Nullable; -import appeng.mixins.BakedQuadAccessor; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; -import net.minecraft.client.render.model.BakedModel; -import net.minecraft.client.texture.Sprite; - import net.minecraft.block.BlockState; +import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.texture.Sprite; import net.minecraft.util.math.Direction; +import appeng.mixins.BakedQuadAccessor; + /** - * This baked model will take the generated item model for the colored color applicator, - * and associate tint indices with the added layers that correspond to the light/medium/dark - * variants of the {@link appeng.api.util.AEColor}. + * This baked model will take the generated item model for the colored color + * applicator, and associate tint indices with the added layers that correspond + * to the light/medium/dark variants of the {@link appeng.api.util.AEColor}. *

- * Using the color provider registered in {@link appeng.items.tools.powered.ColorApplicatorItemRendering}, - * this results in the right color being multiplied with the corresponding layer. + * Using the color provider registered in + * {@link appeng.items.tools.powered.ColorApplicatorItemRendering}, this results + * in the right color being multiplied with the corresponding layer. */ class ColorApplicatorBakedModel extends ForwardingBakedModel { @@ -30,8 +31,7 @@ class ColorApplicatorBakedModel extends ForwardingBakedModel { private final List generalQuads; - ColorApplicatorBakedModel(BakedModel baseModel, Sprite texDark, - Sprite texMedium, Sprite texBright) { + ColorApplicatorBakedModel(BakedModel baseModel, Sprite texDark, Sprite texMedium, Sprite texBright) { this.wrapped = baseModel; // Put the tint indices in... Since this is an item model, we are ignoring rand @@ -46,8 +46,7 @@ class ColorApplicatorBakedModel extends ForwardingBakedModel { return ((BakedQuadAccessor) quad).getSprite(); } - private List fixQuadTint(Direction facing, Sprite texDark, Sprite texMedium, - Sprite texBright) { + private List fixQuadTint(Direction facing, Sprite texDark, Sprite texMedium, Sprite texBright) { List quads = this.wrapped.getQuads(null, facing, new Random(0)); List result = new ArrayList<>(quads.size()); for (BakedQuad quad : quads) { diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java index ca59cf695..d69540399 100644 --- a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java +++ b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java @@ -1,7 +1,12 @@ package appeng.client.render.model; -import appeng.client.render.BasicUnbakedModel; -import appeng.core.AppEng; +import java.util.Collection; +import java.util.Collections; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.annotation.Nullable; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -10,11 +15,8 @@ import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Collections; -import java.util.function.Function; -import java.util.stream.Stream; +import appeng.client.render.BasicUnbakedModel; +import appeng.core.AppEng; /** * A color applicator uses the base model, and extends it with additional layers @@ -22,8 +24,7 @@ import java.util.stream.Stream; */ public class ColorApplicatorModel implements BasicUnbakedModel { - private static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, - "item/color_applicator_colored"); + private static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "item/color_applicator_colored"); private static final SpriteIdentifier TEXTURE_DARK = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, new Identifier(AppEng.MOD_ID, "item/color_applicator_tip_dark")); @@ -44,7 +45,8 @@ public class ColorApplicatorModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { BakedModel baseModel = loader.bake(MODEL_BASE, rotationContainer); Sprite texDark = textureGetter.apply(TEXTURE_DARK); diff --git a/src/main/java/appeng/client/render/model/DriveBakedModel.java b/src/main/java/appeng/client/render/model/DriveBakedModel.java index ca8cc899e..1a9507048 100644 --- a/src/main/java/appeng/client/render/model/DriveBakedModel.java +++ b/src/main/java/appeng/client/render/model/DriveBakedModel.java @@ -18,7 +18,12 @@ package appeng.client.render.model; -import appeng.block.storage.DriveSlotsState; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.function.Supplier; + import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.RendererAccess; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; @@ -40,11 +45,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.function.Supplier; +import appeng.block.storage.DriveSlotsState; public class DriveBakedModel extends ForwardingBakedModel implements FabricBakedModel { private final Map cellModels; @@ -77,7 +78,8 @@ public class DriveBakedModel extends ForwardingBakedModel implements FabricBaked } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { super.emitBlockQuads(blockView, state, pos, randomSupplier, context); @@ -150,7 +152,8 @@ public class DriveBakedModel extends ForwardingBakedModel implements FabricBaked Vector3f translation = new Vector3f(); getSlotOrigin(row, col, translation); - result[getSlotIndex(row, col)] = new QuadTranslator(translation.getX(), translation.getY(), translation.getZ()); + result[getSlotIndex(row, col)] = new QuadTranslator(translation.getX(), translation.getY(), + translation.getZ()); } } diff --git a/src/main/java/appeng/client/render/model/DriveModel.java b/src/main/java/appeng/client/render/model/DriveModel.java index 83cc1ef1d..1fb21ef22 100644 --- a/src/main/java/appeng/client/render/model/DriveModel.java +++ b/src/main/java/appeng/client/render/model/DriveModel.java @@ -18,11 +18,16 @@ package appeng.client.render.model; -import appeng.api.client.ICellModelRegistry; -import appeng.client.render.BasicUnbakedModel; -import appeng.core.Api; -import appeng.core.api.client.ApiCellModelRegistry; +import java.util.Collection; +import java.util.IdentityHashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.function.Function; + +import javax.annotation.Nullable; + import com.google.common.collect.ImmutableSet; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -32,23 +37,21 @@ import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.IdentityHashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.function.Function; +import appeng.api.client.ICellModelRegistry; +import appeng.client.render.BasicUnbakedModel; +import appeng.core.Api; +import appeng.core.api.client.ApiCellModelRegistry; public class DriveModel implements BasicUnbakedModel { - private static final Identifier MODEL_BASE = new Identifier( - "appliedenergistics2:block/drive/drive_base"); + private static final Identifier MODEL_BASE = new Identifier("appliedenergistics2:block/drive/drive_base"); private static final Identifier MODEL_CELL_EMPTY = new Identifier( "appliedenergistics2:block/drive/drive_cell_empty"); @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { final ICellModelRegistry cellRegistry = Api.instance().client().cells(); final Map cellModels = new IdentityHashMap<>(); @@ -68,11 +71,8 @@ public class DriveModel implements BasicUnbakedModel { @Override public Collection getModelDependencies() { ICellModelRegistry cells = Api.instance().client().cells(); - return ImmutableSet.builder() - .add(cells.getDefaultModel()) - .addAll(ApiCellModelRegistry.getModels()) - .addAll(cells.models().values()) - .build(); + return ImmutableSet.builder().add(cells.getDefaultModel()).addAll(ApiCellModelRegistry.getModels()) + .addAll(cells.models().values()).build(); } } diff --git a/src/main/java/appeng/client/render/model/GlassBakedModel.java b/src/main/java/appeng/client/render/model/GlassBakedModel.java index c24b8d422..ceec383fa 100644 --- a/src/main/java/appeng/client/render/model/GlassBakedModel.java +++ b/src/main/java/appeng/client/render/model/GlassBakedModel.java @@ -18,9 +18,19 @@ package appeng.client.render.model; -import appeng.decorative.solid.GlassState; -import appeng.decorative.solid.QuartzGlassBlock; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import java.util.Random; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.IntStream; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import com.google.common.base.Strings; + import net.fabricmc.fabric.api.renderer.v1.RendererAccess; import net.fabricmc.fabric.api.renderer.v1.material.BlendMode; import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial; @@ -44,15 +54,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.BlockRenderView; import net.minecraft.world.BlockView; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.EnumSet; -import java.util.List; -import java.util.Random; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.IntStream; +import appeng.decorative.solid.GlassState; +import appeng.decorative.solid.QuartzGlassBlock; class GlassBakedModel implements BakedModel, FabricBakedModel { @@ -71,17 +74,15 @@ class GlassBakedModel implements BakedModel, FabricBakedModel { // Frame texture static final SpriteIdentifier[] TEXTURES_FRAME = generateTexturesFrame(); private final RenderMaterial material = RendererAccess.INSTANCE.getRenderer().materialFinder() - .disableDiffuse(0, true) - .disableAo(0, true) - .disableColorIndex(0, true) - .blendMode(0, BlendMode.TRANSLUCENT) + .disableDiffuse(0, true).disableAo(0, true).disableColorIndex(0, true).blendMode(0, BlendMode.TRANSLUCENT) .find(); // Generates the required textures for the frame private static SpriteIdentifier[] generateTexturesFrame() { return IntStream.range(1, 16).mapToObj(Integer::toBinaryString).map(s -> Strings.padStart(s, 4, '0')) .map(s -> new Identifier("appliedenergistics2:block/glass/quartz_glass_frame" + s)) - .map(rl -> new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, rl)).toArray(SpriteIdentifier[]::new); + .map(rl -> new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, rl)) + .toArray(SpriteIdentifier[]::new); } private final Sprite[] glassTextures; @@ -89,9 +90,8 @@ class GlassBakedModel implements BakedModel, FabricBakedModel { private final Sprite[] frameTextures; public GlassBakedModel(Function bakedTextureGetter) { - this.glassTextures = new Sprite[] { bakedTextureGetter.apply(TEXTURE_A), - bakedTextureGetter.apply(TEXTURE_B), bakedTextureGetter.apply(TEXTURE_C), - bakedTextureGetter.apply(TEXTURE_D) }; + this.glassTextures = new Sprite[] { bakedTextureGetter.apply(TEXTURE_A), bakedTextureGetter.apply(TEXTURE_B), + bakedTextureGetter.apply(TEXTURE_C), bakedTextureGetter.apply(TEXTURE_D) }; // The first frame texture would be empty, so we simply leave it set to null // here @@ -107,7 +107,8 @@ class GlassBakedModel implements BakedModel, FabricBakedModel { } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { final GlassState glassState = getGlassState(blockView, pos); // TODO: This could just use the Random instance we're given... @@ -217,13 +218,13 @@ class GlassBakedModel implements BakedModel, FabricBakedModel { } private void emitQuad(QuadEmitter emitter, Direction side, List corners, Sprite sprite, float uOffset, - float vOffset) { + float vOffset) { this.emitQuad(emitter, side, corners.get(0), corners.get(1), corners.get(2), corners.get(3), sprite, uOffset, vOffset); } - private void emitQuad(QuadEmitter emitter, Direction side, Vector3f c1, Vector3f c2, Vector3f c3, Vector3f c4, Sprite sprite, - float uOffset, float vOffset) { + private void emitQuad(QuadEmitter emitter, Direction side, Vector3f c1, Vector3f c2, Vector3f c3, Vector3f c4, + Sprite sprite, float uOffset, float vOffset) { // Apply the u,v shift. // This mirrors the logic from OffsetIcon from 1.7 diff --git a/src/main/java/appeng/client/render/model/GlassModel.java b/src/main/java/appeng/client/render/model/GlassModel.java index e4b30f1fa..aa0539d65 100644 --- a/src/main/java/appeng/client/render/model/GlassModel.java +++ b/src/main/java/appeng/client/render/model/GlassModel.java @@ -18,8 +18,13 @@ package appeng.client.render.model; -import appeng.client.render.BasicUnbakedModel; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.annotation.Nullable; + import com.google.common.collect.ImmutableSet; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -27,9 +32,7 @@ import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.function.Function; -import java.util.stream.Stream; +import appeng.client.render.BasicUnbakedModel; /** * Model class for the connected texture glass model. @@ -38,7 +41,8 @@ public class GlassModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { return new GlassBakedModel(textureGetter); } diff --git a/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java b/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java index 6bb417895..40c97f0b0 100644 --- a/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java +++ b/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java @@ -1,8 +1,8 @@ package appeng.client.render.model; -import appeng.api.implementations.items.IMemoryCard; -import appeng.api.util.AEColor; -import appeng.client.render.cablebus.CubeBuilder; +import java.util.Random; +import java.util.function.Supplier; + import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; @@ -10,8 +10,9 @@ import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.texture.Sprite; import net.minecraft.item.ItemStack; -import java.util.Random; -import java.util.function.Supplier; +import appeng.api.implementations.items.IMemoryCard; +import appeng.api.util.AEColor; +import appeng.client.render.cablebus.CubeBuilder; class MemoryCardBakedModel extends ForwardingBakedModel implements FabricBakedModel { private static final AEColor[] DEFAULT_COLOR_CODE = new AEColor[] { AEColor.TRANSPARENT, AEColor.TRANSPARENT, diff --git a/src/main/java/appeng/client/render/model/MemoryCardModel.java b/src/main/java/appeng/client/render/model/MemoryCardModel.java index d4370e198..0591a0a14 100644 --- a/src/main/java/appeng/client/render/model/MemoryCardModel.java +++ b/src/main/java/appeng/client/render/model/MemoryCardModel.java @@ -1,7 +1,12 @@ package appeng.client.render.model; -import appeng.client.render.BasicUnbakedModel; -import appeng.core.AppEng; +import java.util.Collection; +import java.util.Collections; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.annotation.Nullable; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -10,11 +15,8 @@ import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Collections; -import java.util.function.Function; -import java.util.stream.Stream; +import appeng.client.render.BasicUnbakedModel; +import appeng.core.AppEng; /** * Model wrapper for the memory card item model, which combines a base card @@ -33,7 +35,8 @@ public class MemoryCardModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { Sprite texture = textureGetter.apply(TEXTURE); BakedModel baseModel = loader.bake(MODEL_BASE, rotationContainer); diff --git a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java index d4cad9e36..a069511d8 100644 --- a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java +++ b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java @@ -18,8 +18,13 @@ package appeng.client.render.model; -import appeng.hooks.CompassManager; -import appeng.hooks.CompassResult; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; import net.minecraft.block.BlockState; @@ -39,11 +44,8 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.math.Quaternion; import net.minecraft.world.BlockRenderView; -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import java.util.function.Supplier; +import appeng.hooks.CompassManager; +import appeng.hooks.CompassResult; /** * This baked model combines the quads of a compass base and the quads of a @@ -79,7 +81,8 @@ public class SkyCompassBakedModel implements BakedModel, FabricBakedModel { } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { // Pre-compute the quad count to avoid list resizes context.fallbackConsumer().accept(this.base); } @@ -88,7 +91,8 @@ public class SkyCompassBakedModel implements BakedModel, FabricBakedModel { public void emitItemQuads(ItemStack stack, Supplier randomSupplier, RenderContext context) { context.fallbackConsumer().accept(base); - // This is used to render a compass pointing in a specific direction when being held in hand + // This is used to render a compass pointing in a specific direction when being + // held in hand // Set up the rotation around the Y-axis for the pointer context.pushTransform(quad -> { Quaternion quaternion = new Quaternion(0, this.fallbackRotation, 0, false); @@ -151,7 +155,7 @@ public class SkyCompassBakedModel implements BakedModel, FabricBakedModel { return new ModelOverrideList(null, null, null, Collections.emptyList()) { @Override public BakedModel apply(BakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, - @Nullable LivingEntity entity) { + @Nullable LivingEntity entity) { // FIXME: This check prevents compasses being held by OTHERS from getting the // rotation, BUT do we actually still need this??? if (world != null && entity instanceof ClientPlayerEntity) { diff --git a/src/main/java/appeng/client/render/model/SkyCompassModel.java b/src/main/java/appeng/client/render/model/SkyCompassModel.java index 654236c91..29dc3ac29 100644 --- a/src/main/java/appeng/client/render/model/SkyCompassModel.java +++ b/src/main/java/appeng/client/render/model/SkyCompassModel.java @@ -18,10 +18,18 @@ package appeng.client.render.model; -import appeng.client.render.BasicUnbakedModel; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.function.Function; + +import javax.annotation.Nullable; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.mojang.datafixers.util.Pair; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -30,12 +38,7 @@ import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.function.Function; +import appeng.client.render.BasicUnbakedModel; /** * The parent model for the compass baked model. Declares the dependencies for @@ -43,17 +46,16 @@ import java.util.function.Function; */ public class SkyCompassModel implements BasicUnbakedModel { - private static final Identifier MODEL_BASE = new Identifier( - "appliedenergistics2:block/sky_compass_base"); + private static final Identifier MODEL_BASE = new Identifier("appliedenergistics2:block/sky_compass_base"); - private static final Identifier MODEL_POINTER = new Identifier( - "appliedenergistics2:block/sky_compass_pointer"); + private static final Identifier MODEL_POINTER = new Identifier("appliedenergistics2:block/sky_compass_pointer"); public static final List DEPENDENCIES = ImmutableList.of(MODEL_BASE, MODEL_POINTER); @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { BakedModel baseModel = loader.bake(MODEL_BASE, rotationContainer); BakedModel pointerModel = loader.bake(MODEL_POINTER, rotationContainer); return new SkyCompassBakedModel(baseModel, pointerModel); diff --git a/src/main/java/appeng/client/render/renderable/ItemRenderable.java b/src/main/java/appeng/client/render/renderable/ItemRenderable.java index 0d788721c..6984cb333 100644 --- a/src/main/java/appeng/client/render/renderable/ItemRenderable.java +++ b/src/main/java/appeng/client/render/renderable/ItemRenderable.java @@ -18,15 +18,16 @@ package appeng.client.render.renderable; +import java.util.function.Function; + +import org.apache.commons.lang3.tuple.Pair; + import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.client.render.model.json.Transformation; import net.minecraft.item.ItemStack; -import org.apache.commons.lang3.tuple.Pair; - -import java.util.function.Function; public class ItemRenderable implements Renderable { @@ -38,15 +39,15 @@ public class ItemRenderable implements Renderable { @Override public void renderTileEntityAt(T te, float partialTicks, net.minecraft.client.util.math.MatrixStack matrixStack, - VertexConsumerProvider buffers, int combinedLight, int combinedOverlay) { + VertexConsumerProvider buffers, int combinedLight, int combinedOverlay) { Pair pair = this.f.apply(te); if (pair != null && pair.getLeft() != null) { matrixStack.push(); if (pair.getRight() != null) { pair.getRight().apply(false, matrixStack); // FIXME: check left handed } - MinecraftClient.getInstance().getItemRenderer().renderItem(pair.getLeft(), - ModelTransformation.Mode.GROUND, combinedLight, combinedOverlay, matrixStack, buffers); + MinecraftClient.getInstance().getItemRenderer().renderItem(pair.getLeft(), ModelTransformation.Mode.GROUND, + combinedLight, combinedOverlay, matrixStack, buffers); matrixStack.pop(); } } diff --git a/src/main/java/appeng/client/render/renderable/Renderable.java b/src/main/java/appeng/client/render/renderable/Renderable.java index a8c39a33f..33519cd2b 100644 --- a/src/main/java/appeng/client/render/renderable/Renderable.java +++ b/src/main/java/appeng/client/render/renderable/Renderable.java @@ -18,11 +18,10 @@ package appeng.client.render.renderable; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.block.entity.BlockEntity; - public interface Renderable { void renderTileEntityAt(T te, float partialTicks, MatrixStack matrixStack, VertexConsumerProvider buffers, diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java index 652a746d6..778363b63 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java @@ -43,7 +43,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; - import appeng.client.render.cablebus.CubeBuilder; import appeng.tile.spatial.SpatialPylonBlockEntity; @@ -64,7 +63,8 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel { } @Override - public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos, + Supplier randomSupplier, RenderContext context) { int flags = getFlags(blockView, pos); CubeBuilder builder = new CubeBuilder(context.getEmitter()); @@ -80,7 +80,8 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel { builder.setUvRotation(Direction.NORTH, 1); builder.setUvRotation(Direction.UP, 2); builder.setUvRotation(Direction.DOWN, 2); - } else if ((flags & SpatialPylonBlockEntity.DISPLAY_MIDDLE) == SpatialPylonBlockEntity.DISPLAY_END_MIN) { + } else if ((flags + & SpatialPylonBlockEntity.DISPLAY_MIDDLE) == SpatialPylonBlockEntity.DISPLAY_END_MIN) { builder.setUvRotation(Direction.SOUTH, 2); builder.setUvRotation(Direction.NORTH, 2); builder.setUvRotation(Direction.UP, 1); @@ -108,7 +109,8 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel { if ((flags & SpatialPylonBlockEntity.DISPLAY_MIDDLE) == SpatialPylonBlockEntity.DISPLAY_END_MAX) { builder.setUvRotation(Direction.EAST, 2); builder.setUvRotation(Direction.WEST, 1); - } else if ((flags & SpatialPylonBlockEntity.DISPLAY_MIDDLE) == SpatialPylonBlockEntity.DISPLAY_END_MIN) { + } else if ((flags + & SpatialPylonBlockEntity.DISPLAY_MIDDLE) == SpatialPylonBlockEntity.DISPLAY_END_MIN) { builder.setUvRotation(Direction.EAST, 1); builder.setUvRotation(Direction.WEST, 2); builder.setUvRotation(Direction.UP, 3); @@ -190,7 +192,8 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel { } private static SpatialPylonTextureType getTextureTypeFromSideInside(int flags, Direction ori, Direction dir) { - final boolean good = (flags & SpatialPylonBlockEntity.DISPLAY_ENABLED) == SpatialPylonBlockEntity.DISPLAY_ENABLED; + final boolean good = (flags + & SpatialPylonBlockEntity.DISPLAY_ENABLED) == SpatialPylonBlockEntity.DISPLAY_ENABLED; if (ori == dir || ori.getOpposite() == dir) { return good ? SpatialPylonTextureType.DIM : SpatialPylonTextureType.RED; diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java index 975b5d666..98f274353 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java @@ -18,8 +18,14 @@ package appeng.client.render.spatial; -import appeng.client.render.BasicUnbakedModel; -import appeng.core.AppEng; +import java.util.Arrays; +import java.util.EnumMap; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.annotation.Nullable; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -28,18 +34,15 @@ import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.EnumMap; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Stream; +import appeng.client.render.BasicUnbakedModel; +import appeng.core.AppEng; public class SpatialPylonModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { Map textures = new EnumMap<>(SpatialPylonTextureType.class); for (SpatialPylonTextureType type : SpatialPylonTextureType.values()) { diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java b/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java index 253dbf216..fd0694394 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java @@ -19,8 +19,8 @@ package appeng.client.render.spatial; import net.fabricmc.api.EnvType; -import net.minecraft.client.render.RenderLayer; import net.fabricmc.api.Environment; +import net.minecraft.client.render.RenderLayer; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; diff --git a/src/main/java/appeng/client/render/tesr/CellLedRenderer.java b/src/main/java/appeng/client/render/tesr/CellLedRenderer.java index 1067d715e..d45cb4b2d 100644 --- a/src/main/java/appeng/client/render/tesr/CellLedRenderer.java +++ b/src/main/java/appeng/client/render/tesr/CellLedRenderer.java @@ -2,14 +2,15 @@ package appeng.client.render.tesr; import java.util.EnumMap; -import appeng.api.implementations.tiles.IChestOrDrive; -import appeng.block.storage.DriveSlotState; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexFormats; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.Vector3f; +import appeng.api.implementations.tiles.IChestOrDrive; +import appeng.block.storage.DriveSlotState; + /** * Utility class to render LEDs for storage cells from a Tile Entity Renderer. */ @@ -51,11 +52,11 @@ class CellLedRenderer { // Bottom Face R, B, FR, L, B, FR, L, B, BA, R, B, BA, }; - public static final RenderLayer RENDER_LAYER = RenderLayer.of("ae_drive_leds", - VertexFormats.POSITION_COLOR, 7, 32565, false, true, RenderLayer.MultiPhaseParameters.builder().build(false)); + public static final RenderLayer RENDER_LAYER = RenderLayer.of("ae_drive_leds", VertexFormats.POSITION_COLOR, 7, + 32565, false, true, RenderLayer.MultiPhaseParameters.builder().build(false)); public static void renderLed(IChestOrDrive drive, int slot, VertexConsumer buffer, MatrixStack ms, - float partialTicks) { + float partialTicks) { Vector3f color = getColorForSlot(drive, slot, partialTicks); if (color == null) { @@ -66,8 +67,7 @@ class CellLedRenderer { float x = LED_QUADS[i]; float y = LED_QUADS[i + 1]; float z = LED_QUADS[i + 2]; - buffer.vertex(ms.peek().getModel(), x, y, z).color(color.getX(), color.getY(), color.getZ(), 1.f) - .next(); + buffer.vertex(ms.peek().getModel(), x, y, z).color(color.getX(), color.getY(), color.getZ(), 1.f).next(); } } diff --git a/src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java b/src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java index 16a3d4cb9..8ba9a703a 100644 --- a/src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java +++ b/src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java @@ -25,11 +25,6 @@ import java.util.Random; import javax.annotation.Nonnull; import javax.annotation.Nullable; - -import appeng.client.render.BakedModelUnwrapper; -import appeng.client.render.model.AutoRotatingBakedModel; -import appeng.client.render.model.DriveBakedModel; -import appeng.tile.storage.ChestBlockEntity; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.minecraft.block.BlockState; @@ -51,8 +46,12 @@ import net.minecraft.world.World; import appeng.api.client.ICellModelRegistry; import appeng.block.storage.DriveSlotsState; +import appeng.client.render.BakedModelUnwrapper; import appeng.client.render.FacingToRotation; +import appeng.client.render.model.AutoRotatingBakedModel; +import appeng.client.render.model.DriveBakedModel; import appeng.core.Api; +import appeng.tile.storage.ChestBlockEntity; /** * The tile entity renderer for ME chests takes care of rendering the right @@ -75,7 +74,7 @@ public class ChestTileEntityRenderer extends BlockEntityRenderer { @Override public void render(CrankBlockEntity te, float partialTicks, MatrixStack ms, VertexConsumerProvider buffers, - int combinedLightIn, int combinedOverlayIn) { + int combinedLightIn, int combinedOverlayIn) { // Apply GL transformations relative to the center of the block: 1) TE rotation // and 2) crank rotation @@ -63,8 +62,8 @@ public class CrankTESR extends BlockEntityRenderer { BlockRenderManager dispatcher = MinecraftClient.getInstance().getBlockRenderManager(); BakedModel model = dispatcher.getModel(blockState); VertexConsumer buffer = buffers.getBuffer(TexturedRenderLayers.getEntityTranslucentCull()); - dispatcher.getModelRenderer().render(ms.peek(), buffer, null, model, 1, 1, 1, - combinedLightIn, combinedOverlayIn); + dispatcher.getModelRenderer().render(ms.peek(), buffer, null, model, 1, 1, 1, combinedLightIn, + combinedOverlayIn); ms.pop(); } diff --git a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java index 8bdc7ec1c..0f9cb181c 100644 --- a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java +++ b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java @@ -1,17 +1,16 @@ package appeng.client.render.tesr; -import appeng.client.render.model.DriveBakedModel; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.util.math.MatrixStack; - -import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.util.math.Vector3f; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import appeng.client.render.FacingToRotation; +import appeng.client.render.model.DriveBakedModel; import appeng.tile.storage.DriveBlockEntity; /** @@ -26,7 +25,7 @@ public class DriveLedTileEntityRenderer extends BlockEntityRenderer SPRITES = ImmutableList.of( - TEXTURE_INSIDE - ); + public static final ImmutableList SPRITES = ImmutableList.of(TEXTURE_INSIDE); public InscriberTESR(BlockEntityRenderDispatcher rendererDispatcherIn) { super(rendererDispatcherIn); @@ -49,7 +48,7 @@ public final class InscriberTESR extends BlockEntityRenderer extends BlockEntityRendere @Override public void render(T te, float partialTicks, MatrixStack ms, VertexConsumerProvider buffers, int combinedLight, - int combinedOverlay) { + int combinedOverlay) { ms.push(); ms.translate(0.5, 0.5, 0.5); FacingToRotation.get(te.getForward(), te.getUp()).push(ms); diff --git a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java index 5ac8c31be..68b51db72 100644 --- a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java @@ -18,11 +18,8 @@ package appeng.client.render.tesr; -import appeng.block.storage.SkyChestBlock; -import appeng.block.storage.SkyChestBlock.SkyChestType; -import appeng.core.AppEng; -import appeng.tile.storage.SkyChestBlockEntity; import com.google.common.collect.ImmutableList; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback; @@ -39,6 +36,11 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.Vector3f; import net.minecraft.util.Identifier; +import appeng.block.storage.SkyChestBlock; +import appeng.block.storage.SkyChestBlock.SkyChestType; +import appeng.core.AppEng; +import appeng.tile.storage.SkyChestBlockEntity; + // This is mostly a copy&paste job of the vanilla chest TESR @Environment(EnvType.CLIENT) public class SkyChestTESR extends BlockEntityRenderer { @@ -48,10 +50,7 @@ public class SkyChestTESR extends BlockEntityRenderer { public static final SpriteIdentifier TEXTURE_BLOCK = new SpriteIdentifier(TexturedRenderLayers.CHEST_ATLAS_TEXTURE, new Identifier(AppEng.MOD_ID, "models/skyblockchest")); - public static final ImmutableList SPRITES = ImmutableList.of( - TEXTURE_STONE, - TEXTURE_BLOCK - ); + public static final ImmutableList SPRITES = ImmutableList.of(TEXTURE_STONE, TEXTURE_BLOCK); private final ModelPart singleLid; private final ModelPart singleBottom; @@ -73,7 +72,7 @@ public class SkyChestTESR extends BlockEntityRenderer { @Override public void render(SkyChestBlockEntity tileEntityIn, float partialTicks, MatrixStack matrixStackIn, - VertexConsumerProvider bufferIn, int combinedLightIn, int combinedOverlayIn) { + VertexConsumerProvider bufferIn, int combinedLightIn, int combinedOverlayIn) { matrixStackIn.push(); float f = tileEntityIn.getForward().asRotation(); matrixStackIn.translate(0.5D, 0.5D, 0.5D); @@ -93,8 +92,7 @@ public class SkyChestTESR extends BlockEntityRenderer { // See ChestBlockEntityRenderer private void renderModels(MatrixStack matrixStackIn, VertexConsumer bufferIn, ModelPart chestLid, - ModelPart chestLatch, ModelPart chestBottom, float lidAngle, int combinedLightIn, - int combinedOverlayIn) { + ModelPart chestLatch, ModelPart chestBottom, float lidAngle, int combinedLightIn, int combinedOverlayIn) { chestLid.pitch = -(lidAngle * 1.5707964F); chestLatch.pitch = chestLid.pitch; chestLid.render(matrixStackIn, bufferIn, combinedLightIn, combinedOverlayIn); diff --git a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java index 9f6da9c4a..03a5d2739 100644 --- a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java @@ -18,10 +18,8 @@ package appeng.client.render.tesr; -import appeng.client.render.BakedModelUnwrapper; -import appeng.client.render.FacingToRotation; -import appeng.client.render.model.SkyCompassBakedModel; -import appeng.tile.misc.SkyCompassBlockEntity; +import java.util.Random; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.renderer.v1.RendererAccess; @@ -40,7 +38,10 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Quaternion; -import java.util.Random; +import appeng.client.render.BakedModelUnwrapper; +import appeng.client.render.FacingToRotation; +import appeng.client.render.model.SkyCompassBakedModel; +import appeng.tile.misc.SkyCompassBlockEntity; @Environment(EnvType.CLIENT) public class SkyCompassTESR extends BlockEntityRenderer { @@ -53,7 +54,7 @@ public class SkyCompassTESR extends BlockEntityRenderer { @Override public void render(SkyCompassBlockEntity te, float partialTicks, MatrixStack ms, VertexConsumerProvider buffers, - int combinedLightIn, int combinedOverlayIn) { + int combinedLightIn, int combinedOverlayIn) { if (blockRenderer == null) { blockRenderer = MinecraftClient.getInstance().getBlockRenderManager(); } diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index a780637e8..7691abc15 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -24,19 +24,19 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; -import appeng.mixins.ScreenHandlerListeners; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerListener; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.screen.slot.Slot; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.inventory.Inventory; -import net.minecraft.screen.ScreenHandlerListener; -import net.minecraft.item.ItemStack; + +import alexiil.mc.lib.attributes.item.FixedItemInv; +import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; import appeng.api.config.Actionable; import appeng.api.config.SecurityPermissions; @@ -72,6 +72,7 @@ import appeng.core.sync.packets.TargetItemStackPacket; import appeng.helpers.ICustomNameObject; import appeng.helpers.InventoryAction; import appeng.me.helpers.PlayerSource; +import appeng.mixins.ScreenHandlerListeners; import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.inv.AdaptorFixedInv; @@ -97,13 +98,13 @@ public abstract class AEBaseContainer extends ScreenHandler { // Slots that were created to represent the player inventory private List playerInventorySlots = null; - public AEBaseContainer(ScreenHandlerType containerType, int id, final PlayerInventory ip, final BlockEntity myTile, - final IPart myPart) { + public AEBaseContainer(ScreenHandlerType containerType, int id, final PlayerInventory ip, + final BlockEntity myTile, final IPart myPart) { this(containerType, id, ip, myTile, myPart, null); } - public AEBaseContainer(ScreenHandlerType containerType, int id, final PlayerInventory ip, final BlockEntity myTile, - final IPart myPart, final IGuiItemObject gio) { + public AEBaseContainer(ScreenHandlerType containerType, int id, final PlayerInventory ip, + final BlockEntity myTile, final IPart myPart, final IGuiItemObject gio) { super(containerType, id); this.invPlayer = ip; this.tileEntity = myTile; @@ -299,7 +300,7 @@ public abstract class AEBaseContainer extends ScreenHandler { } public List getListeners() { - return ((ScreenHandlerListeners)this).ae2_getListeners(); + return ((ScreenHandlerListeners) this).ae2_getListeners(); } @Override @@ -672,8 +673,7 @@ public abstract class AEBaseContainer extends ScreenHandler { ais = Platform.poweredInsert(this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource()); if (ais == null) { - final InventoryAdaptor ia = new AdaptorFixedInv( - new WrapperCursorItemHandler(player.inventory)); + final InventoryAdaptor ia = new AdaptorFixedInv(new WrapperCursorItemHandler(player.inventory)); final ItemStack fail = ia.removeItems(1, extracted.getDefinition(), null); if (fail.isEmpty()) { diff --git a/src/main/java/appeng/container/ContainerLocator.java b/src/main/java/appeng/container/ContainerLocator.java index 57ed94845..647660e81 100644 --- a/src/main/java/appeng/container/ContainerLocator.java +++ b/src/main/java/appeng/container/ContainerLocator.java @@ -18,12 +18,10 @@ package appeng.container; -import appeng.api.parts.IPartHost; -import appeng.api.util.AEPartLocation; -import appeng.api.util.DimensionalCoord; -import appeng.parts.AEBasePart; import com.google.common.base.Preconditions; + import io.netty.handler.codec.DecoderException; + import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -35,6 +33,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import appeng.api.parts.IPartHost; +import appeng.api.util.AEPartLocation; +import appeng.api.util.DimensionalCoord; +import appeng.parts.AEBasePart; + /** * Describes how a container the player has opened was originally located. This * can be one of three ways: @@ -198,8 +201,8 @@ public final class ContainerLocator { case 0: return new ContainerLocator(Type.PLAYER_INVENTORY, buf.readInt(), (Identifier) null, null, null); case 1: - return new ContainerLocator(Type.PLAYER_INVENTORY_WITH_BLOCK_CONTEXT, buf.readInt(), buf.readIdentifier(), - buf.readBlockPos(), AEPartLocation.values()[buf.readByte()]); + return new ContainerLocator(Type.PLAYER_INVENTORY_WITH_BLOCK_CONTEXT, buf.readInt(), + buf.readIdentifier(), buf.readBlockPos(), AEPartLocation.values()[buf.readByte()]); case 2: return new ContainerLocator(Type.BLOCK, -1, buf.readIdentifier(), buf.readBlockPos(), null); case 3: diff --git a/src/main/java/appeng/container/guisync/SyncData.java b/src/main/java/appeng/container/guisync/SyncData.java index 8dbe1a4a1..35feba6c6 100644 --- a/src/main/java/appeng/container/guisync/SyncData.java +++ b/src/main/java/appeng/container/guisync/SyncData.java @@ -23,8 +23,8 @@ import java.lang.invoke.MethodHandles; import java.lang.reflect.Field; import java.util.Objects; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.screen.ScreenHandlerListener; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; import appeng.container.AEBaseContainer; diff --git a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java index aec8ce7f5..6dd9d12e5 100644 --- a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java +++ b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java @@ -20,15 +20,16 @@ package appeng.container.implementations; import java.util.Iterator; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerListener; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.screen.slot.Slot; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.screen.ScreenHandlerListener; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketByteBuf; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv; import appeng.api.config.CopyMode; diff --git a/src/main/java/appeng/container/implementations/ChestContainer.java b/src/main/java/appeng/container/implementations/ChestContainer.java index e94d2aae3..a2c667ce7 100644 --- a/src/main/java/appeng/container/implementations/ChestContainer.java +++ b/src/main/java/appeng/container/implementations/ChestContainer.java @@ -20,8 +20,8 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; diff --git a/src/main/java/appeng/container/implementations/CondenserContainer.java b/src/main/java/appeng/container/implementations/CondenserContainer.java index db755c662..7e0e1c909 100644 --- a/src/main/java/appeng/container/implementations/CondenserContainer.java +++ b/src/main/java/appeng/container/implementations/CondenserContainer.java @@ -20,8 +20,9 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.CondenserOutput; diff --git a/src/main/java/appeng/container/implementations/ContainerHelper.java b/src/main/java/appeng/container/implementations/ContainerHelper.java index abd618903..c75482742 100644 --- a/src/main/java/appeng/container/implementations/ContainerHelper.java +++ b/src/main/java/appeng/container/implementations/ContainerHelper.java @@ -1,17 +1,19 @@ package appeng.container.implementations; +import javax.annotation.Nullable; + import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.text.Text; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.config.SecurityPermissions; @@ -28,8 +30,6 @@ import appeng.helpers.ICustomNameObject; import appeng.helpers.WirelessTerminalGuiObject; import appeng.util.Platform; -import javax.annotation.Nullable; - /** * Helper for containers that can be opened for a part or tile given * that either implements a given interface. @@ -142,8 +142,7 @@ public final class ContainerHelper { // FIXME: Should move this up, because at this point, it's hard to know where // the terminal host came from (part or tile) if (locator.hasBlockPos()) { - return new TranslatableText( - world.getBlockState(locator.getBlockPos()).getBlock().getTranslationKey()); + return new TranslatableText(world.getBlockState(locator.getBlockPos()).getBlock().getTranslationKey()); } return new LiteralText("Unknown"); diff --git a/src/main/java/appeng/container/implementations/CraftAmountContainer.java b/src/main/java/appeng/container/implementations/CraftAmountContainer.java index 23bbddbff..4870976c2 100644 --- a/src/main/java/appeng/container/implementations/CraftAmountContainer.java +++ b/src/main/java/appeng/container/implementations/CraftAmountContainer.java @@ -22,9 +22,9 @@ import javax.annotation.Nonnull; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.screen.slot.Slot; -import net.minecraft.network.PacketByteBuf; import net.minecraft.world.World; import appeng.api.config.SecurityPermissions; diff --git a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java index b4f5841a5..e66d98fed 100644 --- a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java +++ b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java @@ -29,12 +29,12 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandlerListener; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.text.Text; import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.util.Util; import net.minecraft.world.World; diff --git a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java index 3c0945a1e..481bf79a1 100644 --- a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java +++ b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java @@ -22,10 +22,10 @@ import java.io.IOException; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandlerListener; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.network.PacketByteBuf; import net.minecraft.text.Text; import appeng.api.config.SecurityPermissions; diff --git a/src/main/java/appeng/container/implementations/CraftingStatusContainer.java b/src/main/java/appeng/container/implementations/CraftingStatusContainer.java index d5bd05323..24164b2ab 100644 --- a/src/main/java/appeng/container/implementations/CraftingStatusContainer.java +++ b/src/main/java/appeng/container/implementations/CraftingStatusContainer.java @@ -26,8 +26,8 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.text.Text; import appeng.api.config.SecurityPermissions; diff --git a/src/main/java/appeng/container/implementations/CraftingTermContainer.java b/src/main/java/appeng/container/implementations/CraftingTermContainer.java index 4cd0cd627..9b86915c1 100644 --- a/src/main/java/appeng/container/implementations/CraftingTermContainer.java +++ b/src/main/java/appeng/container/implementations/CraftingTermContainer.java @@ -18,19 +18,20 @@ package appeng.container.implementations; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.Inventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeType; -import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.item.FixedItemInv; +import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; + import appeng.api.config.SecurityPermissions; import appeng.api.storage.ITerminalHost; import appeng.container.ContainerLocator; @@ -121,7 +122,7 @@ public class CraftingTermContainer extends MEMonitorableContainer @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { } diff --git a/src/main/java/appeng/container/implementations/DriveContainer.java b/src/main/java/appeng/container/implementations/DriveContainer.java index d590b2d61..499cc20f8 100644 --- a/src/main/java/appeng/container/implementations/DriveContainer.java +++ b/src/main/java/appeng/container/implementations/DriveContainer.java @@ -20,8 +20,8 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; diff --git a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java index a598dfede..1bb894908 100644 --- a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java +++ b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java @@ -18,11 +18,12 @@ package appeng.container.implementations; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.FuzzyMode; import appeng.api.config.SecurityPermissions; diff --git a/src/main/java/appeng/container/implementations/GrinderContainer.java b/src/main/java/appeng/container/implementations/GrinderContainer.java index 9c08406ea..8a5fb9dd8 100644 --- a/src/main/java/appeng/container/implementations/GrinderContainer.java +++ b/src/main/java/appeng/container/implementations/GrinderContainer.java @@ -20,8 +20,9 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.container.AEBaseContainer; diff --git a/src/main/java/appeng/container/implementations/IOPortContainer.java b/src/main/java/appeng/container/implementations/IOPortContainer.java index d4c15164b..ab1e9d185 100644 --- a/src/main/java/appeng/container/implementations/IOPortContainer.java +++ b/src/main/java/appeng/container/implementations/IOPortContainer.java @@ -18,11 +18,12 @@ package appeng.container.implementations; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.FullnessMode; import appeng.api.config.OperationMode; diff --git a/src/main/java/appeng/container/implementations/InscriberContainer.java b/src/main/java/appeng/container/implementations/InscriberContainer.java index 93261afe6..87712452f 100644 --- a/src/main/java/appeng/container/implementations/InscriberContainer.java +++ b/src/main/java/appeng/container/implementations/InscriberContainer.java @@ -20,10 +20,11 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.screen.slot.Slot; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.screen.slot.Slot; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.definitions.IItemDefinition; @@ -33,8 +34,8 @@ import appeng.container.interfaces.IProgressProvider; import appeng.container.slot.OutputSlot; import appeng.container.slot.RestrictedInputSlot; import appeng.core.Api; -import appeng.tile.misc.InscriberRecipes; import appeng.tile.misc.InscriberBlockEntity; +import appeng.tile.misc.InscriberRecipes; import appeng.util.Platform; /** diff --git a/src/main/java/appeng/container/implementations/InterfaceContainer.java b/src/main/java/appeng/container/implementations/InterfaceContainer.java index adfcb2408..25188f3c7 100644 --- a/src/main/java/appeng/container/implementations/InterfaceContainer.java +++ b/src/main/java/appeng/container/implementations/InterfaceContainer.java @@ -20,8 +20,8 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.api.config.SecurityPermissions; import appeng.api.config.Settings; diff --git a/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java b/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java index cd506f096..9f05ba69d 100644 --- a/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java +++ b/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java @@ -25,12 +25,13 @@ import java.util.Map.Entry; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.SecurityPermissions; @@ -195,8 +196,8 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { final InventoryAdaptor playerHand = new AdaptorFixedInv(new WrapperCursorItemHandler(player.inventory)); - final FixedItemInv theSlot = new WrapperFilteredItemHandler( - inv.server.getSubInv(slot, slot + 1), new PatternSlotFilter()); + final FixedItemInv theSlot = new WrapperFilteredItemHandler(inv.server.getSubInv(slot, slot + 1), + new PatternSlotFilter()); final InventoryAdaptor interfaceSlot = new AdaptorFixedInv(theSlot); switch (action) { @@ -259,8 +260,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { final InventoryAdaptor playerInvAd = InventoryAdaptor.getAdaptor(player); for (int x = 0; x < inv.server.getSlotCount(); x++) { - ItemHandlerUtil.setStackInSlot(inv.server, x, - playerInvAd.addItems(inv.server.getInvStack(x))); + ItemHandlerUtil.setStackInSlot(inv.server, x, playerInvAd.addItems(inv.server.getInvStack(x))); } break; diff --git a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java index df70bf3d7..971345ff5 100644 --- a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java +++ b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java @@ -18,14 +18,15 @@ package appeng.container.implementations; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.FuzzyMode; import appeng.api.config.LevelType; diff --git a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java index 13a3cb9e8..e8d0b45df 100644 --- a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java +++ b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java @@ -23,14 +23,14 @@ import java.nio.BufferOverflowException; import javax.annotation.Nonnull; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandlerListener; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntity; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -110,7 +110,7 @@ public class MEMonitorableContainer extends AEBaseContainer } public MEMonitorableContainer(ScreenHandlerType containerType, int id, PlayerInventory ip, - final ITerminalHost monitorable, final boolean bindInventory) { + final ITerminalHost monitorable, final boolean bindInventory) { super(containerType, id, ip, monitorable instanceof BlockEntity ? (BlockEntity) monitorable : null, monitorable instanceof IPart ? (IPart) monitorable : null, monitorable instanceof IGuiItemObject ? (IGuiItemObject) monitorable : null); diff --git a/src/main/java/appeng/container/implementations/MEPortableCellContainer.java b/src/main/java/appeng/container/implementations/MEPortableCellContainer.java index 4d0a2ebe3..f440f7be1 100644 --- a/src/main/java/appeng/container/implementations/MEPortableCellContainer.java +++ b/src/main/java/appeng/container/implementations/MEPortableCellContainer.java @@ -20,9 +20,9 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -56,7 +56,7 @@ public class MEPortableCellContainer extends MEMonitorableContainer { } protected MEPortableCellContainer(ScreenHandlerType type, int id, - final PlayerInventory ip, final IPortableCell monitorable) { + final PlayerInventory ip, final IPortableCell monitorable) { super(type, id, ip, monitorable, false); if (monitorable instanceof IInventorySlotAware) { final int slotIndex = ((IInventorySlotAware) monitorable).getInventorySlot(); diff --git a/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java b/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java index ca41d09ab..b5948eac6 100644 --- a/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java +++ b/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java @@ -18,15 +18,16 @@ package appeng.container.implementations; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.screen.slot.Slot; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.screen.slot.Slot; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.RedstoneMode; import appeng.api.config.SecurityPermissions; import appeng.api.config.Settings; diff --git a/src/main/java/appeng/container/implementations/NetworkStatusContainer.java b/src/main/java/appeng/container/implementations/NetworkStatusContainer.java index d1412a945..972411400 100644 --- a/src/main/java/appeng/container/implementations/NetworkStatusContainer.java +++ b/src/main/java/appeng/container/implementations/NetworkStatusContainer.java @@ -22,10 +22,10 @@ import java.io.IOException; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.server.network.ServerPlayerEntity; import appeng.api.implementations.guiobjects.INetworkTool; import appeng.api.networking.IGrid; diff --git a/src/main/java/appeng/container/implementations/NetworkToolContainer.java b/src/main/java/appeng/container/implementations/NetworkToolContainer.java index 48ce56c81..9acc5441b 100644 --- a/src/main/java/appeng/container/implementations/NetworkToolContainer.java +++ b/src/main/java/appeng/container/implementations/NetworkToolContainer.java @@ -20,10 +20,10 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.api.implementations.guiobjects.INetworkTool; import appeng.container.AEBaseContainer; @@ -80,8 +80,7 @@ public class NetworkToolContainer extends AEBaseContainer { if (currentItem != this.toolInv.getItemStack()) { if (!currentItem.isEmpty()) { if (ItemStack.areItemsEqual(this.toolInv.getItemStack(), currentItem)) { - this.getPlayerInv().setStack(this.getPlayerInv().selectedSlot, - this.toolInv.getItemStack()); + this.getPlayerInv().setStack(this.getPlayerInv().selectedSlot, this.toolInv.getItemStack()); } else { this.setValidContainer(false); } diff --git a/src/main/java/appeng/container/implementations/PatternTermContainer.java b/src/main/java/appeng/container/implementations/PatternTermContainer.java index 7e913b3e5..5f4825bf9 100644 --- a/src/main/java/appeng/container/implementations/PatternTermContainer.java +++ b/src/main/java/appeng/container/implementations/PatternTermContainer.java @@ -21,28 +21,28 @@ package appeng.container.implementations; import java.util.ArrayList; import java.util.List; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; -import appeng.mixins.SlotMixin; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.CraftingResultInventory; -import net.minecraft.nbt.Tag; -import net.minecraft.recipe.CraftingRecipe; -import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeType; -import net.minecraft.screen.slot.CraftingResultSlot; -import net.minecraft.screen.slot.Slot; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.inventory.CraftingInventory; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.screen.ScreenHandlerListener; +import net.minecraft.inventory.CraftingResultInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.network.PacketByteBuf; +import net.minecraft.recipe.CraftingRecipe; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeType; +import net.minecraft.screen.ScreenHandlerListener; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.screen.slot.CraftingResultSlot; +import net.minecraft.screen.slot.Slot; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.item.FixedItemInv; +import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; + import appeng.api.config.Actionable; import appeng.api.config.SecurityPermissions; import appeng.api.crafting.ICraftingHelper; @@ -66,6 +66,7 @@ import appeng.core.sync.packets.PatternSlotPacket; import appeng.helpers.IContainerCraftingPacket; import appeng.items.storage.ViewCellItem; import appeng.me.helpers.MachineSource; +import appeng.mixins.SlotMixin; import appeng.parts.reporting.PatternTerminalPart; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.InventoryAdaptor; @@ -165,7 +166,6 @@ public class PatternTermContainer extends MEMonitorableContainer } } - @Override public void setStackInSlot(int slotID, ItemStack stack) { super.setStackInSlot(slotID, stack); @@ -203,7 +203,7 @@ public class PatternTermContainer extends MEMonitorableContainer @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { } @@ -341,8 +341,8 @@ public class PatternTermContainer extends MEMonitorableContainer : packetPatternSlot.pattern[x].createItemStack()); } - final Recipe r = p.world.getRecipeManager().getFirstMatch(RecipeType.CRAFTING, ic, p.world) - .orElse(null); + final Recipe r = p.world.getRecipeManager() + .getFirstMatch(RecipeType.CRAFTING, ic, p.world).orElse(null); if (r == null) { return; diff --git a/src/main/java/appeng/container/implementations/PriorityContainer.java b/src/main/java/appeng/container/implementations/PriorityContainer.java index f4173bcf3..eed9a9a89 100644 --- a/src/main/java/appeng/container/implementations/PriorityContainer.java +++ b/src/main/java/appeng/container/implementations/PriorityContainer.java @@ -18,14 +18,14 @@ package appeng.container.implementations; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; +import net.minecraft.screen.ScreenHandlerType; import appeng.api.config.SecurityPermissions; import appeng.api.parts.IPart; diff --git a/src/main/java/appeng/container/implementations/QNBContainer.java b/src/main/java/appeng/container/implementations/QNBContainer.java index 839df7020..ebc02209b 100644 --- a/src/main/java/appeng/container/implementations/QNBContainer.java +++ b/src/main/java/appeng/container/implementations/QNBContainer.java @@ -20,8 +20,8 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; diff --git a/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java index b8dcebef1..3b352de63 100644 --- a/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java +++ b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java @@ -20,13 +20,14 @@ package appeng.container.implementations; import javax.annotation.Nonnull; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; @@ -82,8 +83,7 @@ public class QuartzKnifeContainer extends AEBaseContainer { if (currentItem != this.toolInv.getItemStack()) { if (!currentItem.isEmpty()) { if (ItemStack.areItemsEqual(this.toolInv.getItemStack(), currentItem)) { - this.getPlayerInv().setStack(this.getPlayerInv().selectedSlot, - this.toolInv.getItemStack()); + this.getPlayerInv().setStack(this.getPlayerInv().selectedSlot, this.toolInv.getItemStack()); } else { this.setValidContainer(false); } @@ -147,11 +147,11 @@ public class QuartzKnifeContainer extends AEBaseContainer { final ItemStack item = QuartzKnifeContainer.this.toolInv.getItemStack(); final ItemStack before = item.copy(); item.damage(1, QuartzKnifeContainer.this.getPlayerInv().player, p -> { - QuartzKnifeContainer.this.getPlayerInv().setStack( - QuartzKnifeContainer.this.getPlayerInv().selectedSlot, ItemStack.EMPTY); + QuartzKnifeContainer.this.getPlayerInv() + .setStack(QuartzKnifeContainer.this.getPlayerInv().selectedSlot, ItemStack.EMPTY); // FIXME FABRIC equivalent?? // FIXME FABRIC MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent( - // FIXME FABRIC QuartzKnifeContainer.this.getPlayerInv().player, before, null)); + // FIXME FABRIC QuartzKnifeContainer.this.getPlayerInv().player, before, null)); }); QuartzKnifeContainer.this.sendContentUpdates(); diff --git a/src/main/java/appeng/container/implementations/SecurityStationContainer.java b/src/main/java/appeng/container/implementations/SecurityStationContainer.java index 9d073632b..0a77ae8f3 100644 --- a/src/main/java/appeng/container/implementations/SecurityStationContainer.java +++ b/src/main/java/appeng/container/implementations/SecurityStationContainer.java @@ -20,10 +20,11 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerListener; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerListener; +import net.minecraft.screen.ScreenHandlerType; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.SecurityPermissions; @@ -140,7 +141,7 @@ public class SecurityStationContainer extends MEMonitorableContainer implements @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { if (!this.wirelessOut.hasStack()) { if (this.wirelessIn.hasStack()) { final ItemStack term = this.wirelessIn.getStack().copy(); diff --git a/src/main/java/appeng/container/implementations/SkyChestContainer.java b/src/main/java/appeng/container/implementations/SkyChestContainer.java index 804c5e5d1..08ac0c903 100644 --- a/src/main/java/appeng/container/implementations/SkyChestContainer.java +++ b/src/main/java/appeng/container/implementations/SkyChestContainer.java @@ -20,8 +20,8 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; diff --git a/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java b/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java index 9ccfa9381..a922fad1d 100644 --- a/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java +++ b/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java @@ -20,8 +20,8 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.api.config.SecurityPermissions; import appeng.api.networking.IGrid; diff --git a/src/main/java/appeng/container/implementations/StorageBusContainer.java b/src/main/java/appeng/container/implementations/StorageBusContainer.java index 215a4a77a..194cf63fc 100644 --- a/src/main/java/appeng/container/implementations/StorageBusContainer.java +++ b/src/main/java/appeng/container/implementations/StorageBusContainer.java @@ -20,12 +20,13 @@ package appeng.container.implementations; import java.util.Iterator; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.AccessRestriction; import appeng.api.config.FuzzyMode; diff --git a/src/main/java/appeng/container/implementations/UpgradeableContainer.java b/src/main/java/appeng/container/implementations/UpgradeableContainer.java index 9d958d8df..cd754bb91 100644 --- a/src/main/java/appeng/container/implementations/UpgradeableContainer.java +++ b/src/main/java/appeng/container/implementations/UpgradeableContainer.java @@ -22,11 +22,12 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.Inventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.FuzzyMode; @@ -85,7 +86,7 @@ public class UpgradeableContainer extends AEBaseContainer implements IOptionalSl } public UpgradeableContainer(ScreenHandlerType containerType, int id, final PlayerInventory ip, - final IUpgradeableHost te) { + final IUpgradeableHost te) { super(containerType, id, ip, (BlockEntity) (te instanceof BlockEntity ? te : null), (IPart) (te instanceof IPart ? te : null)); this.upgradeable = te; diff --git a/src/main/java/appeng/container/implementations/VibrationChamberContainer.java b/src/main/java/appeng/container/implementations/VibrationChamberContainer.java index 73eb5ab61..57c79d718 100644 --- a/src/main/java/appeng/container/implementations/VibrationChamberContainer.java +++ b/src/main/java/appeng/container/implementations/VibrationChamberContainer.java @@ -20,8 +20,8 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; diff --git a/src/main/java/appeng/container/implementations/WirelessContainer.java b/src/main/java/appeng/container/implementations/WirelessContainer.java index 859cb6f7b..afaecc0c3 100644 --- a/src/main/java/appeng/container/implementations/WirelessContainer.java +++ b/src/main/java/appeng/container/implementations/WirelessContainer.java @@ -20,8 +20,8 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; diff --git a/src/main/java/appeng/container/implementations/WirelessTermContainer.java b/src/main/java/appeng/container/implementations/WirelessTermContainer.java index febdcacda..db5868106 100644 --- a/src/main/java/appeng/container/implementations/WirelessTermContainer.java +++ b/src/main/java/appeng/container/implementations/WirelessTermContainer.java @@ -20,15 +20,15 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.util.Util; import appeng.container.ContainerLocator; import appeng.core.AEConfig; import appeng.core.localization.PlayerMessages; import appeng.helpers.WirelessTerminalGuiObject; import appeng.util.Platform; -import net.minecraft.util.Util; public class WirelessTermContainer extends MEPortableCellContainer { diff --git a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java index 70ecadf9c..4958c9e00 100644 --- a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java +++ b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java @@ -18,15 +18,16 @@ package appeng.container.slot; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.RecipeType; import net.minecraft.util.collection.DefaultedList; +import net.minecraft.world.World; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.util.helpers.ItemHandlerUtil; -import net.minecraft.world.World; public class AppEngCraftingSlot extends AppEngSlot { @@ -47,7 +48,7 @@ public class AppEngCraftingSlot extends AppEngSlot { private int amountCrafted; public AppEngCraftingSlot(final PlayerEntity par1PlayerEntity, final FixedItemInv par2IInventory, - final FixedItemInv par3IInventory, final int par4, final int par5, final int par6) { + final FixedItemInv par3IInventory, final int par4, final int par5, final int par6) { super(par3IInventory, par4, par5, par6); this.thePlayer = par1PlayerEntity; this.craftMatrix = par2IInventory; @@ -85,9 +86,11 @@ public class AppEngCraftingSlot extends AppEngSlot { @Override public ItemStack onTakeItem(final PlayerEntity playerIn, final ItemStack stack) { - // FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent(playerIn, stack, new WrapperInvItemHandler(this.craftMatrix)); + // FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent(playerIn, stack, new + // WrapperInvItemHandler(this.craftMatrix)); this.onCrafted(stack); - // FIXME FABRIC: net.minecraftforge.common.ForgeHooks.setCraftingPlayer(playerIn); + // FIXME FABRIC: + // net.minecraftforge.common.ForgeHooks.setCraftingPlayer(playerIn); final CraftingInventory ic = new CraftingInventory(this.getContainer(), 3, 3); for (int x = 0; x < this.craftMatrix.getSlotCount(); x++) { diff --git a/src/main/java/appeng/container/slot/AppEngSlot.java b/src/main/java/appeng/container/slot/AppEngSlot.java index ff038255f..c99338dd3 100644 --- a/src/main/java/appeng/container/slot/AppEngSlot.java +++ b/src/main/java/appeng/container/slot/AppEngSlot.java @@ -18,9 +18,8 @@ package appeng.container.slot; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import alexiil.mc.lib.attributes.item.SingleItemSlot; -import appeng.container.AEBaseContainer; +import javax.annotation.Nonnull; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.entity.player.PlayerEntity; @@ -29,7 +28,10 @@ import net.minecraft.inventory.SimpleInventory; import net.minecraft.item.ItemStack; import net.minecraft.screen.slot.Slot; -import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.item.FixedItemInv; +import alexiil.mc.lib.attributes.item.SingleItemSlot; + +import appeng.container.AEBaseContainer; public class AppEngSlot extends Slot { private static Inventory emptyInventory = new SimpleInventory(0); @@ -152,8 +154,6 @@ public class AppEngSlot extends Slot { return !backingSlot.get().isEmpty(); } - - @Override @Environment(EnvType.CLIENT) public boolean doDrawHoveringEffect() { diff --git a/src/main/java/appeng/container/slot/CraftingMatrixSlot.java b/src/main/java/appeng/container/slot/CraftingMatrixSlot.java index 27482a05e..f433f1521 100644 --- a/src/main/java/appeng/container/slot/CraftingMatrixSlot.java +++ b/src/main/java/appeng/container/slot/CraftingMatrixSlot.java @@ -18,10 +18,11 @@ package appeng.container.slot; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.container.AEBaseContainer; import appeng.util.inv.WrapperInvItemHandler; @@ -30,7 +31,7 @@ public class CraftingMatrixSlot extends AppEngSlot { private final Inventory wrappedInventory; public CraftingMatrixSlot(final AEBaseContainer c, final FixedItemInv par1iInventory, final int par2, - final int par3, final int par4) { + final int par3, final int par4) { super(par1iInventory, par2, par3, par4); this.c = c; this.wrappedInventory = new WrapperInvItemHandler(par1iInventory); diff --git a/src/main/java/appeng/container/slot/CraftingTermSlot.java b/src/main/java/appeng/container/slot/CraftingTermSlot.java index 14d6adccd..4cdb9ae65 100644 --- a/src/main/java/appeng/container/slot/CraftingTermSlot.java +++ b/src/main/java/appeng/container/slot/CraftingTermSlot.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.Item; @@ -33,6 +32,8 @@ import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.Actionable; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.IActionSource; @@ -66,8 +67,8 @@ public class CraftingTermSlot extends AppEngCraftingSlot { private final IContainerCraftingPacket container; public CraftingTermSlot(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc, - final IStorageMonitorable storage, final FixedItemInv cMatrix, final FixedItemInv secondMatrix, - final FixedItemInv output, final int x, final int y, final IContainerCraftingPacket ccp) { + final IStorageMonitorable storage, final FixedItemInv cMatrix, final FixedItemInv secondMatrix, + final FixedItemInv output, final int x, final int y, final IContainerCraftingPacket ccp) { super(player, cMatrix, output, 0, x, y); this.energySrc = energySrc; this.storage = storage; @@ -138,8 +139,8 @@ public class CraftingTermSlot extends AppEngCraftingSlot { if (!extra.isEmpty()) { final List drops = new ArrayList<>(); drops.add(extra); - Platform.spawnDrops(who.world, - new BlockPos((int) who.getX(), (int) who.getY(), (int) who.getZ()), drops); + Platform.spawnDrops(who.world, new BlockPos((int) who.getX(), (int) who.getY(), (int) who.getZ()), + drops); return; } } @@ -201,8 +202,9 @@ public class CraftingTermSlot extends AppEngCraftingSlot { if (r == null) { final Item target = request.getItem(); - // FIXME FABRIC: This entire code-path may be pointless because RepairItemRecipe is of type CRAFTING - if (target.isDamageable() /* FIXME FABRIC && target.isRepairable(request) */) { + // FIXME FABRIC: This entire code-path may be pointless because RepairItemRecipe + // is of type CRAFTING + if (target.isDamageable() /* FIXME FABRIC && target.isRepairable(request) */) { boolean isBad = false; for (int x = 0; x < ic.size(); x++) { final ItemStack pis = ic.getStack(x); diff --git a/src/main/java/appeng/container/slot/DisabledSlot.java b/src/main/java/appeng/container/slot/DisabledSlot.java index a9ba26b77..684e4f903 100644 --- a/src/main/java/appeng/container/slot/DisabledSlot.java +++ b/src/main/java/appeng/container/slot/DisabledSlot.java @@ -20,6 +20,7 @@ package appeng.container.slot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.item.FixedItemInv; public class DisabledSlot extends AppEngSlot { diff --git a/src/main/java/appeng/container/slot/FakeSlot.java b/src/main/java/appeng/container/slot/FakeSlot.java index 89cbded54..98b9d3276 100644 --- a/src/main/java/appeng/container/slot/FakeSlot.java +++ b/src/main/java/appeng/container/slot/FakeSlot.java @@ -18,10 +18,11 @@ package appeng.container.slot; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + public class FakeSlot extends AppEngSlot { public FakeSlot(final FixedItemInv inv, final int idx, final int x, final int y) { diff --git a/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java b/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java index a6805ec4b..d749fcb00 100644 --- a/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java +++ b/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java @@ -18,9 +18,10 @@ package appeng.container.slot; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + public class FakeTypeOnlySlot extends FakeSlot { public FakeTypeOnlySlot(final FixedItemInv inv, final int idx, final int x, final int y) { diff --git a/src/main/java/appeng/container/slot/InaccessibleSlot.java b/src/main/java/appeng/container/slot/InaccessibleSlot.java index 517dde352..a3d9c5a0a 100644 --- a/src/main/java/appeng/container/slot/InaccessibleSlot.java +++ b/src/main/java/appeng/container/slot/InaccessibleSlot.java @@ -20,6 +20,7 @@ package appeng.container.slot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.item.FixedItemInv; public class InaccessibleSlot extends AppEngSlot { diff --git a/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java b/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java index 17eed9ffe..67b453f12 100644 --- a/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java +++ b/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java @@ -19,6 +19,7 @@ package appeng.container.slot; import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.container.implementations.MolecularAssemblerContainer; @@ -30,7 +31,7 @@ public class MolecularAssemblerPatternSlot extends AppEngSlot { private final int slotIdx; public MolecularAssemblerPatternSlot(final MolecularAssemblerContainer mac, final FixedItemInv i, final int slotIdx, - final int x, final int y) { + final int x, final int y) { super(i, slotIdx, x, y); this.mac = mac; this.slotIdx = slotIdx; diff --git a/src/main/java/appeng/container/slot/OptionalFakeSlot.java b/src/main/java/appeng/container/slot/OptionalFakeSlot.java index 0fff55612..72d183136 100644 --- a/src/main/java/appeng/container/slot/OptionalFakeSlot.java +++ b/src/main/java/appeng/container/slot/OptionalFakeSlot.java @@ -21,6 +21,7 @@ package appeng.container.slot; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.item.FixedItemInv; public class OptionalFakeSlot extends FakeSlot implements IOptionalSlot { @@ -32,7 +33,7 @@ public class OptionalFakeSlot extends FakeSlot implements IOptionalSlot { private boolean renderDisabled = true; public OptionalFakeSlot(final FixedItemInv inv, final IOptionalSlotHost containerBus, final int idx, final int x, - final int y, final int offX, final int offY, final int groupNum) { + final int y, final int offX, final int offY, final int groupNum) { super(inv, idx, x + offX * 18, y + offY * 18); this.srcX = x; this.srcY = y; diff --git a/src/main/java/appeng/container/slot/OptionalNormalSlot.java b/src/main/java/appeng/container/slot/OptionalNormalSlot.java index aa593ac48..59eca57fe 100644 --- a/src/main/java/appeng/container/slot/OptionalNormalSlot.java +++ b/src/main/java/appeng/container/slot/OptionalNormalSlot.java @@ -26,7 +26,7 @@ public class OptionalNormalSlot extends AppEngSlot implements IOptionalSlot { private final IOptionalSlotHost host; public OptionalNormalSlot(final FixedItemInv inv, final IOptionalSlotHost containerBus, final int slot, - final int xPos, final int yPos, final int groupNum) { + final int xPos, final int yPos, final int groupNum) { super(inv, slot, xPos, yPos); this.groupNum = groupNum; this.host = containerBus; diff --git a/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java b/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java index b5706071f..6e53e5a7f 100644 --- a/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java +++ b/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java @@ -18,16 +18,17 @@ package appeng.container.slot; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerInventory; +import alexiil.mc.lib.attributes.item.FixedItemInv; + public class OptionalRestrictedInputSlot extends RestrictedInputSlot { private final int groupNum; private final IOptionalSlotHost host; public OptionalRestrictedInputSlot(final PlacableItemType valid, final FixedItemInv i, final IOptionalSlotHost host, - final int slotIndex, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) { + final int slotIndex, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) { super(valid, i, slotIndex, x, y, invPlayer); this.groupNum = grpNum; this.host = host; diff --git a/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java b/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java index 60dbeb14f..22ec06e8a 100644 --- a/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java +++ b/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java @@ -19,12 +19,13 @@ package appeng.container.slot; import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.item.FixedItemInv; public class OptionalTypeOnlyFakeSlot extends OptionalFakeSlot { public OptionalTypeOnlyFakeSlot(final FixedItemInv inv, final IOptionalSlotHost containerBus, final int idx, - final int x, final int y, final int offX, final int offY, final int groupNum) { + final int x, final int y, final int offX, final int offY, final int groupNum) { super(inv, containerBus, idx, x, y, offX, offY, groupNum); } diff --git a/src/main/java/appeng/container/slot/OutputSlot.java b/src/main/java/appeng/container/slot/OutputSlot.java index ad8b0476d..f869d4853 100644 --- a/src/main/java/appeng/container/slot/OutputSlot.java +++ b/src/main/java/appeng/container/slot/OutputSlot.java @@ -19,6 +19,7 @@ package appeng.container.slot; import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.item.FixedItemInv; public class OutputSlot extends AppEngSlot { diff --git a/src/main/java/appeng/container/slot/PatternOutputsSlot.java b/src/main/java/appeng/container/slot/PatternOutputsSlot.java index e75df58f8..51fbcc1a9 100644 --- a/src/main/java/appeng/container/slot/PatternOutputsSlot.java +++ b/src/main/java/appeng/container/slot/PatternOutputsSlot.java @@ -23,7 +23,7 @@ import alexiil.mc.lib.attributes.item.FixedItemInv; public class PatternOutputsSlot extends OptionalFakeSlot { public PatternOutputsSlot(final FixedItemInv inv, final IOptionalSlotHost containerBus, final int idx, final int x, - final int y, final int offX, final int offY, final int groupNum) { + final int y, final int offX, final int offY, final int groupNum) { super(inv, containerBus, idx, x, y, offX, offY, groupNum); } diff --git a/src/main/java/appeng/container/slot/PatternTermSlot.java b/src/main/java/appeng/container/slot/PatternTermSlot.java index 25951bb15..0b246afef 100644 --- a/src/main/java/appeng/container/slot/PatternTermSlot.java +++ b/src/main/java/appeng/container/slot/PatternTermSlot.java @@ -18,10 +18,11 @@ package appeng.container.slot; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.IActionSource; import appeng.api.storage.IStorageMonitorable; @@ -37,9 +38,9 @@ public class PatternTermSlot extends CraftingTermSlot { private final IOptionalSlotHost host; public PatternTermSlot(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc, - final IStorageMonitorable storage, final FixedItemInv cMatrix, final FixedItemInv secondMatrix, - final FixedItemInv output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber, - final IContainerCraftingPacket c) { + final IStorageMonitorable storage, final FixedItemInv cMatrix, final FixedItemInv secondMatrix, + final FixedItemInv output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber, + final IContainerCraftingPacket c) { super(player, mySrc, energySrc, storage, cMatrix, secondMatrix, output, x, y, c); this.host = h; diff --git a/src/main/java/appeng/container/slot/RestrictedInputSlot.java b/src/main/java/appeng/container/slot/RestrictedInputSlot.java index 49bfaa68e..3a7b745a7 100644 --- a/src/main/java/appeng/container/slot/RestrictedInputSlot.java +++ b/src/main/java/appeng/container/slot/RestrictedInputSlot.java @@ -20,21 +20,22 @@ package appeng.container.slot; import java.util.List; -import alexiil.mc.lib.attributes.item.FixedItemInv; import com.google.common.collect.ImmutableList; import net.fabricmc.fabric.api.registry.FuelRegistry; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.Item; -import net.minecraft.screen.slot.Slot; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.screen.slot.Slot; import net.minecraft.tag.ItemTags; import net.minecraft.tag.Tag; import net.minecraft.util.Identifier; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.crafting.ICraftingHelper; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItems; @@ -60,12 +61,10 @@ import appeng.util.Platform; */ public class RestrictedInputSlot extends AppEngSlot { - private static final List METAL_INGOT_TAGS = ImmutableList.of( - new Identifier("c:copper_ingots"), new Identifier("c:tin_ingots"), - new Identifier("c:iron_ingots"), new Identifier("c:gold_ingots"), - new Identifier("c:lead_ingots"), new Identifier("c:bronze_ingots"), - new Identifier("c:brass_ingots"), new Identifier("c:nickel_ingots"), - new Identifier("c:aluminium_ingots")); + private static final List METAL_INGOT_TAGS = ImmutableList.of(new Identifier("c:copper_ingots"), + new Identifier("c:tin_ingots"), new Identifier("c:iron_ingots"), new Identifier("c:gold_ingots"), + new Identifier("c:lead_ingots"), new Identifier("c:bronze_ingots"), new Identifier("c:brass_ingots"), + new Identifier("c:nickel_ingots"), new Identifier("c:aluminium_ingots")); private final PlacableItemType which; private final PlayerInventory p; @@ -73,7 +72,7 @@ public class RestrictedInputSlot extends AppEngSlot { private int stackLimit = -1; public RestrictedInputSlot(final PlacableItemType valid, final FixedItemInv i, final int slotIndex, final int x, - final int y, final PlayerInventory p) { + final int y, final PlayerInventory p) { super(i, slotIndex, x, y); this.which = valid; this.setIIcon(valid.IIcon); diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 3538c1610..cc9321522 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -18,19 +18,20 @@ package appeng.core; -import appeng.api.config.*; -import appeng.api.features.AEFeature; -import appeng.core.config.*; -import appeng.client.gui.NumberEntryType; -import appeng.core.settings.TickRates; -import appeng.util.EnumCycler; -import net.minecraft.world.dimension.DimensionType; - import java.io.File; import java.util.*; import java.util.function.DoubleSupplier; import java.util.stream.Collectors; +import net.minecraft.world.dimension.DimensionType; + +import appeng.api.config.*; +import appeng.api.features.AEFeature; +import appeng.client.gui.NumberEntryType; +import appeng.core.config.*; +import appeng.core.settings.TickRates; +import appeng.util.EnumCycler; + public final class AEConfig { public final ClientConfig clientConfig; @@ -51,7 +52,8 @@ public final class AEConfig { syncCommonConfig(); } - private static ConfigFileManager createConfigFileManager(ConfigSection commonRoot, File configDir, String filename) { + private static ConfigFileManager createConfigFileManager(ConfigSection commonRoot, File configDir, + String filename) { File configFile = new File(configDir, filename); ConfigFileManager result = new ConfigFileManager(commonRoot, configFile); if (!configFile.exists()) { @@ -95,7 +97,7 @@ public final class AEConfig { private final int[] craftByStacks = new int[4]; private final int[] priorityByStacks = new int[4]; private final int[] levelByStacks = new int[4]; - private final int[] levelByMillibuckets = {10, 100, 1000, 10000}; + private final int[] levelByMillibuckets = { 10, 100, 1000, 10000 }; // Spatial IO/Dimension private double spatialPowerExponent; @@ -178,7 +180,8 @@ public final class AEConfig { for (final AEFeature feature : AEFeature.values()) { if (feature.isVisible() && feature.isConfig()) { - if (commonConfig.enabledFeatures.containsKey(feature) && commonConfig.enabledFeatures.get(feature).get()) { + if (commonConfig.enabledFeatures.containsKey(feature) + && commonConfig.enabledFeatures.get(feature).get()) { this.featureFlags.add(feature); } } else { @@ -381,7 +384,7 @@ public final class AEConfig { public final EnumOption selectedPowerUnit; // GUI Buttons - private static final int[] BTN_BY_STACK_DEFAULTS = {1, 10, 100, 1000}; + private static final int[] BTN_BY_STACK_DEFAULTS = { 1, 10, 100, 1000 }; public final List craftByStacks; public final List priorityByStacks; public final List levelByStacks; @@ -393,8 +396,7 @@ public final class AEConfig { public ClientConfig(ConfigSection root) { ConfigSection client = root.subsection("client"); - this.disableColoredCableRecipesInJEI = client.addBoolean("disableColoredCableRecipesInJEI", - true); + this.disableColoredCableRecipesInJEI = client.addBoolean("disableColoredCableRecipesInJEI", true); this.enableEffects = client.addBoolean("enableEffects", true); this.useLargeFonts = client.addBoolean("useTerminalUseLargeFont", false); this.useColoredCraftingStatus = client.addBoolean("useColoredCraftingStatus", true); @@ -408,17 +410,17 @@ public final class AEConfig { int defaultValue = BTN_BY_STACK_DEFAULTS[btnNum]; final int buttonCap = (int) (Math.pow(10, btnNum + 1) - 1); - this.craftByStacks.add(client - .addInt("craftByStacks" + btnNum, defaultValue, 1, buttonCap, "Controls buttons on Crafting Screen")); - this.priorityByStacks.add(client - .addInt("priorityByStacks" + btnNum, defaultValue, 1, buttonCap, "Controls buttons on Priority Screen")); - this.levelByStacks.add(client - .addInt("levelByStacks" + btnNum, defaultValue, 1, buttonCap, "Controls buttons on Level Emitter Screen")); + this.craftByStacks.add(client.addInt("craftByStacks" + btnNum, defaultValue, 1, buttonCap, + "Controls buttons on Crafting Screen")); + this.priorityByStacks.add(client.addInt("priorityByStacks" + btnNum, defaultValue, 1, buttonCap, + "Controls buttons on Priority Screen")); + this.levelByStacks.add(client.addInt("levelByStacks" + btnNum, defaultValue, 1, buttonCap, + "Controls buttons on Level Emitter Screen")); } ConfigSection terminals = root.subsection("terminals"); - this.searchTooltips = terminals - .addEnum("searchTooltips", YesNo.YES, "Should tooltips be searched. Performance impact"); + this.searchTooltips = terminals.addEnum("searchTooltips", YesNo.YES, + "Should tooltips be searched. Performance impact"); this.terminalStyle = terminals.addEnum("terminalStyle", TerminalStyle.TALL); this.terminalSearchMode = terminals.addEnum("terminalSearchMode", SearchBoxMode.AUTOSEARCH); } @@ -484,7 +486,8 @@ public final class AEConfig { public CommonConfig(ConfigSection root) { // Feature switches - ConfigSection features = root.subsection("features", "Warning: Disabling a feature may disable other features depending on it."); + ConfigSection features = root.subsection("features", + "Warning: Disabling a feature may disable other features depending on it."); // We need to group by feature category Map> groupedFeatures = Arrays.stream(AEFeature.values()) @@ -497,13 +500,15 @@ public final class AEConfig { ConfigSection categorySection = features.subsection(category); for (AEFeature feature : featuresInGroup) { if (feature.isConfig()) { - enabledFeatures.put(feature, categorySection.addBoolean(feature.key(), feature.isEnabled(), feature.comment())); + enabledFeatures.put(feature, + categorySection.addBoolean(feature.key(), feature.isEnabled(), feature.comment())); } } } ConfigSection general = root.subsection("general"); - removeCrashingItemsOnLoad = general.addBoolean("removeCrashingItemsOnLoad", false, "Will auto-remove items that crash when being loaded from storage. This will destroy those items instead of crashing the game!"); + removeCrashingItemsOnLoad = general.addBoolean("removeCrashingItemsOnLoad", false, + "Will auto-remove items that crash when being loaded from storage. This will destroy those items instead of crashing the game!"); ConfigSection automation = root.subsection("automation"); formationPlaneEntityLimit = automation.addInt("formationPlaneEntityLimit", 128); @@ -511,15 +516,15 @@ public final class AEConfig { ConfigSection craftingCPU = root.subsection("craftingCPU"); this.craftingCalculationTimePerTick = craftingCPU.addInt("craftingCalculationTimePerTick", 5); - ConfigSection spatialio = root.subsection("spatialio"); this.spatialPowerMultiplier = spatialio.addDouble("spatialPowerMultiplier", 1250.0); this.spatialPowerExponent = spatialio.addDouble("spatialPowerExponent", 1.35); - this.spatialBlockTags = spatialio - .addBoolean("spatialBlockTags", false, "BE CAREFUL, CAN CORRUPT YOUR WORLD! Will use #spatial/whitelist as whitelist."); + this.spatialBlockTags = spatialio.addBoolean("spatialBlockTags", false, + "BE CAREFUL, CAN CORRUPT YOUR WORLD! Will use #spatial/whitelist as whitelist."); ConfigSection grindStone = root.subsection("GrindStone"); - this.oreDoublePercentage = grindStone.addDouble("oreDoublePercentage", 90.0, 0.0, 100.0, "Chance to actually get an output with stacksize > 1."); + this.oreDoublePercentage = grindStone.addDouble("oreDoublePercentage", 90.0, 0.0, 100.0, + "Chance to actually get an output with stacksize > 1."); ConfigSection battery = root.subsection("battery"); this.wirelessTerminalBattery = battery.addInt("wirelessTerminal", 1600000); @@ -559,7 +564,8 @@ public final class AEConfig { condenserMatterBallsPower = Condenser.addInt("MatterBalls", 256); condenserSingularityPower = Condenser.addInt("Singularity", 256000); - ConfigSection tickrates = root.subsection("tickRates", " Min / Max Tickrates for dynamic ticking, most of these components also use sleeping, to prevent constant ticking, adjust with care, non standard rates are not supported or tested."); + ConfigSection tickrates = root.subsection("tickRates", + " Min / Max Tickrates for dynamic ticking, most of these components also use sleeping, to prevent constant ticking, adjust with care, non standard rates are not supported or tested."); for (TickRates tickRate : TickRates.values()) { tickRateMin.put(tickRate, tickrates.addInt(tickRate.name() + "Min", tickRate.getDefaultMin())); tickRateMax.put(tickRate, tickrates.addInt(tickRate.name() + "Max", tickRate.getDefaultMax())); diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index ff8b6fa6f..1f09cd663 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -18,12 +18,12 @@ package appeng.core; -import appeng.api.parts.CableRenderMode; -import appeng.block.AEBaseBlock; -import appeng.client.ActionKey; -import appeng.client.EffectType; -import appeng.core.stats.AdvancementTriggers; -import appeng.core.sync.BasePacket; +import java.util.List; +import java.util.Random; +import java.util.stream.Stream; + +import javax.annotation.Nonnull; + import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.util.InputUtil; import net.minecraft.entity.player.PlayerEntity; @@ -32,10 +32,12 @@ import net.minecraft.util.Identifier; import net.minecraft.util.hit.HitResult; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Random; -import java.util.stream.Stream; +import appeng.api.parts.CableRenderMode; +import appeng.block.AEBaseBlock; +import appeng.client.ActionKey; +import appeng.client.EffectType; +import appeng.core.stats.AdvancementTriggers; +import appeng.core.sync.BasePacket; public interface AppEng { @@ -55,11 +57,9 @@ public interface AppEng { Stream getPlayers(); - void sendToAllNearExcept(PlayerEntity p, double x, double y, double z, double dist, World w, - BasePacket packet); + void sendToAllNearExcept(PlayerEntity p, double x, double y, double z, double dist, World w, BasePacket packet); - void spawnEffect(EffectType effect, World world, double posX, double posY, double posZ, - Object extra); + void spawnEffect(EffectType effect, World world, double posX, double posY, double posZ, Object extra); boolean shouldAddParticles(Random r); @@ -74,8 +74,8 @@ public interface AppEng { boolean isActionKey(@Nonnull final ActionKey key, int keyCode, int scanCode); /** - * Get the currently running server. On the client-side this may throw if no server - * is currently running or a remote server has been joined. + * Get the currently running server. On the client-side this may throw if no + * server is currently running or a remote server has been joined. * * @return The current server. Never null. */ diff --git a/src/main/java/appeng/core/AppEngBase.java b/src/main/java/appeng/core/AppEngBase.java index 145e7717a..305b5f5e4 100644 --- a/src/main/java/appeng/core/AppEngBase.java +++ b/src/main/java/appeng/core/AppEngBase.java @@ -1,5 +1,56 @@ package appeng.core; +import java.util.OptionalLong; +import java.util.function.Consumer; + +import net.earthcomputer.libstructure.LibStructure; +import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; +import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BannerBlockEntity; +import net.minecraft.block.entity.BeaconBlockEntity; +import net.minecraft.block.entity.BrewingStandBlockEntity; +import net.minecraft.block.entity.ChestBlockEntity; +import net.minecraft.block.entity.CommandBlockBlockEntity; +import net.minecraft.block.entity.ComparatorBlockEntity; +import net.minecraft.block.entity.DaylightDetectorBlockEntity; +import net.minecraft.block.entity.DispenserBlockEntity; +import net.minecraft.block.entity.DropperBlockEntity; +import net.minecraft.block.entity.EnchantingTableBlockEntity; +import net.minecraft.block.entity.EndPortalBlockEntity; +import net.minecraft.block.entity.EnderChestBlockEntity; +import net.minecraft.block.entity.FurnaceBlockEntity; +import net.minecraft.block.entity.HopperBlockEntity; +import net.minecraft.block.entity.MobSpawnerBlockEntity; +import net.minecraft.block.entity.PistonBlockEntity; +import net.minecraft.block.entity.ShulkerBoxBlockEntity; +import net.minecraft.block.entity.SignBlockEntity; +import net.minecraft.block.entity.SkullBlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeType; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.tag.BlockTags; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.dimension.DimensionType; +import net.minecraft.world.gen.GenerationStep; +import net.minecraft.world.gen.chunk.StructureConfig; +import net.minecraft.world.gen.decorator.Decorator; +import net.minecraft.world.gen.decorator.NopeDecoratorConfig; +import net.minecraft.world.gen.decorator.RangeDecoratorConfig; +import net.minecraft.world.gen.feature.DefaultFeatureConfig; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.feature.FeatureConfig; +import net.minecraft.world.gen.feature.OreFeatureConfig; + import appeng.api.config.Upgrades; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IItems; @@ -101,56 +152,6 @@ import appeng.tile.AEBaseBlockEntity; import appeng.worldgen.ChargedQuartzOreConfig; import appeng.worldgen.ChargedQuartzOreFeature; import appeng.worldgen.meteorite.MeteoriteStructure; -import net.earthcomputer.libstructure.LibStructure; -import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; -import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BannerBlockEntity; -import net.minecraft.block.entity.BeaconBlockEntity; -import net.minecraft.block.entity.BrewingStandBlockEntity; -import net.minecraft.block.entity.ChestBlockEntity; -import net.minecraft.block.entity.CommandBlockBlockEntity; -import net.minecraft.block.entity.ComparatorBlockEntity; -import net.minecraft.block.entity.DaylightDetectorBlockEntity; -import net.minecraft.block.entity.DispenserBlockEntity; -import net.minecraft.block.entity.DropperBlockEntity; -import net.minecraft.block.entity.EnchantingTableBlockEntity; -import net.minecraft.block.entity.EndPortalBlockEntity; -import net.minecraft.block.entity.EnderChestBlockEntity; -import net.minecraft.block.entity.FurnaceBlockEntity; -import net.minecraft.block.entity.HopperBlockEntity; -import net.minecraft.block.entity.MobSpawnerBlockEntity; -import net.minecraft.block.entity.PistonBlockEntity; -import net.minecraft.block.entity.ShulkerBoxBlockEntity; -import net.minecraft.block.entity.SignBlockEntity; -import net.minecraft.block.entity.SkullBlockEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeType; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.tag.BlockTags; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.dimension.DimensionType; -import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.chunk.StructureConfig; -import net.minecraft.world.gen.decorator.Decorator; -import net.minecraft.world.gen.decorator.NopeDecoratorConfig; -import net.minecraft.world.gen.decorator.RangeDecoratorConfig; -import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.FeatureConfig; -import net.minecraft.world.gen.feature.OreFeatureConfig; - -import java.util.OptionalLong; -import java.util.function.Consumer; public abstract class AppEngBase implements AppEng { @@ -167,7 +168,7 @@ public abstract class AppEngBase implements AppEng { AEConfig.load(FabricLoader.getInstance().getConfigDirectory()); CreativeTab.init(); - FacadeCreativeTab.init() ;// This call has a side-effect (adding it to the creative screen) + FacadeCreativeTab.init();// This call has a side-effect (adding it to the creative screen) AeStats.register(); advancementTriggers = new AdvancementTriggers(CriteriaRegisterMixin::callRegister); @@ -409,7 +410,8 @@ public abstract class AppEngBase implements AppEng { } private void registerRecipeSerializers() { - Registry.register(Registry.RECIPE_SERIALIZER, AppEng.makeId("quartz_knife"), QuartzKnifeRecipeSerializer.INSTANCE); + Registry.register(Registry.RECIPE_SERIALIZER, AppEng.makeId("quartz_knife"), + QuartzKnifeRecipeSerializer.INSTANCE); Registry.register(Registry.RECIPE_SERIALIZER, AppEng.makeId("grinder"), GrinderRecipeSerializer.INSTANCE); Registry.register(Registry.RECIPE_SERIALIZER, AppEng.makeId("inscriber"), InscriberRecipeSerializer.INSTANCE); Registry.register(Registry.RECIPE_SERIALIZER, AppEng.makeId("disassemble"), DisassembleRecipe.SERIALIZER); @@ -424,14 +426,12 @@ public abstract class AppEngBase implements AppEng { @Override public void sendToAllNearExcept(final PlayerEntity p, final double x, final double y, final double z, - final double dist, final World w, final BasePacket packet) { + final double dist, final World w, final BasePacket packet) { if (w.isClient()) { return; } - NetworkHandler.instance().sendToAllAround(packet, new TargetPoint( - x, y, z, dist, w - )); + NetworkHandler.instance().sendToAllAround(packet, new TargetPoint(x, y, z, dist, w)); } @Override @@ -449,10 +449,10 @@ public abstract class AppEngBase implements AppEng { this.renderModeBased = player; } - protected final void callDeferredBootstrapComponents(Class componentClass, Consumer invoker) { + protected final void callDeferredBootstrapComponents(Class componentClass, + Consumer invoker) { final ApiDefinitions definitions = Api.INSTANCE.definitions(); - definitions.getRegistry().getBootstrapComponents(componentClass) - .forEachRemaining(invoker); + definitions.getRegistry().getBootstrapComponents(componentClass).forEachRemaining(invoker); } protected CableRenderMode renderModeForPlayer(final PlayerEntity player) { @@ -485,31 +485,29 @@ public abstract class AppEngBase implements AppEng { CraftConfirmContainer::open); CraftingCPUContainer.TYPE = registerScreenHandler("craftingcpu", CraftingCPUContainer::fromNetwork, CraftingCPUContainer::open); - CraftingStatusContainer.TYPE = registerScreenHandler("craftingstatus", - CraftingStatusContainer::fromNetwork, CraftingStatusContainer::open); + CraftingStatusContainer.TYPE = registerScreenHandler("craftingstatus", CraftingStatusContainer::fromNetwork, + CraftingStatusContainer::open); CraftingTermContainer.TYPE = registerScreenHandler("craftingterm", CraftingTermContainer::fromNetwork, CraftingTermContainer::open); DriveContainer.TYPE = registerScreenHandler("drive", DriveContainer::fromNetwork, DriveContainer::open); - FormationPlaneContainer.TYPE = registerScreenHandler("formationplane", - FormationPlaneContainer::fromNetwork, FormationPlaneContainer::open); - GrinderContainer.TYPE = registerScreenHandler("grinder", GrinderContainer::fromNetwork, - GrinderContainer::open); + FormationPlaneContainer.TYPE = registerScreenHandler("formationplane", FormationPlaneContainer::fromNetwork, + FormationPlaneContainer::open); + GrinderContainer.TYPE = registerScreenHandler("grinder", GrinderContainer::fromNetwork, GrinderContainer::open); InscriberContainer.TYPE = registerScreenHandler("inscriber", InscriberContainer::fromNetwork, InscriberContainer::open); InterfaceContainer.TYPE = registerScreenHandler("interface", InterfaceContainer::fromNetwork, InterfaceContainer::open); InterfaceTerminalContainer.TYPE = registerScreenHandler("interfaceterminal", InterfaceTerminalContainer::fromNetwork, InterfaceTerminalContainer::open); - IOPortContainer.TYPE = registerScreenHandler("ioport", IOPortContainer::fromNetwork, - IOPortContainer::open); + IOPortContainer.TYPE = registerScreenHandler("ioport", IOPortContainer::fromNetwork, IOPortContainer::open); LevelEmitterContainer.TYPE = registerScreenHandler("levelemitter", LevelEmitterContainer::fromNetwork, LevelEmitterContainer::open); MolecularAssemblerContainer.TYPE = registerScreenHandler("molecular_assembler", MolecularAssemblerContainer::fromNetwork, MolecularAssemblerContainer::open); MEMonitorableContainer.TYPE = registerScreenHandler("memonitorable", MEMonitorableContainer::fromNetwork, MEMonitorableContainer::open); - MEPortableCellContainer.TYPE = registerScreenHandler("meportablecell", - MEPortableCellContainer::fromNetwork, MEPortableCellContainer::open); + MEPortableCellContainer.TYPE = registerScreenHandler("meportablecell", MEPortableCellContainer::fromNetwork, + MEPortableCellContainer::open); NetworkStatusContainer.TYPE = registerScreenHandler("networkstatus", NetworkStatusContainer::fromNetwork, NetworkStatusContainer::open); NetworkToolContainer.TYPE = registerScreenHandler("networktool", NetworkToolContainer::fromNetwork, @@ -521,8 +519,8 @@ public abstract class AppEngBase implements AppEng { QNBContainer.TYPE = registerScreenHandler("qnb", QNBContainer::fromNetwork, QNBContainer::open); QuartzKnifeContainer.TYPE = registerScreenHandler("quartzknife", QuartzKnifeContainer::fromNetwork, QuartzKnifeContainer::open); - SecurityStationContainer.TYPE = registerScreenHandler("securitystation", - SecurityStationContainer::fromNetwork, SecurityStationContainer::open); + SecurityStationContainer.TYPE = registerScreenHandler("securitystation", SecurityStationContainer::fromNetwork, + SecurityStationContainer::open); SkyChestContainer.TYPE = registerScreenHandler("skychest", SkyChestContainer::fromNetwork, SkyChestContainer::open); SpatialIOPortContainer.TYPE = registerScreenHandler("spatialioport", SpatialIOPortContainer::fromNetwork, @@ -542,8 +540,8 @@ public abstract class AppEngBase implements AppEng { FluidFormationPlaneContainer::fromNetwork, FluidFormationPlaneContainer::open); FluidIOContainer.TYPE = registerScreenHandler("fluid_io", FluidIOContainer::fromNetwork, FluidIOContainer::open); - FluidInterfaceContainer.TYPE = registerScreenHandler("fluid_interface", - FluidInterfaceContainer::fromNetwork, FluidInterfaceContainer::open); + FluidInterfaceContainer.TYPE = registerScreenHandler("fluid_interface", FluidInterfaceContainer::fromNetwork, + FluidInterfaceContainer::open); FluidLevelEmitterContainer.TYPE = registerScreenHandler("fluid_level_emitter", FluidLevelEmitterContainer::fromNetwork, FluidLevelEmitterContainer::open); FluidStorageBusContainer.TYPE = registerScreenHandler("fluid_storage_bus", @@ -553,21 +551,19 @@ public abstract class AppEngBase implements AppEng { } - private ScreenHandlerType registerScreenHandler(String id, ScreenHandlerRegistry.ExtendedClientHandlerFactory factory, ContainerOpener.Opener opener) { + private ScreenHandlerType registerScreenHandler(String id, + ScreenHandlerRegistry.ExtendedClientHandlerFactory factory, ContainerOpener.Opener opener) { ScreenHandlerType type = ScreenHandlerRegistry.registerExtended(AppEng.makeId(id), factory); ContainerOpener.addOpener(type, opener); return type; } private void registerWorldGen() { - LibStructure.registerStructure( - MeteoriteStructure.ID, - MeteoriteStructure.INSTANCE, - GenerationStep.Feature.TOP_LAYER_MODIFICATION, - new StructureConfig(32, 8, 124895654), - new MeteoriteStructure(DefaultFeatureConfig.CODEC).configure(DefaultFeatureConfig.INSTANCE) - ); - Registry.register(Registry.FEATURE, AppEng.makeId("charged_quartz_ore"), new ChargedQuartzOreFeature(ChargedQuartzOreConfig.CODEC)); + LibStructure.registerStructure(MeteoriteStructure.ID, MeteoriteStructure.INSTANCE, + GenerationStep.Feature.TOP_LAYER_MODIFICATION, new StructureConfig(32, 8, 124895654), + new MeteoriteStructure(DefaultFeatureConfig.CODEC).configure(DefaultFeatureConfig.INSTANCE)); + Registry.register(Registry.FEATURE, AppEng.makeId("charged_quartz_ore"), + new ChargedQuartzOreFeature(ChargedQuartzOreConfig.CODEC)); Biome.BIOMES.forEach(b -> { addMeteoriteWorldGen(b); @@ -593,12 +589,11 @@ public abstract class AppEngBase implements AppEng { } BlockState quartzOre = Api.instance().definitions().blocks().quartzOre().block().getDefaultState(); - b.addFeature(GenerationStep.Feature.UNDERGROUND_ORES, - Feature.ORE - .configure(new OreFeatureConfig(OreFeatureConfig.Target.NATURAL_STONE, - quartzOre, AEConfig.instance().getQuartzOresPerCluster())) - .createDecoratedFeature(Decorator.COUNT_RANGE.configure( - new RangeDecoratorConfig(AEConfig.instance().getQuartzOresClusterAmount(), 12, 12, 72)))); + b.addFeature(GenerationStep.Feature.UNDERGROUND_ORES, Feature.ORE + .configure(new OreFeatureConfig(OreFeatureConfig.Target.NATURAL_STONE, quartzOre, + AEConfig.instance().getQuartzOresPerCluster())) + .createDecoratedFeature(Decorator.COUNT_RANGE.configure( + new RangeDecoratorConfig(AEConfig.instance().getQuartzOresClusterAmount(), 12, 12, 72)))); if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) { @@ -626,24 +621,9 @@ public abstract class AppEngBase implements AppEng { RegisterDimensionTypeCallback.EVENT.register(registryTracker -> { - registryTracker.addDimensionType( - SpatialDimensionManager.STORAGE_DIMENSION_TYPE, - new DimensionType( - OptionalLong.of(12000), - false, - false, - false, - false, - false, - false, - true, - false, - false, - 256, - BlockTags.INFINIBURN_OVERWORLD.getId(), - 1.0f - ) - ); + registryTracker.addDimensionType(SpatialDimensionManager.STORAGE_DIMENSION_TYPE, + new DimensionType(OptionalLong.of(12000), false, false, false, false, false, false, true, false, + false, 256, BlockTags.INFINIBURN_OVERWORLD.getId(), 1.0f)); }); } diff --git a/src/main/java/appeng/core/AppEngClientStartup.java b/src/main/java/appeng/core/AppEngClientStartup.java index 34aa90091..de2e85796 100644 --- a/src/main/java/appeng/core/AppEngClientStartup.java +++ b/src/main/java/appeng/core/AppEngClientStartup.java @@ -1,8 +1,9 @@ package appeng.core; -import appeng.client.AppEngClient; import net.fabricmc.api.ClientModInitializer; +import appeng.client.AppEngClient; + @SuppressWarnings("unused") public class AppEngClientStartup implements ClientModInitializer { diff --git a/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java index 54558d535..d3c06eba5 100644 --- a/src/main/java/appeng/core/CreativeTab.java +++ b/src/main/java/appeng/core/CreativeTab.java @@ -18,17 +18,18 @@ package appeng.core; -import appeng.core.Api; -import appeng.api.definitions.IBlocks; -import appeng.api.definitions.IDefinitions; -import appeng.api.definitions.IItemDefinition; +import java.util.ArrayList; +import java.util.List; + import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.collection.DefaultedList; -import java.util.ArrayList; -import java.util.List; +import appeng.api.definitions.IBlocks; +import appeng.api.definitions.IDefinitions; +import appeng.api.definitions.IItemDefinition; +import appeng.core.Api; public final class CreativeTab { @@ -37,14 +38,11 @@ public final class CreativeTab { public static ItemGroup INSTANCE; public static void init() { - INSTANCE = FabricItemGroupBuilder.create(AppEng.makeId("main")) - .icon(() -> { - final IDefinitions definitions = Api.instance().definitions(); - final IBlocks blocks = definitions.blocks(); - return blocks.controller().stack(1); - }) - .appendItems(CreativeTab::fill) - .build(); + INSTANCE = FabricItemGroupBuilder.create(AppEng.makeId("main")).icon(() -> { + final IDefinitions definitions = Api.instance().definitions(); + final IBlocks blocks = definitions.blocks(); + return blocks.controller().stack(1); + }).appendItems(CreativeTab::fill).build(); } public static void add(IItemDefinition itemDef) { diff --git a/src/main/java/appeng/core/FacadeCreativeTab.java b/src/main/java/appeng/core/FacadeCreativeTab.java index 2dc664159..d560591a4 100644 --- a/src/main/java/appeng/core/FacadeCreativeTab.java +++ b/src/main/java/appeng/core/FacadeCreativeTab.java @@ -18,8 +18,11 @@ package appeng.core; -import appeng.items.parts.FacadeItem; +import java.util.ArrayList; +import java.util.List; + import com.google.common.base.Preconditions; + import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -29,8 +32,7 @@ import net.minecraft.item.Items; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.registry.Registry; -import java.util.ArrayList; -import java.util.List; +import appeng.items.parts.FacadeItem; public final class FacadeCreativeTab { @@ -40,16 +42,13 @@ public final class FacadeCreativeTab { public static void init() { Preconditions.checkState(group == null); - group = FabricItemGroupBuilder.create(AppEng.makeId("facades")) - .icon(() -> { - calculateSubTypes(); - if (subTypes.isEmpty()) { - return new ItemStack(Items.CAKE); - } - return subTypes.get(0); - }) - .appendItems(FacadeCreativeTab::fill) - .build(); + group = FabricItemGroupBuilder.create(AppEng.makeId("facades")).icon(() -> { + calculateSubTypes(); + if (subTypes.isEmpty()) { + return new ItemStack(Items.CAKE); + } + return subTypes.get(0); + }).appendItems(FacadeCreativeTab::fill).build(); } public static ItemGroup getGroup() { diff --git a/src/main/java/appeng/core/api/ApiClientHelper.java b/src/main/java/appeng/core/api/ApiClientHelper.java index 503a4fbd1..d1132a81c 100644 --- a/src/main/java/appeng/core/api/ApiClientHelper.java +++ b/src/main/java/appeng/core/api/ApiClientHelper.java @@ -43,8 +43,7 @@ public class ApiClientHelper implements IClientHelper { } @Override - public > void addCellInformation(ICellInventoryHandler handler, - List lines) { + public > void addCellInformation(ICellInventoryHandler handler, List lines) { if (handler == null) { return; } @@ -52,13 +51,11 @@ public class ApiClientHelper implements IClientHelper { final ICellInventory cellInventory = handler.getCellInv(); if (cellInventory != null) { - lines.add(new LiteralText(cellInventory.getUsedBytes() + " ") - .append(GuiText.Of.text()).append(" " + cellInventory.getTotalBytes() + " ") - .append(GuiText.BytesUsed.text())); + lines.add(new LiteralText(cellInventory.getUsedBytes() + " ").append(GuiText.Of.text()) + .append(" " + cellInventory.getTotalBytes() + " ").append(GuiText.BytesUsed.text())); - lines.add(new LiteralText(cellInventory.getStoredItemTypes() + " ") - .append(GuiText.Of.text()).append(" " + cellInventory.getTotalItemTypes() + " ") - .append(GuiText.Types.text())); + lines.add(new LiteralText(cellInventory.getStoredItemTypes() + " ").append(GuiText.Of.text()) + .append(" " + cellInventory.getTotalItemTypes() + " ").append(GuiText.Types.text())); } if (handler.isPreformatted()) { @@ -66,11 +63,9 @@ public class ApiClientHelper implements IClientHelper { : GuiText.Excluded).getLocal(); if (handler.isFuzzy()) { - lines.add(GuiText.Partitioned.text().copy().append(" - " + list + " ") - .append(GuiText.Fuzzy.text())); + lines.add(GuiText.Partitioned.text().copy().append(" - " + list + " ").append(GuiText.Fuzzy.text())); } else { - lines.add(GuiText.Partitioned.text().copy().append(" - " + list + " ") - .append(GuiText.Precise.text())); + lines.add(GuiText.Partitioned.text().copy().append(" - " + list + " ").append(GuiText.Precise.text())); } } diff --git a/src/main/java/appeng/core/api/ApiCrafting.java b/src/main/java/appeng/core/api/ApiCrafting.java index bee445985..d2b6edf23 100644 --- a/src/main/java/appeng/core/api/ApiCrafting.java +++ b/src/main/java/appeng/core/api/ApiCrafting.java @@ -65,7 +65,7 @@ public class ApiCrafting implements ICraftingHelper { @Override public ItemStack encodeCraftingPattern(@Nullable ItemStack stack, CraftingRecipe recipe, ItemStack[] in, - ItemStack out, boolean allowSubstitutes) { + ItemStack out, boolean allowSubstitutes) { if (stack == null) { stack = encodedPattern.stack(1); } else { diff --git a/src/main/java/appeng/core/api/ApiGrid.java b/src/main/java/appeng/core/api/ApiGrid.java index 43ed08686..45c8f2c25 100644 --- a/src/main/java/appeng/core/api/ApiGrid.java +++ b/src/main/java/appeng/core/api/ApiGrid.java @@ -18,9 +18,6 @@ package appeng.core.api; -import appeng.api.util.AEPartLocation; -import appeng.me.GridConnection; -import appeng.me.GridNode; import com.google.common.base.Preconditions; import appeng.api.exceptions.FailedConnectionException; @@ -28,6 +25,9 @@ import appeng.api.networking.IGridBlock; import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridHelper; import appeng.api.networking.IGridNode; +import appeng.api.util.AEPartLocation; +import appeng.me.GridConnection; +import appeng.me.GridNode; import appeng.util.Platform; /** diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index efd1decb9..7d0cb95e5 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -18,18 +18,18 @@ package appeng.core.api; -import appeng.parts.PartPlacement; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; import appeng.api.parts.CableRenderMode; import appeng.api.parts.IPartHelper; import appeng.core.AppEng; +import appeng.parts.PartPlacement; public class ApiPart implements IPartHelper { diff --git a/src/main/java/appeng/core/api/ApiStorage.java b/src/main/java/appeng/core/api/ApiStorage.java index b461d89c4..b3d1f82ca 100644 --- a/src/main/java/appeng/core/api/ApiStorage.java +++ b/src/main/java/appeng/core/api/ApiStorage.java @@ -22,13 +22,6 @@ import java.math.RoundingMode; import java.util.Collection; import java.util.Collections; -import alexiil.mc.lib.attributes.Simulation; -import alexiil.mc.lib.attributes.fluid.FluidAttributes; -import alexiil.mc.lib.attributes.fluid.FluidExtractable; -import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; -import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -import appeng.crafting.CraftingLink; -import appeng.fluids.util.FluidList; import com.google.common.base.Preconditions; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.MutableClassToInstanceMap; @@ -37,6 +30,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.fluid.FluidAttributes; +import alexiil.mc.lib.attributes.fluid.FluidExtractable; +import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; + import appeng.api.config.Actionable; import appeng.api.networking.crafting.ICraftingLink; import appeng.api.networking.crafting.ICraftingRequester; @@ -52,8 +51,10 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; +import appeng.crafting.CraftingLink; import appeng.fluids.items.FluidDummyItem; import appeng.fluids.util.AEFluidStack; +import appeng.fluids.util.FluidList; import appeng.util.Platform; import appeng.util.item.AEItemStack; import appeng.util.item.ItemList; @@ -184,10 +185,12 @@ public class ApiStorage implements IStorageHelper { if (input instanceof ItemStack) { final ItemStack is = (ItemStack) input; if (is.getItem() instanceof FluidDummyItem) { - return AEFluidStack.fromFluidVolume(((FluidDummyItem) is.getItem()).getFluidStack(is), RoundingMode.DOWN); + return AEFluidStack.fromFluidVolume(((FluidDummyItem) is.getItem()).getFluidStack(is), + RoundingMode.DOWN); } else { FluidExtractable fluidExtractable = FluidAttributes.EXTRACTABLE.get(is); - FluidVolume fluidVolume = fluidExtractable.attemptAnyExtraction(FluidAmount.MAX_VALUE, Simulation.ACTION); + FluidVolume fluidVolume = fluidExtractable.attemptAnyExtraction(FluidAmount.MAX_VALUE, + Simulation.ACTION); if (!fluidVolume.isEmpty()) { return AEFluidStack.fromFluidVolume(fluidVolume, RoundingMode.DOWN); } diff --git a/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java b/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java index 5463251b2..93434077e 100644 --- a/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java +++ b/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java @@ -29,19 +29,17 @@ import javax.annotation.Nullable; import com.google.common.base.Preconditions; import net.minecraft.item.Item; +import net.minecraft.util.Identifier; import appeng.api.client.ICellModelRegistry; import appeng.core.ApiDefinitions; -import net.minecraft.util.Identifier; public class ApiCellModelRegistry implements ICellModelRegistry { - private static final Identifier MODEL_BASE = new Identifier( - "appliedenergistics2:block/drive/drive_base"); + private static final Identifier MODEL_BASE = new Identifier("appliedenergistics2:block/drive/drive_base"); private static final Identifier MODEL_CELL_EMPTY = new Identifier( "appliedenergistics2:block/drive/drive_cell_empty"); - private static final Identifier MODEL_CELL_DEFAULT = new Identifier( - "appliedenergistics2:block/drive/drive_cell"); + private static final Identifier MODEL_CELL_DEFAULT = new Identifier("appliedenergistics2:block/drive/drive_cell"); private static final Identifier MODEL_CELL_ITEMS_1K = new Identifier( "appliedenergistics2:block/drive/cells/1k_item_cell"); private static final Identifier MODEL_CELL_ITEMS_4K = new Identifier( @@ -61,9 +59,9 @@ public class ApiCellModelRegistry implements ICellModelRegistry { private static final Identifier MODEL_CELL_CREATIVE = new Identifier( "appliedenergistics2:block/drive/cells/creative_cell"); - private static final Identifier[] MODELS = { MODEL_BASE, MODEL_CELL_EMPTY, MODEL_CELL_DEFAULT, - MODEL_CELL_ITEMS_1K, MODEL_CELL_ITEMS_4K, MODEL_CELL_ITEMS_16K, MODEL_CELL_ITEMS_64K, MODEL_CELL_FLUIDS_1K, - MODEL_CELL_FLUIDS_4K, MODEL_CELL_FLUIDS_16K, MODEL_CELL_FLUIDS_64K, MODEL_CELL_CREATIVE }; + private static final Identifier[] MODELS = { MODEL_BASE, MODEL_CELL_EMPTY, MODEL_CELL_DEFAULT, MODEL_CELL_ITEMS_1K, + MODEL_CELL_ITEMS_4K, MODEL_CELL_ITEMS_16K, MODEL_CELL_ITEMS_64K, MODEL_CELL_FLUIDS_1K, MODEL_CELL_FLUIDS_4K, + MODEL_CELL_FLUIDS_16K, MODEL_CELL_FLUIDS_64K, MODEL_CELL_CREATIVE }; public static Collection getModels() { return Arrays.asList(MODELS); diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 4f3a4726f..1490a1960 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -18,6 +18,19 @@ package appeng.core.api.definitions; +import static appeng.block.AEBaseBlock.defaultProps; +import static appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.*; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.entity.EntityDimensions; +import net.minecraft.entity.SpawnGroup; +import net.minecraft.sound.BlockSoundGroup; + import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlocks; import appeng.api.definitions.ITileDefinition; @@ -39,7 +52,6 @@ import appeng.block.spatial.SpatialPylonBlock; import appeng.block.storage.*; import appeng.block.storage.ChestBlock; import appeng.bootstrap.*; -import static appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; import appeng.bootstrap.components.IInitComponent; import appeng.bootstrap.definitions.TileEntityDefinition; import appeng.client.render.crafting.CraftingCubeRendering; @@ -78,17 +90,6 @@ import appeng.tile.storage.ChestBlockEntity; import appeng.tile.storage.DriveBlockEntity; import appeng.tile.storage.IOPortBlockEntity; import appeng.tile.storage.SkyChestBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; -import net.minecraft.block.*; -import net.minecraft.client.render.RenderLayer; -import net.minecraft.entity.EntityDimensions; -import net.minecraft.entity.SpawnGroup; -import net.minecraft.sound.BlockSoundGroup; - -import static appeng.block.AEBaseBlock.defaultProps; /** * Internal implementation for the API blocks @@ -173,16 +174,11 @@ public final class ApiBlocks implements IBlocks { private static final FabricBlockSettings QUARTZ_PROPERTIES = defaultProps(Material.STONE).strength(3, 5); - private static final FabricBlockSettings SKYSTONE_PROPERTIES = defaultProps(Material.STONE).strength(50, - 150); + private static final FabricBlockSettings SKYSTONE_PROPERTIES = defaultProps(Material.STONE).strength(50, 150); private static FabricBlockSettings glassProps() { - return defaultProps(Material.GLASS) - .sounds(BlockSoundGroup.GLASS) - .nonOpaque() - .allowsSpawning((state, world, pos, type) -> false) - .nonOpaque() - .suffocates((state, world, pos) -> false) + return defaultProps(Material.GLASS).sounds(BlockSoundGroup.GLASS).nonOpaque() + .allowsSpawning((state, world, pos, type) -> false).nonOpaque().suffocates((state, world, pos) -> false) .blockVision((state, world, pos) -> false); } @@ -215,8 +211,7 @@ public final class ApiBlocks implements IBlocks { } }).build(); this.quartzVibrantGlass = deco - .block("quartz_vibrant_glass", - () -> new QuartzLampBlock(glassProps().lightLevel(15))) + .block("quartz_vibrant_glass", () -> new QuartzLampBlock(glassProps().lightLevel(15))) .addFeatures(AEFeature.DECORATIVE_LIGHTS, AEFeature.QUARTZ_GLASS) .rendering(new BlockRenderingCustomizer() { @Override @@ -238,11 +233,10 @@ public final class ApiBlocks implements IBlocks { this.fluixBlock = registry.features(AEFeature.FLUIX) .block("fluix_block", () -> new AEDecorativeBlock(QUARTZ_PROPERTIES)).build(); - this.skyStoneBlock = registry - .features( - AEFeature.SKY_STONE) - .block("sky_stone_block", () -> new SkyStoneBlock(SkystoneType.STONE, - defaultProps(Material.STONE).strength(50, 150).breakByTool(FabricToolTags.PICKAXES, 3))) + this.skyStoneBlock = registry.features(AEFeature.SKY_STONE) + .block("sky_stone_block", + () -> new SkyStoneBlock(SkystoneType.STONE, + defaultProps(Material.STONE).strength(50, 150).breakByTool(FabricToolTags.PICKAXES, 3))) .build(); this.smoothSkyStoneBlock = registry.features(AEFeature.SKY_STONE) @@ -255,9 +249,7 @@ public final class ApiBlocks implements IBlocks { .block("sky_stone_small_brick", () -> new SkyStoneBlock(SkystoneType.SMALL_BRICK, SKYSTONE_PROPERTIES)) .addFeatures(AEFeature.SKY_STONE).build(); - AbstractBlock.Settings skyStoneChestProps = defaultProps(Material.STONE) - .strength(50, 150) - .nonOpaque(); + AbstractBlock.Settings skyStoneChestProps = defaultProps(Material.STONE).strength(50, 150).nonOpaque(); TileEntityDefinition skyChestTile = registry .tileEntity("sky_chest", SkyChestBlockEntity.class, SkyChestBlockEntity::new) @@ -284,7 +276,8 @@ public final class ApiBlocks implements IBlocks { this.grindstone = registry .block("grindstone", () -> new GrinderBlock(defaultProps(Material.STONE).strength(3.2f))) .features(AEFeature.GRIND_STONE) - .tileEntity(registry.tileEntity("grindstone", GrinderBlockEntity.class, GrinderBlockEntity::new).build()) + .tileEntity( + registry.tileEntity("grindstone", GrinderBlockEntity.class, GrinderBlockEntity::new).build()) .build(); this.crank = registry .block("crank", @@ -305,11 +298,12 @@ public final class ApiBlocks implements IBlocks { .tileEntity(registry.tileEntity("inscriber", InscriberBlockEntity.class, InscriberBlockEntity::new) .rendering(new InscriberRendering()).build()) .build(); - this.wirelessAccessPoint = registry.block("wireless_access_point", WirelessBlock::new) - .features(AEFeature.WIRELESS_ACCESS_TERMINAL) - .tileEntity(registry - .tileEntity("wireless_access_point", WirelessBlockEntity.class, WirelessBlockEntity::new).build()) - .rendering(new WirelessRendering()).build(); + this.wirelessAccessPoint = registry.block("wireless_access_point", WirelessBlock::new) + .features(AEFeature.WIRELESS_ACCESS_TERMINAL) + .tileEntity(registry + .tileEntity("wireless_access_point", WirelessBlockEntity.class, WirelessBlockEntity::new) + .build()) + .rendering(new WirelessRendering()).build(); this.charger = registry.block("charger", ChargerBlock::new).features(AEFeature.CHARGER) .tileEntity(registry.tileEntity("charger", ChargerBlockEntity.class, ChargerBlockEntity::new) .rendering(new TileEntityRenderingCustomizer() { @@ -324,8 +318,7 @@ public final class ApiBlocks implements IBlocks { TinyTNTPrimedEntity.TYPE = registry .entity("tiny_tnt_primed", TinyTNTPrimedEntity::new, SpawnGroup.MISC) // Entity properties are a copy of the standard TNT entity - .customize(p -> p.trackable(10, 10, true).dimensions(EntityDimensions.fixed(0.98f, 0.98f))) - .build(); + .customize(p -> p.trackable(10, 10, true).dimensions(EntityDimensions.fixed(0.98f, 0.98f))).build(); this.tinyTNT = registry .block("tiny_tnt", @@ -334,46 +327,45 @@ public final class ApiBlocks implements IBlocks { .features(AEFeature.TINY_TNT).bootstrap((block, item) -> (IInitComponent) () -> DispenserBlock .registerBehavior(item, new TinyTNTDispenseItemBehavior())) .build(); - this.securityStation = registry.block("security_station", SecurityStationBlock::new) - .features(AEFeature.SECURITY) - .tileEntity(registry - .tileEntity("security_station", SecurityStationBlockEntity.class, SecurityStationBlockEntity::new) - .build()) - .rendering(new SecurityStationRendering()).build(); + this.securityStation = registry.block("security_station", SecurityStationBlock::new) + .features(AEFeature.SECURITY).tileEntity(registry.tileEntity("security_station", + SecurityStationBlockEntity.class, SecurityStationBlockEntity::new).build()) + .rendering(new SecurityStationRendering()).build(); - TileEntityDefinition quantumRingTile = registry - .tileEntity("quantum_ring", QuantumBridgeBlockEntity.class, QuantumBridgeBlockEntity::new).build(); - this.quantumRing = registry.block("quantum_ring", QuantumRingBlock::new) - .features(AEFeature.QUANTUM_NETWORK_BRIDGE).tileEntity(quantumRingTile) - .rendering(new QuantumBridgeRendering()).build(); - this.quantumLink = registry.block("quantum_link", QuantumLinkChamberBlock::new) - .features(AEFeature.QUANTUM_NETWORK_BRIDGE).tileEntity(quantumRingTile) - .rendering(new QuantumBridgeRendering()).build(); - this.spatialPylon = registry.block("spatial_pylon", SpatialPylonBlock::new).features(AEFeature.SPATIAL_IO) - .tileEntity(registry - .tileEntity("spatial_pylon", SpatialPylonBlockEntity.class, SpatialPylonBlockEntity::new).build()) - .rendering(new SpatialPylonRendering()).build(); - this.spatialIOPort = registry.block("spatial_io_port", SpatialIOPortBlock::new).features(AEFeature.SPATIAL_IO) - .tileEntity(registry - .tileEntity("spatial_io_port", SpatialIOPortBlockEntity.class, SpatialIOPortBlockEntity::new) - .build()) - .build(); - this.controller = registry - .block("controller", ControllerBlock::new).features(AEFeature.CHANNELS).tileEntity(registry - .tileEntity("controller", ControllerBlockEntity.class, ControllerBlockEntity::new).build()) - .rendering(new ControllerRendering()).build(); - this.drive = registry.block("drive", DriveBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.ME_DRIVE) - .tileEntity(registry.tileEntity("drive", DriveBlockEntity.class, DriveBlockEntity::new) - .rendering(new TileEntityRenderingCustomizer() { - @Override - @Environment(EnvType.CLIENT) - public void customize(TileEntityRendering rendering) { - rendering.tileEntityRenderer(DriveLedTileEntityRenderer::new); - } - }).build()) - .rendering(new DriveRendering()).build(); - this.chest = registry.block("chest", ChestBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.ME_CHEST) - .tileEntity(registry.tileEntity("chest", ChestBlockEntity.class, ChestBlockEntity::new) + TileEntityDefinition quantumRingTile = registry + .tileEntity("quantum_ring", QuantumBridgeBlockEntity.class, QuantumBridgeBlockEntity::new).build(); + this.quantumRing = registry.block("quantum_ring", QuantumRingBlock::new) + .features(AEFeature.QUANTUM_NETWORK_BRIDGE).tileEntity(quantumRingTile) + .rendering(new QuantumBridgeRendering()).build(); + this.quantumLink = registry.block("quantum_link", QuantumLinkChamberBlock::new) + .features(AEFeature.QUANTUM_NETWORK_BRIDGE).tileEntity(quantumRingTile) + .rendering(new QuantumBridgeRendering()).build(); + this.spatialPylon = registry.block("spatial_pylon", SpatialPylonBlock::new).features(AEFeature.SPATIAL_IO) + .tileEntity(registry + .tileEntity("spatial_pylon", SpatialPylonBlockEntity.class, SpatialPylonBlockEntity::new) + .build()) + .rendering(new SpatialPylonRendering()).build(); + this.spatialIOPort = registry.block("spatial_io_port", SpatialIOPortBlock::new).features(AEFeature.SPATIAL_IO) + .tileEntity(registry + .tileEntity("spatial_io_port", SpatialIOPortBlockEntity.class, SpatialIOPortBlockEntity::new) + .build()) + .build(); + this.controller = registry + .block("controller", ControllerBlock::new).features(AEFeature.CHANNELS).tileEntity(registry + .tileEntity("controller", ControllerBlockEntity.class, ControllerBlockEntity::new).build()) + .rendering(new ControllerRendering()).build(); + this.drive = registry.block("drive", DriveBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.ME_DRIVE) + .tileEntity(registry.tileEntity("drive", DriveBlockEntity.class, DriveBlockEntity::new) + .rendering(new TileEntityRenderingCustomizer() { + @Override + @Environment(EnvType.CLIENT) + public void customize(TileEntityRendering rendering) { + rendering.tileEntityRenderer(DriveLedTileEntityRenderer::new); + } + }).build()) + .rendering(new DriveRendering()).build(); + this.chest = registry.block("chest", ChestBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.ME_CHEST) + .tileEntity(registry.tileEntity("chest", ChestBlockEntity.class, ChestBlockEntity::new) .rendering(new TileEntityRenderingCustomizer() { @Override @Environment(EnvType.CLIENT) @@ -381,138 +373,140 @@ public final class ApiBlocks implements IBlocks { rendering.tileEntityRenderer(ChestTileEntityRenderer::new); } }).build()) - .rendering(new ChestRendering()).build(); - this.iface = registry.block("interface", InterfaceBlock::new).features(AEFeature.INTERFACE) - .tileEntity( - registry.tileEntity("interface", InterfaceBlockEntity.class, InterfaceBlockEntity::new).build()) - .build(); - this.fluidIface = registry.block("fluid_interface", FluidInterfaceBlock::new) - .features(AEFeature.FLUID_INTERFACE) - .tileEntity(registry - .tileEntity("fluid_interface", FluidInterfaceBlockEntity.class, FluidInterfaceBlockEntity::new) - .build()) - .build(); - this.cellWorkbench = registry.block("cell_workbench", CellWorkbenchBlock::new).features(AEFeature.STORAGE_CELLS) - .tileEntity(registry - .tileEntity("cell_workbench", CellWorkbenchBlockEntity.class, CellWorkbenchBlockEntity::new) - .build()) - .build(); - this.iOPort = registry.block("io_port", IOPortBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.IO_PORT) - .tileEntity(registry.tileEntity("io_port", IOPortBlockEntity.class, IOPortBlockEntity::new).build()) - .build(); - this.condenser = registry.block("condenser", CondenserBlock::new).features(AEFeature.CONDENSER) - .tileEntity( - registry.tileEntity("condenser", CondenserBlockEntity.class, CondenserBlockEntity::new).build()) - .build(); - this.energyAcceptor = registry.block("energy_acceptor", EnergyAcceptorBlock::new) - .features(AEFeature.ENERGY_ACCEPTOR) - .tileEntity(registry - .tileEntity("energy_acceptor", EnergyAcceptorBlockEntity.class, EnergyAcceptorBlockEntity::new) - .build()) - .build(); - this.vibrationChamber = registry.block("vibration_chamber", VibrationChamberBlock::new) - .features(AEFeature.POWER_GEN).tileEntity(registry.tileEntity("vibration_chamber", - VibrationChamberBlockEntity.class, VibrationChamberBlockEntity::new).build()) - .build(); - this.quartzGrowthAccelerator = registry.block("quartz_growth_accelerator", QuartzGrowthAcceleratorBlock::new) - .tileEntity(registry.tileEntity("quartz_growth_accelerator", QuartzGrowthAcceleratorBlockEntity.class, - QuartzGrowthAcceleratorBlockEntity::new).build()) - .features(AEFeature.CRYSTAL_GROWTH_ACCELERATOR).build(); - this.energyCell = registry.block("energy_cell", EnergyCellBlock::new).features(AEFeature.ENERGY_CELLS) - .item(AEBaseBlockItemChargeable::new).tileEntity(registry - .tileEntity("energy_cell", EnergyCellBlockEntity.class, EnergyCellBlockEntity::new).build()) - .build(); - this.energyCellDense = registry.block("dense_energy_cell", DenseEnergyCellBlock::new) - .features(AEFeature.ENERGY_CELLS, AEFeature.DENSE_ENERGY_CELLS).item(AEBaseBlockItemChargeable::new) - .tileEntity(registry.tileEntity("dense_energy_cell", DenseEnergyCellBlockEntity.class, - DenseEnergyCellBlockEntity::new).build()) - .build(); - this.energyCellCreative = registry.block("creative_energy_cell", CreativeEnergyCellBlock::new) - .features(AEFeature.CREATIVE).tileEntity(registry.tileEntity("creative_energy_cell", - CreativeEnergyCellBlockEntity.class, CreativeEnergyCellBlockEntity::new).build()) - .build(); + .rendering(new ChestRendering()).build(); + this.iface = registry.block("interface", InterfaceBlock::new).features(AEFeature.INTERFACE) + .tileEntity( + registry.tileEntity("interface", InterfaceBlockEntity.class, InterfaceBlockEntity::new).build()) + .build(); + this.fluidIface = registry.block("fluid_interface", FluidInterfaceBlock::new) + .features(AEFeature.FLUID_INTERFACE) + .tileEntity(registry + .tileEntity("fluid_interface", FluidInterfaceBlockEntity.class, FluidInterfaceBlockEntity::new) + .build()) + .build(); + this.cellWorkbench = registry.block("cell_workbench", CellWorkbenchBlock::new).features(AEFeature.STORAGE_CELLS) + .tileEntity(registry + .tileEntity("cell_workbench", CellWorkbenchBlockEntity.class, CellWorkbenchBlockEntity::new) + .build()) + .build(); + this.iOPort = registry.block("io_port", IOPortBlock::new).features(AEFeature.STORAGE_CELLS, AEFeature.IO_PORT) + .tileEntity(registry.tileEntity("io_port", IOPortBlockEntity.class, IOPortBlockEntity::new).build()) + .build(); + this.condenser = registry.block("condenser", CondenserBlock::new).features(AEFeature.CONDENSER) + .tileEntity( + registry.tileEntity("condenser", CondenserBlockEntity.class, CondenserBlockEntity::new).build()) + .build(); + this.energyAcceptor = registry.block("energy_acceptor", EnergyAcceptorBlock::new) + .features(AEFeature.ENERGY_ACCEPTOR) + .tileEntity(registry + .tileEntity("energy_acceptor", EnergyAcceptorBlockEntity.class, EnergyAcceptorBlockEntity::new) + .build()) + .build(); + this.vibrationChamber = registry.block("vibration_chamber", VibrationChamberBlock::new) + .features(AEFeature.POWER_GEN).tileEntity(registry.tileEntity("vibration_chamber", + VibrationChamberBlockEntity.class, VibrationChamberBlockEntity::new).build()) + .build(); + this.quartzGrowthAccelerator = registry.block("quartz_growth_accelerator", QuartzGrowthAcceleratorBlock::new) + .tileEntity(registry.tileEntity("quartz_growth_accelerator", QuartzGrowthAcceleratorBlockEntity.class, + QuartzGrowthAcceleratorBlockEntity::new).build()) + .features(AEFeature.CRYSTAL_GROWTH_ACCELERATOR).build(); + this.energyCell = registry.block("energy_cell", EnergyCellBlock::new).features(AEFeature.ENERGY_CELLS) + .item(AEBaseBlockItemChargeable::new).tileEntity(registry + .tileEntity("energy_cell", EnergyCellBlockEntity.class, EnergyCellBlockEntity::new).build()) + .build(); + this.energyCellDense = registry.block("dense_energy_cell", DenseEnergyCellBlock::new) + .features(AEFeature.ENERGY_CELLS, AEFeature.DENSE_ENERGY_CELLS).item(AEBaseBlockItemChargeable::new) + .tileEntity(registry.tileEntity("dense_energy_cell", DenseEnergyCellBlockEntity.class, + DenseEnergyCellBlockEntity::new).build()) + .build(); + this.energyCellCreative = registry.block("creative_energy_cell", CreativeEnergyCellBlock::new) + .features(AEFeature.CREATIVE).tileEntity(registry.tileEntity("creative_energy_cell", + CreativeEnergyCellBlockEntity.class, CreativeEnergyCellBlockEntity::new).build()) + .build(); - TileEntityDefinition craftingUnit = registry - .tileEntity("crafting_unit", CraftingBlockEntity.class, CraftingBlockEntity::new).build(); + TileEntityDefinition craftingUnit = registry + .tileEntity("crafting_unit", CraftingBlockEntity.class, CraftingBlockEntity::new).build(); - FeatureFactory crafting = registry.features(AEFeature.CRAFTING_CPU); - AbstractBlock.Settings craftingBlockProps = defaultProps(Material.METAL); - this.craftingUnit = crafting - .block("crafting_unit", () -> new CraftingUnitBlock(craftingBlockProps, CraftingUnitType.UNIT)) - .rendering(new CraftingCubeRendering()).tileEntity(craftingUnit).build(); - this.craftingAccelerator = crafting - .block("crafting_accelerator", - () -> new CraftingUnitBlock(craftingBlockProps, CraftingUnitType.ACCELERATOR)) - .rendering(new CraftingCubeRendering()).tileEntity(craftingUnit).build(); + FeatureFactory crafting = registry.features(AEFeature.CRAFTING_CPU); + AbstractBlock.Settings craftingBlockProps = defaultProps(Material.METAL); + this.craftingUnit = crafting + .block("crafting_unit", () -> new CraftingUnitBlock(craftingBlockProps, CraftingUnitType.UNIT)) + .rendering(new CraftingCubeRendering()).tileEntity(craftingUnit).build(); + this.craftingAccelerator = crafting + .block("crafting_accelerator", + () -> new CraftingUnitBlock(craftingBlockProps, CraftingUnitType.ACCELERATOR)) + .rendering(new CraftingCubeRendering()).tileEntity(craftingUnit).build(); - TileEntityDefinition craftingStorage = registry - .tileEntity("crafting_storage", CraftingStorageBlockEntity.class, CraftingStorageBlockEntity::new) - .build(); - this.craftingStorage1k = crafting - .block("1k_crafting_storage", - () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_1K)) - .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) - .build(); - this.craftingStorage4k = crafting - .block("4k_crafting_storage", - () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_4K)) - .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) - .build(); - this.craftingStorage16k = crafting - .block("16k_crafting_storage", - () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_16K)) - .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) - .build(); - this.craftingStorage64k = crafting - .block("64k_crafting_storage", - () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_64K)) - .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) - .build(); - this.craftingMonitor = crafting.block("crafting_monitor", () -> new CraftingMonitorBlock(craftingBlockProps)) - .tileEntity(registry - .tileEntity("crafting_monitor", CraftingMonitorBlockEntity.class, CraftingMonitorBlockEntity::new) - .rendering(new TileEntityRenderingCustomizer() { - @Environment(EnvType.CLIENT) - @Override - public void customize(TileEntityRendering rendering) { - rendering.tileEntityRenderer(CraftingMonitorTESR::new); - } - }).build()) - .rendering(new BlockRenderingCustomizer() { - @Override - @Environment(EnvType.CLIENT) - public void customize(IBlockRendering rendering, IItemRendering itemRendering) { - rendering.renderType(RenderLayer.getCutout()); - rendering.modelCustomizer((path, model) -> { - // The formed model handles rotations itself, the unformed one does not - if (model instanceof MonitorBakedModel) { - return model; - } - return new AutoRotatingBakedModel(model); - }); - } - }).build(); + TileEntityDefinition craftingStorage = registry + .tileEntity("crafting_storage", CraftingStorageBlockEntity.class, CraftingStorageBlockEntity::new) + .build(); + this.craftingStorage1k = crafting + .block("1k_crafting_storage", + () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_1K)) + .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) + .build(); + this.craftingStorage4k = crafting + .block("4k_crafting_storage", + () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_4K)) + .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) + .build(); + this.craftingStorage16k = crafting + .block("16k_crafting_storage", + () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_16K)) + .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) + .build(); + this.craftingStorage64k = crafting + .block("64k_crafting_storage", + () -> new CraftingStorageBlock(craftingBlockProps, CraftingUnitType.STORAGE_64K)) + .item(CraftingStorageItem::new).tileEntity(craftingStorage).rendering(new CraftingCubeRendering()) + .build(); + this.craftingMonitor = crafting.block("crafting_monitor", () -> new CraftingMonitorBlock(craftingBlockProps)) + .tileEntity(registry + .tileEntity("crafting_monitor", CraftingMonitorBlockEntity.class, + CraftingMonitorBlockEntity::new) + .rendering(new TileEntityRenderingCustomizer() { + @Environment(EnvType.CLIENT) + @Override + public void customize(TileEntityRendering rendering) { + rendering.tileEntityRenderer(CraftingMonitorTESR::new); + } + }).build()) + .rendering(new BlockRenderingCustomizer() { + @Override + @Environment(EnvType.CLIENT) + public void customize(IBlockRendering rendering, IItemRendering itemRendering) { + rendering.renderType(RenderLayer.getCutout()); + rendering.modelCustomizer((path, model) -> { + // The formed model handles rotations itself, the unformed one does not + if (model instanceof MonitorBakedModel) { + return model; + } + return new AutoRotatingBakedModel(model); + }); + } + }).build(); - this.molecularAssembler = registry - .block("molecular_assembler", () -> new MolecularAssemblerBlock(defaultProps(Material.METAL).nonOpaque())) - .features(AEFeature.MOLECULAR_ASSEMBLER).rendering(new BlockRenderingCustomizer() { - @Environment(EnvType.CLIENT) - @Override - public void customize(IBlockRendering rendering, IItemRendering itemRendering) { - rendering.renderType(RenderLayer.getCutout()); - } - }) - .tileEntity(registry - .tileEntity("molecular_assembler", MolecularAssemblerBlockEntity.class, - MolecularAssemblerBlockEntity::new) - .rendering(new TileEntityRenderingCustomizer() { - @Override - @Environment(EnvType.CLIENT) - public void customize(TileEntityRendering rendering) { - rendering.tileEntityRenderer(MolecularAssemblerRenderer::new); - } - }).build()) - .build(); + this.molecularAssembler = registry + .block("molecular_assembler", + () -> new MolecularAssemblerBlock(defaultProps(Material.METAL).nonOpaque())) + .features(AEFeature.MOLECULAR_ASSEMBLER).rendering(new BlockRenderingCustomizer() { + @Environment(EnvType.CLIENT) + @Override + public void customize(IBlockRendering rendering, IItemRendering itemRendering) { + rendering.renderType(RenderLayer.getCutout()); + } + }) + .tileEntity(registry + .tileEntity("molecular_assembler", MolecularAssemblerBlockEntity.class, + MolecularAssemblerBlockEntity::new) + .rendering(new TileEntityRenderingCustomizer() { + @Override + @Environment(EnvType.CLIENT) + public void customize(TileEntityRendering rendering) { + rendering.tileEntityRenderer(MolecularAssemblerRenderer::new); + } + }).build()) + .build(); this.lightDetector = registry.block("light_detector", LightDetectorBlock::new) .features(AEFeature.LIGHT_DETECTOR) @@ -526,8 +520,8 @@ public final class ApiBlocks implements IBlocks { rendering.renderType(RenderLayer.getCutout()); } }).build(); - this.paint = registry - .block("paint", PaintSplotchesBlock::new).features(AEFeature.PAINT_BALLS).tileEntity(registry + this.paint = registry.block("paint", PaintSplotchesBlock::new).features(AEFeature.PAINT_BALLS) + .tileEntity(registry .tileEntity("paint", PaintSplotchesBlockEntity.class, PaintSplotchesBlockEntity::new).build()) .rendering(new PaintSplotchesRendering()).build(); @@ -535,17 +529,15 @@ public final class ApiBlocks implements IBlocks { .block("sky_stone_stairs", () -> new AEStairsBlock(this.skyStoneBlock().block().getDefaultState(), SKYSTONE_PROPERTIES)) .addFeatures(AEFeature.SKY_STONE).build(); - this.smoothSkyStoneStairs = deco - .block("smooth_sky_stone_stairs", - () -> new AEStairsBlock(this.smoothSkyStoneBlock().block().getDefaultState(), SKYSTONE_PROPERTIES)) + this.smoothSkyStoneStairs = deco.block("smooth_sky_stone_stairs", + () -> new AEStairsBlock(this.smoothSkyStoneBlock().block().getDefaultState(), SKYSTONE_PROPERTIES)) .addFeatures(AEFeature.SKY_STONE).build(); this.skyStoneBrickStairs = deco .block("sky_stone_brick_stairs", () -> new AEStairsBlock(this.skyStoneBrick().block().getDefaultState(), SKYSTONE_PROPERTIES)) .addFeatures(AEFeature.SKY_STONE).build(); - this.skyStoneSmallBrickStairs = deco - .block("sky_stone_small_brick_stairs", - () -> new AEStairsBlock(this.skyStoneSmallBrick().block().getDefaultState(), SKYSTONE_PROPERTIES)) + this.skyStoneSmallBrickStairs = deco.block("sky_stone_small_brick_stairs", + () -> new AEStairsBlock(this.skyStoneSmallBrick().block().getDefaultState(), SKYSTONE_PROPERTIES)) .addFeatures(AEFeature.SKY_STONE).build(); this.fluixStairs = deco @@ -556,9 +548,8 @@ public final class ApiBlocks implements IBlocks { .block("quartz_stairs", () -> new AEStairsBlock(this.quartzBlock().block().getDefaultState(), QUARTZ_PROPERTIES)) .addFeatures(AEFeature.CERTUS).build(); - this.chiseledQuartzStairs = deco - .block("chiseled_quartz_stairs", - () -> new AEStairsBlock(this.chiseledQuartzBlock().block().getDefaultState(), QUARTZ_PROPERTIES)) + this.chiseledQuartzStairs = deco.block("chiseled_quartz_stairs", + () -> new AEStairsBlock(this.chiseledQuartzBlock().block().getDefaultState(), QUARTZ_PROPERTIES)) .addFeatures(AEFeature.CERTUS).build(); this.quartzPillarStairs = deco .block("quartz_pillar_stairs", @@ -595,9 +586,8 @@ public final class ApiBlocks implements IBlocks { .addFeatures(AEFeature.CERTUS).build(); this.itemGen = registry.block("debug_item_gen", ItemGenBlock::new) - .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) - .tileEntity( - registry.tileEntity("debug_item_gen", ItemGenBlockEntity.class, ItemGenBlockEntity::new).build()) + .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE).tileEntity(registry + .tileEntity("debug_item_gen", ItemGenBlockEntity.class, ItemGenBlockEntity::new).build()) .build(); this.chunkLoader = registry.block("debug_chunk_loader", ChunkLoaderBlock::new) .features(AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE) diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java index 1df885282..cfd6dca6a 100644 --- a/src/main/java/appeng/core/api/definitions/ApiItems.java +++ b/src/main/java/appeng/core/api/definitions/ApiItems.java @@ -18,6 +18,15 @@ package appeng.core.api.definitions; +import java.util.function.Consumer; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.entity.EntityDimensions; +import net.minecraft.entity.SpawnGroup; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; + import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IItems; import appeng.api.features.AEFeature; @@ -55,14 +64,6 @@ import appeng.items.tools.MemoryCardItem; import appeng.items.tools.NetworkToolItem; import appeng.items.tools.powered.*; import appeng.items.tools.quartz.*; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.entity.EntityDimensions; -import net.minecraft.entity.SpawnGroup; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; - -import java.util.function.Consumer; /** * Internal implementation for the API items @@ -183,7 +184,7 @@ public final class ApiItems implements IItems { Consumer chargedDefaults = props -> props.maxCount(1).maxDamage(32); - FeatureFactory powerTools = registry.features(AEFeature.POWERED_TOOLS); + FeatureFactory powerTools = registry.features(AEFeature.POWERED_TOOLS); this.entropyManipulator = powerTools.item("entropy_manipulator", EntropyManipulatorItem::new) .props(chargedDefaults).addFeatures(AEFeature.ENTROPY_MANIPULATOR) .dispenserBehavior(BlockToolDispenseItemBehavior::new).build(); @@ -195,16 +196,23 @@ public final class ApiItems implements IItems { .addFeatures(AEFeature.MATTER_CANNON).dispenserBehavior(MatterCannonDispenseItemBehavior::new).build(); this.portableCell = powerTools.item("portable_cell", PortableCellItem::new).props(chargedDefaults) .addFeatures(AEFeature.PORTABLE_CELL, AEFeature.STORAGE_CELLS).build(); - this.colorApplicator = powerTools.item("color_applicator", ColorApplicatorItem::new).props(chargedDefaults) - .addFeatures(AEFeature.COLOR_APPLICATOR).dispenserBehavior(BlockToolDispenseItemBehavior::new) - .rendering(new ColorApplicatorItemRendering()).build(); + this.colorApplicator = powerTools.item("color_applicator", ColorApplicatorItem::new).props(chargedDefaults) + .addFeatures(AEFeature.COLOR_APPLICATOR).dispenserBehavior(BlockToolDispenseItemBehavior::new) + .rendering(new ColorApplicatorItemRendering()).build(); - this.biometricCard = registry.item("biometric_card", BiometricCardItem::new) - .props(props -> props.maxCount(1)).features(AEFeature.SECURITY).build(); + this.biometricCard = registry.item("biometric_card", BiometricCardItem::new).props(props -> props.maxCount(1)) + .features(AEFeature.SECURITY).build(); this.memoryCard = registry.item("memory_card", MemoryCardItem::new).props(props -> props.maxCount(1)) .features(AEFeature.MEMORY_CARD).build(); - this.networkTool = registry.item("network_tool", NetworkToolItem::new) - .props(props -> props.maxCount(1)) // FIXME FABRIC .addToolType(FabricToolTags.get("wrench"), 0) (how???, just add a tag???) + this.networkTool = registry.item("network_tool", NetworkToolItem::new).props(props -> props.maxCount(1)) // FIXME + // FABRIC + // .addToolType(FabricToolTags.get("wrench"), + // 0) + // (how???, + // just + // add + // a + // tag???) .features(AEFeature.NETWORK_TOOL).build(); this.cellCreative = registry.item("creative_storage_cell", CreativeStorageCellItem::new) @@ -280,7 +288,7 @@ public final class ApiItems implements IItems { .customize(builder -> builder.dimensions(EntityDimensions.fixed(0.25F, 0.25F))).build(); // rv1 - this.encodedPattern = registry.item("encoded_pattern", EncodedPatternItem::new) + this.encodedPattern = registry.item("encoded_pattern", EncodedPatternItem::new) .props(props -> props.maxCount(1)).features(AEFeature.PATTERNS).build(); this.coloredPaintBall = createPaintBalls(registry, "_paint_ball", false); @@ -300,8 +308,7 @@ public final class ApiItems implements IItems { public void customize(IItemRendering rendering) { rendering.color(new FluidDummyItemColor()); } - }) - .build(); + }).build(); } private static AEColoredItemDefinition createPaintBalls(FeatureFactory registry, String idSuffix, boolean lumen) { diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index cf7bdb6ea..c36f22b8b 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -120,13 +120,11 @@ public final class ApiMaterials implements IMaterials { SingularityEntity.TYPE = registry .entity("singularity", SingularityEntity::new, SpawnGroup.MISC) - .customize(b -> b.trackable(16, 4, true).dimensions(EntityDimensions.fixed(0.2f, 0.2f))) - .build(); + .customize(b -> b.trackable(16, 4, true).dimensions(EntityDimensions.fixed(0.2f, 0.2f))).build(); ChargedQuartzEntity.TYPE = registry .entity("charged_quartz", ChargedQuartzEntity::new, SpawnGroup.MISC) - .customize(b -> b.trackable(16, 4, true).dimensions(EntityDimensions.fixed(0.2f, 0.2f))) - .build(); + .customize(b -> b.trackable(16, 4, true).dimensions(EntityDimensions.fixed(0.2f, 0.2f))).build(); this.cell2SpatialPart = createMaterial(MaterialType.SPATIAL_2_CELL_COMPONENT); this.cell16SpatialPart = createMaterial(MaterialType.SPATIAL_16_CELL_COMPONENT); diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index 8e7790781..ef715e1d3 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -20,9 +20,6 @@ package appeng.core.api.definitions; import java.util.function.Function; -import appeng.fluids.parts.*; -import appeng.parts.automation.*; -import appeng.parts.p2p.*; import net.minecraft.item.ItemStack; import appeng.api.definitions.IItemDefinition; @@ -36,6 +33,7 @@ import appeng.core.features.ActivityState; import appeng.core.features.ColoredItemDefinition; import appeng.core.features.ItemStackSrc; import appeng.core.features.registries.PartModels; +import appeng.fluids.parts.*; import appeng.fluids.parts.FluidAnnihilationPlanePart; import appeng.fluids.parts.FluidExportBusPart; import appeng.fluids.parts.FluidFormationPlanePart; @@ -48,6 +46,7 @@ import appeng.items.parts.ColoredPartItem; import appeng.items.parts.PartItem; import appeng.items.parts.PartItemRendering; import appeng.items.parts.PartModelsHelper; +import appeng.parts.automation.*; import appeng.parts.automation.AnnihilationPlanePart; import appeng.parts.automation.ExportBusPart; import appeng.parts.automation.FormationPlanePart; @@ -65,6 +64,7 @@ import appeng.parts.networking.GlassCablePart; import appeng.parts.networking.QuartzFiberPart; import appeng.parts.networking.SmartCablePart; import appeng.parts.networking.SmartDenseCablePart; +import appeng.parts.p2p.*; import appeng.parts.p2p.FluidP2PTunnelPart; import appeng.parts.p2p.ItemP2PTunnelPart; import appeng.parts.p2p.LightP2PTunnelPart; @@ -153,19 +153,19 @@ public final class ApiParts implements IParts { this.importBus = createPart("import_bus", ImportBusPart.class, ImportBusPart::new); this.fluidImportBus = createPart("fluid_import_bus", FluidImportBusPart.class, FluidImportBusPart::new); this.exportBus = createPart("export_bus", ExportBusPart.class, ExportBusPart::new); - this.fluidExportBus = createPart("fluid_export_bus", FluidExportBusPart.class, FluidExportBusPart::new); + this.fluidExportBus = createPart("fluid_export_bus", FluidExportBusPart.class, FluidExportBusPart::new); this.levelEmitter = createPart("level_emitter", LevelEmitterPart.class, LevelEmitterPart::new); - this.fluidLevelEmitter = createPart("fluid_level_emitter", FluidLevelEmitterPart.class, - FluidLevelEmitterPart::new); + this.fluidLevelEmitter = createPart("fluid_level_emitter", FluidLevelEmitterPart.class, + FluidLevelEmitterPart::new); this.annihilationPlane = createPart("annihilation_plane", AnnihilationPlanePart.class, AnnihilationPlanePart::new); this.identityAnnihilationPlane = createPart("identity_annihilation_plane", IdentityAnnihilationPlanePart.class, IdentityAnnihilationPlanePart::new); - this.fluidAnnihilationPlane = createPart("fluid_annihilation_plane", FluidAnnihilationPlanePart.class, - FluidAnnihilationPlanePart::new); + this.fluidAnnihilationPlane = createPart("fluid_annihilation_plane", FluidAnnihilationPlanePart.class, + FluidAnnihilationPlanePart::new); this.formationPlane = createPart("formation_plane", FormationPlanePart.class, FormationPlanePart::new); - this.fluidFormationPlane = createPart("fluid_formation_plane", FluidFormationPlanePart.class, - FluidFormationPlanePart::new); + this.fluidFormationPlane = createPart("fluid_formation_plane", FluidFormationPlanePart.class, + FluidFormationPlanePart::new); this.patternTerminal = createPart("pattern_terminal", PatternTerminalPart.class, PatternTerminalPart::new); this.craftingTerminal = createPart("crafting_terminal", CraftingTerminalPart.class, CraftingTerminalPart::new); this.terminal = createPart("terminal", TerminalPart.class, TerminalPart::new); @@ -173,19 +173,19 @@ public final class ApiParts implements IParts { this.conversionMonitor = createPart("conversion_monitor", ConversionMonitorPart.class, ConversionMonitorPart::new); this.iface = createPart("cable_interface", InterfacePart.class, InterfacePart::new); - this.fluidIface = createPart("cable_fluid_interface", FluidInterfacePart.class, FluidInterfacePart::new); - this.p2PTunnelME = createPart("me_p2p_tunnel", MEP2PTunnelPart.class, MEP2PTunnelPart::new); - this.p2PTunnelRedstone = createPart("redstone_p2p_tunnel", RedstoneP2PTunnelPart.class, - RedstoneP2PTunnelPart::new); - this.p2PTunnelItems = createPart("item_p2p_tunnel", ItemP2PTunnelPart.class, ItemP2PTunnelPart::new); - this.p2PTunnelFluids = createPart("fluid_p2p_tunnel", FluidP2PTunnelPart.class, FluidP2PTunnelPart::new); + this.fluidIface = createPart("cable_fluid_interface", FluidInterfacePart.class, FluidInterfacePart::new); + this.p2PTunnelME = createPart("me_p2p_tunnel", MEP2PTunnelPart.class, MEP2PTunnelPart::new); + this.p2PTunnelRedstone = createPart("redstone_p2p_tunnel", RedstoneP2PTunnelPart.class, + RedstoneP2PTunnelPart::new); + this.p2PTunnelItems = createPart("item_p2p_tunnel", ItemP2PTunnelPart.class, ItemP2PTunnelPart::new); + this.p2PTunnelFluids = createPart("fluid_p2p_tunnel", FluidP2PTunnelPart.class, FluidP2PTunnelPart::new); // FIXME FABRIC this.p2PTunnelEU = null; // FIXME createPart( "ic2_p2p_tunnel", PartType.P2P_TUNNEL_IC2, // FIXME FABRIC // PartP2PIC2Power.class, PartP2PIC2Power::new); // FIXME FABRIC this.p2PTunnelFE = createPart("fe_p2p_tunnel", FEP2PTunnelPart.class, FEP2PTunnelPart::new); - this.p2PTunnelLight = createPart("light_p2p_tunnel", LightP2PTunnelPart.class, LightP2PTunnelPart::new); + this.p2PTunnelLight = createPart("light_p2p_tunnel", LightP2PTunnelPart.class, LightP2PTunnelPart::new); this.interfaceTerminal = createPart("interface_terminal", InterfaceTerminalPart.class, InterfaceTerminalPart::new); - this.fluidTerminal = createPart("fluid_terminal", FluidTerminalPart.class, FluidTerminalPart::new); + this.fluidTerminal = createPart("fluid_terminal", FluidTerminalPart.class, FluidTerminalPart::new); this.p2PTunnelEU = null; this.p2PTunnelFE = null; diff --git a/src/main/java/appeng/core/config/ConfigFileManager.java b/src/main/java/appeng/core/config/ConfigFileManager.java index 1a61e0357..bf04edf4a 100644 --- a/src/main/java/appeng/core/config/ConfigFileManager.java +++ b/src/main/java/appeng/core/config/ConfigFileManager.java @@ -1,19 +1,16 @@ package appeng.core.config; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonObject; - import java.io.*; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; + public class ConfigFileManager { - private static final Gson GSON = new GsonBuilder() - .setPrettyPrinting() - .setLenient() - .create(); + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().setLenient().create(); private final ConfigSection rootSection; diff --git a/src/main/java/appeng/core/config/ConfigSection.java b/src/main/java/appeng/core/config/ConfigSection.java index 72a184a20..6823c0c7d 100644 --- a/src/main/java/appeng/core/config/ConfigSection.java +++ b/src/main/java/appeng/core/config/ConfigSection.java @@ -1,10 +1,10 @@ package appeng.core.config; -import com.google.gson.JsonObject; - import java.util.ArrayList; import java.util.List; +import com.google.gson.JsonObject; + public class ConfigSection { private final ConfigSection parent; @@ -160,4 +160,3 @@ public class ConfigSection { } } - diff --git a/src/main/java/appeng/core/config/DoubleOption.java b/src/main/java/appeng/core/config/DoubleOption.java index 6abeded86..3fcbea815 100644 --- a/src/main/java/appeng/core/config/DoubleOption.java +++ b/src/main/java/appeng/core/config/DoubleOption.java @@ -10,7 +10,8 @@ public class DoubleOption extends BaseOption { private final double maxValue; private double currentValue; - public DoubleOption(ConfigSection parent, String id, String comment, double defaultValue, double minValue, double maxValue) { + public DoubleOption(ConfigSection parent, String id, String comment, double defaultValue, double minValue, + double maxValue) { super(parent, id, comment); this.defaultValue = defaultValue; this.currentValue = defaultValue; diff --git a/src/main/java/appeng/core/config/EnumOption.java b/src/main/java/appeng/core/config/EnumOption.java index b410ef642..7741afc10 100644 --- a/src/main/java/appeng/core/config/EnumOption.java +++ b/src/main/java/appeng/core/config/EnumOption.java @@ -1,12 +1,12 @@ package appeng.core.config; +import java.util.Arrays; +import java.util.stream.Collectors; + import com.google.common.base.Preconditions; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; -import java.util.Arrays; -import java.util.stream.Collectors; - public class EnumOption> extends BaseOption { private final T defaultValue; @@ -55,8 +55,7 @@ public class EnumOption> extends BaseOption { } } - String allowedValues = Arrays.stream(enumConstants) - .map(e -> e.name().toLowerCase()) + String allowedValues = Arrays.stream(enumConstants).map(e -> e.name().toLowerCase()) .collect(Collectors.joining(", ")); throw new ConfigValidationException(this, "Expected one of: " + allowedValues); } diff --git a/src/main/java/appeng/core/config/IntegerOption.java b/src/main/java/appeng/core/config/IntegerOption.java index 705e50748..732ffe671 100644 --- a/src/main/java/appeng/core/config/IntegerOption.java +++ b/src/main/java/appeng/core/config/IntegerOption.java @@ -10,7 +10,8 @@ public class IntegerOption extends BaseOption { private final int maxValue; private int currentValue; - public IntegerOption(ConfigSection parent, String id, String comment, int defaultValue, int minValue, int maxValue) { + public IntegerOption(ConfigSection parent, String id, String comment, int defaultValue, int minValue, + int maxValue) { super(parent, id, comment); this.defaultValue = defaultValue; this.currentValue = defaultValue; diff --git a/src/main/java/appeng/core/config/StringListOption.java b/src/main/java/appeng/core/config/StringListOption.java index 4b842291d..05b702f9c 100644 --- a/src/main/java/appeng/core/config/StringListOption.java +++ b/src/main/java/appeng/core/config/StringListOption.java @@ -1,14 +1,14 @@ package appeng.core.config; +import java.util.ArrayList; +import java.util.List; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; -import java.util.ArrayList; -import java.util.List; - public class StringListOption extends BaseOption { private final List defaultValue; diff --git a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java index fa73ef330..f4e4d48af 100644 --- a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java +++ b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java @@ -27,6 +27,9 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.tag.BlockTags; +import net.minecraft.tag.Tag; +import net.minecraft.util.Identifier; import appeng.api.exceptions.AppEngException; import appeng.api.movable.IMovableHandler; @@ -35,9 +38,6 @@ import appeng.api.movable.IMovableTile; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.spatial.DefaultSpatialHandler; -import net.minecraft.tag.BlockTags; -import net.minecraft.tag.Tag; -import net.minecraft.util.Identifier; public class MovableTileRegistry implements IMovableRegistry { diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index 6097dca89..83c24c591 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -25,14 +25,16 @@ import java.util.Map.Entry; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import alexiil.mc.lib.attributes.Attribute; -import alexiil.mc.lib.attributes.fluid.FluidAttributes; import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.util.math.Direction; import net.minecraft.util.Identifier; +import net.minecraft.util.math.Direction; +import net.minecraft.util.registry.Registry; + +import alexiil.mc.lib.attributes.Attribute; +import alexiil.mc.lib.attributes.fluid.FluidAttributes; import appeng.api.config.TunnelType; import appeng.api.definitions.IBlocks; @@ -41,7 +43,6 @@ import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IParts; import appeng.api.features.IP2PTunnelRegistry; import appeng.api.util.AEColor; -import net.minecraft.util.registry.Registry; import appeng.core.Api; public final class P2PTunnelRegistry implements IP2PTunnelRegistry { @@ -154,7 +155,8 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry { /** * attune based caps */ - // FIXME FABRIC this.addNewAttunement(Capabilities.FORGE_ENERGY, TunnelType.FE_POWER); + // FIXME FABRIC this.addNewAttunement(Capabilities.FORGE_ENERGY, + // TunnelType.FE_POWER); this.addNewAttunement(FluidAttributes.EXTRACTABLE, TunnelType.FLUID); this.addNewAttunement(FluidAttributes.INSERTABLE, TunnelType.FLUID); this.addNewAttunement(FluidAttributes.FIXED_INV, TunnelType.FLUID); diff --git a/src/main/java/appeng/core/features/registries/PlayerRegistry.java b/src/main/java/appeng/core/features/registries/PlayerRegistry.java index 1e4b15f88..f7daeed9a 100644 --- a/src/main/java/appeng/core/features/registries/PlayerRegistry.java +++ b/src/main/java/appeng/core/features/registries/PlayerRegistry.java @@ -18,14 +18,17 @@ package appeng.core.features.registries; +import java.util.UUID; + +import javax.annotation.Nullable; + +import com.mojang.authlib.GameProfile; + +import net.minecraft.entity.player.PlayerEntity; + import appeng.api.features.IPlayerRegistry; import appeng.core.AppEng; import appeng.core.worlddata.WorldData; -import com.mojang.authlib.GameProfile; -import net.minecraft.entity.player.PlayerEntity; - -import javax.annotation.Nullable; -import java.util.UUID; public class PlayerRegistry implements IPlayerRegistry { @@ -51,9 +54,7 @@ public class PlayerRegistry implements IPlayerRegistry { return null; } - return AppEng.instance().getPlayers() - .filter(p -> p.getGameProfile().getId().equals(profileId)) - .findFirst() + return AppEng.instance().getPlayers().filter(p -> p.getGameProfile().getId().equals(profileId)).findFirst() .orElse(null); } } diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 8bad27302..488300750 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -20,11 +20,10 @@ package appeng.core.features.registries; import java.util.HashSet; -import appeng.api.features.IWorldGen; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Identifier; -import java.util.HashSet; +import appeng.api.features.IWorldGen; public final class WorldGenRegistry implements IWorldGen { diff --git a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java index 7498db9b5..f4598fcaf 100644 --- a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java +++ b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java @@ -1,9 +1,6 @@ package appeng.core.features.registries.cell; -import appeng.container.ContainerLocator; -import appeng.container.ContainerOpener; -import appeng.container.implementations.MEMonitorableContainer; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -29,7 +26,7 @@ public class BasicItemCellGuiHandler implements ICellGuiHandler { @Override public void openChestGui(final PlayerEntity player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final IStorageChannel chan) { - ContainerOpener.openContainer(MEMonitorableContainer.TYPE, player, - ContainerLocator.forTileEntitySide((BlockEntity) chest, chest.getUp())); + ContainerOpener.openContainer(MEMonitorableContainer.TYPE, player, + ContainerLocator.forTileEntitySide((BlockEntity) chest, chest.getUp())); } } diff --git a/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java b/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java index cf877e223..12ec7e862 100644 --- a/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java +++ b/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java @@ -18,8 +18,10 @@ package appeng.core.stats; -import appeng.core.AppEng; +import java.util.*; + import com.google.gson.JsonObject; + import net.minecraft.advancement.PlayerAdvancementTracker; import net.minecraft.advancement.criterion.Criterion; import net.minecraft.advancement.criterion.CriterionConditions; @@ -29,10 +31,9 @@ import net.minecraft.predicate.entity.AdvancementEntityPredicateSerializer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; -import java.util.*; +import appeng.core.AppEng; -public class AppEngAdvancementTrigger - implements Criterion, IAdvancementTrigger { +public class AppEngAdvancementTrigger implements Criterion, IAdvancementTrigger { private final Identifier ID; private final Map listeners = new HashMap<>(); @@ -48,7 +49,7 @@ public class AppEngAdvancementTrigger @Override public void beginTrackingCondition(PlayerAdvancementTracker playerAdvancementsIn, - Criterion.ConditionsContainer listener) { + Criterion.ConditionsContainer listener) { AppEngAdvancementTrigger.Listeners l = this.listeners.get(playerAdvancementsIn); if (l == null) { @@ -61,7 +62,7 @@ public class AppEngAdvancementTrigger @Override public void endTrackingCondition(PlayerAdvancementTracker playerAdvancementsIn, - Criterion.ConditionsContainer listener) { + Criterion.ConditionsContainer listener) { AppEngAdvancementTrigger.Listeners l = this.listeners.get(playerAdvancementsIn); if (l != null) { @@ -79,7 +80,8 @@ public class AppEngAdvancementTrigger } @Override - public AppEngAdvancementTrigger.Instance conditionsFromJson(JsonObject json, AdvancementEntityPredicateDeserializer context) { + public AppEngAdvancementTrigger.Instance conditionsFromJson(JsonObject json, + AdvancementEntityPredicateDeserializer context) { return new AppEngAdvancementTrigger.Instance(this.getId()); } diff --git a/src/main/java/appeng/core/sync/BasePacket.java b/src/main/java/appeng/core/sync/BasePacket.java index 21ecb4675..38202f635 100644 --- a/src/main/java/appeng/core/sync/BasePacket.java +++ b/src/main/java/appeng/core/sync/BasePacket.java @@ -18,10 +18,6 @@ package appeng.core.sync; -import appeng.api.features.AEFeature; -import appeng.core.AEConfig; -import appeng.core.AELog; -import appeng.core.sync.network.INetworkInfo; import net.fabricmc.fabric.api.network.ClientSidePacketRegistry; import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; import net.minecraft.entity.player.PlayerEntity; @@ -30,6 +26,11 @@ import net.minecraft.network.Packet; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; +import appeng.api.features.AEFeature; +import appeng.core.AEConfig; +import appeng.core.AELog; +import appeng.core.sync.network.INetworkInfo; + public abstract class BasePacket { /** diff --git a/src/main/java/appeng/core/sync/BasePacketHandler.java b/src/main/java/appeng/core/sync/BasePacketHandler.java index 07b48e823..b2db79f03 100644 --- a/src/main/java/appeng/core/sync/BasePacketHandler.java +++ b/src/main/java/appeng/core/sync/BasePacketHandler.java @@ -22,11 +22,12 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; +import net.minecraft.network.PacketByteBuf; + import appeng.core.sync.packets.*; import appeng.core.sync.packets.CompassResponsePacket; import appeng.core.sync.packets.PartPlacementPacket; import appeng.core.sync.packets.SpawnEntityPacket; -import net.minecraft.network.PacketByteBuf; public class BasePacketHandler { private static final Map, PacketTypes> REVERSE_LOOKUP = new HashMap<>(); diff --git a/src/main/java/appeng/core/sync/network/ClientNetworkHandler.java b/src/main/java/appeng/core/sync/network/ClientNetworkHandler.java index 76c78dde9..1cfb75056 100644 --- a/src/main/java/appeng/core/sync/network/ClientNetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/ClientNetworkHandler.java @@ -1,13 +1,14 @@ package appeng.core.sync.network; -import appeng.core.AELog; -import appeng.core.sync.BasePacket; -import appeng.core.sync.BasePacketHandler; import net.fabricmc.fabric.api.network.ClientSidePacketRegistry; import net.fabricmc.fabric.api.network.PacketContext; import net.minecraft.network.NetworkSide; import net.minecraft.network.PacketByteBuf; +import appeng.core.AELog; +import appeng.core.sync.BasePacket; +import appeng.core.sync.BasePacketHandler; + public class ClientNetworkHandler extends ServerNetworkHandler { private final ClientSidePacketRegistry registry = ClientSidePacketRegistry.INSTANCE; diff --git a/src/main/java/appeng/core/sync/network/NetworkHandler.java b/src/main/java/appeng/core/sync/network/NetworkHandler.java index 596f346e0..21355c939 100644 --- a/src/main/java/appeng/core/sync/network/NetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/NetworkHandler.java @@ -18,10 +18,11 @@ package appeng.core.sync.network; -import appeng.core.sync.BasePacket; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.world.World; +import appeng.core.sync.BasePacket; + public interface NetworkHandler { static NetworkHandler instance() { diff --git a/src/main/java/appeng/core/sync/network/ServerNetworkHandler.java b/src/main/java/appeng/core/sync/network/ServerNetworkHandler.java index 58f99218f..d9e92450a 100644 --- a/src/main/java/appeng/core/sync/network/ServerNetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/ServerNetworkHandler.java @@ -1,9 +1,5 @@ package appeng.core.sync.network; -import appeng.core.AELog; -import appeng.core.AppEng; -import appeng.core.sync.BasePacket; -import appeng.core.sync.BasePacketHandler; import net.fabricmc.fabric.api.network.PacketContext; import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; import net.fabricmc.fabric.api.server.PlayerStream; @@ -16,6 +12,11 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import appeng.core.AELog; +import appeng.core.AppEng; +import appeng.core.sync.BasePacket; +import appeng.core.sync.BasePacketHandler; + public class ServerNetworkHandler implements NetworkHandler { private final ServerSidePacketRegistry registry = ServerSidePacketRegistry.INSTANCE; @@ -39,18 +40,16 @@ public class ServerNetworkHandler implements NetworkHandler { public void sendToAllAround(final BasePacket message, final TargetPoint point) { Packet packet = message.toPacket(NetworkSide.CLIENTBOUND); - PlayerStream.around(point.world, new Vec3d(point.x, point.y, point.z), point.radius) - .forEach(player -> { - if (player != point.excluded) { - ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, packet); - } - }); + PlayerStream.around(point.world, new Vec3d(point.x, point.y, point.z), point.radius).forEach(player -> { + if (player != point.excluded) { + ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, packet); + } + }); } public void sendToDimension(final BasePacket message, final World world) { Packet packet = message.toPacket(NetworkSide.CLIENTBOUND); - PlayerStream.world(world) - .forEach(player -> ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, packet)); + PlayerStream.world(world).forEach(player -> ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, packet)); } @Override diff --git a/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java b/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java index c31b9e620..16ba49168 100644 --- a/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java +++ b/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java @@ -20,12 +20,12 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; +import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import net.fabricmc.api.EnvType; import appeng.api.storage.data.IAEItemStack; import appeng.core.sync.BasePacket; diff --git a/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java b/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java index 2c3470eec..9e0f5f9a0 100644 --- a/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java +++ b/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java @@ -18,14 +18,8 @@ package appeng.core.sync.packets; -import appeng.api.util.AEPartLocation; -import appeng.client.render.effects.EnergyParticleData; -import appeng.core.AELog; -import appeng.core.AppEng; -import appeng.core.sync.BasePacket; -import appeng.core.sync.network.INetworkInfo; -import appeng.util.Platform; import io.netty.buffer.Unpooled; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.block.Block; @@ -43,6 +37,14 @@ import net.minecraft.sound.SoundEvents; import net.minecraft.tag.FluidTags; import net.minecraft.util.math.BlockPos; +import appeng.api.util.AEPartLocation; +import appeng.client.render.effects.EnergyParticleData; +import appeng.core.AELog; +import appeng.core.AppEng; +import appeng.core.sync.BasePacket; +import appeng.core.sync.network.INetworkInfo; +import appeng.util.Platform; + /** * Plays the block breaking or fluid pickup sound and a transition particle * effect into the supplied direction. Used primarily by annihilation planes. @@ -145,8 +147,8 @@ public class BlockTransitionEffectPacket extends BasePacket { return; } - PositionedSoundInstance sound = new PositionedSoundInstance(soundEvent, SoundCategory.BLOCKS, (volume + 1.0F) / 2.0F, pitch * 0.8F, - pos); + PositionedSoundInstance sound = new PositionedSoundInstance(soundEvent, SoundCategory.BLOCKS, + (volume + 1.0F) / 2.0F, pitch * 0.8F, pos); MinecraftClient.getInstance().getSoundManager().play(sound); } diff --git a/src/main/java/appeng/core/sync/packets/ClickPacket.java b/src/main/java/appeng/core/sync/packets/ClickPacket.java index c598cbad8..6b1f4eb1d 100644 --- a/src/main/java/appeng/core/sync/packets/ClickPacket.java +++ b/src/main/java/appeng/core/sync/packets/ClickPacket.java @@ -25,10 +25,10 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import appeng.api.definitions.IComparableDefinition; diff --git a/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java b/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java index d3dd07d7f..33fe885a4 100644 --- a/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java +++ b/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java @@ -21,8 +21,8 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.network.ServerPlayerEntity; import appeng.api.util.DimensionalCoord; import appeng.core.sync.BasePacket; diff --git a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java index 506e40ccf..27efc84e8 100644 --- a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java +++ b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java @@ -26,18 +26,18 @@ import java.io.OutputStream; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import appeng.client.gui.implementations.InterfaceTerminalScreen; import io.netty.buffer.Unpooled; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.network.PacketByteBuf; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; +import appeng.client.gui.implementations.InterfaceTerminalScreen; import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; diff --git a/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java b/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java index 957878e39..24b58f492 100644 --- a/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java +++ b/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java @@ -23,8 +23,8 @@ import java.util.EnumSet; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.network.ServerPlayerEntity; import appeng.api.config.Settings; import appeng.api.util.IConfigManager; diff --git a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java index f9709fe48..70ceb015f 100644 --- a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java +++ b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java @@ -18,6 +18,16 @@ package appeng.core.sync.packets; +import io.netty.buffer.Unpooled; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.util.Hand; + import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; import appeng.api.util.IConfigManager; @@ -30,14 +40,6 @@ import appeng.core.sync.network.INetworkInfo; import appeng.fluids.container.FluidLevelEmitterContainer; import appeng.fluids.container.FluidStorageBusContainer; import appeng.helpers.IMouseWheelItem; -import io.netty.buffer.Unpooled; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.util.Hand; public class ConfigValuePacket extends BasePacket { diff --git a/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java b/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java index fd05ae21e..50ec614f9 100644 --- a/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java +++ b/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java @@ -24,9 +24,9 @@ import java.util.Map; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandler; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandler; import appeng.api.storage.data.IAEFluidStack; import appeng.core.sync.BasePacket; diff --git a/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java b/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java index a6694769e..3e2c24a36 100644 --- a/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java +++ b/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java @@ -18,12 +18,14 @@ package appeng.core.sync.packets; +import java.util.Optional; + import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.network.ServerPlayerEntity; import appeng.api.storage.data.IAEItemStack; import appeng.container.AEBaseContainer; @@ -37,8 +39,6 @@ import appeng.helpers.InventoryAction; import appeng.util.Platform; import appeng.util.item.AEItemStack; -import java.util.Optional; - public class InventoryActionPacket extends BasePacket { private final InventoryAction action; diff --git a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java index 85f424a72..7bb05e079 100644 --- a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java +++ b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java @@ -18,16 +18,17 @@ package appeng.core.sync.packets; -import alexiil.mc.lib.attributes.item.FixedItemInv; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.server.network.ServerPlayerEntity; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.Actionable; import appeng.api.config.SecurityPermissions; diff --git a/src/main/java/appeng/core/sync/packets/LightningPacket.java b/src/main/java/appeng/core/sync/packets/LightningPacket.java index b4ded440f..bec2be2df 100644 --- a/src/main/java/appeng/core/sync/packets/LightningPacket.java +++ b/src/main/java/appeng/core/sync/packets/LightningPacket.java @@ -20,11 +20,11 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; +import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketByteBuf; -import net.fabricmc.api.EnvType; import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; @@ -65,8 +65,8 @@ public class LightningPacket extends BasePacket { public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { try { if (Platform.isClient() && AEConfig.instance().isEnableEffects()) { - MinecraftClient.getInstance().world.addParticle(ParticleTypes.LIGHTNING, this.x, this.y, this.z, 0.0f, 0.0f, - 0.0f); + MinecraftClient.getInstance().world.addParticle(ParticleTypes.LIGHTNING, this.x, this.y, this.z, 0.0f, + 0.0f, 0.0f); } } catch (final Exception ignored) { } diff --git a/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java b/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java index 40a32a70e..682884c64 100644 --- a/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java +++ b/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java @@ -31,14 +31,14 @@ import javax.annotation.Nullable; import io.netty.buffer.Unpooled; +import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.network.NetworkSide; import net.minecraft.network.Packet; import net.minecraft.network.PacketByteBuf; -import net.fabricmc.api.EnvType; -import net.minecraft.network.NetworkSide; import appeng.api.storage.data.IAEFluidStack; import appeng.core.AELog; diff --git a/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java b/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java index 33a81b8ee..badb06c75 100644 --- a/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java +++ b/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java @@ -29,22 +29,22 @@ import java.util.zip.GZIPOutputStream; import javax.annotation.Nullable; -import appeng.client.gui.implementations.CraftConfirmScreen; -import appeng.client.gui.implementations.CraftingCPUScreen; -import appeng.client.gui.implementations.MEMonitorableScreen; -import appeng.client.gui.implementations.NetworkStatusScreen; import io.netty.buffer.Unpooled; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.NetworkSide; import net.minecraft.network.Packet; import net.minecraft.network.PacketByteBuf; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import appeng.api.storage.data.IAEItemStack; +import appeng.client.gui.implementations.CraftConfirmScreen; +import appeng.client.gui.implementations.CraftingCPUScreen; +import appeng.client.gui.implementations.MEMonitorableScreen; +import appeng.client.gui.implementations.NetworkStatusScreen; import appeng.core.AELog; import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; diff --git a/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java b/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java index 42979ee67..a8850c455 100644 --- a/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java +++ b/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java @@ -83,8 +83,8 @@ public class MatterCannonPacket extends BasePacket { public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { try { for (int a = 1; a < this.len; a++) { - MinecraftClient.getInstance().particleManager.addParticle(ParticleTypes.MATTER_CANNON, this.x + this.dx * a, - this.y + this.dy * a, this.z + this.dz * a, 0, 0, 0); + MinecraftClient.getInstance().particleManager.addParticle(ParticleTypes.MATTER_CANNON, + this.x + this.dx * a, this.y + this.dy * a, this.z + this.dz * a, 0, 0, 0); } } catch (final Exception ignored) { } diff --git a/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java b/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java index e19664c8f..f502e62fb 100644 --- a/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java +++ b/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java @@ -21,11 +21,11 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.math.Direction; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import appeng.core.AppEng; import appeng.core.sync.BasePacket; diff --git a/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java b/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java index daf74751a..8326dd396 100644 --- a/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java +++ b/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java @@ -18,12 +18,13 @@ package appeng.core.sync.packets; -import alexiil.mc.lib.attributes.item.FixedItemInv; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.network.ServerPlayerEntity; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; diff --git a/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java b/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java index 569775358..f1f736b4e 100644 --- a/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java +++ b/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java @@ -21,8 +21,8 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandler; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandler; import appeng.container.AEBaseContainer; import appeng.core.sync.BasePacket; diff --git a/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java b/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java index 4e29b3eac..4033e0840 100644 --- a/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java +++ b/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java @@ -1,8 +1,10 @@ package appeng.core.sync.packets; -import appeng.core.sync.BasePacket; -import appeng.core.sync.network.INetworkInfo; +import java.util.UUID; +import java.util.function.Consumer; + import io.netty.buffer.Unpooled; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.world.ClientWorld; @@ -15,8 +17,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.util.registry.Registry; -import java.util.UUID; -import java.util.function.Consumer; +import appeng.core.sync.BasePacket; +import appeng.core.sync.network.INetworkInfo; // This is essentially a copy of EntitySpawnS2CPacket, supporting custom entities public class SpawnEntityPacket extends BasePacket { @@ -48,7 +50,8 @@ public class SpawnEntityPacket extends BasePacket { this.extraData = new PacketByteBuf(buf.copy()); } - public SpawnEntityPacket(int id, UUID uuid, double x, double y, double z, float pitch, float yaw, EntityType entityTypeId, Vec3d velocity, Consumer extraSpawnData) { + public SpawnEntityPacket(int id, UUID uuid, double x, double y, double z, float pitch, float yaw, + EntityType entityTypeId, Vec3d velocity, Consumer extraSpawnData) { this.id = id; this.uuid = uuid; this.x = x; @@ -57,9 +60,9 @@ public class SpawnEntityPacket extends BasePacket { this.pitch = MathHelper.floor(pitch * 256.0F / 360.0F); this.yaw = MathHelper.floor(yaw * 256.0F / 360.0F); this.entityTypeId = entityTypeId; - this.velocityX = (int)(MathHelper.clamp(velocity.x, -3.9D, 3.9D) * 8000.0D); - this.velocityY = (int)(MathHelper.clamp(velocity.y, -3.9D, 3.9D) * 8000.0D); - this.velocityZ = (int)(MathHelper.clamp(velocity.z, -3.9D, 3.9D) * 8000.0D); + this.velocityX = (int) (MathHelper.clamp(velocity.x, -3.9D, 3.9D) * 8000.0D); + this.velocityY = (int) (MathHelper.clamp(velocity.y, -3.9D, 3.9D) * 8000.0D); + this.velocityZ = (int) (MathHelper.clamp(velocity.z, -3.9D, 3.9D) * 8000.0D); final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); @@ -80,7 +83,8 @@ public class SpawnEntityPacket extends BasePacket { } public SpawnEntityPacket(Entity entity, Consumer extraSpawnData) { - this(entity.getEntityId(), entity.getUuid(), entity.getX(), entity.getY(), entity.getZ(), entity.pitch, entity.yaw, entity.getType(), entity.getVelocity(), extraSpawnData); + this(entity.getEntityId(), entity.getUuid(), entity.getX(), entity.getY(), entity.getZ(), entity.pitch, + entity.yaw, entity.getType(), entity.getVelocity(), extraSpawnData); } @Override @@ -93,11 +97,12 @@ public class SpawnEntityPacket extends BasePacket { if (entity != null) { entity.updateTrackedPosition(x, y, z); - // NOTE: Vanilla doesn't do this for all spawned entities, but why transfer the velocity??? + // NOTE: Vanilla doesn't do this for all spawned entities, but why transfer the + // velocity??? entity.setVelocityClient(velocityX, velocityY, velocityZ); entity.refreshPositionAfterTeleport(x, y, z); - entity.pitch = (float)(pitch * 360) / 256.0F; - entity.yaw = (float)(yaw * 360) / 256.0F; + entity.pitch = (float) (pitch * 360) / 256.0F; + entity.yaw = (float) (yaw * 360) / 256.0F; entity.setEntityId(id); entity.setUuid(uuid); @@ -111,8 +116,10 @@ public class SpawnEntityPacket extends BasePacket { public static Packet create(T entity) { // Not having this typed local variable will lead to a JVM bug because - // the method reference will have a target type of "Entity" and not "ICustomEntity" - @SuppressWarnings("UnnecessaryLocalVariable") ICustomEntity customEntity = entity; + // the method reference will have a target type of "Entity" and not + // "ICustomEntity" + @SuppressWarnings("UnnecessaryLocalVariable") + ICustomEntity customEntity = entity; SpawnEntityPacket packet = new SpawnEntityPacket(entity, customEntity::writeAdditionalSpawnData); return packet.toPacket(NetworkSide.CLIENTBOUND); } diff --git a/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java b/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java index 9b5ab84fe..2491876d8 100644 --- a/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java +++ b/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java @@ -21,9 +21,9 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; diff --git a/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java index 528ccb8d7..975241372 100644 --- a/src/main/java/appeng/core/worlddata/WorldData.java +++ b/src/main/java/appeng/core/worlddata/WorldData.java @@ -26,8 +26,8 @@ import javax.annotation.Nullable; import com.google.common.base.Preconditions; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.dimension.DimensionType; import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.dimension.DimensionType; import appeng.services.CompassService; import appeng.services.compass.CompassThreadFactory; @@ -67,8 +67,10 @@ public final class WorldData implements IWorldData { "The server doesn't have an Overworld dimension we could store our data on!"); } - final PlayerData playerData = overworld.getPersistentStateManager().getOrCreate(PlayerData::new, PlayerData.NAME); - final StorageData storageData = overworld.getPersistentStateManager().getOrCreate(StorageData::new, StorageData.NAME); + final PlayerData playerData = overworld.getPersistentStateManager().getOrCreate(PlayerData::new, + PlayerData.NAME); + final StorageData storageData = overworld.getPersistentStateManager().getOrCreate(StorageData::new, + StorageData.NAME); final ThreadFactory compassThreadFactory = new CompassThreadFactory(); final CompassService compassService = new CompassService(server, compassThreadFactory); diff --git a/src/main/java/appeng/crafting/CraftBranchFailure.java b/src/main/java/appeng/crafting/CraftBranchFailure.java index e340a2151..6b2937f6d 100644 --- a/src/main/java/appeng/crafting/CraftBranchFailure.java +++ b/src/main/java/appeng/crafting/CraftBranchFailure.java @@ -18,9 +18,10 @@ package appeng.crafting; -import appeng.api.storage.data.IAEItemStack; import net.minecraft.util.registry.Registry; +import appeng.api.storage.data.IAEItemStack; + public class CraftBranchFailure extends Exception { private static final long serialVersionUID = 654603652836724823L; diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index d3517eded..8ffdfef49 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -18,7 +18,14 @@ package appeng.crafting; -import appeng.core.Api; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; + +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import appeng.api.config.Actionable; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.crafting.ICraftingPatternDetails; @@ -30,13 +37,6 @@ import appeng.container.ContainerNull; import appeng.core.Api; import appeng.me.cluster.implementations.CraftingCPUCluster; import appeng.util.Platform; -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; public class CraftingTreeProcess { @@ -71,8 +71,9 @@ public class CraftingTreeProcess { } // FIXME FABRIC Hooks don't exist - // FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent((PlayerEntity) FakePlayer.getOrCreate((ServerWorld) world), - // FIXME FABRIC details.getOutput(ic, world), ic); + // FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent((PlayerEntity) + // FakePlayer.getOrCreate((ServerWorld) world), + // FIXME FABRIC details.getOutput(ic, world), ic); for (int x = 0; x < ic.size(); x++) { final ItemStack g = ic.getStack(x); @@ -173,8 +174,9 @@ public class CraftingTreeProcess { } // FIXME FABRIC Hook doesn't exist - // FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent((PlayerEntity) FakePlayer.getOrCreate((ServerWorld) this.world), - // FIXME FABRIC this.details.getOutput(ic, this.world), ic); + // FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent((PlayerEntity) + // FakePlayer.getOrCreate((ServerWorld) this.world), + // FIXME FABRIC this.details.getOutput(ic, this.world), ic); for (int x = 0; x < ic.size(); x++) { ItemStack is = ic.getStack(x); diff --git a/src/main/java/appeng/debug/ChunkLoaderBlockEntity.java b/src/main/java/appeng/debug/ChunkLoaderBlockEntity.java index b3203c131..d7915e174 100644 --- a/src/main/java/appeng/debug/ChunkLoaderBlockEntity.java +++ b/src/main/java/appeng/debug/ChunkLoaderBlockEntity.java @@ -18,11 +18,11 @@ package appeng.debug; -import net.minecraft.util.Tickable; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.Tickable; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; -import net.minecraft.server.world.ServerWorld; import appeng.core.AELog; import appeng.tile.AEBaseBlockEntity; diff --git a/src/main/java/appeng/debug/CubeGeneratorBlockEntity.java b/src/main/java/appeng/debug/CubeGeneratorBlockEntity.java index f1b107b87..0aff3c8ce 100644 --- a/src/main/java/appeng/debug/CubeGeneratorBlockEntity.java +++ b/src/main/java/appeng/debug/CubeGeneratorBlockEntity.java @@ -18,17 +18,17 @@ package appeng.debug; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.AutomaticItemPlacementContext; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; -import net.minecraft.util.Tickable; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.Util; -import net.minecraft.util.math.Direction; -import net.minecraft.util.math.BlockPos; import net.minecraft.text.LiteralText; +import net.minecraft.util.Tickable; +import net.minecraft.util.Util; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import appeng.core.AppEng; import appeng.tile.AEBaseBlockEntity; diff --git a/src/main/java/appeng/debug/DebugCardItem.java b/src/main/java/appeng/debug/DebugCardItem.java index cb5540e41..eae9afa08 100644 --- a/src/main/java/appeng/debug/DebugCardItem.java +++ b/src/main/java/appeng/debug/DebugCardItem.java @@ -21,18 +21,16 @@ package appeng.debug; import java.util.HashSet; import java.util.Set; -import appeng.hooks.AEToolItem; -import appeng.tile.networking.ControllerBlockEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.Util; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; import appeng.api.networking.IGridConnection; @@ -46,12 +44,14 @@ import appeng.api.networking.ticking.ITickManager; import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; import appeng.api.util.AEPartLocation; +import appeng.hooks.AEToolItem; import appeng.hooks.TickHandler; import appeng.items.AEBaseItem; import appeng.me.Grid; import appeng.me.GridNode; import appeng.me.cache.TickManagerCache; import appeng.parts.p2p.P2PTunnelPart; +import appeng.tile.networking.ControllerBlockEntity; public class DebugCardItem extends AEBaseItem implements AEToolItem { diff --git a/src/main/java/appeng/debug/DebugPartPlacerItem.java b/src/main/java/appeng/debug/DebugPartPlacerItem.java index a1711ee36..d4b84f2f0 100644 --- a/src/main/java/appeng/debug/DebugPartPlacerItem.java +++ b/src/main/java/appeng/debug/DebugPartPlacerItem.java @@ -2,7 +2,6 @@ package appeng.debug; import java.util.Arrays; -import appeng.hooks.AEToolItem; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -11,8 +10,8 @@ import net.minecraft.item.ItemUsageContext; import net.minecraft.text.LiteralText; import net.minecraft.util.ActionResult; import net.minecraft.util.Util; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3i; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; @@ -21,6 +20,7 @@ import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; import appeng.api.parts.PartItemStack; import appeng.api.util.AEPartLocation; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; import appeng.items.parts.ColoredPartItem; import appeng.items.parts.PartItem; diff --git a/src/main/java/appeng/debug/EraserItem.java b/src/main/java/appeng/debug/EraserItem.java index fa3a8ba72..26e64bbde 100644 --- a/src/main/java/appeng/debug/EraserItem.java +++ b/src/main/java/appeng/debug/EraserItem.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.Queue; import java.util.Set; -import appeng.hooks.AEToolItem; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; @@ -35,6 +34,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.core.AELog; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; public class EraserItem extends AEBaseItem implements AEToolItem { diff --git a/src/main/java/appeng/debug/ItemGenBlockEntity.java b/src/main/java/appeng/debug/ItemGenBlockEntity.java index c1da13138..691a9d558 100644 --- a/src/main/java/appeng/debug/ItemGenBlockEntity.java +++ b/src/main/java/appeng/debug/ItemGenBlockEntity.java @@ -18,12 +18,9 @@ package appeng.debug; -import alexiil.mc.lib.attributes.AttributeList; -import alexiil.mc.lib.attributes.Simulation; -import alexiil.mc.lib.attributes.item.ItemExtractable; -import alexiil.mc.lib.attributes.item.filter.ExactItemStackFilter; -import alexiil.mc.lib.attributes.item.filter.ItemFilter; -import appeng.tile.AEBaseBlockEntity; +import java.util.ArrayDeque; +import java.util.Queue; + import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.Item; @@ -34,8 +31,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; -import java.util.ArrayDeque; -import java.util.Queue; +import alexiil.mc.lib.attributes.AttributeList; +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.ItemExtractable; +import alexiil.mc.lib.attributes.item.filter.ExactItemStackFilter; +import alexiil.mc.lib.attributes.item.filter.ItemFilter; + +import appeng.tile.AEBaseBlockEntity; public class ItemGenBlockEntity extends AEBaseBlockEntity { diff --git a/src/main/java/appeng/debug/MeteoritePlacerItem.java b/src/main/java/appeng/debug/MeteoritePlacerItem.java index 399c64bc2..0c085f743 100644 --- a/src/main/java/appeng/debug/MeteoritePlacerItem.java +++ b/src/main/java/appeng/debug/MeteoritePlacerItem.java @@ -18,32 +18,32 @@ package appeng.debug; -import appeng.hooks.AEToolItem; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; import net.minecraft.text.LiteralText; -import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.Util; import net.minecraft.util.math.BlockBox; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.chunk.WorldChunk; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; import appeng.util.Platform; import appeng.worldgen.meteorite.CraterType; import appeng.worldgen.meteorite.MeteoritePlacer; import appeng.worldgen.meteorite.PlacedMeteoriteSettings; import appeng.worldgen.meteorite.debug.MeteoriteSpawner; -import net.minecraft.world.chunk.WorldChunk; public class MeteoritePlacerItem extends AEBaseItem implements AEToolItem { @@ -117,8 +117,8 @@ public class MeteoritePlacerItem extends AEBaseItem implements AEToolItem { // we have to assume maximum size int range = (int) Math.ceil((coreRadius * 2 + 5) * 5f); - BlockBox boundingBox = new BlockBox(pos.getX() - range, pos.getY(), pos.getZ() - range, - pos.getX() + range, pos.getY(), pos.getZ() + range); + BlockBox boundingBox = new BlockBox(pos.getX() - range, pos.getY(), pos.getZ() - range, pos.getX() + range, + pos.getY(), pos.getZ() + range); final MeteoritePlacer placer = new MeteoritePlacer(world, spawned, boundingBox); placer.place(); diff --git a/src/main/java/appeng/debug/ReplicatorCardItem.java b/src/main/java/appeng/debug/ReplicatorCardItem.java index 4f68578c4..880b9155d 100644 --- a/src/main/java/appeng/debug/ReplicatorCardItem.java +++ b/src/main/java/appeng/debug/ReplicatorCardItem.java @@ -18,23 +18,22 @@ package appeng.debug; -import appeng.hooks.AEToolItem; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; +import net.minecraft.text.LiteralText; import net.minecraft.util.*; import net.minecraft.util.ActionResult; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.text.LiteralText; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; @@ -47,6 +46,7 @@ import appeng.api.networking.IGridNode; import appeng.api.networking.spatial.ISpatialCache; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; public class ReplicatorCardItem extends AEBaseItem implements AEToolItem { @@ -118,7 +118,8 @@ public class ReplicatorCardItem extends AEBaseItem implements AEToolItem { final int src_z = ish.getInt("z"); final int src_side = ish.getInt("side"); final String worldId = ish.getString("w"); - final World src_w = world.getServer().getWorld(RegistryKey.of(Registry.DIMENSION, new Identifier(worldId))); + final World src_w = world.getServer() + .getWorld(RegistryKey.of(Registry.DIMENSION, new Identifier(worldId))); final int replications = ish.getInt("r") + 1; final BlockEntity te = src_w.getBlockEntity(new BlockPos(src_x, src_y, src_z)); @@ -182,9 +183,10 @@ public class ReplicatorCardItem extends AEBaseItem implements AEToolItem { world.setBlockState(d, state); if (blk instanceof BlockEntityProvider) { - BlockEntityProvider blkEntityProvider = (BlockEntityProvider)blk; + BlockEntityProvider blkEntityProvider = (BlockEntityProvider) blk; final BlockEntity ote = src_w.getBlockEntity(p); - final BlockEntity nte = blkEntityProvider.createBlockEntity(world); + final BlockEntity nte = blkEntityProvider + .createBlockEntity(world); final CompoundTag data = new CompoundTag(); ote.toTag(data); nte.fromTag(state, data.copy()); diff --git a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java index 0725ed298..9dee4563c 100644 --- a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java @@ -21,10 +21,10 @@ package appeng.decorative.solid; import java.util.Random; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.fabricmc.api.Environment; import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; diff --git a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java index 396b5c29e..528e194fb 100644 --- a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java @@ -18,7 +18,6 @@ package appeng.decorative.solid; -import appeng.block.AEBaseBlock; import net.minecraft.block.BlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; @@ -27,6 +26,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import appeng.block.AEBaseBlock; + public class QuartzOreBlock extends AEBaseBlock { public QuartzOreBlock(Settings props) { super(props); diff --git a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java index c850e7d27..7357a7ae8 100644 --- a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java @@ -20,11 +20,11 @@ package appeng.decorative.solid; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.state.property.EnumProperty; import net.minecraft.state.StateManager; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import appeng.api.util.IOrientable; diff --git a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java index 66278765d..f20720f46 100644 --- a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java +++ b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java @@ -18,8 +18,6 @@ package appeng.decorative.solid; -import appeng.block.AEBaseBlock; -import appeng.core.worlddata.WorldData; import net.minecraft.block.BlockState; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; @@ -28,6 +26,9 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; +import appeng.block.AEBaseBlock; +import appeng.core.worlddata.WorldData; + public class SkyStoneBlock extends AEBaseBlock { private static final float BREAK_SPEAK_SCALAR = 0.1f; private static final double BREAK_SPEAK_THRESHOLD = 7.0; @@ -56,8 +57,8 @@ public class SkyStoneBlock extends AEBaseBlock { // } @Override - public BlockState getStateForNeighborUpdate(BlockState stateIn, Direction facing, BlockState facingState, WorldAccess worldIn, - BlockPos currentPos, BlockPos facingPos) { + public BlockState getStateForNeighborUpdate(BlockState stateIn, Direction facing, BlockState facingState, + WorldAccess worldIn, BlockPos currentPos, BlockPos facingPos) { if (worldIn instanceof ServerWorld) { ServerWorld serverWorld = (ServerWorld) worldIn; WorldData.instance().compassData().service().notifyBlockChange(serverWorld, currentPos); @@ -66,8 +67,6 @@ public class SkyStoneBlock extends AEBaseBlock { return super.getStateForNeighborUpdate(stateIn, facing, facingState, worldIn, currentPos, facingPos); } - - @Override public void onStateReplaced(BlockState state, World w, BlockPos pos, BlockState newState, boolean isMoving) { if (newState.getBlock() == state.getBlock()) { diff --git a/src/main/java/appeng/entity/AEBaseItemEntity.java b/src/main/java/appeng/entity/AEBaseItemEntity.java index b05a72b11..43db54ecd 100644 --- a/src/main/java/appeng/entity/AEBaseItemEntity.java +++ b/src/main/java/appeng/entity/AEBaseItemEntity.java @@ -40,7 +40,8 @@ public abstract class AEBaseItemEntity extends ItemEntity { this.yaw = this.random.nextFloat() * 360.0F; this.setVelocity(this.random.nextDouble() * 0.2D - 0.1D, 0.2D, this.random.nextDouble() * 0.2D - 0.1D); this.setStack(stack); - // FIXME FABRIC Needs replacement hook this.lifespan = stack.getEntityLifespan(world); + // FIXME FABRIC Needs replacement hook this.lifespan = + // stack.getEntityLifespan(world); } protected List getCheckedEntitiesWithinAABBExcludingEntity(final Box region) { diff --git a/src/main/java/appeng/entity/ChargedQuartzEntity.java b/src/main/java/appeng/entity/ChargedQuartzEntity.java index 930421f37..096cdec33 100644 --- a/src/main/java/appeng/entity/ChargedQuartzEntity.java +++ b/src/main/java/appeng/entity/ChargedQuartzEntity.java @@ -20,7 +20,6 @@ package appeng.entity; import java.util.List; -import appeng.client.render.effects.ParticleTypes; import net.minecraft.block.BlockState; import net.minecraft.block.Material; import net.minecraft.client.MinecraftClient; @@ -29,13 +28,14 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import appeng.api.definitions.IMaterials; import appeng.api.features.AEFeature; +import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; import appeng.core.Api; import appeng.core.AppEng; @@ -65,8 +65,8 @@ public final class ChargedQuartzEntity extends AEBaseItemEntity { } if (world.isClient && this.delay > 30 && AEConfig.instance().isEnableEffects()) { - MinecraftClient.getInstance().particleManager.addParticle(ParticleTypes.LIGHTNING, this.getX(), this.getY() + 0.3f, this.getZ(), 0.0f, 0.0f, - 0.0f); + MinecraftClient.getInstance().particleManager.addParticle(ParticleTypes.LIGHTNING, this.getX(), + this.getY() + 0.3f, this.getZ(), 0.0f, 0.0f, 0.0f); this.delay = 0; } @@ -96,8 +96,8 @@ public final class ChargedQuartzEntity extends AEBaseItemEntity { final IMaterials materials = Api.instance().definitions().materials(); if (materials.certusQuartzCrystalCharged().isSameAs(item)) { - final Box region = new Box(this.getX() - 1, this.getY() - 1, this.getZ() - 1, - this.getX() + 1, this.getY() + 1, this.getZ() + 1); + final Box region = new Box(this.getX() - 1, this.getY() - 1, this.getZ() - 1, this.getX() + 1, + this.getY() + 1, this.getZ() + 1); final List l = this.getCheckedEntitiesWithinAABBExcludingEntity(region); ItemEntity redstone = null; @@ -136,8 +136,7 @@ public final class ChargedQuartzEntity extends AEBaseItemEntity { } materials.fluixCrystal().maybeStack(2).ifPresent(is -> { - final ItemEntity entity = new ItemEntity(this.world, this.getX(), this.getY(), this.getZ(), - is); + final ItemEntity entity = new ItemEntity(this.world, this.getX(), this.getY(), this.getZ(), is); this.world.spawnEntity(entity); }); diff --git a/src/main/java/appeng/entity/GrowingCrystalEntity.java b/src/main/java/appeng/entity/GrowingCrystalEntity.java index 81ce954b9..659244fe8 100644 --- a/src/main/java/appeng/entity/GrowingCrystalEntity.java +++ b/src/main/java/appeng/entity/GrowingCrystalEntity.java @@ -18,8 +18,6 @@ package appeng.entity; -import appeng.client.EffectType; -import appeng.items.misc.CrystalSeedItem; import net.minecraft.block.BlockState; import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; @@ -33,8 +31,10 @@ import net.minecraft.world.World; import appeng.api.features.AEFeature; import appeng.api.implementations.items.IGrowableCrystal; import appeng.api.implementations.tiles.ICrystalGrowthAccelerator; +import appeng.client.EffectType; import appeng.core.AEConfig; import appeng.core.AppEng; +import appeng.items.misc.CrystalSeedItem; import appeng.util.Platform; public final class GrowingCrystalEntity extends AEBaseItemEntity { @@ -50,7 +50,8 @@ public final class GrowingCrystalEntity extends AEBaseItemEntity { public GrowingCrystalEntity(final World w, final double x, final double y, final double z, final ItemStack is) { super(TYPE, w, x, y, z, is); this.setCovetedItem(); - // FIXME FABRIC This does not actually fix despawning, we need to Mixin, probably. + // FIXME FABRIC This does not actually fix despawning, we need to Mixin, + // probably. } @Override @@ -119,7 +120,7 @@ public final class GrowingCrystalEntity extends AEBaseItemEntity { if (this.progress_1000 >= len) { this.progress_1000 = 0; AppEng.instance().spawnEffect(EffectType.Vibrant, this.world, this.getX(), this.getY() + 0.2, - this.getZ(), null); + this.getZ(), null); } } else { if (this.progress_1000 > 1000) { @@ -177,7 +178,7 @@ public final class GrowingCrystalEntity extends AEBaseItemEntity { public void applyBuoyancy() { ItemStack item = getStack(); if (item.getItem() instanceof CrystalSeedItem) { - return; + return; } super.applyBuoyancy(); } diff --git a/src/main/java/appeng/entity/SingularityEntity.java b/src/main/java/appeng/entity/SingularityEntity.java index cd406f55c..98a16e95e 100644 --- a/src/main/java/appeng/entity/SingularityEntity.java +++ b/src/main/java/appeng/entity/SingularityEntity.java @@ -80,8 +80,8 @@ public final class SingularityEntity extends AEBaseItemEntity { final IMaterials materials = Api.instance().definitions().materials(); if (materials.singularity().isSameAs(item)) { - final Box region = new Box(this.getX() - 4, this.getY() - 4, this.getZ() - 4, - this.getX() + 4, this.getY() + 4, this.getZ() + 4); + final Box region = new Box(this.getX() - 4, this.getY() - 4, this.getZ() - 4, this.getX() + 4, + this.getY() + 4, this.getZ() + 4); final List l = this.getCheckedEntitiesWithinAABBExcludingEntity(region); for (final Entity e : l) { diff --git a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java index 0eca1aec3..e08fc18a4 100644 --- a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java @@ -18,12 +18,10 @@ package appeng.entity; -import appeng.core.Api; -import appeng.api.features.AEFeature; -import appeng.core.AEConfig; -import appeng.core.sync.packets.ICustomEntity; -import appeng.core.sync.packets.SpawnEntityPacket; -import appeng.util.Platform; +import java.util.List; + +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -40,8 +38,12 @@ import net.minecraft.util.math.Box; import net.minecraft.world.World; import net.minecraft.world.explosion.Explosion; -import javax.annotation.Nullable; -import java.util.List; +import appeng.api.features.AEFeature; +import appeng.core.AEConfig; +import appeng.core.Api; +import appeng.core.sync.packets.ICustomEntity; +import appeng.core.sync.packets.SpawnEntityPacket; +import appeng.util.Platform; public final class TinyTNTPrimedEntity extends TntEntity implements ICustomEntity { @@ -55,7 +57,7 @@ public final class TinyTNTPrimedEntity extends TntEntity implements ICustomEntit } public TinyTNTPrimedEntity(final World world, final double x, final double y, final double z, - final LivingEntity igniter) { + final LivingEntity igniter) { super(TYPE, world); this.updatePosition(x, y, z); double d = world.random.nextDouble() * 6.2831854820251465D; @@ -101,8 +103,7 @@ public final class TinyTNTPrimedEntity extends TntEntity implements ICustomEntit if (this.isSubmergedInWater() && Platform.isServer()) // put out the fuse. { Api.instance().definitions().blocks().tinyTNT().maybeStack(1).ifPresent(tntStack -> { - final ItemEntity item = new ItemEntity(this.world, this.getX(), this.getY(), this.getZ(), - tntStack); + final ItemEntity item = new ItemEntity(this.world, this.getX(), this.getY(), this.getZ(), tntStack); item.setVelocity(this.getVelocity()); item.prevX = this.prevX; @@ -114,8 +115,7 @@ public final class TinyTNTPrimedEntity extends TntEntity implements ICustomEntit }); } - this.world.addParticle(ParticleTypes.SMOKE, this.getX(), this.getY(), this.getZ(), 0.0D, 0.0D, - 0.0D); + this.world.addParticle(ParticleTypes.SMOKE, this.getX(), this.getY(), this.getZ(), 0.0D, 0.0D, 0.0D); } this.setFuse(this.getFuse() - 1); } @@ -129,11 +129,11 @@ public final class TinyTNTPrimedEntity extends TntEntity implements ICustomEntit return; } - final Explosion ex = new Explosion(this.world, this, this.getX(), this.getY(), this.getZ(), 0.2f, - false, Explosion.DestructionType.BREAK); + final Explosion ex = new Explosion(this.world, this, this.getX(), this.getY(), this.getZ(), 0.2f, false, + Explosion.DestructionType.BREAK); - final Box area = new Box(this.getX() - 1.5, this.getY() - 1.5f, this.getZ() - 1.5, - this.getX() + 1.5, this.getY() + 1.5, this.getZ() + 1.5); + final Box area = new Box(this.getX() - 1.5, this.getY() - 1.5f, this.getZ() - 1.5, this.getX() + 1.5, + this.getY() + 1.5, this.getZ() + 1.5); final List list = this.world.getEntities(this, area); for (final Entity e : list) { @@ -152,8 +152,7 @@ public final class TinyTNTPrimedEntity extends TntEntity implements ICustomEntit final Block block = state.getBlock(); if (block != null && !state.isAir()) { - float strength = (float) (2.3f - - (((x + 0.5f) - this.getX()) * ((x + 0.5f) - this.getX()) + float strength = (float) (2.3f - (((x + 0.5f) - this.getX()) * ((x + 0.5f) - this.getX()) + ((y + 0.5f) - this.getY()) * ((y + 0.5f) - this.getY()) + ((z + 0.5f) - this.getZ()) * ((z + 0.5f) - this.getZ()))); diff --git a/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java index 2b1f63e4f..9272aec04 100644 --- a/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java @@ -40,7 +40,7 @@ public class TinyTNTPrimedRenderer extends EntityRenderer { @Override public void render(TinyTNTPrimedEntity tnt, float entityYaw, float partialTicks, MatrixStack mStack, - VertexConsumerProvider buffers, int packedLight) { + VertexConsumerProvider buffers, int packedLight) { mStack.push(); mStack.translate(0, 0.25F, 0); float f2; diff --git a/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java b/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java index 0d6ba5221..d58b0dfed 100644 --- a/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java +++ b/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java @@ -21,9 +21,9 @@ package appeng.fluids.block; import javax.annotation.Nullable; import net.minecraft.block.Material; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; diff --git a/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java b/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java index 1eeac83d8..292298e8a 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java @@ -45,8 +45,8 @@ public class FluidFormationPlaneScreen extends UpgradeableScreen openPriorityGui())); + this.addButton(new TabButton(this.x + 154, this.y, 2 + 4 * 16, GuiText.Priority.text(), this.itemRenderer, + btn -> openPriorityGui())); } private void openPriorityGui() { diff --git a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java b/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java index 71a8fe334..b62aa1152 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java @@ -22,7 +22,6 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; - import appeng.client.gui.implementations.UpgradeableScreen; import appeng.client.gui.widgets.TabButton; import appeng.container.implementations.PriorityContainer; @@ -36,8 +35,7 @@ import appeng.fluids.helper.DualityFluidInterface; import appeng.fluids.util.IAEFluidTank; public class FluidInterfaceScreen extends UpgradeableScreen { - public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory, - Text title) { + public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.backgroundHeight = 231; } diff --git a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java index ee0f64f65..033865b19 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java @@ -23,8 +23,7 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen(this.x - 18, this.y + 28, - Settings.REDSTONE_EMITTER, RedstoneMode.LOW_SIGNAL); + this.redstoneMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 28, Settings.REDSTONE_EMITTER, + RedstoneMode.LOW_SIGNAL); this.addButton(this.redstoneMode); } @Override - public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, float partialTicks) { + public void drawBG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY, + float partialTicks) { super.drawBG(matrices, offsetX, offsetY, mouseX, mouseY, partialTicks); this.level.render(matrices, mouseX, mouseY, partialTicks); } diff --git a/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java b/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java index 6b7a3284d..c83132d2b 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java @@ -51,8 +51,7 @@ public class FluidStorageBusScreen extends UpgradeableScreen rwMode; private SettingToggleButton storageFilter; - public FluidStorageBusScreen(FluidStorageBusContainer container, PlayerInventory playerInventory, - Text title) { + public FluidStorageBusScreen(FluidStorageBusContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.backgroundHeight = 251; } @@ -84,8 +83,8 @@ public class FluidStorageBusScreen extends UpgradeableScreen partition())); this.rwMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 48, Settings.ACCESS, AccessRestriction.READ_WRITE); - this.storageFilter = new ServerSettingToggleButton<>(this.x - 18, this.y + 68, - Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY); + this.storageFilter = new ServerSettingToggleButton<>(this.x - 18, this.y + 68, Settings.STORAGE_FILTER, + StorageFilter.EXTRACTABLE_ONLY); this.fuzzyMode = new ServerSettingToggleButton<>(this.x - 18, this.y + 88, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL); diff --git a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java index de70793a4..2ccde6b09 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java @@ -24,16 +24,15 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.screen.slot.Slot; -import net.minecraft.text.LiteralText; import org.lwjgl.glfw.GLFW; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.slot.Slot; import net.minecraft.screen.slot.SlotActionType; +import net.minecraft.text.LiteralText; import net.minecraft.text.Text; - import appeng.api.config.Settings; import appeng.api.config.SortDir; import appeng.api.config.SortOrder; @@ -81,8 +80,7 @@ public class FluidTerminalScreen extends AEBaseMEScreen private SettingToggleButton sortByBox; private SettingToggleButton sortDirBox; - public FluidTerminalScreen(FluidTerminalContainer container, PlayerInventory playerInventory, - Text title) { + public FluidTerminalScreen(FluidTerminalContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.backgroundWidth = 185; this.backgroundHeight = 222; @@ -107,8 +105,8 @@ public class FluidTerminalScreen extends AEBaseMEScreen int offset = this.y; - this.sortByBox = this.addButton(new SettingToggleButton<>(this.x - 18, offset, Settings.SORT_BY, - getSortBy(), Platform::isSortOrderAvailable, this::toggleServerSetting)); + this.sortByBox = this.addButton(new SettingToggleButton<>(this.x - 18, offset, Settings.SORT_BY, getSortBy(), + Platform::isSortOrderAvailable, this::toggleServerSetting)); offset += 20; this.sortDirBox = this.addButton(new SettingToggleButton<>(this.x - 18, offset, Settings.SORT_DIRECTION, diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java index b9fd0cab6..f4aa42892 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java @@ -1,23 +1,25 @@ package appeng.fluids.client.gui.widgets; +import java.math.RoundingMode; +import java.util.Collections; +import java.util.Set; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; + import alexiil.mc.lib.attributes.fluid.FluidAttributes; import alexiil.mc.lib.attributes.fluid.GroupedFluidInvView; import alexiil.mc.lib.attributes.fluid.volume.FluidKey; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; + import appeng.api.storage.data.IAEFluidStack; import appeng.client.gui.widgets.CustomSlotWidget; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.FluidSlotPacket; import appeng.fluids.util.AEFluidStack; import appeng.fluids.util.IAEFluidTank; -import net.minecraft.client.MinecraftClient; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.text.Text; - -import java.math.RoundingMode; -import java.util.Collections; -import java.util.Set; public class FluidSlotWidget extends CustomSlotWidget { private final IAEFluidTank fluids; @@ -40,8 +42,7 @@ public class FluidSlotWidget extends CustomSlotWidget { @Override public boolean canClick(final PlayerEntity player) { final ItemStack mouseStack = player.inventory.getCursorStack(); - return mouseStack.isEmpty() - || FluidAttributes.EXTRACTABLE.getFirstOrNull(mouseStack) != null; + return mouseStack.isEmpty() || FluidAttributes.EXTRACTABLE.getFirstOrNull(mouseStack) != null; } @Override diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java index 01354ba1c..5b0798d0d 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java @@ -18,12 +18,6 @@ package appeng.fluids.client.gui.widgets; -import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; -import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.util.AEColor; -import appeng.client.gui.widgets.ITooltip; -import appeng.fluids.util.IAEFluidTank; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.widget.AbstractButtonWidget; @@ -31,6 +25,14 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; +import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; + +import appeng.api.storage.data.IAEFluidStack; +import appeng.api.util.AEColor; +import appeng.client.gui.widgets.ITooltip; +import appeng.fluids.util.IAEFluidTank; + @Environment(EnvType.CLIENT) public class FluidTankWidget extends AbstractButtonWidget implements ITooltip { private final IAEFluidTank tank; @@ -45,7 +47,8 @@ public class FluidTankWidget extends AbstractButtonWidget implements ITooltip { @Override public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) { if (this.visible) { - fill(matrices, this.x, this.y, this.x + this.width, this.y + this.height, AEColor.GRAY.blackVariant | 0xFF000000); + fill(matrices, this.x, this.y, this.x + this.width, this.y + this.height, + AEColor.GRAY.blackVariant | 0xFF000000); final IAEFluidStack fluidStack = this.tank.getFluidInSlot(this.slot); if (fluidStack != null && fluidStack.getStackSize() > 0) { diff --git a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java index d38c425c9..8535367d4 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java @@ -3,12 +3,11 @@ package appeng.fluids.client.gui.widgets; import com.mojang.blaze3d.systems.RenderSystem; - +import net.minecraft.client.util.math.MatrixStack; import appeng.api.storage.data.IAEFluidStack; import appeng.container.slot.IOptionalSlotHost; import appeng.fluids.util.IAEFluidTank; -import net.minecraft.client.util.math.MatrixStack; public class OptionalFluidSlotWidget extends FluidSlotWidget { private final IOptionalSlotHost containerBus; @@ -51,8 +50,8 @@ public class OptionalFluidSlotWidget extends FluidSlotWidget { } int oldZOffset = getZOffset(); setZOffset(currentZIndex); - drawTexture(matrices, guileft + this.xPos() - 1, guitop + this.yPos() - 1, this.srcX - 1, - this.srcY - 1, this.getWidth() + 2, this.getHeight() + 2); + drawTexture(matrices, guileft + this.xPos() - 1, guitop + this.yPos() - 1, this.srcX - 1, this.srcY - 1, + this.getWidth() + 2, this.getHeight() + 2); setZOffset(oldZOffset); } } diff --git a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java b/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java index 41b08c8db..5437e58ad 100644 --- a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java +++ b/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java @@ -5,14 +5,15 @@ import java.math.RoundingMode; import java.util.Collections; import java.util.Map; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandlerListener; +import net.minecraft.screen.ScreenHandlerType; + import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.fluid.FluidAttributes; import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.screen.ScreenHandlerListener; -import net.minecraft.item.ItemStack; import appeng.api.config.Upgrades; import appeng.api.implementations.IUpgradeableHost; @@ -26,7 +27,8 @@ import appeng.util.Platform; public abstract class FluidConfigurableContainer extends UpgradeableContainer implements IFluidSyncContainer { private FluidSyncHelper sync = null; - public FluidConfigurableContainer(ScreenHandlerType containerType, int id, PlayerInventory ip, IUpgradeableHost te) { + public FluidConfigurableContainer(ScreenHandlerType containerType, int id, PlayerInventory ip, + IUpgradeableHost te) { super(containerType, id, ip, te); } @@ -41,8 +43,8 @@ public abstract class FluidConfigurableContainer extends UpgradeableContainer im @Override protected ItemStack transferStackToContainer(ItemStack input) { - FluidVolume fluid = FluidAttributes.EXTRACTABLE.get(input) - .attemptAnyExtraction(FluidAmount.MAX_VALUE, Simulation.ACTION); + FluidVolume fluid = FluidAttributes.EXTRACTABLE.get(input).attemptAnyExtraction(FluidAmount.MAX_VALUE, + Simulation.ACTION); if (!fluid.isEmpty()) { final IAEFluidTank t = this.getFluidConfigInventory(); diff --git a/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java b/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java index 008bc78f8..c22234a03 100644 --- a/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java +++ b/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java @@ -1,11 +1,12 @@ package appeng.fluids.container; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.SecurityPermissions; import appeng.api.config.Upgrades; diff --git a/src/main/java/appeng/fluids/container/FluidIOContainer.java b/src/main/java/appeng/fluids/container/FluidIOContainer.java index 95ef3f983..b14786bd5 100644 --- a/src/main/java/appeng/fluids/container/FluidIOContainer.java +++ b/src/main/java/appeng/fluids/container/FluidIOContainer.java @@ -20,8 +20,8 @@ package appeng.fluids.container; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; diff --git a/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java b/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java index f399c4e18..6c8d0894b 100644 --- a/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java +++ b/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java @@ -23,9 +23,9 @@ import java.util.Map; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandlerListener; import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.network.PacketByteBuf; import appeng.api.config.SecurityPermissions; import appeng.api.storage.data.IAEFluidStack; diff --git a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java b/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java index 5e1e4acef..9b420d3d3 100644 --- a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java +++ b/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java @@ -1,11 +1,11 @@ package appeng.fluids.container; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.network.PacketByteBuf; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; import appeng.api.config.RedstoneMode; import appeng.api.config.SecurityPermissions; diff --git a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java index a0b55c5b1..4f16f3d69 100644 --- a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java +++ b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java @@ -22,8 +22,9 @@ import java.util.Iterator; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.AccessRestriction; diff --git a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java index 461279496..0444abc08 100644 --- a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java +++ b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java @@ -24,6 +24,14 @@ import java.nio.BufferOverflowException; import javax.annotation.Nonnull; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerListener; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.server.network.ServerPlayerEntity; + import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.fluid.FixedFluidInv; import alexiil.mc.lib.attributes.fluid.FluidAttributes; @@ -35,13 +43,6 @@ import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; import alexiil.mc.lib.attributes.fluid.filter.ExactFluidFilter; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import alexiil.mc.lib.attributes.misc.Ref; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandlerListener; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketByteBuf; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -234,8 +235,8 @@ public class FluidTerminalContainer extends AEBaseContainer if (stack == null && this.clientRequestedTargetFluid == null) { return; } - if (stack != null && this.clientRequestedTargetFluid != null - && FluidVolume.areEqualExceptAmounts(stack.getFluidStack(), this.clientRequestedTargetFluid.getFluidStack())) { + if (stack != null && this.clientRequestedTargetFluid != null && FluidVolume + .areEqualExceptAmounts(stack.getFluidStack(), this.clientRequestedTargetFluid.getFluidStack())) { return; } NetworkHandler.instance().sendToServer(new TargetFluidStackPacket((AEFluidStack) stack)); @@ -330,10 +331,13 @@ public class FluidTerminalContainer extends AEBaseContainer } // Check how much we can store in the item - FluidVolume volumeOverflow = insertable.attemptInsertion(this.clientRequestedTargetFluid.getFluidStack().withAmount(FluidAmount.ofWhole(Long.MAX_VALUE)), Simulation.SIMULATE); + FluidVolume volumeOverflow = insertable.attemptInsertion( + this.clientRequestedTargetFluid.getFluidStack().withAmount(FluidAmount.ofWhole(Long.MAX_VALUE)), + Simulation.SIMULATE); FluidAmount amountAllowed = FluidAmount.ofWhole(Long.MAX_VALUE).saturatedSub(volumeOverflow.amount()); - final IAEFluidStack stack = AEFluidStack.fromFluidVolume(this.clientRequestedTargetFluid.getFluidStack().withAmount(amountAllowed), RoundingMode.DOWN); + final IAEFluidStack stack = AEFluidStack.fromFluidVolume( + this.clientRequestedTargetFluid.getFluidStack().withAmount(amountAllowed), RoundingMode.DOWN); if (stack == null) { return; // Might be nothing allowed... } @@ -365,7 +369,8 @@ public class FluidTerminalContainer extends AEBaseContainer volumeOverflow = insertable.attemptInsertion(pulled.getFluidStack(), Simulation.ACTION); if (!volumeOverflow.isEmpty()) { - AELog.error("Fluid item [%s] reported a different possible amount than it actually accepted. Overflow: %s.", + AELog.error( + "Fluid item [%s] reported a different possible amount than it actually accepted. Overflow: %s.", held, volumeOverflow); } @@ -386,13 +391,14 @@ public class FluidTerminalContainer extends AEBaseContainer } // Check if we can push into the system - final IAEFluidStack notStorable = Platform.poweredInsert(this.getPowerSource(), this.monitor, - aeStack, this.getActionSource(), Actionable.SIMULATE); + final IAEFluidStack notStorable = Platform.poweredInsert(this.getPowerSource(), this.monitor, aeStack, + this.getActionSource(), Actionable.SIMULATE); // Adjust the amount if needed if (notStorable != null && notStorable.getStackSize() > 0) { final FluidAmount toStore = aeStack.getAmount().sub(notStorable.getAmount()); - extract = extractable.attemptExtraction(new ExactFluidFilter(aeStack.getFluid()), toStore, Simulation.SIMULATE); + extract = extractable.attemptExtraction(new ExactFluidFilter(aeStack.getFluid()), toStore, + Simulation.SIMULATE); if (extract.isEmpty()) { return; @@ -407,8 +413,8 @@ public class FluidTerminalContainer extends AEBaseContainer return; // I guess the extractable decided to return a different amount upon execution } - final IAEFluidStack notInserted = Platform.poweredInsert(this.getPowerSource(), this.monitor, - aeStack, this.getActionSource()); + final IAEFluidStack notInserted = Platform.poweredInsert(this.getPowerSource(), this.monitor, aeStack, + this.getActionSource()); if (notInserted != null && notInserted.getStackSize() > 0) { AELog.error("Fluid item [%s] reported a different possible amount to drain than it actually provided.", diff --git a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java index 3fc69b63b..67176100a 100644 --- a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java +++ b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java @@ -20,11 +20,12 @@ package appeng.fluids.helper; import java.util.Optional; -import alexiil.mc.lib.attributes.AttributeList; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import net.minecraft.nbt.CompoundTag; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.nbt.CompoundTag; + +import alexiil.mc.lib.attributes.AttributeList; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.Actionable; import appeng.api.config.Settings; diff --git a/src/main/java/appeng/fluids/helper/FluidCellConfig.java b/src/main/java/appeng/fluids/helper/FluidCellConfig.java index c0dfef9e4..f35540c37 100644 --- a/src/main/java/appeng/fluids/helper/FluidCellConfig.java +++ b/src/main/java/appeng/fluids/helper/FluidCellConfig.java @@ -18,16 +18,18 @@ package appeng.fluids.helper; +import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.fluid.FluidAttributes; import alexiil.mc.lib.attributes.fluid.FluidExtractable; import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import alexiil.mc.lib.attributes.item.filter.ItemFilter; + import appeng.core.Api; import appeng.fluids.items.FluidDummyItem; import appeng.items.contents.CellConfig; -import net.minecraft.item.ItemStack; /** * @author DrummerMC @@ -44,7 +46,8 @@ public class FluidCellConfig extends CellConfig { return stack; } - // Try to auto-convert any fluid-containing item into a dummy item before insertion + // Try to auto-convert any fluid-containing item into a dummy item before + // insertion FluidExtractable fluidExtractable = FluidAttributes.EXTRACTABLE.getFirstOrNull(stack); if (fluidExtractable == null) { return ItemStack.EMPTY; diff --git a/src/main/java/appeng/fluids/helper/GroupedFluidInvCache.java b/src/main/java/appeng/fluids/helper/GroupedFluidInvCache.java index d252d5a60..bd42763b5 100644 --- a/src/main/java/appeng/fluids/helper/GroupedFluidInvCache.java +++ b/src/main/java/appeng/fluids/helper/GroupedFluidInvCache.java @@ -1,15 +1,16 @@ package appeng.fluids.helper; +import java.math.RoundingMode; +import java.util.*; + import alexiil.mc.lib.attributes.fluid.GroupedFluidInv; import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; import alexiil.mc.lib.attributes.fluid.volume.FluidKey; + import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; import appeng.fluids.util.AEFluidStack; -import java.math.RoundingMode; -import java.util.*; - public class GroupedFluidInvCache { private final GroupedFluidInv inventory; @@ -38,7 +39,8 @@ public class GroupedFluidInvCache { FluidAmount oldAmount = old == null ? FluidAmount.ZERO : old.getAmount(); if (!newAmount.equals(oldAmount)) { - AEFluidStack newStack = AEFluidStack.fromFluidVolume(storedFluid.withAmount(newAmount), RoundingMode.DOWN); + AEFluidStack newStack = AEFluidStack.fromFluidVolume(storedFluid.withAmount(newAmount), + RoundingMode.DOWN); if (old != null) { old = old.copy(); diff --git a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java index 8d2059b9d..69a008608 100644 --- a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java +++ b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java @@ -20,6 +20,7 @@ package appeng.fluids.items; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.storage.IStorageChannel; diff --git a/src/main/java/appeng/fluids/items/FluidDummyItem.java b/src/main/java/appeng/fluids/items/FluidDummyItem.java index 659f4b082..689522cc7 100644 --- a/src/main/java/appeng/fluids/items/FluidDummyItem.java +++ b/src/main/java/appeng/fluids/items/FluidDummyItem.java @@ -18,15 +18,16 @@ package appeng.fluids.items; -import alexiil.mc.lib.attributes.fluid.FluidVolumeUtil; -import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; -import alexiil.mc.lib.attributes.fluid.volume.FluidKeys; -import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.collection.DefaultedList; +import alexiil.mc.lib.attributes.fluid.FluidVolumeUtil; +import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; +import alexiil.mc.lib.attributes.fluid.volume.FluidKeys; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; + import appeng.items.AEBaseItem; /** diff --git a/src/main/java/appeng/fluids/items/FluidDummyItemColor.java b/src/main/java/appeng/fluids/items/FluidDummyItemColor.java index 32d496c4f..adc77f20c 100644 --- a/src/main/java/appeng/fluids/items/FluidDummyItemColor.java +++ b/src/main/java/appeng/fluids/items/FluidDummyItemColor.java @@ -1,12 +1,12 @@ package appeng.fluids.items; -import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.color.item.ItemColorProvider; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; @Environment(EnvType.CLIENT) public class FluidDummyItemColor implements ItemColorProvider { diff --git a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java index 1f4a99268..bbe10b6df 100644 --- a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java +++ b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java @@ -6,25 +6,26 @@ import java.util.List; import javax.annotation.Nonnull; -import alexiil.mc.lib.attributes.fluid.FluidAttributes; -import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; -import alexiil.mc.lib.attributes.fluid.volume.FluidKeys; -import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraft.block.BlockState; import net.minecraft.block.FluidDrainable; import net.minecraft.block.entity.BlockEntity; import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.tag.FluidTags; import net.minecraft.tag.Tag; import net.minecraft.util.Identifier; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.fluid.FluidAttributes; +import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; +import alexiil.mc.lib.attributes.fluid.volume.FluidKeys; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; + import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.networking.IGridNode; @@ -249,8 +250,8 @@ public class FluidAnnihilationPlanePart extends BasicStatePart implements IGridT // This _MIGHT_ change the liquid, and if it does, and we dont have enough // space, tough luck. you loose the source block. fluid = ((FluidDrainable) blockstate.getBlock()).tryDrainFluid(w, pos, blockstate); - this.storeFluid(AEFluidStack.fromFluidVolume(FluidKeys.get(fluid).withAmount(FluidAmount.ONE), RoundingMode.DOWN), - true); + this.storeFluid(AEFluidStack.fromFluidVolume(FluidKeys.get(fluid).withAmount(FluidAmount.ONE), + RoundingMode.DOWN), true); AppEng.instance().sendToAllNearExcept(null, pos.getX(), pos.getY(), pos.getZ(), 64, w, new BlockTransitionEffectPacket(pos, blockstate, this.getSide().getOpposite(), diff --git a/src/main/java/appeng/fluids/parts/FluidExportBusPart.java b/src/main/java/appeng/fluids/parts/FluidExportBusPart.java index 95c790747..c6c4c67d6 100644 --- a/src/main/java/appeng/fluids/parts/FluidExportBusPart.java +++ b/src/main/java/appeng/fluids/parts/FluidExportBusPart.java @@ -18,16 +18,18 @@ package appeng.fluids.parts; +import java.math.RoundingMode; + import javax.annotation.Nonnull; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Identifier; + import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.fluid.FluidAttributes; import alexiil.mc.lib.attributes.fluid.FluidInsertable; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -import appeng.attributes.MEAttributes; -import net.minecraft.item.ItemStack; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.Identifier; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; @@ -43,6 +45,7 @@ import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartModel; import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEFluidStack; +import appeng.attributes.MEAttributes; import appeng.core.AppEng; import appeng.core.settings.TickRates; import appeng.items.parts.PartModels; @@ -50,8 +53,6 @@ import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; import appeng.parts.PartModel; -import java.math.RoundingMode; - /** * @author BrockWS * @version rv6 - 30/04/2018 diff --git a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java b/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java index 5f1cf242f..fd698cee6 100644 --- a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java +++ b/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java @@ -1,10 +1,33 @@ package appeng.fluids.parts; +import java.math.RoundingMode; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; +import net.minecraft.block.FluidFillable; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.util.Hand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; + import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import alexiil.mc.lib.attributes.fluid.world.FluidWorldUtil; + import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.IncludeExclude; @@ -36,26 +59,6 @@ import appeng.parts.automation.AbstractFormationPlanePart; import appeng.parts.automation.PlaneModels; import appeng.util.Platform; import appeng.util.prioritylist.PrecisePriorityList; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.FluidBlock; -import net.minecraft.block.FluidFillable; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.BlockView; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; public class FluidFormationPlanePart extends AbstractFormationPlanePart implements IAEFluidInventory { private static final PlaneModels MODELS = new PlaneModels("part/fluid_formation_plane", @@ -114,7 +117,8 @@ public class FluidFormationPlanePart extends AbstractFormationPlanePart 0) { aeFluidStack.decStackSize(notInserted.getStackSize()); } - // Now we need to actually drain the fluid, and use the actual amount we just inserted + // Now we need to actually drain the fluid, and use the actual amount we just + // inserted extractable.extract(filter, aeFluidStack.getAmount()); // FIXME: If there's a mismatch here, log? return TickRateModulation.FASTER; @@ -141,7 +144,8 @@ public class FluidImportBusPart extends SharedFluidBusPart { return this.getProxy().isActive(); } - // Returns a filter for fluid extraction based on the configured filter for this bus + // Returns a filter for fluid extraction based on the configured filter for this + // bus private FluidFilter getFilter() { Set allowedFluids = null; diff --git a/src/main/java/appeng/fluids/parts/FluidInterfacePart.java b/src/main/java/appeng/fluids/parts/FluidInterfacePart.java index f8994a524..b3dbafb13 100644 --- a/src/main/java/appeng/fluids/parts/FluidInterfacePart.java +++ b/src/main/java/appeng/fluids/parts/FluidInterfacePart.java @@ -20,16 +20,17 @@ package appeng.fluids.parts; import java.util.EnumSet; -import alexiil.mc.lib.attributes.AttributeList; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.math.Direction; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; + +import alexiil.mc.lib.attributes.AttributeList; import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.Upgrades; @@ -56,7 +57,6 @@ import appeng.fluids.container.FluidInterfaceContainer; import appeng.fluids.helper.DualityFluidInterface; import appeng.fluids.helper.IFluidInterfaceHost; import appeng.helpers.IPriorityHost; - import appeng.items.parts.PartModels; import appeng.parts.BasicStatePart; import appeng.parts.PartModel; diff --git a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java b/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java index ba3e67395..e1dafc478 100644 --- a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java +++ b/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java @@ -53,17 +53,13 @@ import appeng.util.Platform; public class FluidLevelEmitterPart extends UpgradeablePart implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver { @PartModels - public static final Identifier MODEL_BASE_OFF = new Identifier(AppEng.MOD_ID, - "part/level_emitter_base_off"); + public static final Identifier MODEL_BASE_OFF = new Identifier(AppEng.MOD_ID, "part/level_emitter_base_off"); @PartModels - public static final Identifier MODEL_BASE_ON = new Identifier(AppEng.MOD_ID, - "part/level_emitter_base_on"); + public static final Identifier MODEL_BASE_ON = new Identifier(AppEng.MOD_ID, "part/level_emitter_base_on"); @PartModels - public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, - "part/level_emitter_status_off"); + public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_off"); @PartModels - public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, - "part/level_emitter_status_on"); + public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_on"); @PartModels public static final Identifier MODEL_STATUS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_has_channel"); diff --git a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java index 4e886ac73..1ed44aca1 100644 --- a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java +++ b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java @@ -24,18 +24,19 @@ import java.util.Objects; import javax.annotation.Nonnull; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; + import alexiil.mc.lib.attributes.fluid.FluidAttributes; import alexiil.mc.lib.attributes.fluid.GroupedFluidInv; import alexiil.mc.lib.attributes.fluid.GroupedFluidInvView; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.Vec3d; import appeng.api.config.AccessRestriction; import appeng.api.config.FuzzyMode; @@ -91,8 +92,7 @@ import appeng.util.prioritylist.PrecisePriorityList; */ public class FluidStorageBusPart extends SharedStorageBusPart implements IMEMonitorHandlerReceiver, IAEFluidInventory { - public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, - "part/fluid_storage_bus_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/fluid_storage_bus_base"); @PartModels public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, new Identifier(AppEng.MOD_ID, "part/fluid_storage_bus_off")); @@ -121,7 +121,8 @@ public class FluidStorageBusPart extends SharedStorageBusPart private IMEInventory getInventoryWrapper(BlockEntity target) { // Prioritize a handler to directly link to another ME network - IStorageMonitorableAccessor accessor = MEAttributes.getAttributeInFrontOfPart(MEAttributes.STORAGE_MONITORABLE_ACCESSOR, this); + IStorageMonitorableAccessor accessor = MEAttributes + .getAttributeInFrontOfPart(MEAttributes.STORAGE_MONITORABLE_ACCESSOR, this); if (accessor != null) { IStorageMonitorable inventory = accessor.getInventory(this.source); if (inventory != null) { @@ -379,14 +380,13 @@ public class FluidStorageBusPart extends SharedStorageBusPart return 0; } - IStorageMonitorableAccessor accessor = MEAttributes.getAttributeInFrontOfPart( - MEAttributes.STORAGE_MONITORABLE_ACCESSOR, this); + IStorageMonitorableAccessor accessor = MEAttributes + .getAttributeInFrontOfPart(MEAttributes.STORAGE_MONITORABLE_ACCESSOR, this); if (accessor != null) { return Objects.hash(target, accessor); } - final GroupedFluidInv groupedInv = MEAttributes.getAttributeInFrontOfPart( - FluidAttributes.GROUPED_INV, this); + final GroupedFluidInv groupedInv = MEAttributes.getAttributeInFrontOfPart(FluidAttributes.GROUPED_INV, this); if (groupedInv != null) { return Objects.hash(target, groupedInv); } diff --git a/src/main/java/appeng/fluids/parts/FluidTerminalPart.java b/src/main/java/appeng/fluids/parts/FluidTerminalPart.java index af5bf57f7..67c76f78c 100644 --- a/src/main/java/appeng/fluids/parts/FluidTerminalPart.java +++ b/src/main/java/appeng/fluids/parts/FluidTerminalPart.java @@ -19,8 +19,8 @@ package appeng.fluids.parts; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; diff --git a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java b/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java index 423865d2f..3a1ce02af 100644 --- a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java +++ b/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java @@ -18,8 +18,6 @@ package appeng.fluids.parts; -import alexiil.mc.lib.attributes.Attribute; -import alexiil.mc.lib.attributes.SearchOptions; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -29,6 +27,9 @@ import net.minecraft.util.math.*; import net.minecraft.world.BlockView; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.Attribute; +import alexiil.mc.lib.attributes.SearchOptions; + import appeng.api.config.RedstoneMode; import appeng.api.config.Upgrades; import appeng.api.networking.ticking.IGridTickable; diff --git a/src/main/java/appeng/fluids/tile/FluidInterfaceBlockEntity.java b/src/main/java/appeng/fluids/tile/FluidInterfaceBlockEntity.java index 634d976db..231019c21 100644 --- a/src/main/java/appeng/fluids/tile/FluidInterfaceBlockEntity.java +++ b/src/main/java/appeng/fluids/tile/FluidInterfaceBlockEntity.java @@ -20,16 +20,18 @@ package appeng.fluids.tile; import java.util.EnumSet; -import alexiil.mc.lib.attributes.AttributeList; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.block.BlockState; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +import alexiil.mc.lib.attributes.AttributeList; +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.Upgrades; import appeng.api.networking.IGridNode; @@ -49,7 +51,6 @@ import appeng.fluids.helper.DualityFluidInterface; import appeng.fluids.helper.IFluidInterfaceHost; import appeng.helpers.IPriorityHost; import appeng.tile.grid.AENetworkBlockEntity; -import net.minecraft.world.World; public class FluidInterfaceBlockEntity extends AENetworkBlockEntity implements IGridTickable, IFluidInterfaceHost, IPriorityHost { diff --git a/src/main/java/appeng/fluids/util/AEFluidInventory.java b/src/main/java/appeng/fluids/util/AEFluidInventory.java index e39098270..9b3ff5d7e 100644 --- a/src/main/java/appeng/fluids/util/AEFluidInventory.java +++ b/src/main/java/appeng/fluids/util/AEFluidInventory.java @@ -4,6 +4,8 @@ package appeng.fluids.util; import java.math.RoundingMode; import java.util.Objects; +import net.minecraft.nbt.CompoundTag; + import alexiil.mc.lib.attributes.ListenerRemovalToken; import alexiil.mc.lib.attributes.ListenerToken; import alexiil.mc.lib.attributes.Simulation; @@ -12,7 +14,6 @@ import alexiil.mc.lib.attributes.fluid.FluidVolumeUtil; import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; import alexiil.mc.lib.attributes.fluid.volume.FluidKey; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -import net.minecraft.nbt.CompoundTag; import appeng.api.storage.data.IAEFluidStack; import appeng.core.AELog; diff --git a/src/main/java/appeng/fluids/util/AEFluidStack.java b/src/main/java/appeng/fluids/util/AEFluidStack.java index cedcace0c..08941420d 100644 --- a/src/main/java/appeng/fluids/util/AEFluidStack.java +++ b/src/main/java/appeng/fluids/util/AEFluidStack.java @@ -18,12 +18,10 @@ package appeng.fluids.util; +import java.math.RoundingMode; + import javax.annotation.Nonnull; -import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; -import alexiil.mc.lib.attributes.fluid.volume.FluidKey; -import alexiil.mc.lib.attributes.fluid.volume.FluidKeys; -import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import com.google.common.base.Preconditions; import net.fabricmc.fabric.api.util.NbtType; @@ -31,6 +29,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; +import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; +import alexiil.mc.lib.attributes.fluid.volume.FluidKey; +import alexiil.mc.lib.attributes.fluid.volume.FluidKeys; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; + import appeng.api.config.FuzzyMode; import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IFluidStorageChannel; @@ -40,8 +43,6 @@ import appeng.fluids.items.FluidDummyItem; import appeng.util.Platform; import appeng.util.item.AEStack; -import java.math.RoundingMode; - public final class AEFluidStack extends AEStack implements IAEFluidStack, Comparable { private static final String NBT_STACKSIZE = "cnt"; private static final String NBT_REQUESTABLE = "req"; diff --git a/src/main/java/appeng/helpers/AEMaterials.java b/src/main/java/appeng/helpers/AEMaterials.java index 7a8b0216e..ff4005dd1 100644 --- a/src/main/java/appeng/helpers/AEMaterials.java +++ b/src/main/java/appeng/helpers/AEMaterials.java @@ -24,7 +24,7 @@ import net.minecraft.block.piston.PistonBehavior; public class AEMaterials { - public static final Material GLASS = new Material(MaterialColor.CLEAR, false, false, true, false, false, - false, PistonBehavior.NORMAL); + public static final Material GLASS = new Material(MaterialColor.CLEAR, false, false, true, false, false, false, + PistonBehavior.NORMAL); } diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 8ab68d1c2..b4e616f54 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -28,10 +28,6 @@ import java.util.Optional; import javax.annotation.Nullable; -import alexiil.mc.lib.attributes.AttributeList; -import alexiil.mc.lib.attributes.AttributeProvider; -import alexiil.mc.lib.attributes.Simulation; -import alexiil.mc.lib.attributes.item.FixedItemInv; import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; @@ -43,15 +39,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.text.Text; import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.AttributeList; +import alexiil.mc.lib.attributes.AttributeProvider; +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.Actionable; import appeng.api.config.Settings; import appeng.api.config.Upgrades; @@ -166,7 +167,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { if (this.isWorking == slot) { return; } @@ -970,12 +971,14 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn direction.getOffsetZ() * 0.501); final Vec3d to = from.add(direction.getOffsetX(), direction.getOffsetY(), direction.getOffsetZ()); final BlockHitResult hit = null;// hostWorld.rayTraceBlocks( from, to ); //FIXME: - // https://github.com/MinecraftForge/MinecraftForge/pull/6708 + // https://github.com/MinecraftForge/MinecraftForge/pull/6708 if (hit != null && !BAD_BLOCKS.contains(directedBlock)) { if (hit.getBlockPos().equals(directedTile.getPos())) { - // FIXME FABRIC: Either add "getName" to the interface adaptor, or special-case cable buses here - // FIXME FABRIC final ItemStack g = directedBlock.getPickBlock(directedBlockState, hit, hostWorld, - // FIXME FABRIC directedTile.getPos(), null); + // FIXME FABRIC: Either add "getName" to the interface adaptor, or special-case + // cable buses here + // FIXME FABRIC final ItemStack g = + // directedBlock.getPickBlock(directedBlockState, hit, hostWorld, + // FIXME FABRIC directedTile.getPos(), null); // FIXME FABRIC if (!g.isEmpty()) { // FIXME FABRIC what = g; // FIXME FABRIC } diff --git a/src/main/java/appeng/helpers/IContainerCraftingPacket.java b/src/main/java/appeng/helpers/IContainerCraftingPacket.java index f2a4f042d..5ca795369 100644 --- a/src/main/java/appeng/helpers/IContainerCraftingPacket.java +++ b/src/main/java/appeng/helpers/IContainerCraftingPacket.java @@ -18,9 +18,10 @@ package appeng.helpers; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.networking.IGridNode; import appeng.api.networking.security.IActionSource; diff --git a/src/main/java/appeng/helpers/IPriorityHost.java b/src/main/java/appeng/helpers/IPriorityHost.java index 3167429ec..6833485ac 100644 --- a/src/main/java/appeng/helpers/IPriorityHost.java +++ b/src/main/java/appeng/helpers/IPriorityHost.java @@ -18,8 +18,8 @@ package appeng.helpers; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandlerType; public interface IPriorityHost { diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index f5234ddfc..3f1c9b367 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -20,9 +20,9 @@ package appeng.helpers; import net.minecraft.block.BlockState; import net.minecraft.state.property.DirectionProperty; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction.Axis; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; diff --git a/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java b/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java index d2ad0e8d0..ac53647d8 100644 --- a/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java +++ b/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java @@ -20,14 +20,14 @@ package appeng.hooks; import net.minecraft.block.DispenserBlock; import net.minecraft.block.dispenser.ItemDispenserBehavior; -import net.minecraft.util.math.BlockPointer; import net.minecraft.item.AutomaticItemPlacementContext; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPointer; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import net.minecraft.server.world.ServerWorld; public final class BlockToolDispenseItemBehavior extends ItemDispenserBehavior { @@ -40,8 +40,8 @@ public final class BlockToolDispenseItemBehavior extends ItemDispenserBehavior { final World w = dispenser.getWorld(); if (w instanceof ServerWorld) { - ItemUsageContext context = new AutomaticItemPlacementContext(w, dispenser.getBlockPos().offset(direction), - direction, dispensedItem, direction.getOpposite()); + ItemUsageContext context = new AutomaticItemPlacementContext(w, + dispenser.getBlockPos().offset(direction), direction, dispensedItem, direction.getOpposite()); tm.useOnBlock(context); } } diff --git a/src/main/java/appeng/hooks/ClientTickHandler.java b/src/main/java/appeng/hooks/ClientTickHandler.java index 968e06732..9393c2c8f 100644 --- a/src/main/java/appeng/hooks/ClientTickHandler.java +++ b/src/main/java/appeng/hooks/ClientTickHandler.java @@ -1,16 +1,17 @@ package appeng.hooks; -import appeng.core.Api; -import appeng.api.parts.CableRenderMode; -import appeng.client.AppEngClient; -import appeng.util.Platform; +import java.util.HashMap; +import java.util.Map; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.minecraft.client.MinecraftClient; -import java.util.HashMap; -import java.util.Map; +import appeng.api.parts.CableRenderMode; +import appeng.client.AppEngClient; +import appeng.core.Api; +import appeng.util.Platform; @Environment(EnvType.CLIENT) public class ClientTickHandler extends TickHandler { diff --git a/src/main/java/appeng/hooks/DynamicDimensions.java b/src/main/java/appeng/hooks/DynamicDimensions.java index a6f48b409..bf52d90df 100644 --- a/src/main/java/appeng/hooks/DynamicDimensions.java +++ b/src/main/java/appeng/hooks/DynamicDimensions.java @@ -8,6 +8,7 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; public interface DynamicDimensions { - ServerWorld addWorld(RegistryKey worldId, RegistryKey dimensionTypeId, ChunkGenerator chunkGenerator); + ServerWorld addWorld(RegistryKey worldId, RegistryKey dimensionTypeId, + ChunkGenerator chunkGenerator); } diff --git a/src/main/java/appeng/hooks/ItemRendererHooks.java b/src/main/java/appeng/hooks/ItemRendererHooks.java index 27b23575d..75f93c276 100644 --- a/src/main/java/appeng/hooks/ItemRendererHooks.java +++ b/src/main/java/appeng/hooks/ItemRendererHooks.java @@ -1,12 +1,7 @@ package appeng.hooks; -import alexiil.mc.lib.attributes.fluid.FluidAttributes; -import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -import appeng.client.render.DummyFluidBakedModel; -import appeng.fluids.items.FluidDummyItem; -import appeng.items.misc.EncodedPatternItem; -import appeng.mixins.ItemRendererAccessor; import com.google.common.collect.ImmutableList; + import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.render.item.ItemRenderer; @@ -20,6 +15,14 @@ import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; +import alexiil.mc.lib.attributes.fluid.FluidAttributes; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; + +import appeng.client.render.DummyFluidBakedModel; +import appeng.fluids.items.FluidDummyItem; +import appeng.items.misc.EncodedPatternItem; +import appeng.mixins.ItemRendererAccessor; + public final class ItemRendererHooks { // Prevents recursion in the hook below @@ -29,8 +32,8 @@ public final class ItemRendererHooks { } /** - * This hook will exchange the rendered item model for encoded patterns to the item being crafted by them - * if shift is held. + * This hook will exchange the rendered item model for encoded patterns to the + * item being crafted by them if shift is held. */ public static boolean onRenderGuiItemModel(ItemRenderer renderer, ItemStack stack, int x, int y, BakedModel model) { if (OVERRIDING_FOR.get() == stack) { @@ -44,8 +47,7 @@ public final class ItemRendererHooks { EncodedPatternItem iep = (EncodedPatternItem) stack.getItem(); ItemStack output = iep.getOutput(world, stack); if (!output.isEmpty()) { - BakedModel realModel = MinecraftClient.getInstance().getItemRenderer().getModels() - .getModel(output); + BakedModel realModel = MinecraftClient.getInstance().getItemRenderer().getModels().getModel(output); renderInstead(renderer, stack, x, y, realModel); return true; } diff --git a/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java b/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java index ac0dbff4c..492c8a433 100644 --- a/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java +++ b/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java @@ -18,19 +18,19 @@ package appeng.hooks; -import appeng.util.FakePlayer; import net.minecraft.block.DispenserBlock; import net.minecraft.block.dispenser.ItemDispenserBehavior; -import net.minecraft.util.math.BlockPointer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPointer; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import net.minecraft.server.world.ServerWorld; import appeng.api.util.AEPartLocation; import appeng.items.tools.powered.MatterCannonItem; +import appeng.util.FakePlayer; import appeng.util.Platform; public final class MatterCannonDispenseItemBehavior extends ItemDispenserBehavior { diff --git a/src/main/java/appeng/hooks/RegisterDimensionTypeCallback.java b/src/main/java/appeng/hooks/RegisterDimensionTypeCallback.java index ca8f6e53f..e2695d727 100644 --- a/src/main/java/appeng/hooks/RegisterDimensionTypeCallback.java +++ b/src/main/java/appeng/hooks/RegisterDimensionTypeCallback.java @@ -6,11 +6,12 @@ import net.minecraft.util.registry.RegistryTracker; public interface RegisterDimensionTypeCallback { - Event EVENT = EventFactory.createArrayBacked(RegisterDimensionTypeCallback.class, (listeners) -> (registryTracker) -> { - for (RegisterDimensionTypeCallback listener : listeners) { - listener.addDimensionTypes(registryTracker); - } - }); + Event EVENT = EventFactory.createArrayBacked(RegisterDimensionTypeCallback.class, + (listeners) -> (registryTracker) -> { + for (RegisterDimensionTypeCallback listener : listeners) { + listener.addDimensionTypes(registryTracker); + } + }); void addDimensionTypes(RegistryTracker.Modifiable registryTracker); diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index 59ea8f567..9d9ca3885 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -18,26 +18,6 @@ package appeng.hooks; -import appeng.api.networking.IGridNode; -import appeng.api.util.AEColor; -import appeng.core.AEConfig; -import appeng.core.AELog; -import appeng.core.sync.packets.PaintedEntityPacket; -import appeng.crafting.CraftingJob; -import appeng.me.Grid; -import appeng.tile.AEBaseBlockEntity; -import appeng.util.IWorldCallable; -import appeng.util.Platform; -import com.google.common.base.Stopwatch; -import com.google.common.collect.LinkedListMultimap; -import com.google.common.collect.Multimap; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; - import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; @@ -51,6 +31,28 @@ import java.util.Set; import java.util.WeakHashMap; import java.util.concurrent.TimeUnit; +import com.google.common.base.Stopwatch; +import com.google.common.collect.LinkedListMultimap; +import com.google.common.collect.Multimap; + +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; + +import appeng.api.networking.IGridNode; +import appeng.api.util.AEColor; +import appeng.core.AEConfig; +import appeng.core.AELog; +import appeng.core.sync.packets.PaintedEntityPacket; +import appeng.crafting.CraftingJob; +import appeng.me.Grid; +import appeng.tile.AEBaseBlockEntity; +import appeng.util.IWorldCallable; +import appeng.util.Platform; + public class TickHandler { private static TickHandler INSTANCE; @@ -155,8 +157,8 @@ public class TickHandler { // FIXME FABRIC } /** - * This is primarily useful for an integrated server being stopped, and can be fully replaced by the event - * above once world unload events hit. + * This is primarily useful for an integrated server being stopped, and can be + * fully replaced by the event above once world unload events hit. */ private void onServerStopping(MinecraftServer server) { final List toDestroy = new ArrayList<>(); @@ -187,7 +189,7 @@ public class TickHandler { final int jobSize = jobSet.size(); final int microSecondsPerTick = AEConfig.instance().getCraftingCalculationTimePerTick() * 1000; final int simTime = Math.max(1, microSecondsPerTick / jobSize); - final Iterator i = jobSet.iterator(); + final Iterator i = jobSet.iterator(); while (i.hasNext()) { final CraftingJob cj = i.next(); if (!cj.simulateFor(simTime)) { diff --git a/src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java b/src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java index 7458b1c53..e9db9cf25 100644 --- a/src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java +++ b/src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java @@ -20,8 +20,8 @@ package appeng.hooks; import net.minecraft.block.DispenserBlock; import net.minecraft.block.dispenser.ItemDispenserBehavior; -import net.minecraft.util.math.BlockPointer; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPointer; import net.minecraft.util.math.Direction; import net.minecraft.world.World; diff --git a/src/main/java/appeng/hooks/ToolItemHook.java b/src/main/java/appeng/hooks/ToolItemHook.java index 679a060ae..6d1e6f2ee 100644 --- a/src/main/java/appeng/hooks/ToolItemHook.java +++ b/src/main/java/appeng/hooks/ToolItemHook.java @@ -11,8 +11,8 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.world.World; /** - * This hooks allows item-specific behavior to be triggered when an item is used on a block, - * without shift being held or the block being called first. + * This hooks allows item-specific behavior to be triggered when an item is used + * on a block, without shift being held or the block being called first. */ public class ToolItemHook { @@ -20,7 +20,8 @@ public class ToolItemHook { UseBlockCallback.EVENT.register(ToolItemHook::handleItemUse); } - private static ActionResult handleItemUse(PlayerEntity playerEntity, World world, Hand hand, BlockHitResult blockHitResult) { + private static ActionResult handleItemUse(PlayerEntity playerEntity, World world, Hand hand, + BlockHitResult blockHitResult) { if (playerEntity.isSpectator()) { return ActionResult.PASS; diff --git a/src/main/java/appeng/integration/abstraction/IAEFacade.java b/src/main/java/appeng/integration/abstraction/IAEFacade.java index 8c16eb6ae..7933d1812 100644 --- a/src/main/java/appeng/integration/abstraction/IAEFacade.java +++ b/src/main/java/appeng/integration/abstraction/IAEFacade.java @@ -22,8 +22,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.minecraft.block.BlockState; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import team.chisel.ctm.api.IFacade; diff --git a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java index 07c65f91a..b74692b9c 100644 --- a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java +++ b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java @@ -18,10 +18,18 @@ package appeng.integration.modules.jei; -import appeng.api.config.CondenserOutput; -import appeng.core.Api; -import appeng.core.AppEng; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + import com.google.common.base.Splitter; + +import net.minecraft.text.LiteralText; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Identifier; +import net.minecraft.util.Language; + import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.EntryStack; @@ -30,15 +38,10 @@ import me.shedaniel.rei.api.widgets.Slot; import me.shedaniel.rei.api.widgets.Tooltip; import me.shedaniel.rei.api.widgets.Widgets; import me.shedaniel.rei.gui.widget.Widget; -import net.minecraft.text.LiteralText; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.Identifier; -import net.minecraft.util.Language; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; +import appeng.api.config.CondenserOutput; +import appeng.core.Api; +import appeng.core.AppEng; class CondenserCategory implements RecipeCategory { @@ -85,10 +88,12 @@ class CondenserCategory implements RecipeCategory { widgets.add(Widgets.createTexturedWidget(statesLocation, origin.x + 2, origin.y + 28, 241, 81, 14, 14)); widgets.add(Widgets.createTexturedWidget(statesLocation, origin.x + 78, origin.y + 28, 240, 240, 16, 16)); - // FIXME IDrawableStatic progressDrawable = guiHelper.drawableBuilder(location, 178, 25, 6, 18).addPadding(0, 0, 70, 0) - // FIXME .build(); - // FIXME this.progress = guiHelper.createAnimatedDrawable(progressDrawable, 40, IDrawableAnimated.StartDirection.BOTTOM, - // FIXME false); + // FIXME IDrawableStatic progressDrawable = guiHelper.drawableBuilder(location, + // 178, 25, 6, 18).addPadding(0, 0, 70, 0) + // FIXME .build(); + // FIXME this.progress = guiHelper.createAnimatedDrawable(progressDrawable, 40, + // IDrawableAnimated.StartDirection.BOTTOM, + // FIXME false); if (recipeDisplay.getType() == CondenserOutput.MATTER_BALLS) { widgets.add(Widgets.createTexturedWidget(statesLocation, origin.x + 78, origin.y + 28, 16, 112, 14, 14)); @@ -98,28 +103,24 @@ class CondenserCategory implements RecipeCategory { widgets.add(Widgets.createDrawableWidget((helper, matrices, mouseX, mouseY, delta) -> { Rectangle rect = new Rectangle(origin.x + 78, origin.y + 28, 16, 16); if (rect.contains(mouseX, mouseY)) { - Tooltip.create(getTooltip(recipeDisplay.getType()).stream().map(LiteralText::new).collect(Collectors.toList())) + Tooltip.create( + getTooltip(recipeDisplay.getType()).stream().map(LiteralText::new).collect(Collectors.toList())) .queue(); } })); - Slot outputSlot = Widgets.createSlot(new Point(origin.x + 55, origin.y + 27)) - .disableBackground() - .markOutput() + Slot outputSlot = Widgets.createSlot(new Point(origin.x + 55, origin.y + 27)).disableBackground().markOutput() .entries(recipeDisplay.getOutputEntries()); widgets.add(outputSlot); - Slot storageCellSlot = Widgets.createSlot(new Point(origin.x + 51, origin.y + 1)) - .disableBackground() - .markInput() - .entries(recipeDisplay.getViableStorageComponents()); + Slot storageCellSlot = Widgets.createSlot(new Point(origin.x + 51, origin.y + 1)).disableBackground() + .markInput().entries(recipeDisplay.getViableStorageComponents()); widgets.add(storageCellSlot); return widgets; } - @Override public int getDisplayWidth(CondenserOutputDisplay display) { return 94 + 2 * PADDING; diff --git a/src/main/java/appeng/integration/modules/jei/CondenserOutputDisplay.java b/src/main/java/appeng/integration/modules/jei/CondenserOutputDisplay.java index 173f656ff..d2f0e884b 100644 --- a/src/main/java/appeng/integration/modules/jei/CondenserOutputDisplay.java +++ b/src/main/java/appeng/integration/modules/jei/CondenserOutputDisplay.java @@ -1,19 +1,20 @@ package appeng.integration.modules.jei; -import appeng.core.Api; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.Identifier; + +import me.shedaniel.rei.api.EntryStack; +import me.shedaniel.rei.api.RecipeDisplay; + import appeng.api.config.CondenserOutput; import appeng.api.definitions.IMaterials; import appeng.api.implementations.items.IStorageComponent; import appeng.core.Api; import appeng.tile.misc.CondenserBlockEntity; -import me.shedaniel.rei.api.EntryStack; -import me.shedaniel.rei.api.RecipeDisplay; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; public class CondenserOutputDisplay implements RecipeDisplay { @@ -25,9 +26,7 @@ public class CondenserOutputDisplay implements RecipeDisplay { public CondenserOutputDisplay(CondenserOutput output) { this.type = output; - this.output = Collections.singletonList( - EntryStack.create(getOutput(type)) - ); + this.output = Collections.singletonList(EntryStack.create(getOutput(type))); this.viableStorageComponents = getViableStorageComponents(output); } @@ -72,7 +71,7 @@ public class CondenserOutputDisplay implements RecipeDisplay { } private void addViableComponent(CondenserOutput condenserOutput, List viableComponents, - ItemStack itemStack) { + ItemStack itemStack) { IStorageComponent comp = (IStorageComponent) itemStack.getItem(); int storage = comp.getBytes(itemStack) * CondenserBlockEntity.BYTE_MULTIPLIER; if (storage >= condenserOutput.requiredPower) { diff --git a/src/main/java/appeng/integration/modules/jei/FacadeRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/FacadeRecipeCategory.java index 5a4fa0007..5cc9941d6 100644 --- a/src/main/java/appeng/integration/modules/jei/FacadeRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/FacadeRecipeCategory.java @@ -1,11 +1,13 @@ package appeng.integration.modules.jei; +import net.minecraft.client.resource.language.I18n; +import net.minecraft.util.Identifier; + +import me.shedaniel.rei.api.EntryStack; +import me.shedaniel.rei.plugin.crafting.DefaultCraftingCategory; + import appeng.core.AppEng; import appeng.core.FacadeCreativeTab; -import me.shedaniel.rei.api.EntryStack; -import me.shedaniel.rei.plugin.crafting.DefaultCraftingCategory; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.util.Identifier; /** * A simple copy of the crafting category to separate out the facade recipes. diff --git a/src/main/java/appeng/integration/modules/jei/FacadeRegistryGenerator.java b/src/main/java/appeng/integration/modules/jei/FacadeRegistryGenerator.java index 6ff112dca..6f3235b10 100644 --- a/src/main/java/appeng/integration/modules/jei/FacadeRegistryGenerator.java +++ b/src/main/java/appeng/integration/modules/jei/FacadeRegistryGenerator.java @@ -18,13 +18,10 @@ package appeng.integration.modules.jei; -import appeng.core.AppEng; -import appeng.core.FacadeCreativeTab; -import appeng.items.parts.FacadeItem; -import me.shedaniel.rei.api.ClientHelper; -import me.shedaniel.rei.api.EntryStack; -import me.shedaniel.rei.api.LiveRecipeGenerator; -import me.shedaniel.rei.plugin.crafting.DefaultShapedDisplay; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; @@ -32,9 +29,14 @@ import net.minecraft.recipe.ShapedRecipe; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; -import java.util.Collections; -import java.util.List; -import java.util.Optional; +import me.shedaniel.rei.api.ClientHelper; +import me.shedaniel.rei.api.EntryStack; +import me.shedaniel.rei.api.LiveRecipeGenerator; +import me.shedaniel.rei.plugin.crafting.DefaultShapedDisplay; + +import appeng.core.AppEng; +import appeng.core.FacadeCreativeTab; +import appeng.items.parts.FacadeItem; /** * This plugin will dynamically add facade recipes for any item that can be diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java index 04a601d43..a3a09f596 100644 --- a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java @@ -18,8 +18,15 @@ package appeng.integration.modules.jei; -import appeng.core.Api; -import appeng.core.AppEng; +import java.awt.*; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.text.LiteralText; +import net.minecraft.util.Identifier; +import net.minecraft.util.Language; + import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.EntryStack; @@ -27,14 +34,9 @@ import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.widgets.Slot; import me.shedaniel.rei.api.widgets.Widgets; import me.shedaniel.rei.gui.widget.Widget; -import net.minecraft.text.LiteralText; -import net.minecraft.util.Identifier; -import net.minecraft.util.Language; -import java.awt.*; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.List; +import appeng.core.Api; +import appeng.core.AppEng; class GrinderRecipeCategory implements RecipeCategory { @@ -85,7 +87,8 @@ class GrinderRecipeCategory implements RecipeCategory { // Add the input List input = recipe.getInputEntries().get(0); - widgets.add(Widgets.createSlot(new Point(bounds.x + 1, bounds.y + 1)).backgroundEnabled(false).markInput().entries(input)); + widgets.add(Widgets.createSlot(new Point(bounds.x + 1, bounds.y + 1)).backgroundEnabled(false).markInput() + .entries(input)); // Add the output slots and their chances (if <100%) List output = recipe.getOutputEntries(); @@ -93,16 +96,14 @@ class GrinderRecipeCategory implements RecipeCategory { DecimalFormat df = new DecimalFormat("###.##"); int offset = bounds.x + 101; for (int i = 0; i < output.size(); i++) { - Slot slot = Widgets.createSlot(new Point(offset, bounds.y + 47)) - .backgroundEnabled(false) + Slot slot = Widgets.createSlot(new Point(offset, bounds.y + 47)).backgroundEnabled(false) .entry(output.get(i)); widgets.add(slot); double chance = outputChances.get(i); if (chance < 100) { Point p = new Point(slot.getBounds().getCenterX(), slot.getBounds().getMaxY() + 2); - widgets.add(Widgets.createLabel(p, new LiteralText(df.format(chance) + "%")) - .shadow(false) + widgets.add(Widgets.createLabel(p, new LiteralText(df.format(chance) + "%")).shadow(false) .color(Color.gray.getRGB())); } offset += 18; diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java index 281d671ab..0a5ff7136 100644 --- a/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java +++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java @@ -18,21 +18,24 @@ package appeng.integration.modules.jei; -import appeng.recipes.handlers.GrinderOptionalResult; -import appeng.recipes.handlers.GrinderRecipe; -import com.google.common.collect.ImmutableList; -import me.shedaniel.rei.api.EntryStack; -import me.shedaniel.rei.api.TransferRecipeDisplay; -import me.shedaniel.rei.server.ContainerInfo; -import me.shedaniel.rei.utils.CollectionUtils; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.util.Identifier; - import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import com.google.common.collect.ImmutableList; + +import net.minecraft.screen.ScreenHandler; +import net.minecraft.util.Identifier; + +import me.shedaniel.rei.api.EntryStack; +import me.shedaniel.rei.api.TransferRecipeDisplay; +import me.shedaniel.rei.server.ContainerInfo; +import me.shedaniel.rei.utils.CollectionUtils; + +import appeng.recipes.handlers.GrinderOptionalResult; +import appeng.recipes.handlers.GrinderRecipe; + class GrinderRecipeWrapper implements TransferRecipeDisplay { private final GrinderRecipe recipe; @@ -42,7 +45,8 @@ class GrinderRecipeWrapper implements TransferRecipeDisplay { public GrinderRecipeWrapper(GrinderRecipe recipe) { this.recipe = recipe; - this.input = CollectionUtils.map(recipe.getPreviewInputs(), i -> CollectionUtils.map(i.getMatchingStacksClient(), EntryStack::create)); + this.input = CollectionUtils.map(recipe.getPreviewInputs(), + i -> CollectionUtils.map(i.getMatchingStacksClient(), EntryStack::create)); List outputs = new ArrayList<>(); List outputChances = new ArrayList<>(); @@ -97,7 +101,8 @@ class GrinderRecipeWrapper implements TransferRecipeDisplay { } @Override - public List> getOrganisedInputEntries(ContainerInfo containerInfo, ScreenHandler container) { + public List> getOrganisedInputEntries(ContainerInfo containerInfo, + ScreenHandler container) { return input; } diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java index 7be909ea0..5e1b951d8 100644 --- a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java @@ -18,20 +18,23 @@ package appeng.integration.modules.jei; -import appeng.core.Api; -import appeng.core.AppEng; +import java.util.ArrayList; +import java.util.List; + import com.google.common.collect.ImmutableList; + +import net.minecraft.util.Identifier; +import net.minecraft.util.Language; + import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.widgets.Widgets; import me.shedaniel.rei.gui.widget.Widget; -import net.minecraft.util.Identifier; -import net.minecraft.util.Language; -import java.util.ArrayList; -import java.util.List; +import appeng.core.Api; +import appeng.core.AppEng; class InscriberRecipeCategory implements RecipeCategory { @@ -76,21 +79,13 @@ class InscriberRecipeCategory implements RecipeCategory List> ingredients = recipeDisplay.getInputEntries(); EntryStack output = recipeDisplay.getOutputEntries().get(0); - widgets.add(Widgets.createSlot(new Point(bounds.x + 1, bounds.y + 1)) - .disableBackground() - .markInput() + widgets.add(Widgets.createSlot(new Point(bounds.x + 1, bounds.y + 1)).disableBackground().markInput() .entries(ingredients.get(SLOT_INPUT_TOP))); - widgets.add(Widgets.createSlot(new Point(bounds.x + 19, bounds.y + 24)) - .disableBackground() - .markInput() + widgets.add(Widgets.createSlot(new Point(bounds.x + 19, bounds.y + 24)).disableBackground().markInput() .entries(ingredients.get(SLOT_INPUT_MIDDLE))); - widgets.add(Widgets.createSlot(new Point(bounds.x + 1, bounds.y + 47)) - .disableBackground() - .markInput() + widgets.add(Widgets.createSlot(new Point(bounds.x + 1, bounds.y + 47)).disableBackground().markInput() .entries(ingredients.get(SLOT_INPUT_BOTTOM))); - widgets.add(Widgets.createSlot(new Point(bounds.x + 69, bounds.y + 25)) - .disableBackground() - .markOutput() + widgets.add(Widgets.createSlot(new Point(bounds.x + 69, bounds.y + 25)).disableBackground().markOutput() .entry(output)); return widgets; diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRecipeWrapper.java b/src/main/java/appeng/integration/modules/jei/InscriberRecipeWrapper.java index 54402b0b5..c44e95417 100644 --- a/src/main/java/appeng/integration/modules/jei/InscriberRecipeWrapper.java +++ b/src/main/java/appeng/integration/modules/jei/InscriberRecipeWrapper.java @@ -18,17 +18,20 @@ package appeng.integration.modules.jei; -import appeng.recipes.handlers.InscriberRecipe; +import java.util.List; +import java.util.Optional; + import com.google.common.collect.ImmutableList; + +import net.minecraft.screen.ScreenHandler; +import net.minecraft.util.Identifier; + import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.TransferRecipeDisplay; import me.shedaniel.rei.server.ContainerInfo; import me.shedaniel.rei.utils.CollectionUtils; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.util.Identifier; -import java.util.List; -import java.util.Optional; +import appeng.recipes.handlers.InscriberRecipe; class InscriberRecipeWrapper implements TransferRecipeDisplay { @@ -42,15 +45,14 @@ class InscriberRecipeWrapper implements TransferRecipeDisplay { this.recipe = recipe; this.topOptional = CollectionUtils.map(recipe.getTopOptional().getMatchingStacksClient(), EntryStack::create); this.middleInput = CollectionUtils.map(recipe.getMiddleInput().getMatchingStacksClient(), EntryStack::create); - this.bottomOptional = CollectionUtils.map(recipe.getBottomOptional().getMatchingStacksClient(), EntryStack::create); + this.bottomOptional = CollectionUtils.map(recipe.getBottomOptional().getMatchingStacksClient(), + EntryStack::create); this.output = EntryStack.create(recipe.getOutput()); } @Override public List> getInputEntries() { - return ImmutableList.of( - topOptional, middleInput, bottomOptional - ); + return ImmutableList.of(topOptional, middleInput, bottomOptional); } @Override @@ -84,7 +86,8 @@ class InscriberRecipeWrapper implements TransferRecipeDisplay { } @Override - public List> getOrganisedInputEntries(ContainerInfo containerInfo, ScreenHandler container) { + public List> getOrganisedInputEntries(ContainerInfo containerInfo, + ScreenHandler container) { return getInputEntries(); } diff --git a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java index 63b812001..f6efcbc7b 100644 --- a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java +++ b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java @@ -18,22 +18,24 @@ package appeng.integration.modules.jei; -import appeng.container.slot.CraftingMatrixSlot; -import appeng.container.slot.FakeCraftingMatrixSlot; -import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.JEIRecipePacket; -import appeng.mixins.SlotMixin; -import appeng.util.Platform; -import me.shedaniel.rei.api.AutoTransferHandler; -import me.shedaniel.rei.api.EntryStack; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.slot.Slot; -import java.util.ArrayList; -import java.util.List; +import me.shedaniel.rei.api.AutoTransferHandler; +import me.shedaniel.rei.api.EntryStack; + +import appeng.container.slot.CraftingMatrixSlot; +import appeng.container.slot.FakeCraftingMatrixSlot; +import appeng.core.sync.network.NetworkHandler; +import appeng.core.sync.packets.JEIRecipePacket; +import appeng.mixins.SlotMixin; +import appeng.util.Platform; class RecipeTransferHandler implements AutoTransferHandler { diff --git a/src/main/java/appeng/integration/modules/jei/ReiPlugin.java b/src/main/java/appeng/integration/modules/jei/ReiPlugin.java index 72424082f..12c814079 100644 --- a/src/main/java/appeng/integration/modules/jei/ReiPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/ReiPlugin.java @@ -18,7 +18,18 @@ package appeng.integration.modules.jei; -import appeng.core.Api; +import java.util.Arrays; +import java.util.stream.Collectors; + +import net.minecraft.item.ItemStack; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Identifier; + +import me.shedaniel.rei.api.EntryStack; +import me.shedaniel.rei.api.RecipeHelper; +import me.shedaniel.rei.api.plugins.REIPluginV0; +import me.shedaniel.rei.plugin.information.DefaultInformationDisplay; + import appeng.api.config.CondenserOutput; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItemDefinition; @@ -27,22 +38,13 @@ import appeng.api.features.AEFeature; import appeng.container.implementations.CraftingTermContainer; import appeng.container.implementations.PatternTermContainer; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.core.AppEng; import appeng.core.localization.GuiText; import appeng.integration.abstraction.ReiFacade; import appeng.items.parts.FacadeItem; import appeng.recipes.handlers.GrinderRecipe; import appeng.recipes.handlers.InscriberRecipe; -import me.shedaniel.rei.api.EntryStack; -import me.shedaniel.rei.api.RecipeHelper; -import me.shedaniel.rei.api.plugins.REIPluginV0; -import me.shedaniel.rei.plugin.information.DefaultInformationDisplay; -import net.minecraft.item.ItemStack; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.Identifier; - -import java.util.Arrays; -import java.util.stream.Collectors; public class ReiPlugin implements REIPluginV0 { private static final Identifier ID = new Identifier(AppEng.MOD_ID, "core"); @@ -52,12 +54,13 @@ public class ReiPlugin implements REIPluginV0 { return ID; } - // FIXME FABRIC @Override - // FIXME FABRIC public void registerItemSubtypes(ISubtypeRegistration subtypeRegistry) { - // FIXME FABRIC final Optional maybeFacade = AEApi.instance().definitions().items().facade().maybeItem(); - // FIXME FABRIC maybeFacade.ifPresent(subtypeRegistry::useNbtForSubtypes); - // FIXME FABRIC } - + // FIXME FABRIC @Override + // FIXME FABRIC public void registerItemSubtypes(ISubtypeRegistration + // subtypeRegistry) { + // FIXME FABRIC final Optional maybeFacade = + // AEApi.instance().definitions().items().facade().maybeItem(); + // FIXME FABRIC maybeFacade.ifPresent(subtypeRegistry::useNbtForSubtypes); + // FIXME FABRIC } @Override public void registerPluginCategories(RecipeHelper recipeHelper) { @@ -90,9 +93,7 @@ public class ReiPlugin implements REIPluginV0 { IDefinitions definitions = Api.instance().definitions(); recipeHelper.registerLiveRecipeGenerator(new FacadeRegistryGenerator( - (FacadeItem) definitions.items().facade().item(), - definitions.parts().cableAnchor().stack(1) - )); + (FacadeItem) definitions.items().facade().item(), definitions.parts().cableAnchor().stack(1))); } @Override @@ -121,20 +122,17 @@ public class ReiPlugin implements REIPluginV0 { final String[] message; if (AEConfig.instance().isFeatureEnabled(AEFeature.CERTUS_QUARTZ_WORLD_GEN)) { - message = new String[]{GuiText.ChargedQuartz.getTranslationKey(), "", - GuiText.ChargedQuartzFind.getTranslationKey()}; + message = new String[] { GuiText.ChargedQuartz.getTranslationKey(), "", + GuiText.ChargedQuartzFind.getTranslationKey() }; } else { - message = new String[]{GuiText.ChargedQuartzFind.getTranslationKey()}; + message = new String[] { GuiText.ChargedQuartzFind.getTranslationKey() }; } addDescription(materials.certusQuartzCrystalCharged(), message); if (AEConfig.instance().isFeatureEnabled(AEFeature.METEORITE_WORLD_GEN)) { - addDescription(materials.logicProcessorPress(), - GuiText.inWorldCraftingPresses.getTranslationKey()); - addDescription(materials.calcProcessorPress(), - GuiText.inWorldCraftingPresses.getTranslationKey()); - addDescription(materials.engProcessorPress(), - GuiText.inWorldCraftingPresses.getTranslationKey()); + addDescription(materials.logicProcessorPress(), GuiText.inWorldCraftingPresses.getTranslationKey()); + addDescription(materials.calcProcessorPress(), GuiText.inWorldCraftingPresses.getTranslationKey()); + addDescription(materials.engProcessorPress(), GuiText.inWorldCraftingPresses.getTranslationKey()); } if (AEConfig.instance().isFeatureEnabled(AEFeature.IN_WORLD_FLUIX)) { @@ -150,17 +148,14 @@ public class ReiPlugin implements REIPluginV0 { GuiText.inWorldPurificationCertus.getTranslationKey()); addDescription(materials.purifiedNetherQuartzCrystal(), GuiText.inWorldPurificationNether.getTranslationKey()); - addDescription(materials.purifiedFluixCrystal(), - GuiText.inWorldPurificationFluix.getTranslationKey()); + addDescription(materials.purifiedFluixCrystal(), GuiText.inWorldPurificationFluix.getTranslationKey()); } } private static void addDescription(IItemDefinition itemDefinition, String... message) { - DefaultInformationDisplay info = DefaultInformationDisplay.createFromEntry( - EntryStack.create(itemDefinition), - itemDefinition.item().getName() - ); + DefaultInformationDisplay info = DefaultInformationDisplay.createFromEntry(EntryStack.create(itemDefinition), + itemDefinition.item().getName()); info.lines(Arrays.stream(message).map(TranslatableText::new).collect(Collectors.toList())); RecipeHelper.getInstance().registerDisplay(info); } diff --git a/src/main/java/appeng/integration/modules/waila/BaseWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/BaseWailaDataProvider.java index 9f9106bb7..5a339191e 100644 --- a/src/main/java/appeng/integration/modules/waila/BaseWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/BaseWailaDataProvider.java @@ -18,18 +18,19 @@ package appeng.integration.modules.waila; +import java.util.List; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.world.World; + import mcp.mobius.waila.api.IComponentProvider; import mcp.mobius.waila.api.IDataAccessor; import mcp.mobius.waila.api.IPluginConfig; import mcp.mobius.waila.api.IServerDataProvider; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.text.Text; -import net.minecraft.world.World; - -import java.util.List; /** * Base implementation for {@link mcp.mobius.waila.api.IComponentProvider} diff --git a/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java index 8692468ff..08f83356a 100644 --- a/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java @@ -18,24 +18,27 @@ package appeng.integration.modules.waila; -import appeng.api.parts.IPart; -import appeng.api.parts.PartItemStack; -import appeng.integration.modules.waila.part.*; +import java.util.List; +import java.util.Optional; + import com.google.common.collect.Lists; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; +import net.minecraft.util.hit.HitResult; +import net.minecraft.world.World; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.*; import mcp.mobius.waila.api.impl.config.WailaConfig; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.text.LiteralText; -import net.minecraft.util.hit.HitResult; -import net.minecraft.text.Text; -import net.minecraft.world.World; -import java.util.List; -import java.util.Optional; +import appeng.api.parts.IPart; +import appeng.api.parts.PartItemStack; +import appeng.integration.modules.waila.part.*; /** * Delegation provider for parts through {@link IPartWailaDataProvider} @@ -95,8 +98,7 @@ public final class PartWailaDataProvider implements IComponentProvider, IServerD } @Override - public void appendHead(List currentToolTip, final IDataAccessor accessor, - final IPluginConfig config) { + public void appendHead(List currentToolTip, final IDataAccessor accessor, final IPluginConfig config) { final BlockEntity te = accessor.getBlockEntity(); final HitResult mop = accessor.getHitResult(); diff --git a/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java index 76c6d68b3..b120442a9 100644 --- a/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java @@ -18,23 +18,26 @@ package appeng.integration.modules.waila; -import appeng.integration.modules.waila.tile.ChargerWailaDataProvider; -import appeng.integration.modules.waila.tile.CraftingMonitorWailaDataProvider; -import appeng.integration.modules.waila.tile.PowerStateWailaDataProvider; -import appeng.integration.modules.waila.tile.PowerStorageWailaDataProvider; +import java.util.List; + import com.google.common.collect.Lists; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.world.World; + import mcp.mobius.waila.api.IComponentProvider; import mcp.mobius.waila.api.IDataAccessor; import mcp.mobius.waila.api.IPluginConfig; import mcp.mobius.waila.api.IServerDataProvider; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.text.Text; -import net.minecraft.world.World; -import java.util.List; +import appeng.integration.modules.waila.tile.ChargerWailaDataProvider; +import appeng.integration.modules.waila.tile.CraftingMonitorWailaDataProvider; +import appeng.integration.modules.waila.tile.PowerStateWailaDataProvider; +import appeng.integration.modules.waila.tile.PowerStorageWailaDataProvider; /** * Delegation provider for tiles through @@ -68,24 +71,21 @@ public final class TileWailaDataProvider implements IComponentProvider, IServerD } @Override - public void appendHead(List currentToolTip, final IDataAccessor accessor, - final IPluginConfig config) { + public void appendHead(List currentToolTip, final IDataAccessor accessor, final IPluginConfig config) { for (final BaseWailaDataProvider provider : this.providers) { provider.appendHead(currentToolTip, accessor, config); } } @Override - public void appendBody(List currentToolTip, final IDataAccessor accessor, - final IPluginConfig config) { + public void appendBody(List currentToolTip, final IDataAccessor accessor, final IPluginConfig config) { for (final BaseWailaDataProvider provider : this.providers) { provider.appendBody(currentToolTip, accessor, config); } } @Override - public void appendTail(List currentToolTip, final IDataAccessor accessor, - final IPluginConfig config) { + public void appendTail(List currentToolTip, final IDataAccessor accessor, final IPluginConfig config) { for (final BaseWailaDataProvider provider : this.providers) { provider.appendTail(currentToolTip, accessor, config); } diff --git a/src/main/java/appeng/integration/modules/waila/WailaModule.java b/src/main/java/appeng/integration/modules/waila/WailaModule.java index dc8f019f3..e2644ee80 100644 --- a/src/main/java/appeng/integration/modules/waila/WailaModule.java +++ b/src/main/java/appeng/integration/modules/waila/WailaModule.java @@ -18,9 +18,10 @@ package appeng.integration.modules.waila; -import appeng.tile.AEBaseBlockEntity; import mcp.mobius.waila.api.*; +import appeng.tile.AEBaseBlockEntity; + public class WailaModule implements IWailaPlugin { public void register(final IRegistrar registrar) { diff --git a/src/main/java/appeng/integration/modules/waila/part/BasePartWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/BasePartWailaDataProvider.java index d81a5992f..fff6f3c58 100644 --- a/src/main/java/appeng/integration/modules/waila/part/BasePartWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/BasePartWailaDataProvider.java @@ -18,22 +18,23 @@ package appeng.integration.modules.waila.part; -import appeng.api.parts.IPart; -import mcp.mobius.waila.api.IDataAccessor; -import mcp.mobius.waila.api.IPluginConfig; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.text.Text; -import net.minecraft.world.World; - import java.util.List; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import mcp.mobius.waila.api.IDataAccessor; +import mcp.mobius.waila.api.IPluginConfig; + +import appeng.api.parts.IPart; + /** - * Default implementation of - * {@link IPartWailaDataProvider} + * Default implementation of {@link IPartWailaDataProvider} * * @author thatsIch * @version rv2 @@ -47,21 +48,21 @@ public abstract class BasePartWailaDataProvider implements IPartWailaDataProvide @Override public void appendHead(final IPart part, final List tooltip, final IDataAccessor accessor, - final IPluginConfig config) { + final IPluginConfig config) { } @Override public void appendBody(final IPart part, final List tooltip, final IDataAccessor accessor, - final IPluginConfig config) { + final IPluginConfig config) { } @Override public void appendTail(final IPart part, final List tooltip, final IDataAccessor accessor, - final IPluginConfig config) { + final IPluginConfig config) { } @Override public void appendServerData(ServerPlayerEntity player, IPart part, BlockEntity te, CompoundTag tag, World world, - BlockPos pos) { + BlockPos pos) { } } diff --git a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java index ce7432208..ee61d6ba8 100644 --- a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java @@ -18,22 +18,24 @@ package appeng.integration.modules.waila.part; -import appeng.api.parts.IPart; -import appeng.core.localization.WailaText; -import appeng.parts.networking.SmartCablePart; -import appeng.parts.networking.SmartDenseCablePart; +import java.util.List; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import it.unimi.dsi.fastutil.objects.Object2ByteMap; import it.unimi.dsi.fastutil.objects.Object2ByteOpenHashMap; import mcp.mobius.waila.api.IDataAccessor; import mcp.mobius.waila.api.IPluginConfig; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.text.Text; -import net.minecraft.world.World; -import java.util.List; +import appeng.api.parts.IPart; +import appeng.core.localization.WailaText; +import appeng.parts.networking.SmartCablePart; +import appeng.parts.networking.SmartDenseCablePart; /** * Channel-information provider for WAILA @@ -69,7 +71,7 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider { */ @Override public void appendBody(final IPart part, final List tooltip, final IDataAccessor accessor, - final IPluginConfig config) { + final IPluginConfig config) { if (part instanceof SmartCablePart || part instanceof SmartDenseCablePart) { final CompoundTag tag = accessor.getServerData(); @@ -127,7 +129,7 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider { */ @Override public void appendServerData(ServerPlayerEntity player, IPart part, BlockEntity te, CompoundTag tag, World world, - BlockPos pos) { + BlockPos pos) { if (part instanceof SmartCablePart || part instanceof SmartDenseCablePart) { final CompoundTag tempTag = new CompoundTag(); diff --git a/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java index 9419bfa3b..22ddb3ff8 100644 --- a/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java @@ -18,23 +18,23 @@ package appeng.integration.modules.waila.part; -import appeng.api.parts.IPart; -import mcp.mobius.waila.api.IDataAccessor; -import mcp.mobius.waila.api.IPluginConfig; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.text.Text; -import net.minecraft.world.World; - import java.util.List; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import mcp.mobius.waila.api.IDataAccessor; +import mcp.mobius.waila.api.IPluginConfig; + +import appeng.api.parts.IPart; + /** - * An abstraction layer of the - * {@link IPartWailaDataProvider} for - * {@link IPart}. + * An abstraction layer of the {@link IPartWailaDataProvider} for {@link IPart}. * * @author thatsIch * @version rv2 @@ -50,5 +50,5 @@ public interface IPartWailaDataProvider { void appendTail(IPart part, List tooltip, IDataAccessor accessor, IPluginConfig config); void appendServerData(ServerPlayerEntity player, IPart part, BlockEntity te, CompoundTag tag, World world, - BlockPos pos); + BlockPos pos); } diff --git a/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java index 0149c9d5f..6d330f4ff 100644 --- a/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java @@ -18,23 +18,26 @@ package appeng.integration.modules.waila.part; +import java.util.List; + +import com.google.common.collect.Iterators; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import mcp.mobius.waila.api.IDataAccessor; +import mcp.mobius.waila.api.IPluginConfig; + import appeng.api.parts.IPart; import appeng.core.localization.WailaText; import appeng.me.GridAccessException; import appeng.parts.p2p.P2PTunnelPart; import appeng.util.Platform; -import com.google.common.collect.Iterators; -import mcp.mobius.waila.api.IDataAccessor; -import mcp.mobius.waila.api.IPluginConfig; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.math.BlockPos; -import net.minecraft.text.Text; -import net.minecraft.world.World; - -import java.util.List; /** * Provides information about a P2P tunnel to WAILA. @@ -57,7 +60,7 @@ public final class P2PStateWailaDataProvider extends BasePartWailaDataProvider { */ @Override public void appendBody(final IPart part, final List tooltip, final IDataAccessor accessor, - final IPluginConfig config) { + final IPluginConfig config) { if (part instanceof P2PTunnelPart) { CompoundTag nbtData = accessor.getServerData(); if (nbtData.contains(TAG_P2P_STATE)) { @@ -88,7 +91,7 @@ public final class P2PStateWailaDataProvider extends BasePartWailaDataProvider { @Override public void appendServerData(ServerPlayerEntity player, IPart part, BlockEntity te, CompoundTag tag, World world, - BlockPos pos) { + BlockPos pos) { if (part instanceof P2PTunnelPart) { final P2PTunnelPart tunnel = (P2PTunnelPart) part; diff --git a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java index 9ff06d77a..f266f5def 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java +++ b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java @@ -18,16 +18,17 @@ package appeng.integration.modules.waila.part; +import java.util.Optional; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; + import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; import appeng.api.parts.SelectedPart; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.hit.HitResult; -import net.minecraft.util.math.Vec3d; - -import java.util.Optional; /** * Accessor to access specific parts for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java index 2f34a7a8c..61639e595 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java @@ -18,10 +18,12 @@ package appeng.integration.modules.waila.part; +import net.minecraft.item.ItemStack; + +import mcp.mobius.waila.api.IPluginConfig; + import appeng.api.parts.IPart; import appeng.api.parts.PartItemStack; -import mcp.mobius.waila.api.IPluginConfig; -import net.minecraft.item.ItemStack; /** * Part ItemStack provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java index e9cfce933..f2cbd0940 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java @@ -18,14 +18,16 @@ package appeng.integration.modules.waila.part; +import java.util.List; + +import net.minecraft.text.Text; + +import mcp.mobius.waila.api.IDataAccessor; +import mcp.mobius.waila.api.IPluginConfig; + import appeng.api.implementations.IPowerChannelState; import appeng.api.parts.IPart; import appeng.core.localization.WailaText; -import mcp.mobius.waila.api.IDataAccessor; -import mcp.mobius.waila.api.IPluginConfig; -import net.minecraft.text.Text; - -import java.util.List; /** * Power state provider for WAILA @@ -45,7 +47,7 @@ public final class PowerStateWailaDataProvider extends BasePartWailaDataProvider */ @Override public void appendBody(final IPart part, final List tooltip, final IDataAccessor accessor, - final IPluginConfig config) { + final IPluginConfig config) { if (part instanceof IPowerChannelState) { final IPowerChannelState state = (IPowerChannelState) part; diff --git a/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java index e75984a17..52fe4615d 100644 --- a/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java @@ -18,17 +18,19 @@ package appeng.integration.modules.waila.part; +import java.util.List; + +import net.minecraft.text.Text; + +import mcp.mobius.waila.api.IDataAccessor; +import mcp.mobius.waila.api.IPluginConfig; + import appeng.api.implementations.parts.IStorageMonitorPart; import appeng.api.parts.IPart; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.core.localization.WailaText; -import mcp.mobius.waila.api.IDataAccessor; -import mcp.mobius.waila.api.IPluginConfig; -import net.minecraft.text.Text; - -import java.util.List; /** * Storage monitor provider for WAILA @@ -49,7 +51,7 @@ public final class StorageMonitorWailaDataProvider extends BasePartWailaDataProv */ @Override public void appendBody(final IPart part, final List tooltip, final IDataAccessor accessor, - final IPluginConfig config) { + final IPluginConfig config) { if (part instanceof IStorageMonitorPart) { final IStorageMonitorPart monitor = (IStorageMonitorPart) part; @@ -59,12 +61,11 @@ public final class StorageMonitorWailaDataProvider extends BasePartWailaDataProv // TODO: generalize if (displayed instanceof IAEItemStack) { final IAEItemStack ais = (IAEItemStack) displayed; - tooltip.add(WailaText.Showing.text().copy().append(": ") - .append(ais.asItemStackRepresentation().getName())); + tooltip.add( + WailaText.Showing.text().copy().append(": ").append(ais.asItemStackRepresentation().getName())); } else if (displayed instanceof IAEFluidStack) { final IAEFluidStack ais = (IAEFluidStack) displayed; - tooltip.add(WailaText.Showing.text().copy().append(": ") - .append(ais.getFluidStack().getName())); + tooltip.add(WailaText.Showing.text().copy().append(": ").append(ais.getFluidStack().getName())); } tooltip.add((isLocked) ? WailaText.Locked.text() : WailaText.Unlocked.text()); diff --git a/src/main/java/appeng/integration/modules/waila/part/Tracer.java b/src/main/java/appeng/integration/modules/waila/part/Tracer.java index 8e9255647..f4f3fa0bb 100644 --- a/src/main/java/appeng/integration/modules/waila/part/Tracer.java +++ b/src/main/java/appeng/integration/modules/waila/part/Tracer.java @@ -18,16 +18,17 @@ package appeng.integration.modules.waila.part; -import appeng.util.LookDirection; -import appeng.util.Platform; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import appeng.util.LookDirection; +import appeng.util.Platform; + /** * Tracer for players hitting blocks * diff --git a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java index 2e0db0f53..e27d108e1 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java @@ -18,20 +18,22 @@ package appeng.integration.modules.waila.tile; -import alexiil.mc.lib.attributes.item.FixedItemInvView; -import appeng.core.localization.WailaText; -import appeng.integration.modules.waila.BaseWailaDataProvider; -import appeng.tile.misc.ChargerBlockEntity; -import mcp.mobius.waila.api.IDataAccessor; -import mcp.mobius.waila.api.IPluginConfig; +import java.util.List; + +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.text.Text; -import java.util.List; +import alexiil.mc.lib.attributes.item.FixedItemInvView; +import mcp.mobius.waila.api.IDataAccessor; +import mcp.mobius.waila.api.IPluginConfig; + +import appeng.core.localization.WailaText; +import appeng.integration.modules.waila.BaseWailaDataProvider; +import appeng.tile.misc.ChargerBlockEntity; /** * Charger provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java index b3d5f6401..aec9d695b 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java @@ -18,16 +18,18 @@ package appeng.integration.modules.waila.tile; +import java.util.List; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.text.Text; + +import mcp.mobius.waila.api.IDataAccessor; +import mcp.mobius.waila.api.IPluginConfig; + import appeng.api.storage.data.IAEItemStack; import appeng.core.localization.WailaText; import appeng.integration.modules.waila.BaseWailaDataProvider; import appeng.tile.crafting.CraftingMonitorBlockEntity; -import mcp.mobius.waila.api.IDataAccessor; -import mcp.mobius.waila.api.IPluginConfig; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.text.Text; - -import java.util.List; /** * Crafting-monitor provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java index 073dda6bc..f644466a5 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java @@ -18,15 +18,17 @@ package appeng.integration.modules.waila.tile; -import appeng.api.implementations.IPowerChannelState; -import appeng.core.localization.WailaText; -import appeng.integration.modules.waila.BaseWailaDataProvider; -import mcp.mobius.waila.api.IDataAccessor; -import mcp.mobius.waila.api.IPluginConfig; +import java.util.List; + import net.minecraft.block.entity.BlockEntity; import net.minecraft.text.Text; -import java.util.List; +import mcp.mobius.waila.api.IDataAccessor; +import mcp.mobius.waila.api.IPluginConfig; + +import appeng.api.implementations.IPowerChannelState; +import appeng.core.localization.WailaText; +import appeng.integration.modules.waila.BaseWailaDataProvider; /** * Power state provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java index 2cd3976ec..4f0dd87be 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java @@ -18,21 +18,23 @@ package appeng.integration.modules.waila.tile; -import appeng.api.networking.energy.IAEPowerStorage; -import appeng.core.localization.WailaText; -import appeng.integration.modules.waila.BaseWailaDataProvider; -import appeng.util.Platform; +import java.util.List; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.world.World; + import it.unimi.dsi.fastutil.objects.Object2LongMap; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; import mcp.mobius.waila.api.IDataAccessor; import mcp.mobius.waila.api.IPluginConfig; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.text.Text; -import net.minecraft.world.World; -import java.util.List; +import appeng.api.networking.energy.IAEPowerStorage; +import appeng.core.localization.WailaText; +import appeng.integration.modules.waila.BaseWailaDataProvider; +import appeng.util.Platform; /** * Power storage provider for WAILA @@ -90,8 +92,8 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider { * Called on server to transfer information from server to client. *

* If the {@link net.minecraft.block.entity.BlockEntity} is a - * {@link IAEPowerStorage}, it writes the power - * information to the {@code #tag} using the {@code #ID_CURRENT_POWER} key. + * {@link IAEPowerStorage}, it writes the power information to the {@code #tag} + * using the {@code #ID_CURRENT_POWER} key. * * @param serverPlayerEntity player looking at the power storage * @param te power storage diff --git a/src/main/java/appeng/items/contents/CellConfig.java b/src/main/java/appeng/items/contents/CellConfig.java index 0f654b25c..0f793222e 100644 --- a/src/main/java/appeng/items/contents/CellConfig.java +++ b/src/main/java/appeng/items/contents/CellConfig.java @@ -18,9 +18,10 @@ package appeng.items.contents; -import alexiil.mc.lib.attributes.item.FixedItemInvView; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInvView; + import appeng.tile.inventory.AppEngInternalInventory; public class CellConfig extends AppEngInternalInventory { diff --git a/src/main/java/appeng/items/contents/CellUpgrades.java b/src/main/java/appeng/items/contents/CellUpgrades.java index 1b4e0d0bf..d989ca3d9 100644 --- a/src/main/java/appeng/items/contents/CellUpgrades.java +++ b/src/main/java/appeng/items/contents/CellUpgrades.java @@ -18,9 +18,10 @@ package appeng.items.contents; -import alexiil.mc.lib.attributes.item.FixedItemInvView; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInvView; + import appeng.parts.automation.StackUpgradeInventory; public final class CellUpgrades extends StackUpgradeInventory { diff --git a/src/main/java/appeng/items/contents/NetworkToolViewer.java b/src/main/java/appeng/items/contents/NetworkToolViewer.java index f95a03451..e286fd5df 100644 --- a/src/main/java/appeng/items/contents/NetworkToolViewer.java +++ b/src/main/java/appeng/items/contents/NetworkToolViewer.java @@ -18,9 +18,10 @@ package appeng.items.contents; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.implementations.guiobjects.INetworkTool; import appeng.api.implementations.items.IUpgradeModule; import appeng.api.networking.IGridHost; @@ -53,7 +54,7 @@ public class NetworkToolViewer implements INetworkTool, IAEAppEngInventory { @Override public void onChangeInventory(FixedItemInv inv, int slot, InvOperation mc, ItemStack removedStack, - ItemStack newStack) { + ItemStack newStack) { } @Override diff --git a/src/main/java/appeng/items/materials/MaterialItem.java b/src/main/java/appeng/items/materials/MaterialItem.java index 4ba7368b2..cc770a2b1 100644 --- a/src/main/java/appeng/items/materials/MaterialItem.java +++ b/src/main/java/appeng/items/materials/MaterialItem.java @@ -20,22 +20,22 @@ package appeng.items.materials; import java.util.List; -import appeng.hooks.AEToolItem; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.text.LiteralText; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.Upgrades; @@ -45,6 +45,7 @@ import appeng.api.implementations.items.IUpgradeModule; import appeng.api.implementations.tiles.ISegmentedInventory; import appeng.api.parts.IPartHost; import appeng.api.parts.SelectedPart; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; import appeng.util.InventoryAdaptor; import appeng.util.inv.AdaptorFixedInv; diff --git a/src/main/java/appeng/items/misc/CrystalSeedItem.java b/src/main/java/appeng/items/misc/CrystalSeedItem.java index e53ff6e16..0a5c0d383 100644 --- a/src/main/java/appeng/items/misc/CrystalSeedItem.java +++ b/src/main/java/appeng/items/misc/CrystalSeedItem.java @@ -22,7 +22,6 @@ import java.util.List; import javax.annotation.Nullable; -import appeng.core.AppEng; import com.google.common.base.Preconditions; import net.fabricmc.api.EnvType; @@ -37,13 +36,14 @@ import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.MathHelper; -import net.minecraft.text.Text; import net.minecraft.world.World; import appeng.api.implementations.items.IGrowableCrystal; +import appeng.core.AppEng; import appeng.core.localization.ButtonToolTips; import appeng.entity.GrowingCrystalEntity; import appeng.items.AEBaseItem; @@ -73,11 +73,8 @@ public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal { super(properties); this.grownItem = Preconditions.checkNotNull(grownItem); // Expose the growth of the seed to the model system - FabricModelPredicateProviderRegistry.register( - this, - new Identifier(AppEng.MOD_ID, "growth"), - (is, w, p) -> getGrowthTicks(is) / (float) GROWTH_TICKS_REQUIRED - ); + FabricModelPredicateProviderRegistry.register(this, new Identifier(AppEng.MOD_ID, "growth"), + (is, w, p) -> getGrowthTicks(is) / (float) GROWTH_TICKS_REQUIRED); } @Nullable diff --git a/src/main/java/appeng/items/misc/EncodedPatternItem.java b/src/main/java/appeng/items/misc/EncodedPatternItem.java index 4000b82dc..efa8c6057 100644 --- a/src/main/java/appeng/items/misc/EncodedPatternItem.java +++ b/src/main/java/appeng/items/misc/EncodedPatternItem.java @@ -24,12 +24,12 @@ import java.util.List; import java.util.Map; import java.util.WeakHashMap; -import appeng.core.Api; -import appeng.hooks.AEToolItem; -import net.fabricmc.fabric.api.util.NbtType; -import net.minecraft.client.item.TooltipContext; import com.google.common.base.Preconditions; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.util.NbtType; +import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; @@ -39,17 +39,17 @@ import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; import net.minecraft.text.LiteralText; import net.minecraft.text.MutableText; -import net.minecraft.util.*; import net.minecraft.text.Text; +import net.minecraft.util.*; import net.minecraft.world.World; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; +import appeng.core.Api; import appeng.core.localization.GuiText; import appeng.helpers.InvalidPatternHelper; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; import appeng.util.Platform; @@ -117,10 +117,9 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem { InvalidPatternHelper invalid = new InvalidPatternHelper(stack); - final Text label = (invalid.isCraftable() ? GuiText.Crafts.text() - : GuiText.Creates.text()).copy().append(": "); - final Text and = new LiteralText(" ").append(GuiText.And.text()) - .append(" "); + final Text label = (invalid.isCraftable() ? GuiText.Crafts.text() : GuiText.Creates.text()).copy() + .append(": "); + final Text and = new LiteralText(" ").append(GuiText.And.text()).append(" "); final Text with = GuiText.With.text().copy().append(": "); boolean first = true; @@ -137,8 +136,7 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem { if (invalid.isCraftable()) { final MutableText substitutionLabel = GuiText.Substitute.text().copy().append(" "); - final Text canSubstitute = invalid.canSubstitute() ? GuiText.Yes.text() - : GuiText.No.text(); + final Text canSubstitute = invalid.canSubstitute() ? GuiText.Yes.text() : GuiText.No.text(); lines.add(substitutionLabel.append(canSubstitute)); } @@ -156,10 +154,8 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem { final Collection in = details.getInputs(); final Collection out = details.getOutputs(); - final Text label = (isCrafting ? GuiText.Crafts.text() : GuiText.Creates.text()) - .copy().append(": "); - final Text and = new LiteralText(" ").append(GuiText.And.text()) - .append(" "); + final Text label = (isCrafting ? GuiText.Crafts.text() : GuiText.Creates.text()).copy().append(": "); + final Text and = new LiteralText(" ").append(GuiText.And.text()).append(" "); final Text with = GuiText.With.text().copy().append(": "); boolean first = true; @@ -219,9 +215,7 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem { final CompoundTag tag = itemStack.getTag(); Preconditions.checkArgument(tag != null, "itemStack missing a NBT tag"); - return tag.contains(NBT_RECIPE_ID, NbtType.STRING) - ? new Identifier(tag.getString(NBT_RECIPE_ID)) - : null; + return tag.contains(NBT_RECIPE_ID, NbtType.STRING) ? new Identifier(tag.getString(NBT_RECIPE_ID)) : null; } public List getIngredients(ItemStack itemStack) { @@ -280,8 +274,8 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem { /** * Use the public API instead {@link appeng.core.api.ApiCrafting} */ - public static void encodeCraftingPattern(ItemStack stack, ItemStack[] in, ItemStack[] out, - Identifier recipeId, boolean allowSubstitutes) { + public static void encodeCraftingPattern(ItemStack stack, ItemStack[] in, ItemStack[] out, Identifier recipeId, + boolean allowSubstitutes) { CompoundTag encodedValue = encodeInputsAndOutputs(in, out); encodedValue.putString(EncodedPatternItem.NBT_RECIPE_ID, recipeId.toString()); encodedValue.putBoolean(EncodedPatternItem.NBT_SUBSITUTE, allowSubstitutes); diff --git a/src/main/java/appeng/items/parts/FacadeItem.java b/src/main/java/appeng/items/parts/FacadeItem.java index 691582a46..c8613645e 100644 --- a/src/main/java/appeng/items/parts/FacadeItem.java +++ b/src/main/java/appeng/items/parts/FacadeItem.java @@ -18,7 +18,6 @@ package appeng.items.parts; -import appeng.hooks.AEToolItem; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.api.EnvironmentInterface; @@ -32,12 +31,12 @@ import net.minecraft.item.*; import net.minecraft.nbt.CompoundTag; import net.minecraft.tag.BlockTags; import net.minecraft.tag.Tag; +import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; -import net.minecraft.text.Text; import net.minecraft.world.EmptyBlockView; import appeng.api.exceptions.MissingDefinitionException; @@ -49,9 +48,10 @@ import appeng.core.Api; import appeng.core.AppEng; import appeng.facade.FacadePart; import appeng.facade.IFacadeItem; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; -@EnvironmentInterface(value = EnvType.CLIENT, itf=IAlphaPassItem.class) +@EnvironmentInterface(value = EnvType.CLIENT, itf = IAlphaPassItem.class) public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassItem, AEToolItem { /** @@ -67,8 +67,8 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte @Override public ActionResult onItemUseFirst(ItemStack stack, ItemUsageContext context) { - return Api.instance().partHelper().placeBus(stack, context.getBlockPos(), context.getSide(), context.getPlayer(), - context.getHand(), context.getWorld()); + return Api.instance().partHelper().placeBus(stack, context.getBlockPos(), context.getSide(), + context.getPlayer(), context.getHand(), context.getWorld()); } @Override diff --git a/src/main/java/appeng/items/parts/PartModelsHelper.java b/src/main/java/appeng/items/parts/PartModelsHelper.java index 86d5d9aee..3621467dc 100644 --- a/src/main/java/appeng/items/parts/PartModelsHelper.java +++ b/src/main/java/appeng/items/parts/PartModelsHelper.java @@ -70,8 +70,7 @@ public class PartModelsHelper { // Make sure we can handle the return type Class returnType = method.getReturnType(); - if (!Identifier.class.isAssignableFrom(returnType) - && !Collection.class.isAssignableFrom(returnType)) { + if (!Identifier.class.isAssignableFrom(returnType) && !Collection.class.isAssignableFrom(returnType)) { AELog.error( "The @PartModels annotation can only be used on static methods that return a ResourceLocation or Collection of " + "ResourceLocations. Was seen on: " + method); diff --git a/src/main/java/appeng/items/storage/AbstractStorageCell.java b/src/main/java/appeng/items/storage/AbstractStorageCell.java index 0600e5757..34c7afaea 100644 --- a/src/main/java/appeng/items/storage/AbstractStorageCell.java +++ b/src/main/java/appeng/items/storage/AbstractStorageCell.java @@ -20,20 +20,20 @@ package appeng.items.storage; import java.util.List; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.hooks.AEToolItem; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; -import net.minecraft.util.TypedActionResult; +import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.text.Text; +import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; -import net.fabricmc.api.Environment; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.FuzzyMode; import appeng.api.exceptions.MissingDefinitionException; @@ -46,6 +46,7 @@ import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.core.AEConfig; import appeng.core.Api; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; import appeng.items.contents.CellConfig; import appeng.items.contents.CellUpgrades; @@ -58,7 +59,8 @@ import appeng.util.Platform; * @version rv6 - 2018-01-17 * @since rv6 2018-01-17 */ -public abstract class AbstractStorageCell> extends AEBaseItem implements IStorageCell, AEToolItem { +public abstract class AbstractStorageCell> extends AEBaseItem + implements IStorageCell, AEToolItem { protected final MaterialType component; protected final int totalBytes; diff --git a/src/main/java/appeng/items/storage/CreativeStorageCellItem.java b/src/main/java/appeng/items/storage/CreativeStorageCellItem.java index 83937bd8e..f2ea0add7 100644 --- a/src/main/java/appeng/items/storage/CreativeStorageCellItem.java +++ b/src/main/java/appeng/items/storage/CreativeStorageCellItem.java @@ -20,7 +20,6 @@ package appeng.items.storage; import java.util.List; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; @@ -28,6 +27,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.FuzzyMode; import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.cells.ICellInventoryHandler; diff --git a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java index 02cdb1867..b59ec9afa 100644 --- a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java +++ b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java @@ -21,19 +21,19 @@ package appeng.items.storage; import java.util.List; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.world.ServerWorld; import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.text.Text; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.World; -import net.fabricmc.api.Environment; import appeng.api.implementations.TransitionResult; import appeng.api.implementations.items.ISpatialStorageCell; diff --git a/src/main/java/appeng/items/storage/ViewCellItem.java b/src/main/java/appeng/items/storage/ViewCellItem.java index 4e923826b..2e84c76c7 100644 --- a/src/main/java/appeng/items/storage/ViewCellItem.java +++ b/src/main/java/appeng/items/storage/ViewCellItem.java @@ -18,9 +18,10 @@ package appeng.items.storage; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.FuzzyMode; import appeng.api.config.Upgrades; import appeng.api.implementations.items.IUpgradeModule; diff --git a/src/main/java/appeng/items/tools/BiometricCardItem.java b/src/main/java/appeng/items/tools/BiometricCardItem.java index ae27d2916..52a10bb1e 100644 --- a/src/main/java/appeng/items/tools/BiometricCardItem.java +++ b/src/main/java/appeng/items/tools/BiometricCardItem.java @@ -23,6 +23,8 @@ import java.util.List; import com.mojang.authlib.GameProfile; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -30,14 +32,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtHelper; import net.minecraft.text.MutableText; +import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.ActionResult; -import net.minecraft.util.TypedActionResult; import net.minecraft.util.Hand; -import net.minecraft.text.Text; +import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import appeng.api.config.SecurityPermissions; import appeng.api.features.IPlayerRegistry; @@ -62,7 +62,8 @@ public class BiometricCardItem extends AEBaseItem implements IBiometricCard { return TypedActionResult.pass(p.getStackInHand(hand)); } - // FIXME FABRIC: Validate that this actually works about as well as the forge hook does + // FIXME FABRIC: Validate that this actually works about as well as the forge + // hook does @Override public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity target, Hand hand) { if (target instanceof PlayerEntity && !user.isInSneakingPose()) { @@ -79,8 +80,7 @@ public class BiometricCardItem extends AEBaseItem implements IBiometricCard { @Override public Text getName(final ItemStack is) { final GameProfile username = this.getProfile(is); - return username != null ? super.getName(is).copy().append(" - " + username.getName()) - : super.getName(is); + return username != null ? super.getName(is).copy().append(" - " + username.getName()) : super.getName(is); } private void encode(final ItemStack is, final PlayerEntity p) { diff --git a/src/main/java/appeng/items/tools/MemoryCardItem.java b/src/main/java/appeng/items/tools/MemoryCardItem.java index 7c1fbb7f0..4d0c54542 100644 --- a/src/main/java/appeng/items/tools/MemoryCardItem.java +++ b/src/main/java/appeng/items/tools/MemoryCardItem.java @@ -20,27 +20,27 @@ package appeng.items.tools; import java.util.List; -import appeng.block.AEBaseTileBlock; -import appeng.hooks.AEToolItem; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.nbt.CompoundTag; +import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.*; -import net.minecraft.text.Text; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.world.World; -import net.fabricmc.api.Environment; import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; import appeng.api.util.AEColor; +import appeng.block.AEBaseTileBlock; import appeng.core.localization.GuiText; import appeng.core.localization.PlayerMessages; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; import appeng.util.Platform; @@ -168,7 +168,8 @@ public class MemoryCardItem extends AEBaseItem implements AEToolItem, IMemoryCar if (!context.getPlayer().world.isClient) { BlockState state = context.getWorld().getBlockState(context.getBlockPos()); ActionResult useResult = state.onUse(context.getWorld(), context.getPlayer(), context.getHand(), - new BlockHitResult(context.getHitPos(), context.getSide(), context.getBlockPos(), context.hitsInsideBlock())); + new BlockHitResult(context.getHitPos(), context.getSide(), context.getBlockPos(), + context.hitsInsideBlock())); if (!useResult.isAccepted()) { clearCard(context.getPlayer(), context.getWorld(), context.getHand()); } diff --git a/src/main/java/appeng/items/tools/NetworkToolItem.java b/src/main/java/appeng/items/tools/NetworkToolItem.java index 94487f540..ffd273625 100644 --- a/src/main/java/appeng/items/tools/NetworkToolItem.java +++ b/src/main/java/appeng/items/tools/NetworkToolItem.java @@ -18,7 +18,6 @@ package appeng.items.tools; -import appeng.hooks.AEToolItem; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntity; @@ -27,9 +26,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.util.*; import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.Direction; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; import appeng.api.implementations.guiobjects.IGuiItem; @@ -48,6 +47,7 @@ import appeng.container.implementations.NetworkToolContainer; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ClickPacket; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; import appeng.items.contents.NetworkToolViewer; import appeng.util.Platform; @@ -83,8 +83,8 @@ public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench, @Override public ActionResult onItemUseFirst(ItemStack stack, ItemUsageContext context) { - final BlockHitResult mop = new BlockHitResult(context.getHitPos(), context.getSide(), - context.getBlockPos(), context.hitsInsideBlock()); + final BlockHitResult mop = new BlockHitResult(context.getHitPos(), context.getSide(), context.getBlockPos(), + context.hitsInsideBlock()); final BlockEntity te = context.getWorld().getBlockEntity(context.getBlockPos()); if (te instanceof IPartHost) { diff --git a/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java b/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java index 2b571193a..2df85d9d1 100644 --- a/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java +++ b/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java @@ -19,9 +19,9 @@ package appeng.items.tools.powered; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.util.math.Box; import appeng.api.config.Actionable; diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java index 19e833af8..f9835ee75 100644 --- a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java +++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java @@ -18,37 +18,12 @@ package appeng.items.tools.powered; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.core.Api; -import appeng.api.config.Actionable; -import appeng.api.config.FuzzyMode; -import appeng.api.implementations.items.IStorageCell; -import appeng.api.implementations.tiles.IColorableTile; -import appeng.api.storage.IMEInventory; -import appeng.api.storage.IStorageChannel; -import appeng.api.storage.cells.ICellInventoryHandler; -import appeng.api.storage.channels.IItemStorageChannel; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IItemList; -import appeng.api.util.AEColor; -import appeng.api.util.DimensionalCoord; -import appeng.block.networking.CableBusBlock; -import appeng.block.paint.PaintSplotchesBlock; -import appeng.core.AEConfig; -import appeng.core.AppEng; -import appeng.core.localization.GuiText; -import appeng.helpers.IMouseWheelItem; -import appeng.hooks.IBlockTool; -import appeng.items.contents.CellConfig; -import appeng.items.contents.CellUpgrades; -import appeng.items.misc.PaintBallItem; -import appeng.items.tools.powered.powersink.AEBasePoweredItem; -import appeng.me.helpers.BaseActionSource; -import appeng.tile.misc.PaintSplotchesBlockEntity; -import appeng.util.FakePlayer; -import appeng.util.Platform; -import appeng.util.item.AEItemStack; +import java.util.*; + +import javax.annotation.Nullable; + import com.google.common.collect.ImmutableMap; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; @@ -74,37 +49,58 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.util.*; +import alexiil.mc.lib.attributes.item.FixedItemInv; + +import appeng.api.config.Actionable; +import appeng.api.config.FuzzyMode; +import appeng.api.implementations.items.IStorageCell; +import appeng.api.implementations.tiles.IColorableTile; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IStorageChannel; +import appeng.api.storage.cells.ICellInventoryHandler; +import appeng.api.storage.channels.IItemStorageChannel; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IItemList; +import appeng.api.util.AEColor; +import appeng.api.util.DimensionalCoord; +import appeng.block.networking.CableBusBlock; +import appeng.block.paint.PaintSplotchesBlock; +import appeng.core.AEConfig; +import appeng.core.Api; +import appeng.core.AppEng; +import appeng.core.localization.GuiText; +import appeng.helpers.IMouseWheelItem; +import appeng.hooks.IBlockTool; +import appeng.items.contents.CellConfig; +import appeng.items.contents.CellUpgrades; +import appeng.items.misc.PaintBallItem; +import appeng.items.tools.powered.powersink.AEBasePoweredItem; +import appeng.me.helpers.BaseActionSource; +import appeng.tile.misc.PaintSplotchesBlockEntity; +import appeng.util.FakePlayer; +import appeng.util.Platform; +import appeng.util.item.AEItemStack; public class ColorApplicatorItem extends AEBasePoweredItem implements IStorageCell, IBlockTool, IMouseWheelItem { private static final Map TAG_TO_COLOR = ImmutableMap.builder() - .put(new Identifier("c:black_dyes"), AEColor.BLACK) - .put(new Identifier("c:blue_dyes"), AEColor.BLUE) - .put(new Identifier("c:brown_dyes"), AEColor.BROWN) - .put(new Identifier("c:cyan_dyes"), AEColor.CYAN) - .put(new Identifier("c:gray_dyes"), AEColor.GRAY) - .put(new Identifier("c:green_dyes"), AEColor.GREEN) + .put(new Identifier("c:black_dyes"), AEColor.BLACK).put(new Identifier("c:blue_dyes"), AEColor.BLUE) + .put(new Identifier("c:brown_dyes"), AEColor.BROWN).put(new Identifier("c:cyan_dyes"), AEColor.CYAN) + .put(new Identifier("c:gray_dyes"), AEColor.GRAY).put(new Identifier("c:green_dyes"), AEColor.GREEN) .put(new Identifier("c:light_blue_dyes"), AEColor.LIGHT_BLUE) .put(new Identifier("c:light_gray_dyes"), AEColor.LIGHT_GRAY) - .put(new Identifier("c:lime_dyes"), AEColor.LIME) - .put(new Identifier("c:magenta_dyes"), AEColor.MAGENTA) - .put(new Identifier("c:orange_dyes"), AEColor.ORANGE) - .put(new Identifier("c:pink_dyes"), AEColor.PINK) - .put(new Identifier("c:purple_dyes"), AEColor.PURPLE) - .put(new Identifier("c:red_dyes"), AEColor.RED) - .put(new Identifier("c:white_dyes"), AEColor.WHITE) - .put(new Identifier("c:yellow_dyes"), AEColor.YELLOW).build(); + .put(new Identifier("c:lime_dyes"), AEColor.LIME).put(new Identifier("c:magenta_dyes"), AEColor.MAGENTA) + .put(new Identifier("c:orange_dyes"), AEColor.ORANGE).put(new Identifier("c:pink_dyes"), AEColor.PINK) + .put(new Identifier("c:purple_dyes"), AEColor.PURPLE).put(new Identifier("c:red_dyes"), AEColor.RED) + .put(new Identifier("c:white_dyes"), AEColor.WHITE).put(new Identifier("c:yellow_dyes"), AEColor.YELLOW) + .build(); private static final String TAG_COLOR = "color"; public ColorApplicatorItem(Item.Settings props) { super(AEConfig.instance().getColorApplicatorBattery(), props); - FabricModelPredicateProviderRegistry.register( - this, - new Identifier(AppEng.MOD_ID, "colored"), + FabricModelPredicateProviderRegistry.register(this, new Identifier(AppEng.MOD_ID, "colored"), (itemStack, world, entity) -> { // If the stack has no color, don't use the colored model since the impact of // calling getColor for every quad is extremely high, if the stack tries to @@ -112,8 +108,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem // inventory for a new paintball everytime AEColor col = getActiveColor(itemStack); return (col != null) ? 1 : 0; - } - ); + }); } @Override diff --git a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java index c6ad55662..2de1585ae 100644 --- a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java +++ b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java @@ -25,8 +25,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import appeng.mixins.TntAccessor; -import appeng.util.FakePlayer; import net.minecraft.block.*; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -34,9 +32,10 @@ import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.*; -import net.minecraft.recipe.RecipeType; import net.minecraft.particle.ParticleTypes; +import net.minecraft.recipe.RecipeType; import net.minecraft.recipe.SmeltingRecipe; +import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.state.property.Properties; @@ -44,12 +43,11 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.RayTraceContext; -import net.minecraft.util.hit.HitResult; import net.minecraft.world.World; -import net.minecraft.server.world.ServerWorld; import appeng.api.config.Actionable; import appeng.api.util.DimensionalCoord; @@ -58,6 +56,8 @@ import appeng.container.ContainerNull; import appeng.core.AEConfig; import appeng.hooks.IBlockTool; import appeng.items.tools.powered.powersink.AEBasePoweredItem; +import appeng.mixins.TntAccessor; +import appeng.util.FakePlayer; import appeng.util.InWorldToolOperationResult; import appeng.util.Platform; @@ -287,7 +287,8 @@ public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockT for (final ItemStack i : stack) { CraftingInventory tempInv = new CraftingInventory(new ContainerNull(), 1, 1); tempInv.setStack(0, i); - Optional recipe = w.getRecipeManager().getFirstMatch(RecipeType.SMELTING, tempInv, w); + Optional recipe = w.getRecipeManager().getFirstMatch(RecipeType.SMELTING, tempInv, + w); if (recipe.isPresent()) { ItemStack result = recipe.get().craft(tempInv); diff --git a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java index 3bbf63f9e..f2723edbc 100644 --- a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java +++ b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java @@ -22,35 +22,36 @@ import java.util.List; import javax.annotation.Nullable; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ItemEntity; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.damage.EntityDamageSource; import net.minecraft.entity.passive.SheepEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.TypedActionResult; +import net.minecraft.text.Text; import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.Util; +import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.world.RayTraceContext; -import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.Vec3d; -import net.minecraft.text.Text; +import net.minecraft.world.RayTraceContext; import net.minecraft.world.World; -import net.fabricmc.api.Environment; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; @@ -116,7 +117,8 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< } final ICellInventoryHandler inv = Api.instance().registries().cell().getCellInventory( - p.getStackInHand(hand), null, Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); + p.getStackInHand(hand), null, + Api.instance().storage().getStorageChannel(IItemStorageChannel.class)); if (inv != null) { final IItemList itemList = inv.getAvailableItems( Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createList()); @@ -177,9 +179,9 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< private void shootPaintBalls(final ItemStack type, final World w, final PlayerEntity p, final Vec3d Vec3d, final Vec3d Vec3d1, final Vec3d direction, final double d0, final double d1, final double d2) { - final Box bb = new Box(Math.min(Vec3d.x, Vec3d1.x), Math.min(Vec3d.y, Vec3d1.y), - Math.min(Vec3d.z, Vec3d1.z), Math.max(Vec3d.x, Vec3d1.x), Math.max(Vec3d.y, Vec3d1.y), - Math.max(Vec3d.z, Vec3d1.z)).expand(16, 16, 16); + final Box bb = new Box(Math.min(Vec3d.x, Vec3d1.x), Math.min(Vec3d.y, Vec3d1.y), Math.min(Vec3d.z, Vec3d1.z), + Math.max(Vec3d.x, Vec3d1.x), Math.max(Vec3d.y, Vec3d1.y), Math.max(Vec3d.z, Vec3d1.z)).expand(16, 16, + 16); Entity entity = null; Vec3d entityIntersection = null; @@ -217,18 +219,16 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< HitResult pos = w.rayTrace(rayTraceContext); final Vec3d vec = new Vec3d(d0, d1, d2); - if (entity != null && pos.getType() != HitResult.Type.MISS - && pos.getPos().squaredDistanceTo(vec) > closest) { + if (entity != null && pos.getType() != HitResult.Type.MISS && pos.getPos().squaredDistanceTo(vec) > closest) { pos = new EntityHitResult(entity, entityIntersection); } else if (entity != null && pos.getType() == HitResult.Type.MISS) { pos = new EntityHitResult(entity, entityIntersection); } try { - AppEng.instance().sendToAllNearExcept(null, d0, d1, d2, 128, w, - new MatterCannonPacket(d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, - (byte) (pos.getType() == HitResult.Type.MISS ? 32 - : pos.getPos().squaredDistanceTo(vec) + 1))); + AppEng.instance().sendToAllNearExcept(null, d0, d1, d2, 128, w, new MatterCannonPacket(d0, d1, d2, + (float) direction.x, (float) direction.y, (float) direction.z, + (byte) (pos.getType() == HitResult.Type.MISS ? 32 : pos.getPos().squaredDistanceTo(vec) + 1))); } catch (final Exception err) { AELog.debug(err); } @@ -334,10 +334,9 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< } try { - AppEng.instance().sendToAllNearExcept(null, d0, d1, d2, 128, w, - new MatterCannonPacket(d0, d1, d2, (float) direction.x, (float) direction.y, - (float) direction.z, (byte) (pos.getType() == HitResult.Type.MISS ? 32 - : pos.getPos().squaredDistanceTo(vec) + 1))); + AppEng.instance().sendToAllNearExcept(null, d0, d1, d2, 128, w, new MatterCannonPacket(d0, d1, d2, + (float) direction.x, (float) direction.y, (float) direction.z, + (byte) (pos.getType() == HitResult.Type.MISS ? 32 : pos.getPos().squaredDistanceTo(vec) + 1))); } catch (final Exception err) { AELog.debug(err); } diff --git a/src/main/java/appeng/items/tools/powered/PortableCellItem.java b/src/main/java/appeng/items/tools/powered/PortableCellItem.java index e92207b5a..1f585ba13 100644 --- a/src/main/java/appeng/items/tools/powered/PortableCellItem.java +++ b/src/main/java/appeng/items/tools/powered/PortableCellItem.java @@ -20,18 +20,19 @@ package appeng.items.tools.powered; import java.util.List; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.TypedActionResult; +import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.math.BlockPos; -import net.minecraft.text.Text; import net.minecraft.world.World; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.FuzzyMode; diff --git a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java index e11832c70..e091c40b0 100644 --- a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java +++ b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java @@ -20,7 +20,6 @@ package appeng.items.tools.powered; import java.util.List; -import appeng.api.config.*; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; @@ -28,14 +27,14 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; -import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.text.Text; +import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; -import appeng.core.Api; +import appeng.api.config.*; import appeng.api.config.Actionable; import appeng.api.config.Settings; import appeng.api.config.SortDir; diff --git a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java index 2c432f292..8fa29cb76 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java @@ -22,16 +22,16 @@ import java.text.MessageFormat; import java.util.List; import java.util.function.DoubleSupplier; +import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.collection.DefaultedList; -import net.minecraft.text.Text; import net.minecraft.world.World; -import net.fabricmc.api.EnvType; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; diff --git a/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java b/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java index cadf865d4..e1ae567a7 100644 --- a/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java @@ -18,24 +18,24 @@ package appeng.items.tools.quartz; -import appeng.container.ContainerLocator; -import appeng.container.ContainerOpener; -import appeng.container.implementations.QuartzKnifeContainer; -import appeng.items.contents.QuartzKnifeObj; -import appeng.mixins.RemainderSetter; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.features.AEFeature; import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.implementations.guiobjects.IGuiItemObject; +import appeng.container.ContainerLocator; +import appeng.container.ContainerOpener; +import appeng.container.implementations.QuartzKnifeContainer; import appeng.items.AEBaseItem; +import appeng.items.contents.QuartzKnifeObj; +import appeng.mixins.RemainderSetter; import appeng.util.Platform; public class QuartzCuttingKnifeItem extends AEBaseItem implements IGuiItem { @@ -45,13 +45,13 @@ public class QuartzCuttingKnifeItem extends AEBaseItem implements IGuiItem { super(props); this.type = type; // See below for reasoning - ((RemainderSetter)this).setRecipeRemainder(this); + ((RemainderSetter) this).setRecipeRemainder(this); } @Override public TypedActionResult use(final World w, final PlayerEntity p, final Hand hand) { if (Platform.isServer()) { - ContainerOpener.openContainer(QuartzKnifeContainer.TYPE, p, ContainerLocator.forHand(p, hand)); + ContainerOpener.openContainer(QuartzKnifeContainer.TYPE, p, ContainerLocator.forHand(p, hand)); } p.swingHand(hand); return new TypedActionResult<>(ActionResult.SUCCESS, p.getStackInHand(hand)); diff --git a/src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java b/src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java index ef78165c9..360e07d6b 100644 --- a/src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java @@ -20,8 +20,8 @@ package appeng.items.tools.quartz; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.ToolMaterials; import net.minecraft.item.PickaxeItem; +import net.minecraft.item.ToolMaterials; import appeng.api.features.AEFeature; import appeng.util.Platform; diff --git a/src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java b/src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java index 1f0d060fa..ff6977b0a 100644 --- a/src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java @@ -20,8 +20,8 @@ package appeng.items.tools.quartz; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.ToolMaterials; import net.minecraft.item.ShovelItem; +import net.minecraft.item.ToolMaterials; import appeng.api.features.AEFeature; import appeng.util.Platform; diff --git a/src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java b/src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java index ddc0d4245..acd0747f7 100644 --- a/src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java @@ -20,8 +20,8 @@ package appeng.items.tools.quartz; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.ToolMaterials; import net.minecraft.item.SwordItem; +import net.minecraft.item.ToolMaterials; import appeng.api.features.AEFeature; import appeng.util.Platform; diff --git a/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java b/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java index ac712eedd..18a79c402 100644 --- a/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java +++ b/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java @@ -18,7 +18,6 @@ package appeng.items.tools.quartz; -import appeng.hooks.AEToolItem; import net.minecraft.block.Block; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -30,6 +29,7 @@ import net.minecraft.util.math.BlockPos; import appeng.api.implementations.items.IAEWrench; import appeng.api.util.DimensionalCoord; import appeng.block.AEBaseBlock; +import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; import appeng.util.Platform; diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 3b413c4d9..49d6f6b85 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -26,12 +26,12 @@ import java.util.Deque; import java.util.EnumSet; import java.util.List; -import net.minecraft.nbt.CompoundTag; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.math.Direction; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldAccess; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; import appeng.api.exceptions.FailedConnectionException; import appeng.api.exceptions.SecurityConnectionException; diff --git a/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java index 561eac756..e08476e1e 100644 --- a/src/main/java/appeng/me/GridStorage.java +++ b/src/main/java/appeng/me/GridStorage.java @@ -66,7 +66,7 @@ public class GridStorage implements IGridStorage { public void saveState() { final Grid currentGrid = (Grid) this.getGrid(); if (currentGrid != null) { - currentGrid.saveState(); + currentGrid.saveState(); } } diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index 27f8c630a..2807dc4b7 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -85,8 +85,8 @@ import appeng.helpers.CraftingPatternDetails; import appeng.me.cluster.implementations.CraftingCPUCluster; import appeng.me.helpers.BaseActionSource; import appeng.me.helpers.GenericInterestManager; -import appeng.tile.crafting.CraftingStorageBlockEntity; import appeng.tile.crafting.CraftingBlockEntity; +import appeng.tile.crafting.CraftingStorageBlockEntity; public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler { diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index e2a131d7a..bf174d154 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import appeng.tile.networking.ControllerBlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; @@ -57,6 +56,7 @@ import appeng.me.pathfinding.ControllerChannelUpdater; import appeng.me.pathfinding.ControllerValidator; import appeng.me.pathfinding.IPathItem; import appeng.me.pathfinding.PathSegment; +import appeng.tile.networking.ControllerBlockEntity; public class PathGridCache implements IPathingGrid { diff --git a/src/main/java/appeng/me/cache/TickManagerCache.java b/src/main/java/appeng/me/cache/TickManagerCache.java index 1f8e43b61..1f863d629 100644 --- a/src/main/java/appeng/me/cache/TickManagerCache.java +++ b/src/main/java/appeng/me/cache/TickManagerCache.java @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import net.minecraft.util.crash.CrashException; import net.minecraft.util.crash.CrashReport; import net.minecraft.util.crash.CrashReportSection; -import net.minecraft.util.crash.CrashException; import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; diff --git a/src/main/java/appeng/me/cache/helpers/TickTracker.java b/src/main/java/appeng/me/cache/helpers/TickTracker.java index ac8bcb39a..69bf7b1e4 100644 --- a/src/main/java/appeng/me/cache/helpers/TickTracker.java +++ b/src/main/java/appeng/me/cache/helpers/TickTracker.java @@ -20,7 +20,6 @@ package appeng.me.cache.helpers; import javax.annotation.Nonnull; -import appeng.api.parts.IPart; import net.minecraft.util.crash.CrashReportSection; import appeng.api.networking.IGridNode; diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index b69dfa3e1..06b7ca1eb 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -32,8 +32,8 @@ import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; -import net.minecraft.util.math.BlockPos; import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.config.Actionable; @@ -71,8 +71,8 @@ import appeng.me.cache.CraftingGridCache; import appeng.me.cluster.IAECluster; import appeng.me.cluster.MBCalculator; import appeng.me.helpers.MachineSource; -import appeng.tile.crafting.CraftingMonitorBlockEntity; import appeng.tile.crafting.CraftingBlockEntity; +import appeng.tile.crafting.CraftingMonitorBlockEntity; import appeng.util.Platform; import appeng.util.item.AEItemStack; @@ -683,8 +683,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } if (details.isCraftable()) { - // FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent((PlayerEntity) FakePlayer.getOrCreate((ServerWorld) getWorld()), - // FIXME FABRIC details.getOutput(ic, this.getWorld()), ic); + // FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent((PlayerEntity) + // FakePlayer.getOrCreate((ServerWorld) getWorld()), + // FIXME FABRIC details.getOutput(ic, this.getWorld()), ic); for (int x = 0; x < ic.size(); x++) { final ItemStack output = Platform.getRecipeRemainder(ic.getStack(x)); diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index cf6d6fb3e..da927a67a 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -212,9 +212,9 @@ public class QuantumCluster implements ILocatable, IAECluster { try { if (this.registered) { // FIXME FABRIC -> onWorldUnload event - // FIXME FABRIC MinecraftForge.EVENT_BUS.unregister(this); - this.registered = false; - } + // FIXME FABRIC MinecraftForge.EVENT_BUS.unregister(this); + this.registered = false; + } if (this.thisSide != 0) { this.updateStatus(true); diff --git a/src/main/java/appeng/me/pathfinding/ControllerValidator.java b/src/main/java/appeng/me/pathfinding/ControllerValidator.java index 03d416429..0067e2ecb 100644 --- a/src/main/java/appeng/me/pathfinding/ControllerValidator.java +++ b/src/main/java/appeng/me/pathfinding/ControllerValidator.java @@ -18,12 +18,12 @@ package appeng.me.pathfinding; -import appeng.tile.networking.ControllerBlockEntity; import net.minecraft.util.math.BlockPos; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.networking.IGridVisitor; +import appeng.tile.networking.ControllerBlockEntity; public class ControllerValidator implements IGridVisitor { diff --git a/src/main/java/appeng/me/storage/AbstractCellInventory.java b/src/main/java/appeng/me/storage/AbstractCellInventory.java index c6f4fa059..3e8c1aeb9 100644 --- a/src/main/java/appeng/me/storage/AbstractCellInventory.java +++ b/src/main/java/appeng/me/storage/AbstractCellInventory.java @@ -18,10 +18,11 @@ package appeng.me.storage; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.FuzzyMode; import appeng.api.implementations.items.IStorageCell; import appeng.api.storage.cells.CellState; diff --git a/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java b/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java index 16ca372aa..49c465d7c 100644 --- a/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java +++ b/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java @@ -18,10 +18,11 @@ package appeng.me.storage; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.FuzzyMode; import appeng.api.config.IncludeExclude; import appeng.api.config.Upgrades; diff --git a/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java b/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java index 9cae93b36..d8f098f12 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java +++ b/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java @@ -18,6 +18,10 @@ package appeng.me.storage; +import java.math.RoundingMode; +import java.util.*; +import java.util.Map.Entry; + import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.fluid.FluidVolumeUtil; import alexiil.mc.lib.attributes.fluid.GroupedFluidInv; @@ -25,7 +29,7 @@ import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; import alexiil.mc.lib.attributes.fluid.filter.ExactFluidFilter; import alexiil.mc.lib.attributes.fluid.volume.FluidKey; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -import appeng.core.Api; + import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.StorageFilter; @@ -37,12 +41,8 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; -import appeng.fluids.util.AEFluidStack; - -import java.math.RoundingMode; -import java.util.*; -import java.util.Map.Entry; import appeng.core.Api; +import appeng.fluids.util.AEFluidStack; public class MEMonitorIFluidHandler implements IMEMonitor, ITickingMonitor { private final GroupedFluidInv handler; @@ -68,7 +68,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki this.listeners.remove(l); } - private Simulation getFluidAction(Actionable actionable){ + private Simulation getFluidAction(Actionable actionable) { return actionable == Actionable.MODULATE ? Simulation.ACTION : Simulation.SIMULATE; } @@ -153,7 +153,9 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki IAEFluidStack stack = null; if (!newAmount.isZero()) { - stack = (old == null || old.aeStack == null ? AEFluidStack.fromFluidVolume(storedFluid.withAmount(newAmount), RoundingMode.DOWN) : old.aeStack.copy()); + stack = (old == null || old.aeStack == null + ? AEFluidStack.fromFluidVolume(storedFluid.withAmount(newAmount), RoundingMode.DOWN) + : old.aeStack.copy()); } if (stack != null) { stack.setStackSize(newSize); diff --git a/src/main/java/appeng/mixins/BakedModelManagerAccessor.java b/src/main/java/appeng/mixins/BakedModelManagerAccessor.java index f3efbbda1..50050ae29 100644 --- a/src/main/java/appeng/mixins/BakedModelManagerAccessor.java +++ b/src/main/java/appeng/mixins/BakedModelManagerAccessor.java @@ -1,12 +1,13 @@ package appeng.mixins; +import java.util.Map; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.BakedModelManager; import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import java.util.Map; @Mixin(BakedModelManager.class) public interface BakedModelManagerAccessor { diff --git a/src/main/java/appeng/mixins/BakedQuadAccessor.java b/src/main/java/appeng/mixins/BakedQuadAccessor.java index 409162e95..b2dfaa640 100644 --- a/src/main/java/appeng/mixins/BakedQuadAccessor.java +++ b/src/main/java/appeng/mixins/BakedQuadAccessor.java @@ -1,9 +1,10 @@ package appeng.mixins; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + import net.minecraft.client.render.model.BakedQuad; import net.minecraft.client.texture.Sprite; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(BakedQuad.class) public interface BakedQuadAccessor { diff --git a/src/main/java/appeng/mixins/CriteriaRegisterMixin.java b/src/main/java/appeng/mixins/CriteriaRegisterMixin.java index 64d7e6fe1..66d2c77ab 100644 --- a/src/main/java/appeng/mixins/CriteriaRegisterMixin.java +++ b/src/main/java/appeng/mixins/CriteriaRegisterMixin.java @@ -1,9 +1,10 @@ package appeng.mixins; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + import net.minecraft.advancement.criterion.Criteria; import net.minecraft.advancement.criterion.Criterion; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(Criteria.class) public interface CriteriaRegisterMixin { diff --git a/src/main/java/appeng/mixins/DimensionTypeMixin.java b/src/main/java/appeng/mixins/DimensionTypeMixin.java index a8369fbbd..fc557e5e0 100644 --- a/src/main/java/appeng/mixins/DimensionTypeMixin.java +++ b/src/main/java/appeng/mixins/DimensionTypeMixin.java @@ -1,17 +1,19 @@ package appeng.mixins; -import appeng.hooks.RegisterDimensionTypeCallback; -import net.minecraft.util.registry.RegistryTracker; -import net.minecraft.world.dimension.DimensionType; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import net.minecraft.util.registry.RegistryTracker; +import net.minecraft.world.dimension.DimensionType; + +import appeng.hooks.RegisterDimensionTypeCallback; + @Mixin(DimensionType.class) public class DimensionTypeMixin { - @Inject(method="addRegistryDefaults", at=@At("TAIL")) + @Inject(method = "addRegistryDefaults", at = @At("TAIL")) private static void addRegistryDefaults(RegistryTracker.Modifiable registryTracker, CallbackInfoReturnable cir) { RegisterDimensionTypeCallback.EVENT.invoker().addDimensionTypes(registryTracker); } diff --git a/src/main/java/appeng/mixins/ItemRendererAccessor.java b/src/main/java/appeng/mixins/ItemRendererAccessor.java index c7ccdaae0..b776a4f92 100644 --- a/src/main/java/appeng/mixins/ItemRendererAccessor.java +++ b/src/main/java/appeng/mixins/ItemRendererAccessor.java @@ -1,10 +1,11 @@ package appeng.mixins; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.render.model.BakedModel; import net.minecraft.item.ItemStack; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(ItemRenderer.class) public interface ItemRendererAccessor { diff --git a/src/main/java/appeng/mixins/MinecraftClientAccessor.java b/src/main/java/appeng/mixins/MinecraftClientAccessor.java index 5d38e9b0b..ff45fece3 100644 --- a/src/main/java/appeng/mixins/MinecraftClientAccessor.java +++ b/src/main/java/appeng/mixins/MinecraftClientAccessor.java @@ -1,9 +1,10 @@ package appeng.mixins; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + import net.minecraft.client.MinecraftClient; import net.minecraft.client.color.item.ItemColors; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(MinecraftClient.class) public interface MinecraftClientAccessor { diff --git a/src/main/java/appeng/mixins/MinecraftServerMixin.java b/src/main/java/appeng/mixins/MinecraftServerMixin.java index 70cb20ac3..4e4b402d8 100644 --- a/src/main/java/appeng/mixins/MinecraftServerMixin.java +++ b/src/main/java/appeng/mixins/MinecraftServerMixin.java @@ -1,8 +1,14 @@ package appeng.mixins; -import appeng.hooks.DynamicDimensions; +import java.util.Map; +import java.util.concurrent.Executor; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + import net.minecraft.server.MinecraftServer; import net.minecraft.server.WorldGenerationProgressListener; import net.minecraft.server.world.ServerWorld; @@ -20,11 +26,8 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.level.ServerWorldProperties; import net.minecraft.world.level.UnmodifiableLevelProperties; import net.minecraft.world.level.storage.LevelStorage; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import java.util.Map; -import java.util.concurrent.Executor; +import appeng.hooks.DynamicDimensions; @Mixin(MinecraftServer.class) public class MinecraftServerMixin implements DynamicDimensions { @@ -44,10 +47,13 @@ public class MinecraftServerMixin implements DynamicDimensions { @Shadow private LevelStorage.Session session; - public ServerWorld addWorld(RegistryKey worldId, RegistryKey dimensionTypeId, ChunkGenerator chunkGenerator) { - Preconditions.checkArgument(!worlds.containsKey(worldId), "World with id %s already exists.", worldId.getValue()); + public ServerWorld addWorld(RegistryKey worldId, RegistryKey dimensionTypeId, + ChunkGenerator chunkGenerator) { + Preconditions.checkArgument(!worlds.containsKey(worldId), "World with id %s already exists.", + worldId.getValue()); - // Each worlds must have a corresponding dimension options, otherwise they will not be re-created on load + // Each worlds must have a corresponding dimension options, otherwise they will + // not be re-created on load GeneratorOptions generatorOptions = this.saveProperties.getGeneratorOptions(); Preconditions.checkArgument(!generatorOptions.getDimensionMap().containsId(worldId.getValue()), "Dimension config with id %s already exists.", worldId.getValue()); @@ -57,28 +63,30 @@ public class MinecraftServerMixin implements DynamicDimensions { // Create dimension options with the given world-id and chunk generator DimensionOptions dimensionOptions = new DimensionOptions( - () -> dimensionTracker.getDimensionTypeRegistry().get(dimensionTypeId), - chunkGenerator - ); + () -> dimensionTracker.getDimensionTypeRegistry().get(dimensionTypeId), chunkGenerator); ServerWorldProperties serverWorldProperties = this.saveProperties.getMainWorldProperties(); - // This sucks a little, but during startup, the server will use the same listener for every world, - // but it is ultimately only stored in the chunk storage. So we retrieve it from the overworld to + // This sucks a little, but during startup, the server will use the same + // listener for every world, + // but it is ultimately only stored in the chunk storage. So we retrieve it from + // the overworld to // mirror the original code as much as possible ServerWorld overworld = worlds.get(ServerWorld.OVERWORLD); Preconditions.checkState(overworld != null, "Overworld does not exist!"); - WorldGenerationProgressListener worldGenerationProgressListener = ((ThreadedAnvilChunkStorageAccessor) overworld.getChunkManager().threadedAnvilChunkStorage).getWorldGenerationProgressListener(); + WorldGenerationProgressListener worldGenerationProgressListener = ((ThreadedAnvilChunkStorageAccessor) overworld + .getChunkManager().threadedAnvilChunkStorage).getWorldGenerationProgressListener(); // Inherit seed + WorldBorder from overworld long seed = overworld.getSeed(); WorldBorder worldBorder = overworld.getWorldBorder(); MinecraftServer self = (MinecraftServer) (Object) this; - UnmodifiableLevelProperties unmodifiableLevelProperties = new UnmodifiableLevelProperties(this.saveProperties, serverWorldProperties); - ServerWorld world = new ServerWorld( - self, this.workerExecutor, this.session, unmodifiableLevelProperties, worldId, dimensionTypeId, dimensionType, worldGenerationProgressListener, chunkGenerator, false, seed, ImmutableList.of(), false - ); + UnmodifiableLevelProperties unmodifiableLevelProperties = new UnmodifiableLevelProperties(this.saveProperties, + serverWorldProperties); + ServerWorld world = new ServerWorld(self, this.workerExecutor, this.session, unmodifiableLevelProperties, + worldId, dimensionTypeId, dimensionType, worldGenerationProgressListener, chunkGenerator, false, seed, + ImmutableList.of(), false); worldBorder.addListener(new WorldBorderListener.WorldBorderSyncer(world.getWorldBorder())); this.worlds.put(worldId, world); @@ -86,7 +94,8 @@ public class MinecraftServerMixin implements DynamicDimensions { RegistryKey dimOptKey = RegistryKey.of(Registry.DIMENSION_OPTIONS, worldId.getValue()); generatorOptions.getDimensionMap().add(dimOptKey, dimensionOptions); generatorOptions.getDimensionMap().markLoaded(dimOptKey); // Otherwise it wont be saved - // Ensure the save properties are saved, or the world will potentially be lost on restart + // Ensure the save properties are saved, or the world will potentially be lost + // on restart this.session.method_27426(this.dimensionTracker, this.saveProperties, self.getPlayerManager().getUserData()); return world; diff --git a/src/main/java/appeng/mixins/ModelsReloadMixin.java b/src/main/java/appeng/mixins/ModelsReloadMixin.java index f1321c515..941ac0d5e 100644 --- a/src/main/java/appeng/mixins/ModelsReloadMixin.java +++ b/src/main/java/appeng/mixins/ModelsReloadMixin.java @@ -1,15 +1,17 @@ package appeng.mixins; -import appeng.bootstrap.ModelsReloadCallback; -import net.minecraft.client.render.model.BakedModel; -import net.minecraft.client.render.model.ModelLoader; -import net.minecraft.util.Identifier; +import java.util.Map; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.util.Map; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.ModelLoader; +import net.minecraft.util.Identifier; + +import appeng.bootstrap.ModelsReloadCallback; @Mixin(ModelLoader.class) public class ModelsReloadMixin { diff --git a/src/main/java/appeng/mixins/RecipeManagerMixin.java b/src/main/java/appeng/mixins/RecipeManagerMixin.java index ee52e415e..e4d8658ba 100644 --- a/src/main/java/appeng/mixins/RecipeManagerMixin.java +++ b/src/main/java/appeng/mixins/RecipeManagerMixin.java @@ -1,14 +1,15 @@ package appeng.mixins; +import java.util.Map; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + import net.minecraft.inventory.Inventory; import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeManager; import net.minecraft.recipe.RecipeType; import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import java.util.Map; @Mixin(RecipeManager.class) public interface RecipeManagerMixin { diff --git a/src/main/java/appeng/mixins/RemainderSetter.java b/src/main/java/appeng/mixins/RemainderSetter.java index c758b2f4f..ab880ea45 100644 --- a/src/main/java/appeng/mixins/RemainderSetter.java +++ b/src/main/java/appeng/mixins/RemainderSetter.java @@ -1,9 +1,10 @@ package appeng.mixins; -import net.minecraft.item.Item; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; +import net.minecraft.item.Item; + @Mixin(Item.class) public interface RemainderSetter { @Accessor("recipeRemainder") diff --git a/src/main/java/appeng/mixins/RenderEncodedPatternMixin.java b/src/main/java/appeng/mixins/RenderEncodedPatternMixin.java index f737bafd7..1100907b7 100644 --- a/src/main/java/appeng/mixins/RenderEncodedPatternMixin.java +++ b/src/main/java/appeng/mixins/RenderEncodedPatternMixin.java @@ -1,17 +1,20 @@ package appeng.mixins; -import appeng.hooks.ItemRendererHooks; -import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.client.render.model.BakedModel; -import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.item.ItemStack; + +import appeng.hooks.ItemRendererHooks; + /** - * This mixin specifically targets rendering of items in the user interface to allow us to - * customize _only_ the UI representation of an item, and none of the others (held items, in-world, etc.) + * This mixin specifically targets rendering of items in the user interface to + * allow us to customize _only_ the UI representation of an item, and none of + * the others (held items, in-world, etc.) */ @Mixin(ItemRenderer.class) public abstract class RenderEncodedPatternMixin { diff --git a/src/main/java/appeng/mixins/RenderPhaseMixin.java b/src/main/java/appeng/mixins/RenderPhaseMixin.java index f5468ca50..55280b70f 100644 --- a/src/main/java/appeng/mixins/RenderPhaseMixin.java +++ b/src/main/java/appeng/mixins/RenderPhaseMixin.java @@ -1,9 +1,10 @@ package appeng.mixins; -import net.minecraft.client.render.RenderPhase; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; +import net.minecraft.client.render.RenderPhase; + @Mixin(RenderPhase.class) public interface RenderPhaseMixin { diff --git a/src/main/java/appeng/mixins/ScreenHandlerListeners.java b/src/main/java/appeng/mixins/ScreenHandlerListeners.java index 98f4b9f23..a741021a3 100644 --- a/src/main/java/appeng/mixins/ScreenHandlerListeners.java +++ b/src/main/java/appeng/mixins/ScreenHandlerListeners.java @@ -1,12 +1,13 @@ package appeng.mixins; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.screen.ScreenHandlerListener; +import java.util.List; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.gen.Accessor; -import java.util.List; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerListener; @Mixin(ScreenHandler.class) public interface ScreenHandlerListeners { diff --git a/src/main/java/appeng/mixins/ShapelessRecipeMixin.java b/src/main/java/appeng/mixins/ShapelessRecipeMixin.java index e89fc35fb..d0256badc 100644 --- a/src/main/java/appeng/mixins/ShapelessRecipeMixin.java +++ b/src/main/java/appeng/mixins/ShapelessRecipeMixin.java @@ -1,9 +1,10 @@ package appeng.mixins; -import net.minecraft.recipe.ShapelessRecipe; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; +import net.minecraft.recipe.ShapelessRecipe; + @Mixin(ShapelessRecipe.class) public interface ShapelessRecipeMixin { diff --git a/src/main/java/appeng/mixins/SkyPropertiesMixin.java b/src/main/java/appeng/mixins/SkyPropertiesMixin.java index 27c0ed75b..70dd07b0f 100644 --- a/src/main/java/appeng/mixins/SkyPropertiesMixin.java +++ b/src/main/java/appeng/mixins/SkyPropertiesMixin.java @@ -1,21 +1,24 @@ package appeng.mixins; -import appeng.spatial.SpatialDimensionManager; -import net.minecraft.client.render.SkyProperties; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.dimension.DimensionType; +import java.util.Optional; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.util.Optional; +import net.minecraft.client.render.SkyProperties; +import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.dimension.DimensionType; + +import appeng.spatial.SpatialDimensionManager; @Mixin(SkyProperties.class) public class SkyPropertiesMixin { @Inject(method = "byDimensionType", at = @At("HEAD"), cancellable = true) - private static void byDimensionType(Optional> optional, CallbackInfoReturnable ci) { + private static void byDimensionType(Optional> optional, + CallbackInfoReturnable ci) { if (optional.orElse(null) == SpatialDimensionManager.STORAGE_DIMENSION_TYPE) { ci.setReturnValue(SpatialDimensionManager.STORAGE_SKY); } diff --git a/src/main/java/appeng/mixins/SkyRenderMixin.java b/src/main/java/appeng/mixins/SkyRenderMixin.java index 931c4ae89..01e34ed45 100644 --- a/src/main/java/appeng/mixins/SkyRenderMixin.java +++ b/src/main/java/appeng/mixins/SkyRenderMixin.java @@ -1,16 +1,18 @@ package appeng.mixins; -import appeng.client.render.SpatialSkyRender; -import appeng.spatial.SpatialDimensionManager; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.WorldRenderer; -import net.minecraft.client.util.math.MatrixStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.util.math.MatrixStack; + +import appeng.client.render.SpatialSkyRender; +import appeng.spatial.SpatialDimensionManager; + @Mixin(WorldRenderer.class) public class SkyRenderMixin { diff --git a/src/main/java/appeng/mixins/SlotMixin.java b/src/main/java/appeng/mixins/SlotMixin.java index 4ceb51474..b14fc0b67 100644 --- a/src/main/java/appeng/mixins/SlotMixin.java +++ b/src/main/java/appeng/mixins/SlotMixin.java @@ -1,9 +1,10 @@ package appeng.mixins; -import net.minecraft.screen.slot.Slot; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; +import net.minecraft.screen.slot.Slot; + @Mixin(Slot.class) public interface SlotMixin { diff --git a/src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java b/src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java index 297394675..f268bee4a 100644 --- a/src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java +++ b/src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java @@ -1,9 +1,10 @@ package appeng.mixins; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + import net.minecraft.server.WorldGenerationProgressListener; import net.minecraft.server.world.ThreadedAnvilChunkStorage; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(ThreadedAnvilChunkStorage.class) public interface ThreadedAnvilChunkStorageAccessor { diff --git a/src/main/java/appeng/mixins/TntAccessor.java b/src/main/java/appeng/mixins/TntAccessor.java index 4aabd48f5..52b6b218f 100644 --- a/src/main/java/appeng/mixins/TntAccessor.java +++ b/src/main/java/appeng/mixins/TntAccessor.java @@ -1,13 +1,14 @@ package appeng.mixins; +import javax.annotation.Nullable; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + import net.minecraft.block.TntBlock; import net.minecraft.entity.LivingEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import javax.annotation.Nullable; @Mixin(TntBlock.class) public interface TntAccessor { diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index de55fa23e..e4f408d61 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -25,26 +25,27 @@ import java.util.List; import java.util.Optional; import java.util.Random; -import alexiil.mc.lib.attributes.Simulation; import com.google.common.base.Preconditions; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.crash.CrashReportSection; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.math.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; import net.minecraft.text.Text; +import net.minecraft.util.Hand; +import net.minecraft.util.crash.CrashReportSection; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.fabricmc.api.Environment; + +import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.Upgrades; diff --git a/src/main/java/appeng/parts/BusCollisionHelper.java b/src/main/java/appeng/parts/BusCollisionHelper.java index 43dc572cc..fd0dea2da 100644 --- a/src/main/java/appeng/parts/BusCollisionHelper.java +++ b/src/main/java/appeng/parts/BusCollisionHelper.java @@ -37,7 +37,7 @@ public class BusCollisionHelper implements IPartCollisionHelper { private final boolean isVisual; public BusCollisionHelper(final List boxes, final Direction x, final Direction y, final Direction z, - final boolean visual) { + final boolean visual) { this.boxes = boxes; this.x = x; this.y = y; diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index a285bac06..402738a90 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -38,10 +38,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; @@ -845,8 +845,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I String defKey = "def:" + side.ordinal(); String extraKey = "extra:" + side.ordinal(); - if (data.contains(defKey, NbtType.COMPOUND) - && data.contains(extraKey, NbtType.COMPOUND)) { + if (data.contains(defKey, NbtType.COMPOUND) && data.contains(extraKey, NbtType.COMPOUND)) { final CompoundTag def = data.getCompound(defKey); final CompoundTag extra = data.getCompound(extraKey); IPart p = this.getPart(side); diff --git a/src/main/java/appeng/parts/ICableBusContainer.java b/src/main/java/appeng/parts/ICableBusContainer.java index 883efe545..523b05318 100644 --- a/src/main/java/appeng/parts/ICableBusContainer.java +++ b/src/main/java/appeng/parts/ICableBusContainer.java @@ -21,16 +21,16 @@ package appeng.parts; import java.util.Random; import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.fabricmc.api.Environment; import appeng.api.parts.SelectedPart; import appeng.api.util.AEColor; diff --git a/src/main/java/appeng/parts/NullCableBusContainer.java b/src/main/java/appeng/parts/NullCableBusContainer.java index 719f98e80..2f4e1c508 100644 --- a/src/main/java/appeng/parts/NullCableBusContainer.java +++ b/src/main/java/appeng/parts/NullCableBusContainer.java @@ -23,9 +23,9 @@ import java.util.Random; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.world.BlockView; import net.minecraft.world.World; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 8e19feab6..491228def 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -18,18 +18,9 @@ package appeng.parts; -import appeng.core.Api; -import appeng.api.definitions.IBlockDefinition; -import appeng.api.parts.*; -import appeng.api.util.AEPartLocation; -import appeng.api.util.DimensionalCoord; -import appeng.core.Api; -import appeng.core.AppEng; -import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PartPlacementPacket; -import appeng.facade.IFacadeItem; -import appeng.util.LookDirection; -import appeng.util.Platform; +import java.util.ArrayList; +import java.util.List; + import net.fabricmc.fabric.api.event.player.UseBlockCallback; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -49,8 +40,17 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.RayTraceContext; import net.minecraft.world.World; -import java.util.ArrayList; -import java.util.List; +import appeng.api.definitions.IBlockDefinition; +import appeng.api.parts.*; +import appeng.api.util.AEPartLocation; +import appeng.api.util.DimensionalCoord; +import appeng.core.Api; +import appeng.core.AppEng; +import appeng.core.sync.network.NetworkHandler; +import appeng.core.sync.packets.PartPlacementPacket; +import appeng.facade.IFacadeItem; +import appeng.util.LookDirection; +import appeng.util.Platform; public class PartPlacement { @@ -58,14 +58,14 @@ public class PartPlacement { private static final ThreadLocal placing = new ThreadLocal<>(); private static boolean wasCanceled = false; - static { + static { UseBlockCallback.EVENT.register(PartPlacement::onPlayerUseBlock); } public static ActionResult place(final ItemStack held, final BlockPos pos, Direction side, - final PlayerEntity player, final Hand hand, final World world, PlaceType pass, final int depth) { + final PlayerEntity player, final Hand hand, final World world, PlaceType pass, final int depth) { if (depth > 3) { return ActionResult.FAIL; } @@ -150,8 +150,7 @@ public class PartPlacement { if (!player.isCreative()) { held.increment(-1); if (held.getCount() == 0) { - player.inventory.main.set(player.inventory.selectedSlot, - ItemStack.EMPTY); + player.inventory.main.set(player.inventory.selectedSlot, ItemStack.EMPTY); } } return ActionResult.CONSUME; @@ -171,8 +170,7 @@ public class PartPlacement { if (held.isEmpty()) { if (host != null && player.isInSneakingPose() && world.isAir(pos)) { if (mop.getType() == HitResult.Type.BLOCK) { - Vec3d hitVec = mop.getPos().add(-mop.getPos().getX(), -mop.getPos().getY(), - -mop.getPos().getZ()); + Vec3d hitVec = mop.getPos().add(-mop.getPos().getX(), -mop.getPos().getY(), -mop.getPos().getZ()); final SelectedPart sPart = selectPart(player, host, hitVec); if (sPart != null && sPart.part != null) { if (sPart.part.onShiftActivate(player, hand, hitVec)) { @@ -228,8 +226,7 @@ public class PartPlacement { // FIXME: This is super-fishy and all needs to be re-checked. what does this // even do??? - if (hostIsNotPresent && canMultiPartBePlaced - && multiPartBlockItem.place(mpUseCtx).isAccepted()) { + if (hostIsNotPresent && canMultiPartBePlaced && multiPartBlockItem.place(mpUseCtx).isAccepted()) { if (!world.isClient) { tile = world.getBlockEntity(te_pos); @@ -351,8 +348,8 @@ public class PartPlacement { placing.set(true); final ItemStack held = player.getStackInHand(hand); - if (place(held, hit.getBlockPos(), hit.getSide(), player, hand, - player.world, PlaceType.INTERACT_FIRST_PASS, 0) == ActionResult.SUCCESS) { + if (place(held, hit.getBlockPos(), hit.getSide(), player, hand, player.world, PlaceType.INTERACT_FIRST_PASS, + 0) == ActionResult.SUCCESS) { return ActionResult.SUCCESS; } diff --git a/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java b/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java index 82f476765..ef7e1ecf4 100644 --- a/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java +++ b/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java @@ -1,11 +1,11 @@ package appeng.parts.automation; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import appeng.api.config.Actionable; diff --git a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java index ad2c46fd6..79010dff2 100644 --- a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java +++ b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java @@ -24,7 +24,6 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import appeng.util.FakePlayer; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Block; @@ -38,16 +37,16 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.ToolMaterials; -import net.minecraft.tag.Tag; +import net.minecraft.server.world.ServerWorld; import net.minecraft.tag.BlockTags; import net.minecraft.tag.ItemTags; +import net.minecraft.tag.Tag; import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.server.world.ServerWorld; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -79,14 +78,14 @@ import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; import appeng.parts.BasicStatePart; +import appeng.util.FakePlayer; import appeng.util.IWorldCallable; import appeng.util.Platform; import appeng.util.item.AEItemStack; public class AnnihilationPlanePart extends BasicStatePart implements IGridTickable, IWorldCallable { - public static final Identifier TAG_BLACKLIST = new Identifier(AppEng.MOD_ID, - "blacklisted/annihilation_plane"); + public static final Identifier TAG_BLACKLIST = new Identifier(AppEng.MOD_ID, "blacklisted/annihilation_plane"); private static final PlaneModels MODELS = new PlaneModels("part/annihilation_plane", "part/annihilation_plane_on"); @@ -258,8 +257,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab if (entity.getX() > pos.getX() && entity.getX() < pos.getX() + 1) { if (posYMiddle > pos.getY() && posYMiddle < pos.getY() + 1) { if ((entity.getZ() > pos.getZ() + 0.9 && this.getSide() == AEPartLocation.SOUTH) - || (entity.getZ() < pos.getZ() + 0.1 - && this.getSide() == AEPartLocation.NORTH)) { + || (entity.getZ() < pos.getZ() + 0.1 && this.getSide() == AEPartLocation.NORTH)) { capture = true; } } @@ -286,8 +284,8 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab if (changed) { AppEng.instance().sendToAllNearExcept(null, pos.getX(), pos.getY(), pos.getZ(), 64, - this.getTile().getWorld(), new ItemTransitionEffectPacket(entity.getX(), - entity.getY(), entity.getZ(), this.getSide().getOpposite())); + this.getTile().getWorld(), new ItemTransitionEffectPacket(entity.getX(), entity.getY(), + entity.getZ(), this.getSide().getOpposite())); } } } @@ -598,11 +596,8 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab return getConnections(); } - private static final Item[] SUPPORTED_HARVEST_TOOLS = { - Items.DIAMOND_AXE, - Items.DIAMOND_PICKAXE, - Items.DIAMOND_SHOVEL, - }; + private static final Item[] SUPPORTED_HARVEST_TOOLS = { Items.DIAMOND_AXE, Items.DIAMOND_PICKAXE, + Items.DIAMOND_SHOVEL, }; /** * Creates the fake (and temporary) tool that will be used to calculate the loot diff --git a/src/main/java/appeng/parts/automation/FormationPlanePart.java b/src/main/java/appeng/parts/automation/FormationPlanePart.java index 04988b325..5b20354c6 100644 --- a/src/main/java/appeng/parts/automation/FormationPlanePart.java +++ b/src/main/java/appeng/parts/automation/FormationPlanePart.java @@ -18,7 +18,31 @@ package appeng.parts.automation; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nullable; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.Entity; +import net.minecraft.entity.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.*; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.*; import appeng.api.networking.events.MENetworkCellArrayUpdate; import appeng.api.networking.events.MENetworkChannelsChanged; @@ -47,27 +71,6 @@ import appeng.util.Platform; import appeng.util.inv.InvOperation; import appeng.util.prioritylist.FuzzyPriorityList; import appeng.util.prioritylist.PrecisePriorityList; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.Entity; -import net.minecraft.entity.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.*; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.Direction; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; public class FormationPlanePart extends AbstractFormationPlanePart { @@ -124,7 +127,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { super.onChangeInventory(inv, slot, mc, removedStack, newStack); if (inv == this.Config) { @@ -205,8 +208,8 @@ public class FormationPlanePart extends AbstractFormationPlanePart final BlockPos placePos = te.getPos().offset(side.getFacing()); if (w.getBlockState(placePos).getMaterial().isReplaceable()) { - if (placeBlock == YesNo.YES && (i instanceof BlockItem - || i instanceof FireworkChargeItem || i instanceof FireworkItem || i instanceof IPartItem)) { + if (placeBlock == YesNo.YES && (i instanceof BlockItem || i instanceof FireworkChargeItem + || i instanceof FireworkItem || i instanceof IPartItem)) { final PlayerEntity player = FakePlayer.getOrCreate((ServerWorld) w); Platform.configurePlayer(player, side, this.getTile()); Hand hand = player.getActiveHand(); @@ -225,8 +228,9 @@ public class FormationPlanePart extends AbstractFormationPlanePart // Up or Down, Attempt 1?? if (side.xOffset == 0 && side.zOffset == 0) { - Worked = i.useOnBlock(new AutomaticItemPlacementContext(w, placePos.offset(side.getFacing()), - lookDirection, is, side.getFacing())) == ActionResult.SUCCESS; + Worked = i + .useOnBlock(new AutomaticItemPlacementContext(w, placePos.offset(side.getFacing()), + lookDirection, is, side.getFacing())) == ActionResult.SUCCESS; } // Up or Down, Attempt 2?? @@ -282,12 +286,12 @@ public class FormationPlanePart extends AbstractFormationPlanePart // FIXME FABRIC No custom item entity support // FIXME FABRIC if (is.getItem().hasCustomEntity(is)) { - // FIXME FABRIC result = is.getItem().createEntity(w, ei, is); - // FIXME FABRIC if (result != null) { - // FIXME FABRIC ei.remove(); - // FIXME FABRIC } else { - // FIXME FABRIC result = ei; - // FIXME FABRIC } + // FIXME FABRIC result = is.getItem().createEntity(w, ei, is); + // FIXME FABRIC if (result != null) { + // FIXME FABRIC ei.remove(); + // FIXME FABRIC } else { + // FIXME FABRIC result = ei; + // FIXME FABRIC } // FIXME FABRIC } if (!w.spawnEntity(result)) { diff --git a/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java b/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java index c469f2a6a..1768319ea 100644 --- a/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java +++ b/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java @@ -29,9 +29,8 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.server.world.ServerWorld; - +import net.minecraft.util.math.BlockPos; import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; diff --git a/src/main/java/appeng/parts/automation/ImportBusPart.java b/src/main/java/appeng/parts/automation/ImportBusPart.java index 80ce2b6ed..d2cfa5625 100644 --- a/src/main/java/appeng/parts/automation/ImportBusPart.java +++ b/src/main/java/appeng/parts/automation/ImportBusPart.java @@ -48,7 +48,6 @@ import appeng.container.implementations.UpgradeableContainer; import appeng.core.Api; import appeng.core.AppEng; import appeng.core.settings.TickRates; - import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.me.helpers.MachineSource; @@ -75,7 +74,6 @@ public class ImportBusPart extends SharedItemBusPart implements IInventoryDestin private int itemsToSend; // used in tickingRequest private boolean worked; // used in tickingRequest - public ImportBusPart(final ItemStack is) { super(is); diff --git a/src/main/java/appeng/parts/automation/LevelEmitterPart.java b/src/main/java/appeng/parts/automation/LevelEmitterPart.java index 19eda5151..c596628d5 100644 --- a/src/main/java/appeng/parts/automation/LevelEmitterPart.java +++ b/src/main/java/appeng/parts/automation/LevelEmitterPart.java @@ -21,19 +21,20 @@ package appeng.parts.automation; import java.util.Collection; import java.util.Random; -import alexiil.mc.lib.attributes.item.FixedItemInv; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.particle.DustParticleEffect; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.FuzzyMode; import appeng.api.config.LevelType; import appeng.api.config.RedstoneMode; @@ -85,17 +86,13 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH ICraftingWatcherHost, IMEMonitorHandlerReceiver, ICraftingProvider { @PartModels - public static final Identifier MODEL_BASE_OFF = new Identifier(AppEng.MOD_ID, - "part/level_emitter_base_off"); + public static final Identifier MODEL_BASE_OFF = new Identifier(AppEng.MOD_ID, "part/level_emitter_base_off"); @PartModels - public static final Identifier MODEL_BASE_ON = new Identifier(AppEng.MOD_ID, - "part/level_emitter_base_on"); + public static final Identifier MODEL_BASE_ON = new Identifier(AppEng.MOD_ID, "part/level_emitter_base_on"); @PartModels - public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, - "part/level_emitter_status_off"); + public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_off"); @PartModels - public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, - "part/level_emitter_status_on"); + public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_on"); @PartModels public static final Identifier MODEL_STATUS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_has_channel"); @@ -416,7 +413,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { if (inv == this.config) { this.configureWatchers(); } diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/main/java/appeng/parts/automation/PlaneBakedModel.java index 23c45f19b..a6341d243 100644 --- a/src/main/java/appeng/parts/automation/PlaneBakedModel.java +++ b/src/main/java/appeng/parts/automation/PlaneBakedModel.java @@ -18,8 +18,15 @@ package appeng.parts.automation; -import appeng.api.parts.IDynamicPartBakedModel; -import appeng.client.render.cablebus.CubeBuilder; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.function.Supplier; + +import javax.annotation.Nullable; + import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.RendererAccess; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; @@ -35,13 +42,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockRenderView; -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.function.Supplier; +import appeng.api.parts.IDynamicPartBakedModel; +import appeng.client.render.cablebus.CubeBuilder; /** * Built-in model for annihilation planes that supports connected textures. @@ -84,7 +86,8 @@ public class PlaneBakedModel implements BakedModel, IDynamicPartBakedModel { } @Override - public void emitQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context, Direction partSide, @Nullable Object modelData) { + public void emitQuads(BlockRenderView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, + RenderContext context, Direction partSide, @Nullable Object modelData) { PlaneConnections connections = DEFAULT_PERMUTATION; if (modelData instanceof PlaneConnections) { diff --git a/src/main/java/appeng/parts/automation/PlaneModel.java b/src/main/java/appeng/parts/automation/PlaneModel.java index ee165305e..e21c15601 100644 --- a/src/main/java/appeng/parts/automation/PlaneModel.java +++ b/src/main/java/appeng/parts/automation/PlaneModel.java @@ -18,7 +18,11 @@ package appeng.parts.automation; -import appeng.client.render.BasicUnbakedModel; +import java.util.function.Function; +import java.util.stream.Stream; + +import javax.annotation.Nullable; + import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.ModelBakeSettings; import net.minecraft.client.render.model.ModelLoader; @@ -27,9 +31,7 @@ import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; -import java.util.function.Function; -import java.util.stream.Stream; +import appeng.client.render.BasicUnbakedModel; /** * Built-in model for annihilation planes that supports connected textures. @@ -48,7 +50,8 @@ public class PlaneModel implements BasicUnbakedModel { @Nullable @Override - public BakedModel bake(ModelLoader loader, Function textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) { + public BakedModel bake(ModelLoader loader, Function textureGetter, + ModelBakeSettings rotationContainer, Identifier modelId) { Sprite frontSprite = textureGetter.apply(this.frontTexture); Sprite sidesSprite = textureGetter.apply(this.sidesTexture); Sprite backSprite = textureGetter.apply(this.backTexture); diff --git a/src/main/java/appeng/parts/automation/PlaneModels.java b/src/main/java/appeng/parts/automation/PlaneModels.java index a9e7f8f71..f0820e230 100644 --- a/src/main/java/appeng/parts/automation/PlaneModels.java +++ b/src/main/java/appeng/parts/automation/PlaneModels.java @@ -34,10 +34,8 @@ import appeng.parts.PartModel; */ public class PlaneModels { - public static final Identifier MODEL_CHASSIS_OFF = new Identifier(AppEng.MOD_ID, - "part/transition_plane_off"); - public static final Identifier MODEL_CHASSIS_ON = new Identifier(AppEng.MOD_ID, - "part/transition_plane_on"); + public static final Identifier MODEL_CHASSIS_OFF = new Identifier(AppEng.MOD_ID, "part/transition_plane_off"); + public static final Identifier MODEL_CHASSIS_ON = new Identifier(AppEng.MOD_ID, "part/transition_plane_on"); public static final Identifier MODEL_CHASSIS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/transition_plane_has_channel"); diff --git a/src/main/java/appeng/parts/automation/SharedItemBusPart.java b/src/main/java/appeng/parts/automation/SharedItemBusPart.java index 07adf4c3d..5306286e0 100644 --- a/src/main/java/appeng/parts/automation/SharedItemBusPart.java +++ b/src/main/java/appeng/parts/automation/SharedItemBusPart.java @@ -24,6 +24,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.RedstoneMode; diff --git a/src/main/java/appeng/parts/automation/UpgradeInventory.java b/src/main/java/appeng/parts/automation/UpgradeInventory.java index 20ccff233..b5f2ecdee 100644 --- a/src/main/java/appeng/parts/automation/UpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/UpgradeInventory.java @@ -18,12 +18,13 @@ package appeng.parts.automation; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.Upgrades; import appeng.api.implementations.items.IUpgradeModule; import appeng.tile.inventory.AppEngInternalInventory; @@ -137,7 +138,7 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { this.cached = false; if (this.parent != null && Platform.isServer()) { this.parent.onChangeInventory(inv, slot, mc, removedStack, newStack); diff --git a/src/main/java/appeng/parts/automation/UpgradeablePart.java b/src/main/java/appeng/parts/automation/UpgradeablePart.java index f5432e601..4c5eaf386 100644 --- a/src/main/java/appeng/parts/automation/UpgradeablePart.java +++ b/src/main/java/appeng/parts/automation/UpgradeablePart.java @@ -21,6 +21,7 @@ package appeng.parts.automation; import java.util.List; import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.RedstoneMode; @@ -54,7 +55,7 @@ public abstract class UpgradeablePart extends BasicStatePart implements IAEAppEn @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { if (inv == this.upgrades) { this.upgradesChanged(); } diff --git a/src/main/java/appeng/parts/misc/CableAnchorPart.java b/src/main/java/appeng/parts/misc/CableAnchorPart.java index 5d9acd809..dd43557c8 100644 --- a/src/main/java/appeng/parts/misc/CableAnchorPart.java +++ b/src/main/java/appeng/parts/misc/CableAnchorPart.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.util.List; import java.util.Random; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/appeng/parts/misc/InterfacePart.java b/src/main/java/appeng/parts/misc/InterfacePart.java index dc46cb96d..b7ed1674f 100644 --- a/src/main/java/appeng/parts/misc/InterfacePart.java +++ b/src/main/java/appeng/parts/misc/InterfacePart.java @@ -21,21 +21,22 @@ package appeng.parts.misc; import java.util.EnumSet; import java.util.List; -import alexiil.mc.lib.attributes.AttributeList; -import alexiil.mc.lib.attributes.item.FixedItemInv; import com.google.common.collect.ImmutableSet; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.util.math.Direction; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; +import alexiil.mc.lib.attributes.AttributeList; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.Actionable; import appeng.api.config.Upgrades; import appeng.api.networking.IGridNode; @@ -190,7 +191,7 @@ public class InterfacePart extends BasicStatePart implements IGridTickable, ISto @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { this.duality.onChangeInventory(inv, slot, mc, removedStack, newStack); } diff --git a/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java b/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java index 303f7b090..be92d101b 100644 --- a/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java +++ b/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java @@ -28,8 +28,7 @@ import appeng.parts.PartModel; public class InvertedToggleBusPart extends ToggleBusPart { @PartModels - public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, - "part/inverted_toggle_bus_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/inverted_toggle_bus_base"); public static final PartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_STATUS_OFF); public static final PartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_STATUS_ON); diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java index f94d1d498..262541319 100644 --- a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java +++ b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java @@ -25,9 +25,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.item.FixedItemInv; -import net.minecraft.item.ItemStack; import appeng.api.config.Actionable; import appeng.api.networking.security.IActionSource; @@ -74,7 +75,8 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor, IBaseMonitor, IBaseMonitor remainingCurrentSlot) { // Something broke. It should never return more than we requested... diff --git a/src/main/java/appeng/parts/misc/StorageBusPart.java b/src/main/java/appeng/parts/misc/StorageBusPart.java index 57a9a0463..fd9a9a01e 100644 --- a/src/main/java/appeng/parts/misc/StorageBusPart.java +++ b/src/main/java/appeng/parts/misc/StorageBusPart.java @@ -22,22 +22,22 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import alexiil.mc.lib.attributes.Attributes; -import alexiil.mc.lib.attributes.item.ItemAttributes; -import appeng.attributes.MEAttributes; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.world.BlockView; + +import alexiil.mc.lib.attributes.Attributes; import alexiil.mc.lib.attributes.item.FixedItemInv; +import alexiil.mc.lib.attributes.item.ItemAttributes; import appeng.api.config.AccessRestriction; import appeng.api.config.FuzzyMode; @@ -73,6 +73,7 @@ import appeng.api.storage.data.IItemList; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.IConfigManager; +import appeng.attributes.MEAttributes; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.StorageBusContainer; @@ -167,7 +168,7 @@ public class StorageBusPart extends UpgradeablePart @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { super.onChangeInventory(inv, slot, mc, removedStack, newStack); if (inv == this.Config) { diff --git a/src/main/java/appeng/parts/misc/ToggleBusPart.java b/src/main/java/appeng/parts/misc/ToggleBusPart.java index be99f9b5e..4189c0163 100644 --- a/src/main/java/appeng/parts/misc/ToggleBusPart.java +++ b/src/main/java/appeng/parts/misc/ToggleBusPart.java @@ -20,10 +20,10 @@ package appeng.parts.misc; import java.util.EnumSet; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; @@ -50,11 +50,9 @@ public class ToggleBusPart extends BasicStatePart { @PartModels public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/toggle_bus_base"); @PartModels - public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, - "part/toggle_bus_status_off"); + public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, "part/toggle_bus_status_off"); @PartModels - public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, - "part/toggle_bus_status_on"); + public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, "part/toggle_bus_status_on"); @PartModels public static final Identifier MODEL_STATUS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/toggle_bus_status_has_channel"); diff --git a/src/main/java/appeng/parts/networking/QuartzFiberPart.java b/src/main/java/appeng/parts/networking/QuartzFiberPart.java index 30c2b13b1..a7f4646ee 100644 --- a/src/main/java/appeng/parts/networking/QuartzFiberPart.java +++ b/src/main/java/appeng/parts/networking/QuartzFiberPart.java @@ -22,10 +22,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; diff --git a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java index 4e0636219..8f21f9f05 100644 --- a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java @@ -18,6 +18,12 @@ package appeng.parts.p2p; +import java.util.*; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; + import alexiil.mc.lib.attributes.AttributeList; import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.fluid.FluidAttributes; @@ -26,14 +32,10 @@ import alexiil.mc.lib.attributes.fluid.FluidVolumeUtil; import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; import alexiil.mc.lib.attributes.fluid.volume.FluidKey; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; + import appeng.api.parts.IPartModel; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; - -import java.util.*; public class FluidP2PTunnelPart extends P2PTunnelPart implements FluidInsertable { @@ -141,16 +143,15 @@ public class FluidP2PTunnelPart extends P2PTunnelPart implem while (i.hasNext() && !remaining.isZero()) { final FluidP2PTunnelPart l = i.next(); - FluidVolume insert = fluid.withAmount( - fluid.amount().div(list.size()) - ); + FluidVolume insert = fluid.withAmount(fluid.amount().div(list.size())); if (insert.amount().isGreaterThan(remaining)) { insert = insert.withAmount(remaining); } FluidInsertable tank = l.getTarget(); if (tank != null) { - remaining = remaining.sub(insert.amount().sub(tank.attemptInsertion(insert, Simulation.ACTION).amount())); + remaining = remaining + .sub(insert.amount().sub(tank.attemptInsertion(insert, Simulation.ACTION).amount())); } } @@ -198,7 +199,8 @@ public class FluidP2PTunnelPart extends P2PTunnelPart implem return this.cachedTank; } - return this.cachedTank = FluidAttributes.INSERTABLE.getFirstOrNullFromNeighbour(this.getTile(), this.getSide().getFacing()); + return this.cachedTank = FluidAttributes.INSERTABLE.getFirstOrNullFromNeighbour(this.getTile(), + this.getSide().getFacing()); } } diff --git a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java index d2b96046a..08291ed0f 100644 --- a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java @@ -18,11 +18,20 @@ package appeng.parts.p2p; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; + import alexiil.mc.lib.attributes.AttributeList; import alexiil.mc.lib.attributes.CacheInfo; import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.ItemAttributes; import alexiil.mc.lib.attributes.item.impl.CombinedFixedItemInv; + import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkBootingStatusChange; import appeng.api.networking.events.MENetworkChannelsChanged; @@ -37,13 +46,6 @@ import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.me.cache.helpers.TunnelCollection; import appeng.util.Platform; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.BlockView; - -import java.util.ArrayList; -import java.util.List; public class ItemP2PTunnelPart extends P2PTunnelPart implements IGridTickable { private static final float POWER_DRAIN = 2.0f; @@ -111,10 +113,7 @@ public class ItemP2PTunnelPart extends P2PTunnelPart implemen this.partVisited = true; if (this.getProxy().isActive()) { final Direction facing = this.getSide().getFacing(); - ret = ItemAttributes.FIXED_INV.getFirstOrNullFromNeighbour( - this.getTile(), - facing - ); + ret = ItemAttributes.FIXED_INV.getFirstOrNullFromNeighbour(this.getTile(), facing); } this.partVisited = false; } diff --git a/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java index 44c88276a..442f11711 100644 --- a/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java @@ -21,10 +21,10 @@ package appeng.parts.p2p; import java.io.IOException; import java.util.List; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; diff --git a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java index b7cd1b617..f7ab90af5 100644 --- a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java @@ -23,10 +23,10 @@ import java.util.EnumSet; import java.util.Iterator; import java.util.List; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; import appeng.api.exceptions.FailedConnectionException; diff --git a/src/main/java/appeng/parts/p2p/P2PModels.java b/src/main/java/appeng/parts/p2p/P2PModels.java index 9ee196e89..1923bb5ee 100644 --- a/src/main/java/appeng/parts/p2p/P2PModels.java +++ b/src/main/java/appeng/parts/p2p/P2PModels.java @@ -32,14 +32,11 @@ import appeng.parts.PartModel; */ class P2PModels { - public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, - "part/p2p/p2p_tunnel_status_off"); - public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, - "part/p2p/p2p_tunnel_status_on"); + public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, "part/p2p/p2p_tunnel_status_off"); + public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, "part/p2p/p2p_tunnel_status_on"); public static final Identifier MODEL_STATUS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/p2p/p2p_tunnel_status_has_channel"); - public static final Identifier MODEL_FREQUENCY = new Identifier(AppEng.MOD_ID, - "part/p2p/p2p_tunnel_frequency"); + public static final Identifier MODEL_FREQUENCY = new Identifier(AppEng.MOD_ID, "part/p2p/p2p_tunnel_frequency"); private final IPartModel modelsOff; private final IPartModel modelsOn; diff --git a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java index c9b7f528a..733170477 100644 --- a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java @@ -30,7 +30,6 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; - import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.PowerUnits; diff --git a/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java index 3720ff114..244a53e60 100644 --- a/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java @@ -25,8 +25,8 @@ import net.minecraft.block.BlockState; import net.minecraft.block.RedstoneWireBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import net.minecraft.world.World; @@ -141,7 +141,8 @@ public class RedstoneP2PTunnelPart extends P2PTunnelPart } this.power = b.getWeakRedstonePower(state, this.getTile().getWorld(), target, srcSide); - this.power = Math.max(this.power, b.getWeakRedstonePower(state, this.getTile().getWorld(), target, srcSide)); + this.power = Math.max(this.power, + b.getWeakRedstonePower(state, this.getTile().getWorld(), target, srcSide)); this.sendToOutput(this.power); } else { this.sendToOutput(0); diff --git a/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java b/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java index ceb6aaf22..89b530585 100644 --- a/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java @@ -44,11 +44,9 @@ public abstract class AbstractDisplayPart extends AbstractReportingPart { // Models that contain the status indicator light @PartModels - protected static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, - "part/display_status_off"); + protected static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, "part/display_status_off"); @PartModels - protected static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, - "part/display_status_on"); + protected static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, "part/display_status_on"); @PartModels protected static final Identifier MODEL_STATUS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/display_status_has_channel"); diff --git a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java index 02728ce3d..01ecb30cd 100644 --- a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java @@ -20,20 +20,19 @@ package appeng.parts.reporting; import java.io.IOException; -import net.minecraft.client.util.math.MatrixStack; - +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.Util; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; +import net.minecraft.util.Util; import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import appeng.api.implementations.parts.IStorageMonitorPart; import appeng.api.networking.security.IActionSource; @@ -49,7 +48,6 @@ import appeng.api.storage.data.IItemList; import appeng.client.render.TesrRenderHelper; import appeng.core.Api; import appeng.core.localization.PlayerMessages; - import appeng.me.GridAccessException; import appeng.util.IWideReadableNumberConverter; import appeng.util.Platform; @@ -77,7 +75,6 @@ public abstract class AbstractMonitorPart extends AbstractDisplayPart private boolean isLocked; private IStackWatcher myWatcher; - public AbstractMonitorPart(final ItemStack is) { super(is); } @@ -179,7 +176,8 @@ public abstract class AbstractMonitorPart extends AbstractDisplayPart if (player.getStackInHand(hand).isEmpty()) { this.isLocked = !this.isLocked; - player.sendSystemMessage((this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked).get(), Util.NIL_UUID); + player.sendSystemMessage((this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked).get(), + Util.NIL_UUID); this.getHost().markForSave(); this.getHost().markForUpdate(); } diff --git a/src/main/java/appeng/parts/reporting/AbstractReportingPart.java b/src/main/java/appeng/parts/reporting/AbstractReportingPart.java index bfa0a7fe1..0b73891f1 100644 --- a/src/main/java/appeng/parts/reporting/AbstractReportingPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractReportingPart.java @@ -20,11 +20,11 @@ package appeng.parts.reporting; import java.io.IOException; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java b/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java index 220ba8c1b..109ba384d 100644 --- a/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java @@ -20,12 +20,14 @@ package appeng.parts.reporting; import java.util.List; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Hand; +import net.minecraft.util.math.Vec3d; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.Settings; import appeng.api.config.SortDir; @@ -46,7 +48,6 @@ import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; -import net.minecraft.util.math.Vec3d; /** * Anything resembling an network terminal with view cells can reuse this. @@ -139,7 +140,7 @@ public abstract class AbstractTerminalPart extends AbstractDisplayPart @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { this.getHost().markForSave(); } } diff --git a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java index 43e763bfa..0596256e5 100644 --- a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java @@ -21,16 +21,17 @@ package appeng.parts.reporting; import java.util.Collections; import java.util.List; -import alexiil.mc.lib.attributes.Simulation; -import alexiil.mc.lib.attributes.item.SingleItemSlot; -import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; + +import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.item.FixedItemInv; +import alexiil.mc.lib.attributes.item.SingleItemSlot; +import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; import appeng.api.networking.energy.IEnergySource; import appeng.api.parts.IPartModel; @@ -57,8 +58,7 @@ public class ConversionMonitorPart extends AbstractMonitorPart { public static final Identifier MODEL_LOCKED_OFF = new Identifier(AppEng.MOD_ID, "part/conversion_monitor_locked_off"); @PartModels - public static final Identifier MODEL_LOCKED_ON = new Identifier(AppEng.MOD_ID, - "part/conversion_monitor_locked_on"); + public static final Identifier MODEL_LOCKED_ON = new Identifier(AppEng.MOD_ID, "part/conversion_monitor_locked_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); @@ -68,7 +68,6 @@ public class ConversionMonitorPart extends AbstractMonitorPart { public static final IPartModel MODELS_LOCKED_HAS_CHANNEL = new PartModel(MODEL_BASE, MODEL_LOCKED_ON, MODEL_STATUS_HAS_CHANNEL); - public ConversionMonitorPart(final ItemStack is) { super(is); } @@ -164,7 +163,8 @@ public class ConversionMonitorPart extends AbstractMonitorPart { final ItemStack targetStack = inv.getInvStack(x); if (input.equals(targetStack)) { SingleItemSlot slot = inv.getSlot(x); - final ItemStack canExtract = slot.attemptAnyExtraction(targetStack.getCount(), Simulation.SIMULATE); + final ItemStack canExtract = slot.attemptAnyExtraction(targetStack.getCount(), + Simulation.SIMULATE); if (!canExtract.isEmpty()) { input.setStackSize(canExtract.getCount()); final IAEItemStack failedToInsert = Platform.poweredInsert(energy, cell, input, @@ -179,7 +179,8 @@ public class ConversionMonitorPart extends AbstractMonitorPart { final IAEItemStack input = AEItemStack.fromItemStack(player.getStackInHand(hand)); final IAEItemStack failedToInsert = Platform.poweredInsert(energy, cell, input, new PlayerSource(player, this)); - player.setStackInHand(hand, failedToInsert == null ? ItemStack.EMPTY : failedToInsert.createItemStack()); + player.setStackInHand(hand, + failedToInsert == null ? ItemStack.EMPTY : failedToInsert.createItemStack()); } } catch (final GridAccessException e) { // :P diff --git a/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java b/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java index f86296b9c..cf2d64bc0 100644 --- a/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java @@ -20,13 +20,14 @@ package appeng.parts.reporting; import java.util.List; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.SecurityPermissions; import appeng.api.parts.IPartModel; import appeng.container.implementations.CraftingTermContainer; diff --git a/src/main/java/appeng/parts/reporting/PatternTerminalPart.java b/src/main/java/appeng/parts/reporting/PatternTerminalPart.java index 01f8cb3b8..828cfd253 100644 --- a/src/main/java/appeng/parts/reporting/PatternTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/PatternTerminalPart.java @@ -21,10 +21,11 @@ package appeng.parts.reporting; import java.util.List; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.SecurityPermissions; @@ -102,7 +103,7 @@ public class PatternTerminalPart extends AbstractTerminalPart { @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { if (inv == this.pattern && slot == 1) { final ItemStack is = this.pattern.getInvStack(1); final ICraftingPatternDetails details = Api.instance().crafting().decodePattern(is, diff --git a/src/main/java/appeng/parts/reporting/StorageMonitorPart.java b/src/main/java/appeng/parts/reporting/StorageMonitorPart.java index 1fea37bd9..be5f30d99 100644 --- a/src/main/java/appeng/parts/reporting/StorageMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/StorageMonitorPart.java @@ -23,7 +23,6 @@ import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AppEng; - import appeng.items.parts.PartModels; import appeng.parts.PartModel; @@ -40,11 +39,9 @@ public class StorageMonitorPart extends AbstractMonitorPart { @PartModels public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/storage_monitor_on"); @PartModels - public static final Identifier MODEL_LOCKED_OFF = new Identifier(AppEng.MOD_ID, - "part/storage_monitor_locked_off"); + public static final Identifier MODEL_LOCKED_OFF = new Identifier(AppEng.MOD_ID, "part/storage_monitor_locked_off"); @PartModels - public static final Identifier MODEL_LOCKED_ON = new Identifier(AppEng.MOD_ID, - "part/storage_monitor_locked_on"); + public static final Identifier MODEL_LOCKED_ON = new Identifier(AppEng.MOD_ID, "part/storage_monitor_locked_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); @@ -55,7 +52,6 @@ public class StorageMonitorPart extends AbstractMonitorPart { public static final IPartModel MODELS_LOCKED_HAS_CHANNEL = new PartModel(MODEL_BASE, MODEL_LOCKED_ON, MODEL_STATUS_HAS_CHANNEL); - public StorageMonitorPart(final ItemStack is) { super(is); } diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index fec1904d1..e354f3bd7 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -18,6 +18,21 @@ package appeng.recipes.game; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + +import javax.annotation.Nonnull; + +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.SpecialCraftingRecipe; +import net.minecraft.recipe.SpecialRecipeSerializer; +import net.minecraft.util.Identifier; +import net.minecraft.world.World; + import appeng.api.definitions.IBlocks; import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IItemDefinition; @@ -28,19 +43,6 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.core.Api; -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.SpecialCraftingRecipe; -import net.minecraft.recipe.SpecialRecipeSerializer; -import net.minecraft.util.Identifier; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; public final class DisassembleRecipe extends SpecialCraftingRecipe { public static final RecipeSerializer SERIALIZER = new SpecialRecipeSerializer<>( diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index 3e2472287..9552fff46 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -18,11 +18,8 @@ package appeng.recipes.game; -import appeng.api.definitions.IComparableDefinition; -import appeng.api.definitions.IDefinitions; -import appeng.core.Api; -import appeng.core.AppEng; -import appeng.items.parts.FacadeItem; +import javax.annotation.Nonnull; + import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; @@ -32,7 +29,11 @@ import net.minecraft.recipe.SpecialRecipeSerializer; import net.minecraft.util.Identifier; import net.minecraft.world.World; -import javax.annotation.Nonnull; +import appeng.api.definitions.IComparableDefinition; +import appeng.api.definitions.IDefinitions; +import appeng.core.Api; +import appeng.core.AppEng; +import appeng.items.parts.FacadeItem; public final class FacadeRecipe extends SpecialCraftingRecipe { public static SpecialRecipeSerializer SERIALIZER = null; diff --git a/src/main/java/appeng/recipes/handlers/GrinderRecipe.java b/src/main/java/appeng/recipes/handlers/GrinderRecipe.java index 07c64950b..929330c0d 100644 --- a/src/main/java/appeng/recipes/handlers/GrinderRecipe.java +++ b/src/main/java/appeng/recipes/handlers/GrinderRecipe.java @@ -6,10 +6,10 @@ import com.google.common.collect.ImmutableList; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; -import net.minecraft.recipe.RecipeType; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.RecipeType; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; @@ -26,8 +26,8 @@ public class GrinderRecipe implements Recipe { private final List optionalResults; private final int turns; - public GrinderRecipe(Identifier id, String group, Ingredient ingredient, int ingredientCount, - ItemStack result, int turns, List optionalResults) { + public GrinderRecipe(Identifier id, String group, Ingredient ingredient, int ingredientCount, ItemStack result, + int turns, List optionalResults) { this.id = id; this.group = group; this.ingredient = ingredient; diff --git a/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java index ff3af338b..fcfa96ed6 100644 --- a/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java +++ b/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java @@ -11,10 +11,10 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.ShapedRecipe; -import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; diff --git a/src/main/java/appeng/recipes/handlers/GrinderRecipes.java b/src/main/java/appeng/recipes/handlers/GrinderRecipes.java index 4933ec982..e40416ed6 100644 --- a/src/main/java/appeng/recipes/handlers/GrinderRecipes.java +++ b/src/main/java/appeng/recipes/handlers/GrinderRecipes.java @@ -1,11 +1,12 @@ package appeng.recipes.handlers; +import java.util.List; + +import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.util.List; - public final class GrinderRecipes { private GrinderRecipes() { diff --git a/src/main/java/appeng/recipes/handlers/InscriberRecipe.java b/src/main/java/appeng/recipes/handlers/InscriberRecipe.java index 47de892bd..3462aff88 100644 --- a/src/main/java/appeng/recipes/handlers/InscriberRecipe.java +++ b/src/main/java/appeng/recipes/handlers/InscriberRecipe.java @@ -5,8 +5,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.*; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Recipe; -import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.Identifier; +import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; import appeng.api.features.InscriberProcessType; @@ -25,7 +25,7 @@ public class InscriberRecipe implements Recipe { private final InscriberProcessType processType; public InscriberRecipe(Identifier id, String group, Ingredient middleInput, ItemStack output, - Ingredient topOptional, Ingredient bottomOptional, InscriberProcessType processType) { + Ingredient topOptional, Ingredient bottomOptional, InscriberProcessType processType) { this.id = id; this.group = group; this.middleInput = middleInput; diff --git a/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java index 39a08a68b..7d26452ea 100644 --- a/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java +++ b/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java @@ -5,10 +5,10 @@ import javax.annotation.Nullable; import com.google.gson.JsonObject; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.ShapedRecipe; -import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; diff --git a/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipe.java b/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipe.java index 603f98d4e..a4df68c30 100644 --- a/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipe.java +++ b/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipe.java @@ -1,7 +1,5 @@ package appeng.recipes.handlers; -import appeng.items.tools.quartz.QuartzCuttingKnifeItem; -import appeng.mixins.ShapelessRecipeMixin; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -9,18 +7,18 @@ import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.ShapelessRecipe; import net.minecraft.util.collection.DefaultedList; +import appeng.items.tools.quartz.QuartzCuttingKnifeItem; +import appeng.mixins.ShapelessRecipeMixin; + /** - * An extended version of ShapelessRecipe to support damaging the QuartzKnife whenever it is used to craft something. + * An extended version of ShapelessRecipe to support damaging the QuartzKnife + * whenever it is used to craft something. */ public class QuartzKnifeRecipe extends ShapelessRecipe { public QuartzKnifeRecipe(ShapelessRecipe original) { - super( - original.getId(), - ((ShapelessRecipeMixin) original).getGroup(), - original.getOutput(), - original.getPreviewInputs() - ); + super(original.getId(), ((ShapelessRecipeMixin) original).getGroup(), original.getOutput(), + original.getPreviewInputs()); } @Override @@ -36,7 +34,8 @@ public class QuartzKnifeRecipe extends ShapelessRecipe { ItemStack stack = inventory.getStack(i); Item item = stack.getItem(); if (item instanceof QuartzCuttingKnifeItem) { - // If it still has durability left, put a more damaged one back, otherwise consume + // If it still has durability left, put a more damaged one back, otherwise + // consume int newDamage = stack.getDamage() + 1; if (newDamage < stack.getMaxDamage()) { stack = stack.copy(); diff --git a/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipeSerializer.java index f0577032b..2f29f1f5d 100644 --- a/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipeSerializer.java +++ b/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipeSerializer.java @@ -1,6 +1,7 @@ package appeng.recipes.handlers; import com.google.gson.JsonObject; + import net.minecraft.network.PacketByteBuf; import net.minecraft.recipe.ShapelessRecipe; import net.minecraft.util.Identifier; diff --git a/src/main/java/appeng/server/AECommand.java b/src/main/java/appeng/server/AECommand.java index 3da1b32a5..e4c18a54b 100644 --- a/src/main/java/appeng/server/AECommand.java +++ b/src/main/java/appeng/server/AECommand.java @@ -18,16 +18,17 @@ package appeng.server; -import appeng.api.features.AEFeature; -import appeng.core.AEConfig; -import appeng.core.AppEng; +import static net.minecraft.server.command.CommandManager.literal; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.LiteralArgumentBuilder; + import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; -import static net.minecraft.server.command.CommandManager.literal; +import appeng.api.features.AEFeature; +import appeng.core.AEConfig; +import appeng.core.AppEng; public final class AECommand { diff --git a/src/main/java/appeng/server/AppEngServer.java b/src/main/java/appeng/server/AppEngServer.java index 5d5910935..01d4a1359 100644 --- a/src/main/java/appeng/server/AppEngServer.java +++ b/src/main/java/appeng/server/AppEngServer.java @@ -1,12 +1,10 @@ package appeng.server; -import appeng.api.parts.CableRenderMode; -import appeng.client.ActionKey; -import appeng.client.EffectType; -import appeng.core.AppEngBase; -import appeng.core.sync.network.ServerNetworkHandler; -import appeng.core.worlddata.WorldData; -import appeng.hooks.TickHandler; +import java.util.Random; +import java.util.stream.Stream; + +import javax.annotation.Nonnull; + import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.server.PlayerStream; import net.minecraft.client.util.InputUtil; @@ -15,9 +13,13 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.hit.HitResult; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import java.util.Random; -import java.util.stream.Stream; +import appeng.api.parts.CableRenderMode; +import appeng.client.ActionKey; +import appeng.client.EffectType; +import appeng.core.AppEngBase; +import appeng.core.sync.network.ServerNetworkHandler; +import appeng.core.worlddata.WorldData; +import appeng.hooks.TickHandler; public final class AppEngServer extends AppEngBase { diff --git a/src/main/java/appeng/server/ISubCommand.java b/src/main/java/appeng/server/ISubCommand.java index 06927c91e..09a77623c 100644 --- a/src/main/java/appeng/server/ISubCommand.java +++ b/src/main/java/appeng/server/ISubCommand.java @@ -21,8 +21,8 @@ package appeng.server; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; -import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.command.ServerCommandSource; public interface ISubCommand { diff --git a/src/main/java/appeng/server/subcommands/ChunkLogger.java b/src/main/java/appeng/server/subcommands/ChunkLogger.java index 8844f1f0d..f6bdd2730 100644 --- a/src/main/java/appeng/server/subcommands/ChunkLogger.java +++ b/src/main/java/appeng/server/subcommands/ChunkLogger.java @@ -21,22 +21,24 @@ package appeng.server.subcommands; import com.mojang.brigadier.context.CommandContext; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents; -import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.world.ServerWorld; import net.minecraft.text.TranslatableText; +import net.minecraft.world.chunk.WorldChunk; + import appeng.api.features.AEFeature; import appeng.core.AEConfig; import appeng.core.AELog; import appeng.server.ISubCommand; -import net.minecraft.world.chunk.WorldChunk; public class ChunkLogger implements ISubCommand { private boolean enabled = false; // Since we cannot unregister a listener once it's registered, but - // we still only want to register it if the command is ever used we track it here + // we still only want to register it if the command is ever used we track it + // here private boolean listenerRegistered = false; private void onChunkLoadEvent(ServerWorld world, WorldChunk chunk) { @@ -70,7 +72,8 @@ public class ChunkLogger implements ISubCommand { } @Override - public synchronized void call(final MinecraftServer srv, final CommandContext data, final ServerCommandSource sender) { + public synchronized void call(final MinecraftServer srv, final CommandContext data, + final ServerCommandSource sender) { this.enabled = !this.enabled; if (this.enabled) { diff --git a/src/main/java/appeng/server/subcommands/Supporters.java b/src/main/java/appeng/server/subcommands/Supporters.java index a70a1565e..54b465800 100644 --- a/src/main/java/appeng/server/subcommands/Supporters.java +++ b/src/main/java/appeng/server/subcommands/Supporters.java @@ -21,8 +21,8 @@ package appeng.server.subcommands; import com.google.common.base.Joiner; import com.mojang.brigadier.context.CommandContext; -import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.LiteralText; import appeng.server.ISubCommand; @@ -30,7 +30,8 @@ import appeng.server.ISubCommand; public class Supporters implements ISubCommand { @Override - public void call(final MinecraftServer srv, final CommandContext data, final ServerCommandSource sender) { + public void call(final MinecraftServer srv, final CommandContext data, + final ServerCommandSource sender) { final String[] who = { "Stig Halvorsen", "Josh Ricker", "Jenny \"Othlon\" Sutherland", "Hristo Bogdanov", "BevoLJ" }; sender.sendFeedback(new LiteralText("Special thanks to " + Joiner.on(", ").join(who)), true); diff --git a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java index 34f0ae2ab..66f4bfc02 100644 --- a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java +++ b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java @@ -25,26 +25,26 @@ import java.util.Comparator; import java.util.List; import java.util.Locale; -import appeng.core.AppEng; import com.google.common.math.StatsAccumulator; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ServerWorld; import net.minecraft.structure.StructureStart; import net.minecraft.text.*; import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; +import net.minecraft.world.Heightmap; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.gen.chunk.ChunkGenerator; -import net.minecraft.world.Heightmap; -import net.minecraft.server.world.ServerWorld; +import appeng.core.AppEng; import appeng.server.ISubCommand; import appeng.worldgen.meteorite.MeteoriteStructure; import appeng.worldgen.meteorite.MeteoriteStructurePiece; @@ -65,7 +65,8 @@ public class TestMeteoritesCommand implements ISubCommand { } @Override - public void call(final MinecraftServer srv, final CommandContext ctx, final ServerCommandSource sender) { + public void call(final MinecraftServer srv, final CommandContext ctx, + final ServerCommandSource sender) { test(srv, sender, false); } @@ -177,8 +178,7 @@ public class TestMeteoritesCommand implements ISubCommand { } // Add a clickable link to teleport the user to the Meteorite - private static Text getClickablePosition(ServerWorld world, PlacedMeteoriteSettings settings, - BlockPos pos) { + private static Text getClickablePosition(ServerWorld world, PlacedMeteoriteSettings settings, BlockPos pos) { BlockPos tpPos = pos.up((int) Math.ceil(settings.getMeteoriteRadius())); int surfaceY = world.getTopY(Heightmap.Type.WORLD_SURFACE, tpPos.getX(), tpPos.getZ()); if (surfaceY > tpPos.getY()) { @@ -188,8 +188,7 @@ public class TestMeteoritesCommand implements ISubCommand { String displayText = String.format(Locale.ROOT, "pos=%d,%d,%d", tpPos.getX(), tpPos.getY(), tpPos.getZ()); String tpCommand = String.format(Locale.ROOT, "/tp @s %d %d %d", tpPos.getX(), tpPos.getY(), tpPos.getZ()); - return new LiteralText(displayText) - .formatted(Formatting.UNDERLINE) + return new LiteralText(displayText).formatted(Formatting.UNDERLINE) .styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, tpCommand))); } diff --git a/src/main/java/appeng/server/subcommands/TestOreGenCommand.java b/src/main/java/appeng/server/subcommands/TestOreGenCommand.java index a6cdda356..319ec7ab1 100644 --- a/src/main/java/appeng/server/subcommands/TestOreGenCommand.java +++ b/src/main/java/appeng/server/subcommands/TestOreGenCommand.java @@ -29,15 +29,15 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.block.BlockState; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ServerWorld; import net.minecraft.text.LiteralText; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.Chunk; -import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.chunk.ChunkStatus; import appeng.core.Api; import appeng.server.ISubCommand; @@ -56,7 +56,8 @@ public class TestOreGenCommand implements ISubCommand { } @Override - public void call(final MinecraftServer srv, final CommandContext data, final ServerCommandSource sender) { + public void call(final MinecraftServer srv, final CommandContext data, + final ServerCommandSource sender) { int radius = 1000; diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index d347fb4e6..c21607fc5 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -29,6 +29,7 @@ import javax.annotation.Nonnull; import net.minecraft.block.Block; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.BlockView; @@ -36,7 +37,6 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.dimension.DimensionType; -import net.minecraft.server.world.ServerWorld; import appeng.api.util.DimensionalCoord; import appeng.core.Api; @@ -71,12 +71,12 @@ public final class CompassService { // FIXME FABRIC this is never registered // FIXME @SubscribeEvent // FIXME public void unloadWorld(final WorldEvent.Unload event) { - // FIXME DimensionType dim = event.getWorld().getDimension().getType(); + // FIXME DimensionType dim = event.getWorld().getDimension().getType(); // FIXME - // FIXME if (Platform.isServer() && this.worldSet.containsKey(dim)) { - // FIXME final CompassReader compassReader = this.worldSet.remove(dim); - // FIXME compassReader.close(); - // FIXME } + // FIXME if (Platform.isServer() && this.worldSet.containsKey(dim)) { + // FIXME final CompassReader compassReader = this.worldSet.remove(dim); + // FIXME compassReader.close(); + // FIXME } // FIXME } private int jobSize() { @@ -90,8 +90,10 @@ public final class CompassService { } public void tryUpdateArea(final WorldAccess w, ChunkPos chunkPos) { - // If this seems weird: during worldgen, WorldAccess is a specific region, but getWorld is - // still the server world. We do need to use the world access to get the chunk in question + // If this seems weird: during worldgen, WorldAccess is a specific region, but + // getWorld is + // still the server world. We do need to use the world access to get the chunk + // in question // though, since during worldgen, it's not comitted to the actual world yet. World world = w.getWorld(); if (!(world instanceof ServerWorld)) { @@ -114,8 +116,8 @@ public final class CompassService { } /** - * Notifies the compass service that a skystone block has either been placed or replaced - * at the give position. + * Notifies the compass service that a skystone block has either been placed or + * replaced at the give position. */ public void notifyBlockChange(final ServerWorld w, BlockPos pos) { Chunk chunk = w.getChunk(pos); diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 9dfe90a69..b41bcbd56 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -18,13 +18,10 @@ package appeng.spatial; -import appeng.core.Api; -import appeng.api.movable.IMovableHandler; -import appeng.api.movable.IMovableRegistry; -import appeng.api.util.AEPartLocation; -import appeng.api.util.WorldCoord; -import appeng.core.AELog; -import appeng.core.worlddata.WorldData; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -42,9 +39,13 @@ import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.chunk.WorldChunk; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +import appeng.api.movable.IMovableHandler; +import appeng.api.movable.IMovableRegistry; +import appeng.api.util.AEPartLocation; +import appeng.api.util.WorldCoord; +import appeng.core.AELog; +import appeng.core.Api; +import appeng.core.worlddata.WorldData; public class CachedPlane { private final int x_size; @@ -159,8 +160,8 @@ public class CachedPlane { final BlockPos tePOS = entry.pos; if (tePOS.getX() >= minX && tePOS.getX() <= maxX && tePOS.getY() >= minY && tePOS.getY() <= maxY && tePOS.getZ() >= minZ && tePOS.getZ() <= maxZ) { - this.ticks.add(new ScheduledTick<>(tePOS, entry.getObject(), - entry.time - gameTime, entry.priority)); + this.ticks.add(new ScheduledTick<>(tePOS, entry.getObject(), entry.time - gameTime, + entry.priority)); } } } @@ -264,8 +265,7 @@ public class CachedPlane { private void addTick(final int x, final int y, final int z, final ScheduledTick entry) { BlockPos where = new BlockPos(x + this.x_offset, y + this.y_offset, z + this.z_offset); - this.world.getBlockTickScheduler().schedule(where, entry.getObject(), (int) entry.time, - entry.priority); + this.world.getBlockTickScheduler().schedule(where, entry.getObject(), (int) entry.time, entry.priority); } private void addTile(final int x, final int y, final int z, final BlockEntity te, @@ -320,8 +320,8 @@ public class CachedPlane { // FIXME this was sending chunks to players... ChunkDataS2CPacket cdp = new ChunkDataS2CPacket(c, verticalBits, false); - ((ServerChunkManager) world.getChunkManager()).threadedAnvilChunkStorage.getPlayersWatchingChunk(c.getPos(), false) - .forEach(spe -> spe.networkHandler.sendPacket(cdp)); + ((ServerChunkManager) world.getChunkManager()).threadedAnvilChunkStorage + .getPlayersWatchingChunk(c.getPos(), false).forEach(spe -> spe.networkHandler.sendPacket(cdp)); } } diff --git a/src/main/java/appeng/spatial/SpatialDimensionManager.java b/src/main/java/appeng/spatial/SpatialDimensionManager.java index fb5e97419..1b18a212b 100644 --- a/src/main/java/appeng/spatial/SpatialDimensionManager.java +++ b/src/main/java/appeng/spatial/SpatialDimensionManager.java @@ -18,11 +18,11 @@ package appeng.spatial; -import appeng.api.storage.ISpatialDimension; -import appeng.core.AELog; -import appeng.core.AppEng; -import appeng.core.localization.GuiText; -import appeng.hooks.DynamicDimensions; +import java.util.List; +import java.util.Locale; + +import javax.annotation.Nullable; + import net.minecraft.client.render.SkyProperties; import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; @@ -35,9 +35,11 @@ import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; -import javax.annotation.Nullable; -import java.util.List; -import java.util.Locale; +import appeng.api.storage.ISpatialDimension; +import appeng.core.AELog; +import appeng.core.AppEng; +import appeng.core.localization.GuiText; +import appeng.hooks.DynamicDimensions; public final class SpatialDimensionManager implements ISpatialDimension { @@ -46,15 +48,11 @@ public final class SpatialDimensionManager implements ISpatialDimension { // we move the origin to the middle of region 0,0 public static final BlockPos REGION_CENTER = new BlockPos(512 / 2, 64, 512 / 2); - public static final RegistryKey STORAGE_DIMENSION_TYPE = RegistryKey.of(Registry.DIMENSION_TYPE_KEY, AppEng.makeId("storage_cell")); + public static final RegistryKey STORAGE_DIMENSION_TYPE = RegistryKey.of(Registry.DIMENSION_TYPE_KEY, + AppEng.makeId("storage_cell")); - public static final SkyProperties STORAGE_SKY = new SkyProperties( - Float.NaN /* disables clouds */, - false, - SkyProperties.SkyType.NONE /* we use a custom render mixin */, - true, - false - ) { + public static final SkyProperties STORAGE_SKY = new SkyProperties(Float.NaN /* disables clouds */, false, + SkyProperties.SkyType.NONE /* we use a custom render mixin */, true, false) { @Override public Vec3d adjustSkyColor(Vec3d color, float sunHeight) { return Vec3d.ZERO; @@ -96,7 +94,8 @@ public final class SpatialDimensionManager implements ISpatialDimension { ServerWorld world = dynamicDimensions.addWorld(worldId, STORAGE_DIMENSION_TYPE, StorageChunkGenerator.INSTANCE); - SpatialDimensionExtraData spatialExtraData = world.getPersistentStateManager().getOrCreate(SpatialDimensionExtraData::new, SpatialDimensionExtraData.ID); + SpatialDimensionExtraData spatialExtraData = world.getPersistentStateManager() + .getOrCreate(SpatialDimensionExtraData::new, SpatialDimensionExtraData.ID); spatialExtraData.setSize(size); return worldId; diff --git a/src/main/java/appeng/spatial/StorageCellBiome.java b/src/main/java/appeng/spatial/StorageCellBiome.java index 3b1f9572b..175a843b3 100644 --- a/src/main/java/appeng/spatial/StorageCellBiome.java +++ b/src/main/java/appeng/spatial/StorageCellBiome.java @@ -30,15 +30,12 @@ public class StorageCellBiome extends Biome { public static final StorageCellBiome INSTANCE = new StorageCellBiome(); public StorageCellBiome() { - super(new Biome.Settings().surfaceBuilder(new ConfiguredSurfaceBuilder<>(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_CONFIG)) + super(new Biome.Settings() + .surfaceBuilder(new ConfiguredSurfaceBuilder<>(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_CONFIG)) .precipitation(Precipitation.NONE).category(Category.NONE).depth(0).scale(1) // Copied from the vanilla void biome .temperature(0.5F).downfall(0.5F) - .effects(new BiomeEffects.Builder() - .waterColor(4159204) - .waterFogColor(329011) - .fogColor(0) - .build()) + .effects(new BiomeEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(0).build()) .parent(null)); } diff --git a/src/main/java/appeng/spatial/StorageChunkGenerator.java b/src/main/java/appeng/spatial/StorageChunkGenerator.java index 485463083..71c30a810 100644 --- a/src/main/java/appeng/spatial/StorageChunkGenerator.java +++ b/src/main/java/appeng/spatial/StorageChunkGenerator.java @@ -18,9 +18,13 @@ package appeng.spatial; -import appeng.core.Api; +import java.util.Arrays; +import java.util.Collections; +import java.util.Optional; + import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; + import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; @@ -37,9 +41,7 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.chunk.StructuresConfig; import net.minecraft.world.gen.chunk.VerticalBlockSample; -import java.util.Arrays; -import java.util.Collections; -import java.util.Optional; +import appeng.core.Api; public class StorageChunkGenerator extends ChunkGenerator { @@ -47,8 +49,8 @@ public class StorageChunkGenerator extends ChunkGenerator { public static final StorageChunkGenerator INSTANCE = new StorageChunkGenerator(); - public static final Codec CODEC = RecordCodecBuilder.create((instance) -> - instance.stable(INSTANCE)); + public static final Codec CODEC = RecordCodecBuilder + .create((instance) -> instance.stable(INSTANCE)); private final BlockState defaultBlockState; @@ -56,7 +58,8 @@ public class StorageChunkGenerator extends ChunkGenerator { super(createBiomeProvider(), createSettings()); this.defaultBlockState = Api.instance().definitions().blocks().matrixFrame().block().getDefaultState(); - // Vertical sample is mostly used for Feature generation, for those purposes we're all filled with matrix blocks + // Vertical sample is mostly used for Feature generation, for those purposes + // we're all filled with matrix blocks BlockState[] columnSample = new BlockState[256]; Arrays.fill(columnSample, this.defaultBlockState); this.columnSample = new VerticalBlockSample(columnSample); diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 92bf6dbca..ef7c54865 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -18,9 +18,9 @@ package appeng.spatial; -import appeng.core.Api; -import appeng.api.util.WorldCoord; -import appeng.core.AppEng; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -36,8 +36,6 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.dimension.DimensionType; -import java.util.ArrayList; -import java.util.List; import appeng.api.util.WorldCoord; import appeng.core.Api; import appeng.core.AppEng; @@ -100,7 +98,8 @@ public class StorageHelper { newWorld.getChunkManager().getChunk(MathHelper.floor(link.x) >> 4, MathHelper.floor(link.z) >> 4, ChunkStatus.FULL, true); - if (entity instanceof ServerPlayerEntity && link.dim.getDimensionRegistryKey().equals(SpatialDimensionManager.STORAGE_DIMENSION_TYPE)) { + if (entity instanceof ServerPlayerEntity + && link.dim.getDimensionRegistryKey().equals(SpatialDimensionManager.STORAGE_DIMENSION_TYPE)) { AppEng.instance().getAdvancementTriggers().getSpatialExplorer().trigger((ServerPlayerEntity) entity); } @@ -144,18 +143,17 @@ public class StorageHelper { } } - public void swapRegions(final ServerWorld srcWorld, final int srcX, final int srcY, final int srcZ, final ServerWorld dstWorld, - final int dstX, final int dstY, final int dstZ, final int scaleX, final int scaleY, final int scaleZ) { + public void swapRegions(final ServerWorld srcWorld, final int srcX, final int srcY, final int srcZ, + final ServerWorld dstWorld, final int dstX, final int dstY, final int dstZ, final int scaleX, + final int scaleY, final int scaleZ) { Api.instance().definitions().blocks().matrixFrame().maybeBlock() .ifPresent(matrixFrameBlock -> this.transverseEdges(dstX - 1, dstY - 1, dstZ - 1, dstX + scaleX + 1, dstY + scaleY + 1, dstZ + scaleZ + 1, new WrapInMatrixFrame(matrixFrameBlock.getDefaultState(), dstWorld))); - final Box srcBox = new Box(srcX, srcY, srcZ, srcX + scaleX + 1, srcY + scaleY + 1, - srcZ + scaleZ + 1); + final Box srcBox = new Box(srcX, srcY, srcZ, srcX + scaleX + 1, srcY + scaleY + 1, srcZ + scaleZ + 1); - final Box dstBox = new Box(dstX, dstY, dstZ, dstX + scaleX + 1, dstY + scaleY + 1, - dstZ + scaleZ + 1); + final Box dstBox = new Box(dstX, dstY, dstZ, dstX + scaleX + 1, dstY + scaleY + 1, dstZ + scaleZ + 1); final CachedPlane cDst = new CachedPlane(dstWorld, dstX, dstY, dstZ, dstX + scaleX, dstY + scaleY, dstZ + scaleZ); @@ -169,13 +167,13 @@ public class StorageHelper { final List dstE = dstWorld.getEntitiesIncludingUngeneratedChunks(Entity.class, dstBox); for (final Entity e : dstE) { - this.teleportEntity(e, new TelDestination(srcWorld, srcBox, e.getX(), e.getY(), e.getZ(), - -dstX + srcX, -dstY + srcY, -dstZ + srcZ)); + this.teleportEntity(e, new TelDestination(srcWorld, srcBox, e.getX(), e.getY(), e.getZ(), -dstX + srcX, + -dstY + srcY, -dstZ + srcZ)); } for (final Entity e : srcE) { - this.teleportEntity(e, new TelDestination(dstWorld, dstBox, e.getX(), e.getY(), e.getZ(), - -srcX + dstX, -srcY + dstY, -srcZ + dstZ)); + this.teleportEntity(e, new TelDestination(dstWorld, dstBox, e.getX(), e.getY(), e.getZ(), -srcX + dstX, + -srcY + dstY, -srcZ + dstZ)); } for (final WorldCoord wc : cDst.getUpdates()) { @@ -235,8 +233,8 @@ public class StorageHelper { private final double y; private final double z; - TelDestination(final ServerWorld dimension, final Box srcBox, final double x, final double y, - final double z, final int tileX, final int tileY, final int tileZ) { + TelDestination(final ServerWorld dimension, final Box srcBox, final double x, final double y, final double z, + final int tileX, final int tileY, final int tileZ) { this.dim = dimension; this.x = Math.min(srcBox.maxX - 0.5, Math.max(srcBox.minX + 0.5, x + tileX)); this.y = Math.min(srcBox.maxY - 0.5, Math.max(srcBox.minY + 0.5, y + tileY)); diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java index a54ab17a2..5430c3325 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java @@ -67,11 +67,9 @@ public class QuadClamper implements RenderContext.QuadTransform { private void clamp(MutableQuadView quad, Box bb) { for (int i = 0; i < 4; i++) { quad.copyPos(i, pos); - pos.set( - (float) MathHelper.clamp(pos.getX(), bb.minX, bb.maxX), + pos.set((float) MathHelper.clamp(pos.getX(), bb.minX, bb.maxX), (float) MathHelper.clamp(pos.getY(), bb.minY, bb.maxY), - (float) MathHelper.clamp(pos.getZ(), bb.minZ, bb.maxZ) - ); + (float) MathHelper.clamp(pos.getZ(), bb.minZ, bb.maxZ)); quad.pos(i, pos); } } diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java index 8722f7015..120e9e671 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java @@ -18,6 +18,9 @@ package appeng.thirdparty.codechicken.lib.model.pipeline.transformers; +import static net.minecraft.util.math.Direction.AxisDirection.NEGATIVE; +import static net.minecraft.util.math.Direction.AxisDirection.POSITIVE; + import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; import net.minecraft.util.math.Box; @@ -25,9 +28,6 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction.AxisDirection; import net.minecraft.util.math.Vec3i; -import static net.minecraft.util.math.Direction.AxisDirection.NEGATIVE; -import static net.minecraft.util.math.Direction.AxisDirection.POSITIVE; - /** * This transformer is a little complicated. Basically a Facade / Cover can use * this to 'kick' the edges in of quads to fix z-Fighting in the corners. Use it @@ -43,18 +43,18 @@ public class QuadCornerKicker implements RenderContext.QuadTransform { public static final QuadCornerKicker INSTANCE = new QuadCornerKicker(); // Simple horizonal lookups. - public static int[][] horizonals = new int[][]{ + public static int[][] horizonals = new int[][] { // Around Y axis, NSWE. - {2, 3, 4, 5}, // - {2, 3, 4, 5}, // + { 2, 3, 4, 5 }, // + { 2, 3, 4, 5 }, // // Around Z axis, DUWE. - {0, 1, 4, 5}, // - {0, 1, 4, 5}, // + { 0, 1, 4, 5 }, // + { 0, 1, 4, 5 }, // // Around X axis, DUNS. - {0, 1, 2, 3}, // - {0, 1, 2, 3}}; + { 0, 1, 2, 3 }, // + { 0, 1, 2, 3 } }; private int mySide; private int facadeMask; @@ -144,7 +144,7 @@ public class QuadCornerKicker implements RenderContext.QuadTransform { private AxisDirection yAxis; private AxisDirection zAxis; - private static final int[] sideMask = {0, 2, 0, 1, 0, 4}; + private static final int[] sideMask = { 0, 2, 0, 1, 0, 4 }; Corner(AxisDirection xAxis, AxisDirection yAxis, AxisDirection zAxis) { this.xAxis = xAxis; diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java index 7db32ac7c..e95e49a11 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java @@ -18,14 +18,14 @@ package appeng.thirdparty.codechicken.lib.model.pipeline.transformers; +import static net.minecraft.util.math.Direction.AxisDirection.POSITIVE; + import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction.AxisDirection; -import static net.minecraft.util.math.Direction.AxisDirection.POSITIVE; - /** * This transformer strips quads that are on faces. Simply set the bounds for * the faces, and the strip mask. diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadReInterpolator.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadReInterpolator.java index 2c3b79d1f..e5ca2a306 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadReInterpolator.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadReInterpolator.java @@ -18,7 +18,6 @@ package appeng.thirdparty.codechicken.lib.model.pipeline.transformers; -import appeng.thirdparty.codechicken.lib.math.InterpHelper; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadView; @@ -26,6 +25,8 @@ import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.EncodingFormat; import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl; +import appeng.thirdparty.codechicken.lib.math.InterpHelper; + /** * This transformer Re-Interpolates the Color, UV's and LightMaps. Use this * after all transformations that translate vertices in the pipeline. diff --git a/src/main/java/appeng/tile/AEBaseBlockEntity.java b/src/main/java/appeng/tile/AEBaseBlockEntity.java index 05389736a..b512f5850 100644 --- a/src/main/java/appeng/tile/AEBaseBlockEntity.java +++ b/src/main/java/appeng/tile/AEBaseBlockEntity.java @@ -18,25 +18,18 @@ package appeng.tile; -import alexiil.mc.lib.attributes.AttributeList; -import alexiil.mc.lib.attributes.AttributeProvider; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.implementations.tiles.ISegmentedInventory; -import appeng.api.util.ICommonTile; -import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigurableObject; -import appeng.api.util.IOrientable; -import appeng.block.AEBaseTileBlock; -import appeng.client.render.model.AEModelData; -import appeng.core.AELog; -import appeng.core.features.IStackSrc; -import appeng.helpers.ICustomNameObject; -import appeng.helpers.IPriorityHost; -import appeng.hooks.TickHandler; -import appeng.tile.inventory.AppEngInternalAEInventory; -import appeng.util.Platform; -import appeng.util.SettingsFrom; +import java.io.IOException; +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import io.netty.buffer.Unpooled; + import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents; import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity; @@ -53,16 +46,28 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.io.IOException; -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import alexiil.mc.lib.attributes.AttributeList; +import alexiil.mc.lib.attributes.AttributeProvider; +import alexiil.mc.lib.attributes.item.FixedItemInv; -public class AEBaseBlockEntity extends BlockEntity implements IOrientable, ICommonTile, ICustomNameObject, BlockEntityClientSerializable, RenderAttachmentBlockEntity, AttributeProvider { +import appeng.api.implementations.tiles.ISegmentedInventory; +import appeng.api.util.ICommonTile; +import appeng.api.util.IConfigManager; +import appeng.api.util.IConfigurableObject; +import appeng.api.util.IOrientable; +import appeng.block.AEBaseTileBlock; +import appeng.client.render.model.AEModelData; +import appeng.core.AELog; +import appeng.core.features.IStackSrc; +import appeng.helpers.ICustomNameObject; +import appeng.helpers.IPriorityHost; +import appeng.hooks.TickHandler; +import appeng.tile.inventory.AppEngInternalAEInventory; +import appeng.util.Platform; +import appeng.util.SettingsFrom; + +public class AEBaseBlockEntity extends BlockEntity implements IOrientable, ICommonTile, ICustomNameObject, + BlockEntityClientSerializable, RenderAttachmentBlockEntity, AttributeProvider { // FIXME: should probably remove at start of next server tick! static { @@ -336,8 +341,8 @@ public class AEBaseBlockEntity extends BlockEntity implements IOrientable, IComm } /** - * returns the contents of the block entity, into the world, defaults to dropping - * everything in the inventory. + * returns the contents of the block entity, into the world, defaults to + * dropping everything in the inventory. * * @param w world * @param pos block position @@ -392,8 +397,7 @@ public class AEBaseBlockEntity extends BlockEntity implements IOrientable, IComm @Override public Text getCustomInventoryName() { - return new LiteralText( - this.hasCustomInventoryName() ? this.customName : this.getClass().getSimpleName()); + return new LiteralText(this.hasCustomInventoryName() ? this.customName : this.getClass().getSimpleName()); } @Override diff --git a/src/main/java/appeng/tile/AEBaseInvBlockEntity.java b/src/main/java/appeng/tile/AEBaseInvBlockEntity.java index b369d58d8..593df881c 100644 --- a/src/main/java/appeng/tile/AEBaseInvBlockEntity.java +++ b/src/main/java/appeng/tile/AEBaseInvBlockEntity.java @@ -23,19 +23,20 @@ import java.util.List; import javax.annotation.Nonnull; -import alexiil.mc.lib.attributes.AttributeList; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.AttributeList; +import alexiil.mc.lib.attributes.item.FixedItemInv; +import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv; + import appeng.util.helpers.ItemHandlerUtil; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; @@ -59,8 +60,7 @@ public abstract class AEBaseInvBlockEntity extends AEBaseBlockEntity implements } } - public abstract @Nonnull - FixedItemInv getInternalInventory(); + public abstract @Nonnull FixedItemInv getInternalInventory(); @Override public CompoundTag toTag(final CompoundTag data) { @@ -95,10 +95,9 @@ public abstract class AEBaseInvBlockEntity extends AEBaseBlockEntity implements @Override public abstract void onChangeInventory(FixedItemInv inv, int slot, InvOperation mc, ItemStack removed, - ItemStack added); + ItemStack added); - protected @Nonnull - FixedItemInv getItemHandlerForSide(@Nonnull Direction side) { + protected @Nonnull FixedItemInv getItemHandlerForSide(@Nonnull Direction side) { return this.getInternalInventory(); } diff --git a/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java b/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java index 777bc5fc7..6d41ddbd6 100644 --- a/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java @@ -25,11 +25,11 @@ import java.util.LinkedList; import java.util.Optional; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import appeng.api.config.Actionable; diff --git a/src/main/java/appeng/tile/crafting/CraftingMonitorBlockEntity.java b/src/main/java/appeng/tile/crafting/CraftingMonitorBlockEntity.java index 7c64fcd23..ec2d0713e 100644 --- a/src/main/java/appeng/tile/crafting/CraftingMonitorBlockEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingMonitorBlockEntity.java @@ -23,6 +23,7 @@ import java.util.Optional; import javax.annotation.Nonnull; +import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; @@ -31,8 +32,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; -import net.fabricmc.api.EnvType; - import appeng.api.implementations.tiles.IColorableTile; import appeng.api.storage.data.IAEItemStack; diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java index 64c2badf5..4e5882709 100644 --- a/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java +++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java @@ -18,8 +18,27 @@ package appeng.tile.crafting; +import java.io.IOException; +import java.util.List; + +import javax.annotation.Nullable; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.*; import appeng.api.definitions.ITileDefinition; import appeng.api.implementations.IPowerChannelState; @@ -58,22 +77,6 @@ import appeng.util.inv.WrapperChainedItemHandler; import appeng.util.inv.WrapperFilteredItemHandler; import appeng.util.inv.filter.IAEItemFilter; import appeng.util.item.AEItemStack; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.io.IOException; -import java.util.List; public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity implements IUpgradeableHost, IConfigManagerHost, IGridTickable, ICraftingMachine, IPowerChannelState { @@ -310,7 +313,7 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { if (inv == this.gridInv || inv == this.patternInv) { this.recalculatePlan(); } @@ -399,13 +402,15 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity this.progress = 0; final ItemStack output = this.myPlan.getOutput(this.craftingInv, this.getWorld()); if (!output.isEmpty()) { - // FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent((PlayerEntity) FakePlayer.getOrCreate((ServerWorld) this.getWorld()), output, - // FIXME FABRIC this.craftingInv); + // FIXME FABRIC BasicEventHooks.firePlayerCraftingEvent((PlayerEntity) + // FakePlayer.getOrCreate((ServerWorld) this.getWorld()), output, + // FIXME FABRIC this.craftingInv); this.pushOut(output.copy()); for (int x = 0; x < this.craftingInv.size(); x++) { - this.gridInv.setInvStack(x, Platform.getRecipeRemainder(this.craftingInv.getStack(x)), Simulation.ACTION); + this.gridInv.setInvStack(x, Platform.getRecipeRemainder(this.craftingInv.getStack(x)), + Simulation.ACTION); } if (ItemHandlerUtil.isEmpty(this.patternInv)) { diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java index 9f3b30026..af3823dbc 100644 --- a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java +++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java @@ -20,28 +20,27 @@ package appeng.tile.crafting; import java.util.Random; -import appeng.mixins.RenderPhaseMixin; +import org.lwjgl.opengl.GL11; + import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.*; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.ModelIdentifier; import net.minecraft.client.util.math.MatrixStack; - -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.render.model.BakedModel; -import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; -import net.fabricmc.api.Environment; import appeng.client.render.effects.ParticleTypes; import appeng.core.AppEng; +import appeng.mixins.RenderPhaseMixin; /** * Renders the item currently being crafted by the molecular assembler, as well @@ -50,8 +49,8 @@ import appeng.core.AppEng; @Environment(EnvType.CLIENT) public class MolecularAssemblerRenderer extends BlockEntityRenderer { - public static final ModelIdentifier LIGHTS_MODEL = new ModelIdentifier(AppEng.makeId( - "block/molecular_assembler_lights"), ""); + public static final ModelIdentifier LIGHTS_MODEL = new ModelIdentifier( + AppEng.makeId("block/molecular_assembler_lights"), ""); private static final RenderLayer MC_161917_RENDERTYPE_FIX = createRenderType(); @@ -63,7 +62,7 @@ public class MolecularAssemblerRenderer extends BlockEntityRenderer !stack.isEmpty() diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index 4c8cf9388..b0de97922 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -23,13 +23,14 @@ import java.util.Iterator; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; + import alexiil.mc.lib.attributes.ListenerRemovalToken; import alexiil.mc.lib.attributes.ListenerToken; import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.InvMarkDirtyListener; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; @@ -124,7 +125,8 @@ public class AppEngInternalAEInventory implements FixedItemInv, Iterable { @@ -68,20 +70,18 @@ public class AppEngInternalInventory extends DirectFixedItemInv implements Itera LimitedFixedItemInv limitedFixedInv = this.createLimitedFixedInv(); for (int i = 0; i < getSlotCount(); i++) { final int slot = i; - limitedFixedInv.getRule(i) - .filterExtracts(stack -> filter.allowExtract(this, slot, stack.getCount())); - limitedFixedInv.getRule(i) - .filterInserts(stack -> { - if (stack.isEmpty()) { - ItemStack current = this.getInvStack(slot); - if (current.isEmpty()) { - return true; // Replacing empty with empty... okay - } - return filter.allowExtract(this, slot, current.getCount()); - } else { - return filter.allowInsert(this, slot, stack); + limitedFixedInv.getRule(i).filterExtracts(stack -> filter.allowExtract(this, slot, stack.getCount())); + limitedFixedInv.getRule(i).filterInserts(stack -> { + if (stack.isEmpty()) { + ItemStack current = this.getInvStack(slot); + if (current.isEmpty()) { + return true; // Replacing empty with empty... okay } - }); + return filter.allowExtract(this, slot, current.getCount()); + } else { + return filter.allowInsert(this, slot, stack); + } + }); } return limitedFixedInv; diff --git a/src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java b/src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java index c56c04017..ff7389475 100644 --- a/src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java +++ b/src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java @@ -20,14 +20,15 @@ package appeng.tile.misc; import java.util.List; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.CopyMode; import appeng.api.config.Settings; import appeng.api.config.Upgrades; @@ -131,7 +132,7 @@ public class CellWorkbenchBlockEntity extends AEBaseBlockEntity @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { if (inv == this.cell && !this.locked) { this.locked = true; diff --git a/src/main/java/appeng/tile/misc/ChargerBlockEntity.java b/src/main/java/appeng/tile/misc/ChargerBlockEntity.java index 4cfb09d1b..282c5dc13 100644 --- a/src/main/java/appeng/tile/misc/ChargerBlockEntity.java +++ b/src/main/java/appeng/tile/misc/ChargerBlockEntity.java @@ -23,12 +23,13 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import alexiil.mc.lib.attributes.Simulation; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; + +import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.Actionable; @@ -141,7 +142,7 @@ public class ChargerBlockEntity extends AENetworkPowerBlockEntity implements ICr @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { try { this.getProxy().getTick().wakeDevice(this.getProxy().getNode()); } catch (final GridAccessException e) { diff --git a/src/main/java/appeng/tile/misc/CondenserBlockEntity.java b/src/main/java/appeng/tile/misc/CondenserBlockEntity.java index 723d22ca0..3aedcc000 100644 --- a/src/main/java/appeng/tile/misc/CondenserBlockEntity.java +++ b/src/main/java/appeng/tile/misc/CondenserBlockEntity.java @@ -20,6 +20,13 @@ package appeng.tile.misc; import javax.annotation.Nullable; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import alexiil.mc.lib.attributes.AttributeList; import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.fluid.FluidInsertable; @@ -28,12 +35,6 @@ import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.ItemInsertable; -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import appeng.api.config.CondenserOutput; import appeng.api.config.Settings; @@ -70,8 +71,7 @@ public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfi private final FluidInsertable externalFluidInput = new FluidHandler(); private final MEHandler meHandler = new MEHandler(); - private final FixedItemInv combinedInv = new WrapperChainedItemHandler(this.outputSlot, - this.storageSlot); + private final FixedItemInv combinedInv = new WrapperChainedItemHandler(this.outputSlot, this.storageSlot); private double storedPower = 0; @@ -168,7 +168,7 @@ public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfi @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { if (inv == this.outputSlot) { this.meHandler.outputChanged(added, removed); } @@ -226,7 +226,8 @@ public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfi final IStorageChannel chan = Api.instance().storage() .getStorageChannel(IFluidStorageChannel.class); CondenserBlockEntity.this - .addPower((fluid.isEmpty() ? 0.0 : fluid.getAmount_F().asInexactDouble() * 1000.0) / chan.transferFactor()); + .addPower((fluid.isEmpty() ? 0.0 : fluid.getAmount_F().asInexactDouble() * 1000.0) + / chan.transferFactor()); } return FluidVolumeUtil.EMPTY; diff --git a/src/main/java/appeng/tile/misc/CondenserItemInventory.java b/src/main/java/appeng/tile/misc/CondenserItemInventory.java index 1953b9b86..25f594270 100644 --- a/src/main/java/appeng/tile/misc/CondenserItemInventory.java +++ b/src/main/java/appeng/tile/misc/CondenserItemInventory.java @@ -22,9 +22,10 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.item.filter.ConstantItemFilter; -import net.minecraft.item.ItemStack; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; @@ -69,7 +70,8 @@ class CondenserItemInventory implements IMEMonitor, ITickingMonito if (!slotItem.isEmpty() && request.isSameType(slotItem)) { int count = (int) Math.min(request.getStackSize(), Integer.MAX_VALUE); ret = AEItemStack - .fromItemStack(this.target.getOutputSlot().getSlot(0).attemptExtraction(ConstantItemFilter.ANYTHING, count, mode == Actionable.SIMULATE ? Simulation.SIMULATE : Simulation.ACTION)); + .fromItemStack(this.target.getOutputSlot().getSlot(0).attemptExtraction(ConstantItemFilter.ANYTHING, + count, mode == Actionable.SIMULATE ? Simulation.SIMULATE : Simulation.ACTION)); } return ret; } diff --git a/src/main/java/appeng/tile/misc/InscriberBlockEntity.java b/src/main/java/appeng/tile/misc/InscriberBlockEntity.java index 131f1faf4..edb6b738a 100644 --- a/src/main/java/appeng/tile/misc/InscriberBlockEntity.java +++ b/src/main/java/appeng/tile/misc/InscriberBlockEntity.java @@ -25,17 +25,18 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import alexiil.mc.lib.attributes.Simulation; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.Settings; @@ -96,8 +97,8 @@ public class InscriberBlockEntity extends AENetworkPowerBlockEntity private InscriberRecipe cachedTask = null; - private final FixedItemInv inv = new WrapperChainedItemHandler(this.topItemHandler, - this.bottomItemHandler, this.sideItemHandler); + private final FixedItemInv inv = new WrapperChainedItemHandler(this.topItemHandler, this.bottomItemHandler, + this.sideItemHandler); public InscriberBlockEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); @@ -213,7 +214,7 @@ public class InscriberBlockEntity extends AENetworkPowerBlockEntity @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { try { if (slot == 0) { this.setProcessingTime(0); diff --git a/src/main/java/appeng/tile/misc/InscriberRecipes.java b/src/main/java/appeng/tile/misc/InscriberRecipes.java index 8df908d55..bdb2028d1 100644 --- a/src/main/java/appeng/tile/misc/InscriberRecipes.java +++ b/src/main/java/appeng/tile/misc/InscriberRecipes.java @@ -1,12 +1,7 @@ package appeng.tile.misc; -import appeng.core.Api; -import appeng.api.definitions.IComparableDefinition; -import appeng.api.features.InscriberProcessType; -import appeng.core.Api; -import appeng.core.AppEng; -import appeng.items.materials.MaterialItem; -import appeng.recipes.handlers.InscriberRecipe; +import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.recipe.Ingredient; @@ -14,7 +9,12 @@ import net.minecraft.text.LiteralText; import net.minecraft.util.Identifier; import net.minecraft.world.World; -import javax.annotation.Nullable; +import appeng.api.definitions.IComparableDefinition; +import appeng.api.features.InscriberProcessType; +import appeng.core.Api; +import appeng.core.AppEng; +import appeng.items.materials.MaterialItem; +import appeng.recipes.handlers.InscriberRecipe; /** * This class indexes all inscriber recipes to find valid inputs for the top and diff --git a/src/main/java/appeng/tile/misc/InterfaceBlockEntity.java b/src/main/java/appeng/tile/misc/InterfaceBlockEntity.java index 87bd18031..e331a20ff 100644 --- a/src/main/java/appeng/tile/misc/InterfaceBlockEntity.java +++ b/src/main/java/appeng/tile/misc/InterfaceBlockEntity.java @@ -22,20 +22,21 @@ import java.io.IOException; import java.util.EnumSet; import java.util.List; -import alexiil.mc.lib.attributes.AttributeList; import com.google.common.collect.ImmutableSet; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.inventory.CraftingInventory; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.math.Direction; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; + +import alexiil.mc.lib.attributes.AttributeList; import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.config.Actionable; @@ -214,7 +215,7 @@ public class InterfaceBlockEntity extends AENetworkInvBlockEntity @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { this.duality.onChangeInventory(inv, slot, mc, removed, added); } diff --git a/src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java b/src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java index 0c9f98c91..755f35cb4 100644 --- a/src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java +++ b/src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java @@ -18,8 +18,8 @@ package appeng.tile.misc; -import net.minecraft.util.Tickable; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.Tickable; import appeng.tile.AEBaseBlockEntity; import appeng.util.Platform; diff --git a/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java b/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java index c824ebbdb..7b5fdb1b4 100644 --- a/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java +++ b/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java @@ -28,12 +28,12 @@ import java.util.List; import io.netty.buffer.Unpooled; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.world.LightType; diff --git a/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java b/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java index 509013849..ef6455e76 100644 --- a/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java +++ b/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java @@ -23,7 +23,6 @@ import java.util.EnumSet; import java.util.List; import java.util.Map; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; @@ -32,10 +31,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.SecurityPermissions; import appeng.api.config.Settings; import appeng.api.config.SortDir; @@ -110,7 +111,7 @@ public class SecurityStationBlockEntity extends AENetworkBlockEntity implements @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + final ItemStack removedStack, final ItemStack newStack) { } diff --git a/src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java b/src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java index bb509fe6a..9761b6473 100644 --- a/src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java +++ b/src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java @@ -18,9 +18,9 @@ package appeng.tile.misc; -import appeng.client.render.model.AEModelData; import net.minecraft.block.entity.BlockEntityType; +import appeng.client.render.model.AEModelData; import appeng.tile.AEBaseBlockEntity; public class SkyCompassBlockEntity extends AEBaseBlockEntity { diff --git a/src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java b/src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java index 59c454339..3d0012d76 100644 --- a/src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java +++ b/src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java @@ -22,17 +22,18 @@ import java.io.IOException; import javax.annotation.Nonnull; -import alexiil.mc.lib.attributes.Simulation; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.fabricmc.fabric.api.registry.FuelRegistry; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.Actionable; import appeng.api.networking.IGridNode; import appeng.api.networking.energy.IEnergyGrid; @@ -122,7 +123,7 @@ public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity impleme @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { if (this.getBurnTime() <= 0) { if (this.canEatFuel()) { try { diff --git a/src/main/java/appeng/tile/networking/CableBusBlockEntity.java b/src/main/java/appeng/tile/networking/CableBusBlockEntity.java index 50dbec50a..fd7c4bb9c 100644 --- a/src/main/java/appeng/tile/networking/CableBusBlockEntity.java +++ b/src/main/java/appeng/tile/networking/CableBusBlockEntity.java @@ -25,19 +25,20 @@ import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import alexiil.mc.lib.attributes.AttributeList; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.AttributeList; + import appeng.api.networking.IGridNode; import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IPart; diff --git a/src/main/java/appeng/tile/networking/CableBusTESR.java b/src/main/java/appeng/tile/networking/CableBusTESR.java index d9490b481..f8229824e 100644 --- a/src/main/java/appeng/tile/networking/CableBusTESR.java +++ b/src/main/java/appeng/tile/networking/CableBusTESR.java @@ -18,11 +18,10 @@ package appeng.tile.networking; -import net.minecraft.client.util.math.MatrixStack; - import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.Direction; import appeng.api.parts.IPart; @@ -35,7 +34,7 @@ public class CableBusTESR extends BlockEntityRenderer { @Override public void render(CableBusBlockEntity te, float partialTicks, MatrixStack ms, VertexConsumerProvider buffers, - int combinedLightIn, int combinedOverlayIn) { + int combinedLightIn, int combinedOverlayIn) { if (!te.getCableBus().isRequiresDynamicRender()) { return; } diff --git a/src/main/java/appeng/tile/networking/ControllerBlockEntity.java b/src/main/java/appeng/tile/networking/ControllerBlockEntity.java index ce52cf551..cbbe486fa 100644 --- a/src/main/java/appeng/tile/networking/ControllerBlockEntity.java +++ b/src/main/java/appeng/tile/networking/ControllerBlockEntity.java @@ -20,11 +20,12 @@ package appeng.tile.networking; import java.util.EnumSet; -import net.minecraft.item.ItemStack; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.math.Direction; +import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; +import net.minecraft.util.math.Direction; + import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv; @@ -174,7 +175,7 @@ public class ControllerBlockEntity extends AENetworkPowerBlockEntity { @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { } /** diff --git a/src/main/java/appeng/tile/networking/EnergyAcceptorBlockEntity.java b/src/main/java/appeng/tile/networking/EnergyAcceptorBlockEntity.java index edf7b493e..d9ff9d9c4 100644 --- a/src/main/java/appeng/tile/networking/EnergyAcceptorBlockEntity.java +++ b/src/main/java/appeng/tile/networking/EnergyAcceptorBlockEntity.java @@ -18,10 +18,11 @@ package appeng.tile.networking; -import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.item.FixedItemInv; +import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv; import appeng.api.config.Actionable; import appeng.api.networking.energy.IEnergyGrid; @@ -74,7 +75,7 @@ public class EnergyAcceptorBlockEntity extends AENetworkPowerBlockEntity { @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { } } diff --git a/src/main/java/appeng/tile/networking/WirelessBlockEntity.java b/src/main/java/appeng/tile/networking/WirelessBlockEntity.java index 92f143590..80bdd8d3b 100644 --- a/src/main/java/appeng/tile/networking/WirelessBlockEntity.java +++ b/src/main/java/appeng/tile/networking/WirelessBlockEntity.java @@ -21,12 +21,13 @@ package appeng.tile.networking; import java.io.IOException; import java.util.EnumSet; -import alexiil.mc.lib.attributes.item.FixedItemInv; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; -import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.implementations.IPowerChannelState; import appeng.api.implementations.tiles.IWirelessAccessPoint; import appeng.api.networking.GridFlags; @@ -123,7 +124,7 @@ public class WirelessBlockEntity extends AENetworkInvBlockEntity implements IWir @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { // :P } diff --git a/src/main/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java b/src/main/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java index 95827e779..f17734438 100644 --- a/src/main/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java +++ b/src/main/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java @@ -21,15 +21,17 @@ package appeng.tile.powersink; import java.util.EnumSet; import java.util.Set; -import alexiil.mc.lib.attributes.AttributeList; -import alexiil.mc.lib.attributes.AttributeProvider; import com.google.common.collect.ImmutableSet; import net.minecraft.block.BlockState; -import net.minecraft.nbt.CompoundTag; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +import alexiil.mc.lib.attributes.AttributeList; +import alexiil.mc.lib.attributes.AttributeProvider; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; @@ -38,7 +40,6 @@ import appeng.api.config.PowerUnits; import appeng.api.networking.energy.IAEPowerStorage; import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType; import appeng.tile.AEBaseInvBlockEntity; -import net.minecraft.world.World; public abstract class AEBasePoweredBlockEntity extends AEBaseInvBlockEntity implements IAEPowerStorage, IExternalPowerSink, AttributeProvider { diff --git a/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java b/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java index 867a982fd..b0dd86f9b 100644 --- a/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java +++ b/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java @@ -22,18 +22,18 @@ import java.io.IOException; import java.util.EnumSet; import java.util.Optional; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Tickable; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv; -import net.minecraft.util.math.BlockPos; import appeng.api.definitions.IBlockDefinition; import appeng.api.networking.GridFlags; @@ -114,7 +114,7 @@ public class QuantumBridgeBlockEntity extends AENetworkInvBlockEntity @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { if (this.cluster != null) { this.cluster.updateStatus(true); } diff --git a/src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java b/src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java index e27e2c875..82eea7e67 100644 --- a/src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java +++ b/src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java @@ -20,16 +20,17 @@ package appeng.tile.spatial; import javax.annotation.Nonnull; -import alexiil.mc.lib.attributes.Simulation; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntityType; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.YesNo; @@ -141,8 +142,8 @@ public class SpatialIOPortBlockEntity extends AENetworkInvBlockEntity implements playerId = this.getProxy().getSecurity().getOwner(); } - final TransitionResult tr = sc.doSpatialTransition(cell, serverWorld, spc.getMin(), spc.getMax(), - playerId); + final TransitionResult tr = sc.doSpatialTransition(cell, serverWorld, spc.getMin(), + spc.getMax(), playerId); if (tr.success) { energy.extractAEPower(req, Actionable.MODULATE, PowerMultiplier.CONFIG); this.inv.setInvStack(0, ItemStack.EMPTY, Simulation.ACTION); @@ -167,8 +168,7 @@ public class SpatialIOPortBlockEntity extends AENetworkInvBlockEntity implements } @Override - protected @Nonnull - FixedItemInv getItemHandlerForSide(@Nonnull Direction side) { + protected @Nonnull FixedItemInv getItemHandlerForSide(@Nonnull Direction side) { return this.invExt; } @@ -179,7 +179,7 @@ public class SpatialIOPortBlockEntity extends AENetworkInvBlockEntity implements @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { } diff --git a/src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java b/src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java index b83a76ce6..3ccafbe81 100644 --- a/src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java +++ b/src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java @@ -23,9 +23,8 @@ import java.util.EnumSet; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.math.Direction; - import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import appeng.api.networking.GridFlags; import appeng.api.networking.events.MENetworkChannelsChanged; diff --git a/src/main/java/appeng/tile/storage/ChestBlockEntity.java b/src/main/java/appeng/tile/storage/ChestBlockEntity.java index 72ece8866..32a7ca3cd 100644 --- a/src/main/java/appeng/tile/storage/ChestBlockEntity.java +++ b/src/main/java/appeng/tile/storage/ChestBlockEntity.java @@ -18,6 +18,28 @@ package appeng.tile.storage; +import java.io.IOException; +import java.math.RoundingMode; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.util.Tickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + import alexiil.mc.lib.attributes.AttributeList; import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.fluid.FluidInsertable; @@ -27,7 +49,7 @@ import alexiil.mc.lib.attributes.fluid.filter.ConstantFluidFilter; import alexiil.mc.lib.attributes.fluid.filter.FluidFilter; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.core.Api; + import appeng.api.config.*; import appeng.api.implementations.tiles.IColorableTile; import appeng.api.implementations.tiles.IMEChest; @@ -70,26 +92,6 @@ import appeng.util.inv.InvOperation; import appeng.util.inv.WrapperChainedItemHandler; import appeng.util.inv.filter.IAEItemFilter; import appeng.util.item.AEItemStack; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.util.Tickable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.World; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.io.IOException; -import java.math.RoundingMode; -import java.util.Collections; -import java.util.List; public class ChestBlockEntity extends AENetworkPowerBlockEntity implements IMEChest, ITerminalHost, IPriorityHost, IConfigManagerHost, IColorableTile, Tickable { @@ -425,7 +427,7 @@ public class ChestBlockEntity extends AENetworkPowerBlockEntity @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { if (inv == this.cellInventory) { this.cellHandler = null; this.isCached = false; // recalculate the storage cell. @@ -715,10 +717,8 @@ public class ChestBlockEntity extends AENetworkPowerBlockEntity return fluidVolume; } - IAEFluidStack remaining = Platform.poweredInsert(ChestBlockEntity.this, - ChestBlockEntity.this.cellHandler, - toInsert, - ChestBlockEntity.this.mySrc, + IAEFluidStack remaining = Platform.poweredInsert(ChestBlockEntity.this, ChestBlockEntity.this.cellHandler, + toInsert, ChestBlockEntity.this.mySrc, simulation == Simulation.ACTION ? Actionable.MODULATE : Actionable.SIMULATE); FluidAmount filledAmt = remaining != null ? remaining.getAmount() : toInsert.getAmount(); @@ -747,8 +747,8 @@ public class ChestBlockEntity extends AENetworkPowerBlockEntity public boolean allowInsert(FixedItemInv inv, int slot, ItemStack stack) { if (ChestBlockEntity.this.isPowered()) { ChestBlockEntity.this.updateHandler(); - return ChestBlockEntity.this.cellHandler != null && ChestBlockEntity.this.cellHandler.getChannel() == Api - .instance().storage().getStorageChannel(IItemStorageChannel.class); + return ChestBlockEntity.this.cellHandler != null && ChestBlockEntity.this.cellHandler + .getChannel() == Api.instance().storage().getStorageChannel(IItemStorageChannel.class); } return false; } diff --git a/src/main/java/appeng/tile/storage/DriveBlockEntity.java b/src/main/java/appeng/tile/storage/DriveBlockEntity.java index b5be38e32..875d86963 100644 --- a/src/main/java/appeng/tile/storage/DriveBlockEntity.java +++ b/src/main/java/appeng/tile/storage/DriveBlockEntity.java @@ -29,15 +29,16 @@ import java.util.Map; import javax.annotation.Nullable; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.client.render.model.DriveModelData; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.screen.ScreenHandlerType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.util.math.Direction; + +import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.api.implementations.tiles.IChestOrDrive; import appeng.api.networking.GridFlags; @@ -59,6 +60,7 @@ import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.block.storage.DriveSlotsState; +import appeng.client.render.model.DriveModelData; import appeng.container.implementations.DriveContainer; import appeng.core.Api; import appeng.helpers.IPriorityHost; @@ -69,7 +71,6 @@ import appeng.tile.grid.AENetworkInvBlockEntity; import appeng.tile.inventory.AppEngCellInventory; import appeng.util.Platform; import appeng.util.inv.InvOperation; -import net.minecraft.util.math.Direction; public class DriveBlockEntity extends AENetworkInvBlockEntity implements IChestOrDrive, IPriorityHost { @@ -323,7 +324,7 @@ public class DriveBlockEntity extends AENetworkInvBlockEntity implements IChestO @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { if (this.isCached) { this.isCached = false; // recalculate the storage cell. this.updateState(); diff --git a/src/main/java/appeng/tile/storage/IOPortBlockEntity.java b/src/main/java/appeng/tile/storage/IOPortBlockEntity.java index 920fe4d41..08fd31dcf 100644 --- a/src/main/java/appeng/tile/storage/IOPortBlockEntity.java +++ b/src/main/java/appeng/tile/storage/IOPortBlockEntity.java @@ -22,17 +22,18 @@ import java.util.IdentityHashMap; import java.util.List; import java.util.Map; -import alexiil.mc.lib.attributes.Simulation; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.config.Actionable; import appeng.api.config.FullnessMode; import appeng.api.config.OperationMode; @@ -219,7 +220,7 @@ public class IOPortBlockEntity extends AENetworkInvBlockEntity @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { if (this.inputCells == inv) { this.updateTask(); } diff --git a/src/main/java/appeng/tile/storage/SkyChestBlockEntity.java b/src/main/java/appeng/tile/storage/SkyChestBlockEntity.java index ef23e962e..a3a841640 100644 --- a/src/main/java/appeng/tile/storage/SkyChestBlockEntity.java +++ b/src/main/java/appeng/tile/storage/SkyChestBlockEntity.java @@ -21,15 +21,16 @@ package appeng.tile.storage; import java.io.IOException; import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.client.block.ChestAnimationProgress; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; +import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.Tickable; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.sound.SoundCategory; import net.minecraft.util.math.MathHelper; + import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.block.storage.SkyChestBlock; @@ -135,7 +136,7 @@ public class SkyChestBlockEntity extends AEBaseInvBlockEntity implements Tickabl @Override public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + final ItemStack removed, final ItemStack added) { } diff --git a/src/main/java/appeng/util/FakePlayer.java b/src/main/java/appeng/util/FakePlayer.java index 21cf08db0..0ed1b5d73 100644 --- a/src/main/java/appeng/util/FakePlayer.java +++ b/src/main/java/appeng/util/FakePlayer.java @@ -1,10 +1,18 @@ package appeng.util; +import java.util.Objects; +import java.util.UUID; +import java.util.WeakHashMap; + +import javax.annotation.Nullable; + import com.mojang.authlib.GameProfile; + import io.netty.util.concurrent.CompleteFuture; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.SucceededFuture; + import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.ClientConnection; import net.minecraft.network.NetworkSide; @@ -17,23 +25,19 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.util.Objects; -import java.util.UUID; -import java.util.WeakHashMap; - public class FakePlayer extends ServerPlayerEntity { private static final WeakHashMap FAKE_PLAYERS = new WeakHashMap<>(); - private static final GameProfile PROFILE = new GameProfile(UUID.fromString("60C173A5-E1E6-4B87-85B1-272CE424521D"), "[AppEng2]"); + private static final GameProfile PROFILE = new GameProfile(UUID.fromString("60C173A5-E1E6-4B87-85B1-272CE424521D"), + "[AppEng2]"); private FakePlayer(ServerWorld world) { super(world.getServer(), world, PROFILE, new ServerPlayerInteractionManager(world)); } /** - * DO NOT COPY THE PLAYER ANYWHERE! - * It will keep the world alive, always call this method if you need it. + * DO NOT COPY THE PLAYER ANYWHERE! It will keep the world alive, always call + * this method if you need it. */ public static FakePlayer getOrCreate(ServerWorld world) { Objects.requireNonNull(world); @@ -49,7 +53,8 @@ public class FakePlayer extends ServerPlayerEntity { } public static boolean isFakePlayer(PlayerEntity player) { - // FIXME FABRIC: Is there a reliable way of detecting fake players of other mods??? + // FIXME FABRIC: Is there a reliable way of detecting fake players of other + // mods??? return player instanceof FakePlayer; } @@ -57,6 +62,7 @@ public class FakePlayer extends ServerPlayerEntity { public void tick() { } - // FIXME: We should probably find and override all methods that access the networkHandler + // FIXME: We should probably find and override all methods that access the + // networkHandler } \ No newline at end of file diff --git a/src/main/java/appeng/util/InventoryAdaptor.java b/src/main/java/appeng/util/InventoryAdaptor.java index d129dcf1e..62cd613e6 100644 --- a/src/main/java/appeng/util/InventoryAdaptor.java +++ b/src/main/java/appeng/util/InventoryAdaptor.java @@ -18,18 +18,20 @@ package appeng.util; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.Direction; + import alexiil.mc.lib.attributes.SearchOptions; import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.ItemAttributes; + import appeng.api.config.FuzzyMode; import appeng.util.inv.AdaptorFixedInv; import appeng.util.inv.AdaptorItemHandlerPlayerInv; import appeng.util.inv.IInventoryDestination; import appeng.util.inv.ItemSlot; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.Direction; /** * Universal Facade for other inventories. Used to conveniently interact with @@ -42,7 +44,8 @@ public abstract class InventoryAdaptor implements Iterable { if (te == null) { return null; } - FixedItemInv inv = ItemAttributes.FIXED_INV.get(te.getWorld(), te.getPos(), SearchOptions.inDirection(d.getOpposite())); + FixedItemInv inv = ItemAttributes.FIXED_INV.get(te.getWorld(), te.getPos(), + SearchOptions.inDirection(d.getOpposite())); if (inv == ItemAttributes.FIXED_INV.defaultValue) { return null; @@ -65,10 +68,10 @@ public abstract class InventoryAdaptor implements Iterable { // return what was extracted. public abstract ItemStack removeSimilarItems(int amount, ItemStack filter, FuzzyMode fuzzyMode, - IInventoryDestination destination); + IInventoryDestination destination); public abstract ItemStack simulateSimilarRemove(int amount, ItemStack filter, FuzzyMode fuzzyMode, - IInventoryDestination destination); + IInventoryDestination destination); // return what isn't used... public abstract ItemStack addItems(ItemStack toBeAdded); diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index e5eb9d043..af9e73eb6 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -18,8 +18,47 @@ package appeng.util; +import java.text.DecimalFormat; +import java.util.*; + +import javax.annotation.Nullable; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.Entity; +import net.minecraft.entity.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.recipe.Recipe; +import net.minecraft.server.integrated.IntegratedServer; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; +import net.minecraft.util.Util; +import net.minecraft.util.hit.EntityHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.*; +import net.minecraft.util.registry.Registry; +import net.minecraft.world.RayTraceContext; +import net.minecraft.world.World; + import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -import appeng.core.Api; + import appeng.api.config.*; import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IMaterials; @@ -58,42 +97,6 @@ import appeng.util.helpers.ItemComparisonHelper; import appeng.util.helpers.P2PHelper; import appeng.util.item.AEItemStack; import appeng.util.prioritylist.IPartitionList; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.item.TooltipContext; -import net.minecraft.entity.Entity; -import net.minecraft.entity.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.recipe.Recipe; -import net.minecraft.server.integrated.IntegratedServer; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.text.LiteralText; -import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.Formatting; -import net.minecraft.util.Identifier; -import net.minecraft.util.Util; -import net.minecraft.util.hit.EntityHitResult; -import net.minecraft.util.hit.HitResult; -import net.minecraft.util.math.*; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.RayTraceContext; -import net.minecraft.world.World; - -import javax.annotation.Nullable; -import java.text.DecimalFormat; -import java.util.*; /** * @author AlgorithmX2 @@ -193,7 +196,7 @@ public class Platform { * @return True if client-side classes (such as Renderers) are available. */ public static boolean hasClientClasses() { - return FABRIC.getEnvironmentType() == EnvType.CLIENT; + return FABRIC.getEnvironmentType() == EnvType.CLIENT; } /* @@ -239,8 +242,9 @@ public class Platform { final ISecurityGrid sg = g.getCache(ISecurityGrid.class); if (!sg.hasPermission(player, requiredPermission)) { - player.sendSystemMessage(new TranslatableText("appliedenergistics2.permission_denied") - .formatted(Formatting.RED), Util.NIL_UUID); + player.sendSystemMessage( + new TranslatableText("appliedenergistics2.permission_denied").formatted(Formatting.RED), + Util.NIL_UUID); // FIXME trace logging? return false; } @@ -635,14 +639,16 @@ public class Platform { } public static LookDirection getPlayerRay(final PlayerEntity playerIn) { - // FIXME this currently cant be modded in Fabric, see net.minecraft.server.network.ServerPlayerInteractionManager.processBlockBreakingAction + // FIXME this currently cant be modded in Fabric, see + // net.minecraft.server.network.ServerPlayerInteractionManager.processBlockBreakingAction double reachDistance = 36.0D; return getPlayerRay(playerIn, reachDistance); } public static LookDirection getPlayerRay(final PlayerEntity playerIn, double reachDistance) { final double x = playerIn.prevX + (playerIn.getX() - playerIn.prevX); - final double y = playerIn.prevY + (playerIn.getY() - playerIn.prevY) + playerIn.getEyeHeight(playerIn.getPose()); + final double y = playerIn.prevY + (playerIn.getY() - playerIn.prevY) + + playerIn.getEyeHeight(playerIn.getPose()); final double z = playerIn.prevZ + (playerIn.getZ() - playerIn.prevZ); final float playerPitch = playerIn.prevPitch + (playerIn.pitch - playerIn.prevPitch); @@ -682,9 +688,8 @@ public class Platform { final Vec3d vec31 = vec3.add(f7 * d3, f6 * d3, f8 * d3); - final Box bb = new Box(Math.min(vec3.x, vec31.x), Math.min(vec3.y, vec31.y), - Math.min(vec3.z, vec31.z), Math.max(vec3.x, vec31.x), Math.max(vec3.y, vec31.y), - Math.max(vec3.z, vec31.z)).expand(16, 16, 16); + final Box bb = new Box(Math.min(vec3.x, vec31.x), Math.min(vec3.y, vec31.y), Math.min(vec3.z, vec31.z), + Math.max(vec3.x, vec31.x), Math.max(vec3.y, vec31.y), Math.max(vec3.z, vec31.z)).expand(16, 16, 16); Entity entity = null; double closest = 9999999.0D; @@ -986,8 +991,8 @@ public class Platform { break; } - player.refreshPositionAndAngles(tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, - yaw, pitch); + player.refreshPositionAndAngles(tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, + tile.getPos().getZ() + 0.5, yaw, pitch); } public static boolean canAccess(final AENetworkProxy gridProxy, final IActionSource src) { @@ -1143,7 +1148,7 @@ public class Platform { public static boolean isSearchModeAvailable(SearchBoxMode mode) { if (mode.isRequiresJei()) { - return ReiFacade.instance().isEnabled(); + return ReiFacade.instance().isEnabled(); } return true; } diff --git a/src/main/java/appeng/util/helpers/ItemHandlerUtil.java b/src/main/java/appeng/util/helpers/ItemHandlerUtil.java index 3132b2313..e02a7a8d8 100644 --- a/src/main/java/appeng/util/helpers/ItemHandlerUtil.java +++ b/src/main/java/appeng/util/helpers/ItemHandlerUtil.java @@ -18,10 +18,11 @@ package appeng.util.helpers; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + public class ItemHandlerUtil { private ItemHandlerUtil() { } diff --git a/src/main/java/appeng/util/inv/AdaptorFixedInv.java b/src/main/java/appeng/util/inv/AdaptorFixedInv.java index 03f04bb4f..46c67cd47 100644 --- a/src/main/java/appeng/util/inv/AdaptorFixedInv.java +++ b/src/main/java/appeng/util/inv/AdaptorFixedInv.java @@ -18,17 +18,20 @@ package appeng.util.inv; +import java.util.Iterator; + +import org.jetbrains.annotations.NotNull; + +import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.ItemTransferable; import alexiil.mc.lib.attributes.item.filter.ItemFilter; + import appeng.api.config.FuzzyMode; import appeng.util.InventoryAdaptor; import appeng.util.Platform; -import net.minecraft.item.ItemStack; -import org.jetbrains.annotations.NotNull; - -import java.util.Iterator; public class AdaptorFixedInv extends InventoryAdaptor { protected final FixedItemInv itemHandler; @@ -63,7 +66,8 @@ public class AdaptorFixedInv extends InventoryAdaptor { ItemFilter itemFilter = destination != null ? destination::canInsert : stack -> true; if (!filter.isEmpty()) { if (destination != null) { - itemFilter = stack -> Platform.itemComparisons().isSameItem(stack, filter) && destination.canInsert(stack); + itemFilter = stack -> Platform.itemComparisons().isSameItem(stack, filter) + && destination.canInsert(stack); } else { itemFilter = stack -> Platform.itemComparisons().isSameItem(stack, filter); } @@ -76,7 +80,8 @@ public class AdaptorFixedInv extends InventoryAdaptor { ItemFilter itemFilter = destination != null ? destination::canInsert : stack -> true; if (!filter.isEmpty()) { if (destination != null) { - itemFilter = stack -> Platform.itemComparisons().isFuzzyEqualItem(stack, filter, fuzzyMode) && destination.canInsert(stack); + itemFilter = stack -> Platform.itemComparisons().isFuzzyEqualItem(stack, filter, fuzzyMode) + && destination.canInsert(stack); } else { itemFilter = stack -> Platform.itemComparisons().isFuzzyEqualItem(stack, filter, fuzzyMode); } @@ -119,7 +124,7 @@ public class AdaptorFixedInv extends InventoryAdaptor { return ItemStack.EMPTY; } - return this.transferable.attemptInsertion(itemsToAdd, simulate ? Simulation.SIMULATE : Simulation.ACTION); + return this.transferable.attemptInsertion(itemsToAdd, simulate ? Simulation.SIMULATE : Simulation.ACTION); } @Override diff --git a/src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java b/src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java index 566f82c06..eb9ae4ed7 100644 --- a/src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java +++ b/src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java @@ -18,12 +18,14 @@ package appeng.util.inv; -import alexiil.mc.lib.attributes.Simulation; -import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; -import appeng.util.Platform; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; + +import appeng.util.Platform; + public class AdaptorItemHandlerPlayerInv extends AdaptorFixedInv { public AdaptorItemHandlerPlayerInv(final PlayerEntity playerInv) { diff --git a/src/main/java/appeng/util/inv/IAEAppEngInventory.java b/src/main/java/appeng/util/inv/IAEAppEngInventory.java index a4afe24b5..cf1bfd475 100644 --- a/src/main/java/appeng/util/inv/IAEAppEngInventory.java +++ b/src/main/java/appeng/util/inv/IAEAppEngInventory.java @@ -18,9 +18,10 @@ package appeng.util.inv; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + public interface IAEAppEngInventory { void saveChanges(); diff --git a/src/main/java/appeng/util/inv/ItemHandlerIterator.java b/src/main/java/appeng/util/inv/ItemHandlerIterator.java index eca263123..7d5eca6fc 100644 --- a/src/main/java/appeng/util/inv/ItemHandlerIterator.java +++ b/src/main/java/appeng/util/inv/ItemHandlerIterator.java @@ -46,7 +46,8 @@ class ItemHandlerIterator implements Iterator { if (this.slot >= this.itemHandler.getSlotCount()) { throw new NoSuchElementException(); } - this.itemSlot.setExtractable(!this.itemHandler.getSlot(this.slot).attemptAnyExtraction(1, Simulation.SIMULATE).isEmpty()); + this.itemSlot.setExtractable( + !this.itemHandler.getSlot(this.slot).attemptAnyExtraction(1, Simulation.SIMULATE).isEmpty()); this.itemSlot.setItemStack(this.itemHandler.getInvStack(this.slot)); this.itemSlot.setSlot(this.slot); this.slot++; diff --git a/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java b/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java index 05ac1d3b0..ba6c1817e 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java @@ -18,12 +18,12 @@ package appeng.util.inv; +import java.util.Arrays; + import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.impl.CombinedFixedItemInv; import alexiil.mc.lib.attributes.item.impl.DelegatingFixedItemInv; -import java.util.Arrays; - // FIXME could be replaced by CombinedFixedItemInv directly public class WrapperChainedItemHandler extends DelegatingFixedItemInv { diff --git a/src/main/java/appeng/util/inv/WrapperCursorItemHandler.java b/src/main/java/appeng/util/inv/WrapperCursorItemHandler.java index c488e72d9..38dbf7429 100644 --- a/src/main/java/appeng/util/inv/WrapperCursorItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperCursorItemHandler.java @@ -18,9 +18,10 @@ package appeng.util.inv; +import net.minecraft.entity.player.PlayerInventory; + import alexiil.mc.lib.attributes.item.compat.FixedInventoryVanillaWrapper; import alexiil.mc.lib.attributes.item.impl.DelegatingFixedItemInv; -import net.minecraft.entity.player.PlayerInventory; public class WrapperCursorItemHandler extends DelegatingFixedItemInv { diff --git a/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java b/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java index 180f4cd19..a1f976f47 100644 --- a/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java @@ -21,13 +21,14 @@ package appeng.util.inv; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.ListenerRemovalToken; import alexiil.mc.lib.attributes.ListenerToken; import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.InvMarkDirtyListener; import alexiil.mc.lib.attributes.item.filter.ItemFilter; -import net.minecraft.item.ItemStack; -import alexiil.mc.lib.attributes.item.FixedItemInv; import appeng.util.inv.filter.IAEItemFilter; diff --git a/src/main/java/appeng/util/inv/WrapperInvItemHandler.java b/src/main/java/appeng/util/inv/WrapperInvItemHandler.java index 9cfb5bee7..5e9d67835 100644 --- a/src/main/java/appeng/util/inv/WrapperInvItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperInvItemHandler.java @@ -18,9 +18,10 @@ package appeng.util.inv; +import net.minecraft.entity.player.PlayerEntity; + import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.compat.InventoryFixedWrapper; -import net.minecraft.entity.player.PlayerEntity; public class WrapperInvItemHandler extends InventoryFixedWrapper { diff --git a/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java b/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java index de60ee373..44c65a9f9 100644 --- a/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java @@ -20,16 +20,17 @@ package appeng.util.inv; import java.util.function.Supplier; +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; + import alexiil.mc.lib.attributes.ListenerRemovalToken; import alexiil.mc.lib.attributes.ListenerToken; import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.GroupedItemInv; import alexiil.mc.lib.attributes.item.InvMarkDirtyListener; import alexiil.mc.lib.attributes.item.impl.DelegatingGroupedItemInv; -import net.minecraft.item.ItemStack; -import alexiil.mc.lib.attributes.item.FixedItemInv; - -import javax.annotation.Nullable; public class WrapperSupplierItemHandler implements FixedItemInv { private final Supplier sourceHandler; diff --git a/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java b/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java index 5196dd101..c252058d7 100644 --- a/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java +++ b/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java @@ -18,9 +18,10 @@ package appeng.util.inv.filter; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + import appeng.api.definitions.IItemDefinition; public class AEItemDefinitionFilter implements IAEItemFilter { diff --git a/src/main/java/appeng/util/inv/filter/AEItemFilters.java b/src/main/java/appeng/util/inv/filter/AEItemFilters.java index 0320d1ec6..4af680ebf 100644 --- a/src/main/java/appeng/util/inv/filter/AEItemFilters.java +++ b/src/main/java/appeng/util/inv/filter/AEItemFilters.java @@ -18,9 +18,10 @@ package appeng.util.inv.filter; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + public class AEItemFilters { public static final IAEItemFilter INSERT_ONLY = new InsertOnlyFilter(); public static final IAEItemFilter EXTRACT_ONLY = new ExtractOnlyFilter(); diff --git a/src/main/java/appeng/util/inv/filter/IAEItemFilter.java b/src/main/java/appeng/util/inv/filter/IAEItemFilter.java index eeba8334f..171fda220 100644 --- a/src/main/java/appeng/util/inv/filter/IAEItemFilter.java +++ b/src/main/java/appeng/util/inv/filter/IAEItemFilter.java @@ -18,9 +18,10 @@ package appeng.util.inv.filter; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + public interface IAEItemFilter { boolean allowExtract(FixedItemInv inv, int slot, int amount); diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index 958354c24..acae924d5 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -24,13 +24,14 @@ import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.PacketByteBuf; import net.minecraft.text.Text; -import net.fabricmc.api.EnvType; +import net.minecraft.util.registry.Registry; import appeng.api.config.FuzzyMode; import appeng.api.storage.IStorageChannel; @@ -38,7 +39,6 @@ import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.core.Api; import appeng.util.Platform; -import net.minecraft.util.registry.Registry; public final class AEItemStack extends AEStack implements IAEItemStack { private static final String NBT_STACKSIZE = "cnt"; @@ -159,8 +159,7 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override public ItemStack createItemStack() { - return Platform.copyStackWithSize(this.getDefinition(), - (int) Math.min(Integer.MAX_VALUE, this.getStackSize())); + return Platform.copyStackWithSize(this.getDefinition(), (int) Math.min(Integer.MAX_VALUE, this.getStackSize())); } @Override diff --git a/src/main/java/appeng/util/iterators/InvIterator.java b/src/main/java/appeng/util/iterators/InvIterator.java index ab618046c..a183f3e4e 100644 --- a/src/main/java/appeng/util/iterators/InvIterator.java +++ b/src/main/java/appeng/util/iterators/InvIterator.java @@ -20,9 +20,10 @@ package appeng.util.iterators; import java.util.Iterator; -import alexiil.mc.lib.attributes.item.FixedItemInv; import net.minecraft.item.ItemStack; +import alexiil.mc.lib.attributes.item.FixedItemInv; + public final class InvIterator implements Iterator { private final FixedItemInv inventory; private final int size; diff --git a/src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java b/src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java index 6d09e4aef..e473218e6 100644 --- a/src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java +++ b/src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java @@ -2,6 +2,7 @@ package appeng.worldgen; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; + import net.minecraft.block.BlockState; import net.minecraft.world.gen.feature.FeatureConfig; import net.minecraft.world.gen.feature.OreFeatureConfig; @@ -11,10 +12,10 @@ import net.minecraft.world.gen.feature.OreFeatureConfig; */ public class ChargedQuartzOreConfig implements FeatureConfig { - public static final Codec CODEC = RecordCodecBuilder.create((instance) -> instance.group( - BlockState.CODEC.fieldOf("target").forGetter((config) -> config.target), - BlockState.CODEC.fieldOf("state").forGetter((config) -> config.state), - Codec.FLOAT.fieldOf("chance").withDefault(0f).forGetter((config) -> config.chance)) + public static final Codec CODEC = RecordCodecBuilder.create((instance) -> instance + .group(BlockState.CODEC.fieldOf("target").forGetter((config) -> config.target), + BlockState.CODEC.fieldOf("state").forGetter((config) -> config.state), + Codec.FLOAT.fieldOf("chance").withDefault(0f).forGetter((config) -> config.chance)) .apply(instance, ChargedQuartzOreConfig::new)); public final BlockState target; diff --git a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java index 9ffa6b3de..89ddaea2e 100644 --- a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java +++ b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java @@ -1,6 +1,10 @@ package appeng.worldgen; +import java.util.Random; +import java.util.function.Predicate; + import com.mojang.serialization.Codec; + import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; @@ -10,12 +14,10 @@ import net.minecraft.world.chunk.Chunk; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.Feature; -import java.util.Random; -import java.util.function.Predicate; - /** - * Extends {@link net.minecraft.world.gen.feature.OreFeature} by also allowing for a replacement - * chance. In addition, the feature will check every block in the chunk. + * Extends {@link net.minecraft.world.gen.feature.OreFeature} by also allowing + * for a replacement chance. In addition, the feature will check every block in + * the chunk. */ public class ChargedQuartzOreFeature extends Feature { @@ -26,12 +28,8 @@ public class ChargedQuartzOreFeature extends Feature { } @Override - public boolean generate(ServerWorldAccess worldIn, - net.minecraft.world.gen.StructureAccessor structureAccessor, - ChunkGenerator generator, - Random rand, - BlockPos pos, - ChargedQuartzOreConfig config) { + public boolean generate(ServerWorldAccess worldIn, net.minecraft.world.gen.StructureAccessor structureAccessor, + ChunkGenerator generator, Random rand, BlockPos pos, ChargedQuartzOreConfig config) { ChunkPos chunkPos = new ChunkPos(pos); BlockPos.Mutable bpos = new BlockPos.Mutable(); diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java index 7ea78d38d..fcd3474f0 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java @@ -21,12 +21,6 @@ package appeng.worldgen.meteorite; import java.util.ArrayList; import java.util.List; -import alexiil.mc.lib.attributes.AttributeList; -import alexiil.mc.lib.attributes.AttributeProvider; -import alexiil.mc.lib.attributes.AttributeUtil; -import alexiil.mc.lib.attributes.item.ItemAttributes; -import appeng.tile.storage.SkyChestBlockEntity; -import appeng.util.inv.AdaptorFixedInv; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -35,12 +29,17 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.ItemEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockBox; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockBox; import net.minecraft.world.WorldAccess; +import alexiil.mc.lib.attributes.AttributeList; +import alexiil.mc.lib.attributes.AttributeProvider; +import alexiil.mc.lib.attributes.AttributeUtil; +import alexiil.mc.lib.attributes.item.ItemAttributes; + import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IMaterials; @@ -48,8 +47,10 @@ import appeng.api.features.AEFeature; import appeng.core.AEConfig; import appeng.core.Api; import appeng.core.worlddata.WorldData; +import appeng.tile.storage.SkyChestBlockEntity; import appeng.util.InventoryAdaptor; import appeng.util.Platform; +import appeng.util.inv.AdaptorFixedInv; import appeng.worldgen.meteorite.fallout.Fallout; import appeng.worldgen.meteorite.fallout.FalloutCopy; import appeng.worldgen.meteorite.fallout.FalloutMode; @@ -192,7 +193,8 @@ public final class MeteoritePlacer { } } - for (final Object o : world.getEntities(ItemEntity.class, new Box(minX(x - 30), y - 5, minZ(z - 30), maxX(x + 30), y + 30, maxZ(z + 30)), null)) { + for (final Object o : world.getEntities(ItemEntity.class, + new Box(minX(x - 30), y - 5, minZ(z - 30), maxX(x + 30), y + 30, maxZ(z + 30)), null)) { final Entity e = (Entity) o; e.remove(); } diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java index 4e93d5e71..9fe9733be 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java @@ -1,7 +1,7 @@ package appeng.worldgen.meteorite; -import appeng.core.AppEng; import com.mojang.serialization.Codec; + import net.minecraft.util.Identifier; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.biome.Biome; @@ -11,18 +11,22 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.StructureFeature; +import appeng.core.AppEng; + public class MeteoriteStructure extends StructureFeature { public static final Identifier ID = AppEng.makeId("meteorite"); - public static final StructureFeature INSTANCE = new MeteoriteStructure(DefaultFeatureConfig.CODEC); + public static final StructureFeature INSTANCE = new MeteoriteStructure( + DefaultFeatureConfig.CODEC); public MeteoriteStructure(Codec configCodec) { super(configCodec); } @Override - public boolean shouldStartAt(ChunkGenerator generator, BiomeSource biomeSource, long seed, ChunkRandom randIn, int chunkX, int chunkZ, Biome biome, ChunkPos chunkPos2, DefaultFeatureConfig featureConfig) { + public boolean shouldStartAt(ChunkGenerator generator, BiomeSource biomeSource, long seed, ChunkRandom randIn, + int chunkX, int chunkZ, Biome biome, ChunkPos chunkPos2, DefaultFeatureConfig featureConfig) { return randIn.nextBoolean(); } diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java index 00dc2e135..8f3eb69ee 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java @@ -20,23 +20,22 @@ package appeng.worldgen.meteorite; import java.util.Random; import net.minecraft.nbt.CompoundTag; +import net.minecraft.structure.StructureManager; import net.minecraft.structure.StructurePiece; import net.minecraft.structure.StructurePieceType; +import net.minecraft.util.math.BlockBox; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.math.BlockBox; import net.minecraft.world.ServerWorldAccess; import net.minecraft.world.gen.StructureAccessor; import net.minecraft.world.gen.chunk.ChunkGenerator; -import net.minecraft.structure.StructureManager; import appeng.core.worlddata.WorldData; import appeng.worldgen.meteorite.fallout.FalloutMode; public class MeteoriteStructurePiece extends StructurePiece { - public static final StructurePieceType TYPE = StructurePieceType.register(MeteoriteStructurePiece::new, - "AE2MTRT"); + public static final StructurePieceType TYPE = StructurePieceType.register(MeteoriteStructurePiece::new, "AE2MTRT"); private final PlacedMeteoriteSettings settings; @@ -50,8 +49,8 @@ public class MeteoriteStructurePiece extends StructurePiece { int range = 4 * 16; ChunkPos chunkPos = new ChunkPos(center); - this.boundingBox = new BlockBox(chunkPos.getStartX() - range, center.getY(), - chunkPos.getStartZ() - range, chunkPos.getEndX() + range, center.getY(), chunkPos.getEndZ() + range); + this.boundingBox = new BlockBox(chunkPos.getStartX() - range, center.getY(), chunkPos.getStartZ() - range, + chunkPos.getEndX() + range, center.getY(), chunkPos.getEndZ() + range); } public MeteoriteStructurePiece(StructureManager templateManager, CompoundTag tag) { @@ -86,11 +85,13 @@ public class MeteoriteStructurePiece extends StructurePiece { } @Override - public boolean generate(ServerWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, Random random, BlockBox bounds, ChunkPos chunkPos, BlockPos blockPos) { + public boolean generate(ServerWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, + Random random, BlockBox bounds, ChunkPos chunkPos, BlockPos blockPos) { MeteoritePlacer placer = new MeteoritePlacer(world, settings, bounds); placer.place(); - WorldData.instance().compassData().service().tryUpdateArea(world, chunkPos); // FIXME: We know the y-range here... + WorldData.instance().compassData().service().tryUpdateArea(world, chunkPos); // FIXME: We know the y-range + // here... return true; } diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java index b670e7fbd..a442fcd3e 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java @@ -7,20 +7,20 @@ import com.google.common.math.StatsAccumulator; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.structure.StructureManager; import net.minecraft.structure.StructureStart; import net.minecraft.tag.BlockTags; import net.minecraft.tag.Tag; import net.minecraft.util.Identifier; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockBox; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.Heightmap; +import net.minecraft.world.Heightmap.Type; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome.Category; import net.minecraft.world.gen.chunk.ChunkGenerator; -import net.minecraft.world.Heightmap.Type; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.StructureFeature; -import net.minecraft.structure.StructureManager; import appeng.worldgen.meteorite.fallout.FalloutMode; @@ -30,13 +30,14 @@ public class MeteoriteStructureStart extends StructureStart terracottaTag = BlockTags.getContainer() .getOrCreate(new Identifier("c:terracotta_blocks")); - public MeteoriteStructureStart(StructureFeature feature, int chunkX, int chunkZ, BlockBox box, int references, long seed) { + public MeteoriteStructureStart(StructureFeature feature, int chunkX, int chunkZ, BlockBox box, + int references, long seed) { super(feature, chunkX, chunkZ, box, references, seed); } @Override - public void init(ChunkGenerator generator, StructureManager templateManagerIn, int chunkX, int chunkZ, - Biome biome, DefaultFeatureConfig config) { + public void init(ChunkGenerator generator, StructureManager templateManagerIn, int chunkX, int chunkZ, Biome biome, + DefaultFeatureConfig config) { final int centerX = chunkX * 16 + this.random.nextInt(16); final int centerZ = chunkZ * 16 + this.random.nextInt(16); final float meteoriteRadius = (this.random.nextFloat() * 6.0f) + 2; diff --git a/src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java b/src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java index b23d31e76..5eabeb851 100644 --- a/src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java +++ b/src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java @@ -20,8 +20,8 @@ package appeng.worldgen.meteorite.debug; import javax.annotation.Nullable; import net.minecraft.block.Block; -import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.WorldView; import appeng.worldgen.meteorite.CraterType; diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java index de7d2075c..6408fc947 100644 --- a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java +++ b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java @@ -33,7 +33,8 @@ public class FalloutCopy extends Fallout { private final BlockState block; private final MeteoriteBlockPutter putter; - public FalloutCopy(final WorldAccess w, BlockPos pos, final MeteoriteBlockPutter putter, final BlockState skyStone) { + public FalloutCopy(final WorldAccess w, BlockPos pos, final MeteoriteBlockPutter putter, + final BlockState skyStone) { super(putter, skyStone); this.putter = putter; this.block = w.getBiome(pos).getSurfaceConfig().getTopMaterial(); diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java index e5cbfc500..8e2557d90 100644 --- a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java +++ b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java @@ -29,7 +29,8 @@ public class FalloutSand extends FalloutCopy { private static final double GLASS_THRESHOLD = 0.66; private final MeteoriteBlockPutter putter; - public FalloutSand(final WorldAccess w, BlockPos pos, final MeteoriteBlockPutter putter, final BlockState skyStone) { + public FalloutSand(final WorldAccess w, BlockPos pos, final MeteoriteBlockPutter putter, + final BlockState skyStone) { super(w, pos, putter, skyStone); this.putter = putter; } diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java index 390900602..be8f40640 100644 --- a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java +++ b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java @@ -30,7 +30,8 @@ public class FalloutSnow extends FalloutCopy { private static final double ICE_THRESHOLD = 0.5; private final MeteoriteBlockPutter putter; - public FalloutSnow(final WorldAccess w, BlockPos pos, final MeteoriteBlockPutter putter, final BlockState skyStone) { + public FalloutSnow(final WorldAccess w, BlockPos pos, final MeteoriteBlockPutter putter, + final BlockState skyStone) { super(w, pos, putter, skyStone); this.putter = putter; } diff --git a/src/main/resources/appliedenergistics2.mixins.json b/src/main/resources/appliedenergistics2.mixins.json index 91aa40fa2..35b0bcf3b 100644 --- a/src/main/resources/appliedenergistics2.mixins.json +++ b/src/main/resources/appliedenergistics2.mixins.json @@ -28,4 +28,4 @@ "injectors": { "defaultRequire": 1 } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cable_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_bus.json index 2c63c0851..0967ef424 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cable_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cable_bus.json @@ -1,2 +1 @@ -{ -} +{} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/paint.json b/src/main/resources/assets/appliedenergistics2/models/item/paint.json index 2c63c0851..0967ef424 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/paint.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/paint.json @@ -1,2 +1 @@ -{ -} +{} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f485e0026..c5526e49c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,9 +5,7 @@ "name": "Applied Energistics 2", "description": "A Mod about matter, energy and using them to conquer the world..", - "authors": [ - "TeamAppliedEnergistics" - ], + "authors": ["TeamAppliedEnergistics"], "contact": { "homepage": "https://ae-mod.info/", "sources": "https://github.com/AppliedEnergistics/Applied-Energistics-2/" @@ -18,18 +16,11 @@ "environment": "*", "entrypoints": { - "main": [ - ], - "client": [ - "appeng.core.AppEngClientStartup" - ], - "rei_plugins": [ - "appeng.integration.modules.jei.ReiPlugin" - ] + "main": [], + "client": ["appeng.core.AppEngClientStartup"], + "rei_plugins": ["appeng.integration.modules.jei.ReiPlugin"] }, - "mixins": [ - "appliedenergistics2.mixins.json" - ], + "mixins": ["appliedenergistics2.mixins.json"], "depends": { "fabricloader": ">=0.7.1", "fabric": "*", @@ -39,7 +30,7 @@ "suggests": { "flamingo": "*" }, - "accessWidener" : "appliedenergistics2.accesswidener", + "accessWidener": "appliedenergistics2.accesswidener", "custom": { "waila:plugins": { "id": "appliedenergistics2:hwyla", diff --git a/src/unported/java/appeng/client/ClientHelper.java b/src/unported/java/appeng/client/ClientHelper.java index 993ba6c27..853986c84 100644 --- a/src/unported/java/appeng/client/ClientHelper.java +++ b/src/unported/java/appeng/client/ClientHelper.java @@ -23,11 +23,11 @@ import java.util.EnumMap; import java.util.List; import java.util.Random; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.util.InputUtil; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -109,7 +109,6 @@ public class ClientHelper extends ServerHelper { public void postInit() { } - private void postPlayerRender(final RenderLivingEvent.Pre p) { // FIXME final PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.getEntity().getEntityId() ); // FIXME if( player != null ) @@ -129,8 +128,8 @@ public class ClientHelper extends ServerHelper { final double d1 = (Platform.getRandomFloat() - 0.5F) * 0.26D; final double d2 = (Platform.getRandomFloat() - 0.5F) * 0.26D; - MinecraftClient.getInstance().particleManager.addParticle(ParticleTypes.VIBRANT, x + d0, y + d1, z + d2, 0.0D, 0.0D, - 0.0D); + MinecraftClient.getInstance().particleManager.addParticle(ParticleTypes.VIBRANT, x + d0, y + d1, z + d2, + 0.0D, 0.0D, 0.0D); } } @@ -139,8 +138,8 @@ public class ClientHelper extends ServerHelper { final float y = (float) (((Platform.getRandomInt() % 100) * 0.01) - 0.5) * 0.7f; final float z = (float) (((Platform.getRandomInt() % 100) * 0.01) - 0.5) * 0.7f; - MinecraftClient.getInstance().particleManager.addParticle(EnergyParticleData.FOR_BLOCK, posX + x, posY + y, posZ + z, - -x * 0.1, -y * 0.1, -z * 0.1); + MinecraftClient.getInstance().particleManager.addParticle(EnergyParticleData.FOR_BLOCK, posX + x, posY + y, + posZ + z, -x * 0.1, -y * 0.1, -z * 0.1); } private void spawnLightningArc(final World world, final double posX, final double posY, final double posZ, diff --git a/src/unported/java/appeng/client/render/DummyFluidItemModel.java b/src/unported/java/appeng/client/render/DummyFluidItemModel.java index c56b2a418..b5a1e0e5a 100644 --- a/src/unported/java/appeng/client/render/DummyFluidItemModel.java +++ b/src/unported/java/appeng/client/render/DummyFluidItemModel.java @@ -28,10 +28,10 @@ import com.mojang.datafixers.util.Pair; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.IModelTransform; import net.minecraft.client.render.model.IUnbakedModel; -import net.minecraft.client.render.model.json.ModelOverrideList; -import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.client.render.model.ModelLoader; +import net.minecraft.client.render.model.json.ModelOverrideList; import net.minecraft.client.texture.Sprite; +import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -44,13 +44,12 @@ import appeng.core.AppEng; */ public class DummyFluidItemModel implements BasicUnbakedModel { // We use this to get the default item transforms and make our lives easier - private static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, - "item/dummy_fluid_item_base"); + private static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "item/dummy_fluid_item_base"); @Override public BakedModel bake(IModelConfiguration owner, ModelLoader bakery, - Function spriteGetter, IModelTransform modelTransform, - ModelOverrideList overrides, Identifier modelLocation) { + Function spriteGetter, IModelTransform modelTransform, + ModelOverrideList overrides, Identifier modelLocation) { BakedModel bakedBaseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter); return new DummyFluidDispatcherBakedModel(bakedBaseModel, spriteGetter); @@ -58,7 +57,7 @@ public class DummyFluidItemModel implements BasicUnbakedModel { @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Collections.emptyList(); } diff --git a/src/unported/java/appeng/client/render/model/UVLModelLoader.java b/src/unported/java/appeng/client/render/model/UVLModelLoader.java index 99629180b..bf8fc4f2d 100644 --- a/src/unported/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/unported/java/appeng/client/render/model/UVLModelLoader.java @@ -31,18 +31,12 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.model.BakedModel; -import net.minecraft.client.render.model.ModelLoader; -import net.minecraft.client.render.model.json.ModelTransformation; -import net.minecraft.client.util.math.AffineTransformation; -import net.minecraft.client.texture.Sprite; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.Identifier; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.BakedQuad; import net.minecraft.client.render.model.BlockFaceUV; import net.minecraft.client.render.model.BlockModel; @@ -51,12 +45,18 @@ import net.minecraft.client.render.model.BlockPartFace; import net.minecraft.client.render.model.IModelTransform; import net.minecraft.client.render.model.IUnbakedModel; import net.minecraft.client.render.model.ItemOverride; -import net.minecraft.client.render.model.json.ModelOverrideList; import net.minecraft.client.render.model.ItemTransformVec3f; +import net.minecraft.client.render.model.ModelLoader; +import net.minecraft.client.render.model.json.ModelOverrideList; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.SpriteIdentifier; +import net.minecraft.client.util.math.AffineTransformation; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.resources.IResourceManager; -import net.minecraft.util.math.Direction; +import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; +import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.IModelBuilder; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.IModelLoader; @@ -143,16 +143,15 @@ public class UVLModelLoader implements IModelLoader spriteGetter, IModelTransform modelTransform, - ModelOverrideList overrides, Identifier modelLocation) { + Function spriteGetter, IModelTransform modelTransform, + ModelOverrideList overrides, Identifier modelLocation) { Sprite particle = spriteGetter.apply(owner.resolveTexture("particle")); IModelBuilder builder = IModelBuilder.of(owner, overrides, particle); for (BlockPart blockpart : parent.getElements()) { for (Direction direction : blockpart.mapFaces.keySet()) { BlockPartFace blockpartface = blockpart.mapFaces.get(direction); - Sprite textureatlassprite1 = spriteGetter - .apply(owner.resolveTexture(blockpartface.texture)); + Sprite textureatlassprite1 = spriteGetter.apply(owner.resolveTexture(blockpartface.texture)); BakedQuad quad = BlockModel.makeBakedQuad(blockpart, blockpartface, textureatlassprite1, direction, modelTransform, modelLocation); @@ -200,8 +199,8 @@ public class UVLModelLoader implements IModelLoader getTextures(IModelConfiguration owner, - Function modelGetter, - Set> missingTextureErrors) { + Function modelGetter, + Set> missingTextureErrors) { return parent.getTextures(modelGetter, missingTextureErrors); } diff --git a/src/unported/java/appeng/core/CommonHelper.java b/src/unported/java/appeng/core/CommonHelper.java index 700612b5e..b78444801 100644 --- a/src/unported/java/appeng/core/CommonHelper.java +++ b/src/unported/java/appeng/core/CommonHelper.java @@ -23,9 +23,9 @@ import java.util.Random; import javax.annotation.Nonnull; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.util.InputUtil; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.hit.HitResult; import net.minecraft.world.World; @@ -42,10 +42,10 @@ public abstract class CommonHelper { public abstract List getPlayers(); public abstract void sendToAllNearExcept(PlayerEntity p, double x, double y, double z, double dist, World w, - BasePacket packet); + BasePacket packet); public abstract void spawnEffect(EffectType effect, World world, double posX, double posY, double posZ, - Object extra); + Object extra); public abstract boolean shouldAddParticles(Random r); diff --git a/src/unported/java/appeng/server/ServerHelper.java b/src/unported/java/appeng/server/ServerHelper.java index 4ee24aa38..87eae64eb 100644 --- a/src/unported/java/appeng/server/ServerHelper.java +++ b/src/unported/java/appeng/server/ServerHelper.java @@ -25,8 +25,8 @@ import java.util.Random; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.util.InputUtil; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.hit.HitResult; import net.minecraft.world.World; import net.minecraftforge.fml.server.ServerLifecycleHooks; @@ -42,7 +42,6 @@ import appeng.util.Platform; public class ServerHelper extends CommonHelper { - @Override public World getWorld() { throw new UnsupportedOperationException("This is a server...");