diff --git a/src/main/java/appeng/client/gui/AEBaseMEScreen.java b/src/main/java/appeng/client/gui/AEBaseMEScreen.java index 731086f35..7833f2ae3 100644 --- a/src/main/java/appeng/client/gui/AEBaseMEScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseMEScreen.java @@ -73,14 +73,16 @@ public abstract class AEBaseMEScreen extends AEBaseSc currentToolTip.add(ButtonToolTips.ItemsRequestable.text(formattedAmount)); } - this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y, this.font); + this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y, + this.font); return; } else if (stack.getCount() > bigNumber) { final String formattedAmount = NumberFormat.getNumberInstance(Locale.US).format(stack.getCount()); currentToolTip.add(ButtonToolTips.ItemsStored.text(formattedAmount).mergeStyle(TextFormatting.GRAY)); - this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y, this.font); + this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y, + this.font); return; } diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index ed7be145d..0316326ad 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -18,23 +18,12 @@ package appeng.core; -import appeng.bootstrap.components.IInitComponent; -import appeng.bootstrap.components.IPostInitComponent; -import appeng.capabilities.Capabilities; -import appeng.client.ClientHelper; -import appeng.core.stats.AdvancementTriggers; -import appeng.core.sync.network.NetworkHandler; -import appeng.core.worlddata.WorldData; -import appeng.entity.ChargedQuartzEntity; -import appeng.entity.GrowingCrystalEntity; -import appeng.entity.SingularityEntity; -import appeng.entity.TinyTNTPrimedEntity; -import appeng.entity.TinyTNTPrimedRenderer; -import appeng.hooks.TickHandler; -import appeng.integration.Integrations; -import appeng.parts.PartPlacement; -import appeng.server.ServerHelper; +import java.util.concurrent.TimeUnit; + +import javax.annotation.Nonnull; + import com.google.common.base.Stopwatch; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.ItemRenderer; @@ -63,8 +52,22 @@ import net.minecraftforge.fml.event.server.FMLServerStoppedEvent; import net.minecraftforge.fml.event.server.FMLServerStoppingEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import javax.annotation.Nonnull; -import java.util.concurrent.TimeUnit; +import appeng.bootstrap.components.IInitComponent; +import appeng.bootstrap.components.IPostInitComponent; +import appeng.capabilities.Capabilities; +import appeng.client.ClientHelper; +import appeng.core.stats.AdvancementTriggers; +import appeng.core.sync.network.NetworkHandler; +import appeng.core.worlddata.WorldData; +import appeng.entity.ChargedQuartzEntity; +import appeng.entity.GrowingCrystalEntity; +import appeng.entity.SingularityEntity; +import appeng.entity.TinyTNTPrimedEntity; +import appeng.entity.TinyTNTPrimedRenderer; +import appeng.hooks.TickHandler; +import appeng.integration.Integrations; +import appeng.parts.PartPlacement; +import appeng.server.ServerHelper; @Mod(AppEng.MOD_ID) public final class AppEng { diff --git a/src/main/java/appeng/core/AppEngBootstrap.java b/src/main/java/appeng/core/AppEngBootstrap.java index afcd3f9b5..6e4fefad6 100644 --- a/src/main/java/appeng/core/AppEngBootstrap.java +++ b/src/main/java/appeng/core/AppEngBootstrap.java @@ -1,5 +1,17 @@ package appeng.core; +import net.minecraft.block.BlockState; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.WorldGenRegistries; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.GenerationStage; +import net.minecraft.world.gen.feature.ConfiguredFeature; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.feature.OreFeatureConfig; +import net.minecraft.world.gen.placement.NoPlacementConfig; +import net.minecraft.world.gen.placement.Placement; +import net.minecraft.world.gen.placement.TopSolidRangeConfig; + import appeng.api.features.AEFeature; import appeng.mixins.feature.ConfiguredFeaturesAccessor; import appeng.mixins.structure.ConfiguredStructureFeaturesAccessor; @@ -11,17 +23,6 @@ import appeng.worldgen.ChargedQuartzOreConfig; import appeng.worldgen.ChargedQuartzOreFeature; import appeng.worldgen.meteorite.MeteoriteStructure; import appeng.worldgen.meteorite.MeteoriteStructurePiece; -import net.minecraft.block.BlockState; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.WorldGenRegistries; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.OreFeatureConfig; -import net.minecraft.world.gen.placement.NoPlacementConfig; -import net.minecraft.world.gen.placement.Placement; -import net.minecraft.world.gen.placement.TopSolidRangeConfig; /** * Hooks into the very early bootstrapping phase to register things before the @@ -87,7 +88,7 @@ public final class AppEngBootstrap { } private static void addQuartzWorldGen(Biome b, ConfiguredFeature quartzOre, - ConfiguredFeature chargedQuartz) { + ConfiguredFeature chargedQuartz) { if (!AEConfig.instance().isFeatureEnabled(AEFeature.CERTUS_QUARTZ_WORLD_GEN)) { return; } @@ -104,12 +105,12 @@ public final class AppEngBootstrap { private static ConfiguredFeature registerQuartzOreFeature() { // Tell Minecraft about our configured quartz ore feature BlockState quartzOreState = Api.instance().definitions().blocks().quartzOre().block().getDefaultState(); - return ConfiguredFeaturesAccessor.register(AppEng.makeId("quartz_ore").toString(), - Feature.ORE - .withConfiguration(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.field_241882_a, quartzOreState, - AEConfig.instance().getQuartzOresPerCluster())) - .withPlacement(Placement.field_242907_l/*RANGE*/.configure(new TopSolidRangeConfig(12, 12, 72))).func_242728_a/*spreadHorizontally*/() - .func_242731_b/*repeat*/(AEConfig.instance().getQuartzOresClusterAmount())); + return ConfiguredFeaturesAccessor.register(AppEng.makeId("quartz_ore").toString(), Feature.ORE + .withConfiguration(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.field_241882_a, quartzOreState, + AEConfig.instance().getQuartzOresPerCluster())) + .withPlacement(Placement.field_242907_l/* RANGE */.configure(new TopSolidRangeConfig(12, 12, 72))) + .func_242728_a/* spreadHorizontally */() + .func_242731_b/* repeat */(AEConfig.instance().getQuartzOresClusterAmount())); } private static ConfiguredFeature registerChargedQuartzOreFeature() { diff --git a/src/main/java/appeng/items/parts/FacadeItem.java b/src/main/java/appeng/items/parts/FacadeItem.java index 3e27435b6..017025ab9 100644 --- a/src/main/java/appeng/items/parts/FacadeItem.java +++ b/src/main/java/appeng/items/parts/FacadeItem.java @@ -58,7 +58,8 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte /** * Block tag used to explicitly whitelist blocks for use in facades. */ - private static final ITag.INamedTag BLOCK_WHITELIST = BlockTags.makeWrapperTag(AppEng.makeId("whitelisted/facades").toString()); + private static final ITag.INamedTag BLOCK_WHITELIST = BlockTags + .makeWrapperTag(AppEng.makeId("whitelisted/facades").toString()); private static final String NBT_ITEM_ID = "item"; diff --git a/src/main/java/appeng/mixins/feature/ConfiguredFeaturesAccessor.java b/src/main/java/appeng/mixins/feature/ConfiguredFeaturesAccessor.java index 4bff3e071..dd9464edb 100644 --- a/src/main/java/appeng/mixins/feature/ConfiguredFeaturesAccessor.java +++ b/src/main/java/appeng/mixins/feature/ConfiguredFeaturesAccessor.java @@ -1,17 +1,18 @@ package appeng.mixins.feature; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.Features; import net.minecraft.world.gen.feature.IFeatureConfig; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(Features.class) public interface ConfiguredFeaturesAccessor { @Invoker("func_243968_a") static ConfiguredFeature register(String id, - ConfiguredFeature configuredFeature) { + ConfiguredFeature configuredFeature) { throw new AssertionError(); } diff --git a/src/main/java/appeng/mixins/spatial/BiomesMixin.java b/src/main/java/appeng/mixins/spatial/BiomesMixin.java index 36a25d275..e6b7d76a0 100644 --- a/src/main/java/appeng/mixins/spatial/BiomesMixin.java +++ b/src/main/java/appeng/mixins/spatial/BiomesMixin.java @@ -1,14 +1,16 @@ package appeng.mixins.spatial; -import appeng.spatial.SpatialStorageBiome; -import appeng.spatial.SpatialStorageDimensionIds; -import net.minecraft.util.registry.WorldGenRegistries; -import net.minecraft.world.biome.BiomeRegistry; 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.util.registry.WorldGenRegistries; +import net.minecraft.world.biome.BiomeRegistry; + +import appeng.spatial.SpatialStorageBiome; +import appeng.spatial.SpatialStorageDimensionIds; + /** * This only needs to be here because the server-side will create a dynamic * registry manager long before our mod is initialized. @@ -18,8 +20,8 @@ public class BiomesMixin { @Inject(method = "", at = @At("TAIL")) private static void registerBiomes(CallbackInfo ci) { - WorldGenRegistries.func_243664_a(WorldGenRegistries.field_243657_i, SpatialStorageDimensionIds.BIOME_KEY.func_240901_a_(), - SpatialStorageBiome.INSTANCE); + WorldGenRegistries.func_243664_a(WorldGenRegistries.field_243657_i, + SpatialStorageDimensionIds.BIOME_KEY.func_240901_a_(), SpatialStorageBiome.INSTANCE); } } diff --git a/src/main/java/appeng/mixins/spatial/DimensionOptionMixin.java b/src/main/java/appeng/mixins/spatial/DimensionOptionMixin.java index 727797ab6..f08899c1f 100644 --- a/src/main/java/appeng/mixins/spatial/DimensionOptionMixin.java +++ b/src/main/java/appeng/mixins/spatial/DimensionOptionMixin.java @@ -1,14 +1,16 @@ package appeng.mixins.spatial; -import appeng.spatial.SpatialStorageDimensionIds; -import net.minecraft.util.RegistryKey; -import net.minecraft.world.Dimension; +import java.util.List; +import java.util.Map; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; -import java.util.List; -import java.util.Map; +import net.minecraft.util.RegistryKey; +import net.minecraft.world.Dimension; + +import appeng.spatial.SpatialStorageDimensionIds; /** * This Mixin tries to hide the screen that warns users about experimental diff --git a/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java b/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java index 6f726678f..137f9f176 100644 --- a/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java +++ b/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java @@ -2,15 +2,8 @@ package appeng.mixins.spatial; import java.util.OptionalLong; -import appeng.spatial.SpatialStorageChunkGenerator; import com.mojang.serialization.Lifecycle; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.registry.DynamicRegistries; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.SimpleRegistry; -import net.minecraft.world.Dimension; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.DimensionSettings; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.injection.At; @@ -18,8 +11,16 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import net.minecraft.tags.BlockTags; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.DynamicRegistries; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.SimpleRegistry; +import net.minecraft.world.Dimension; import net.minecraft.world.DimensionType; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.DimensionSettings; +import appeng.spatial.SpatialStorageChunkGenerator; import appeng.spatial.SpatialStorageDimensionIds; /** @@ -32,28 +33,26 @@ public class DimensionTypeMixin { @Invoker("") static DimensionType create(OptionalLong fixedTime, boolean hasSkylight, boolean hasCeiling, boolean ultrawarm, - boolean natural, double coordinateScale, boolean piglinSafe, boolean bedWorks, boolean respawnAnchorWorks, - boolean hasRaids, int logicalHeight, ResourceLocation infiniburn, ResourceLocation skyProperties, float ambientLight) { + boolean natural, double coordinateScale, boolean piglinSafe, boolean bedWorks, boolean respawnAnchorWorks, + boolean hasRaids, int logicalHeight, ResourceLocation infiniburn, ResourceLocation skyProperties, + float ambientLight) { throw new AssertionError(); } @Inject(method = "func_236027_a_", at = @At("TAIL")) - private static void addRegistryDefaults(DynamicRegistries.Impl registryTracker, - CallbackInfoReturnable cir) { + private static void addRegistryDefaults(DynamicRegistries.Impl registryTracker, CallbackInfoReturnable cir) { DimensionType dimensionType = create(OptionalLong.of(12000), false, false, false, false, 1.0, false, false, - false, false, 256, BlockTags.INFINIBURN_OVERWORLD.getName(), SpatialStorageDimensionIds.SKY_PROPERTIES_ID, - 1.0f); + false, false, 256, BlockTags.INFINIBURN_OVERWORLD.getName(), + SpatialStorageDimensionIds.SKY_PROPERTIES_ID, 1.0f); - Registry.register(registryTracker.func_230520_a_(), SpatialStorageDimensionIds.DIMENSION_TYPE_ID.func_240901_a_(), - dimensionType); + Registry.register(registryTracker.func_230520_a_(), + SpatialStorageDimensionIds.DIMENSION_TYPE_ID.func_240901_a_(), dimensionType); } @Inject(method = "func_242718_a", at = @At("RETURN")) - private static void buildDimensionRegistry(Registry dimensionTypes, - Registry biomes, - Registry dimensionSettings, - long seed, - CallbackInfoReturnable> cir) { + private static void buildDimensionRegistry(Registry dimensionTypes, Registry biomes, + Registry dimensionSettings, long seed, + CallbackInfoReturnable> cir) { SimpleRegistry simpleregistry = cir.getReturnValue(); simpleregistry.register(SpatialStorageDimensionIds.DIMENSION_ID, new Dimension(() -> { diff --git a/src/main/java/appeng/mixins/spatial/EntityMixin.java b/src/main/java/appeng/mixins/spatial/EntityMixin.java index b396ebac1..5cc0849ed 100644 --- a/src/main/java/appeng/mixins/spatial/EntityMixin.java +++ b/src/main/java/appeng/mixins/spatial/EntityMixin.java @@ -1,15 +1,17 @@ package appeng.mixins.spatial; -import appeng.spatial.SpatialStorageDimensionIds; -import appeng.spatial.SpatialStorageHelper; -import net.minecraft.block.PortalInfo; -import net.minecraft.entity.Entity; -import net.minecraft.world.server.ServerWorld; 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.block.PortalInfo; +import net.minecraft.entity.Entity; +import net.minecraft.world.server.ServerWorld; + +import appeng.spatial.SpatialStorageDimensionIds; +import appeng.spatial.SpatialStorageHelper; + /** * This mixin sets the teleport destination, because otherwise Vanilla will not * move the player. diff --git a/src/main/java/appeng/mixins/spatial/SkyPropertiesMixin.java b/src/main/java/appeng/mixins/spatial/SkyPropertiesMixin.java index c7b1e76f7..63b4a4002 100644 --- a/src/main/java/appeng/mixins/spatial/SkyPropertiesMixin.java +++ b/src/main/java/appeng/mixins/spatial/SkyPropertiesMixin.java @@ -1,21 +1,24 @@ package appeng.mixins.spatial; -import appeng.spatial.SpatialStorageDimensionIds; -import appeng.spatial.SpatialStorageSkyProperties; -import it.unimi.dsi.fastutil.objects.Object2ObjectMap; -import net.minecraft.client.world.DimensionRenderInfo; -import net.minecraft.util.ResourceLocation; 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.world.DimensionRenderInfo; +import net.minecraft.util.ResourceLocation; + +import it.unimi.dsi.fastutil.objects.Object2ObjectMap; + +import appeng.spatial.SpatialStorageDimensionIds; +import appeng.spatial.SpatialStorageSkyProperties; + @Mixin(DimensionRenderInfo.class) public class SkyPropertiesMixin { @Shadow - private static Object2ObjectMap field_239208_a_/*BY_IDENTIFIER*/; + private static Object2ObjectMap field_239208_a_/* BY_IDENTIFIER */; @Inject(method = "", at = @At("TAIL")) private static void init(CallbackInfo ci) { diff --git a/src/main/java/appeng/mixins/structure/BiomeAccessor.java b/src/main/java/appeng/mixins/structure/BiomeAccessor.java index 3d2318abe..ece84ac80 100644 --- a/src/main/java/appeng/mixins/structure/BiomeAccessor.java +++ b/src/main/java/appeng/mixins/structure/BiomeAccessor.java @@ -3,12 +3,12 @@ package appeng.mixins.structure; import java.util.List; import java.util.Map; -import net.minecraft.world.gen.feature.structure.Structure; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.feature.StructureFeature; +import net.minecraft.world.gen.feature.structure.Structure; /** * Allows access to the copy of _all_ structures that is maintained within each diff --git a/src/main/java/appeng/mixins/structure/ConfiguredStructureFeaturesAccessor.java b/src/main/java/appeng/mixins/structure/ConfiguredStructureFeaturesAccessor.java index 4a66524be..bd4a9c685 100644 --- a/src/main/java/appeng/mixins/structure/ConfiguredStructureFeaturesAccessor.java +++ b/src/main/java/appeng/mixins/structure/ConfiguredStructureFeaturesAccessor.java @@ -1,19 +1,19 @@ package appeng.mixins.structure; -import net.minecraft.world.gen.feature.IFeatureConfig; -import net.minecraft.world.gen.feature.structure.Structure; -import net.minecraft.world.gen.feature.structure.StructureFeatures; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; +import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.StructureFeature; +import net.minecraft.world.gen.feature.structure.Structure; +import net.minecraft.world.gen.feature.structure.StructureFeatures; @Mixin(StructureFeatures.class) public interface ConfiguredStructureFeaturesAccessor { @Invoker("func_244162_a") - static > StructureFeature register( - String id, StructureFeature configuredStructureFeature) { + static > StructureFeature register(String id, + StructureFeature configuredStructureFeature) { throw new AssertionError(); } diff --git a/src/main/java/appeng/mixins/structure/GenerationSettingsAccessor.java b/src/main/java/appeng/mixins/structure/GenerationSettingsAccessor.java index babd1e627..962b25518 100644 --- a/src/main/java/appeng/mixins/structure/GenerationSettingsAccessor.java +++ b/src/main/java/appeng/mixins/structure/GenerationSettingsAccessor.java @@ -3,12 +3,12 @@ package appeng.mixins.structure; import java.util.List; import java.util.function.Supplier; -import net.minecraft.world.biome.BiomeGenerationSettings; -import net.minecraft.world.gen.feature.StructureFeature; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; +import net.minecraft.world.biome.BiomeGenerationSettings; import net.minecraft.world.gen.feature.ConfiguredFeature; +import net.minecraft.world.gen.feature.StructureFeature; /** * Allows the settings in a Biome's generation settings to be modified. diff --git a/src/main/java/appeng/mixins/structure/StructureFeatureAccessor.java b/src/main/java/appeng/mixins/structure/StructureFeatureAccessor.java index c4c4d5a0d..74c786f28 100644 --- a/src/main/java/appeng/mixins/structure/StructureFeatureAccessor.java +++ b/src/main/java/appeng/mixins/structure/StructureFeatureAccessor.java @@ -1,9 +1,10 @@ package appeng.mixins.structure; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.structure.Structure; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(Structure.class) public interface StructureFeatureAccessor { diff --git a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java index 1ee0767d3..3394d9122 100644 --- a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java +++ b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java @@ -120,8 +120,7 @@ public class SpatialStorageCommand implements ISubCommand { private void teleportBack(CommandSource source, SpatialStoragePlot plot) { TransitionInfo lastTransition = plot.getLastTransition(); if (lastTransition == null) { - throw new CommandException( - ITextComponent.func_244388_a("This plot doesn't have a last known transition.")); + throw new CommandException(ITextComponent.func_244388_a("This plot doesn't have a last known transition.")); } String command = getTeleportCommand(lastTransition.getWorldId(), lastTransition.getMin().add(0, 1, 0)); diff --git a/src/main/java/appeng/spatial/SpatialStorageBiome.java b/src/main/java/appeng/spatial/SpatialStorageBiome.java index 5a8b62c28..0e63257c7 100644 --- a/src/main/java/appeng/spatial/SpatialStorageBiome.java +++ b/src/main/java/appeng/spatial/SpatialStorageBiome.java @@ -31,13 +31,14 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; public class SpatialStorageBiome { public static final Biome INSTANCE = new Biome.Builder() - .func_242457_a(new BiomeGenerationSettings.Builder() - .func_242517_a(new ConfiguredSurfaceBuilder<>(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_STONE_GRAVEL_CONFIG)) + .func_242457_a(new BiomeGenerationSettings.Builder().func_242517_a( + new ConfiguredSurfaceBuilder<>(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_STONE_GRAVEL_CONFIG)) .func_242508_a()) .precipitation(Biome.RainType.NONE).category(Biome.Category.NONE).depth(0).scale(1) // Copied from the vanilla void biome - .temperature(0.5F).downfall(0.5F).func_235097_a_(new BiomeAmbience.Builder().setWaterColor(4159204) - .setWaterFogColor(329011).setFogColor(0).func_242539_d(0x111111).build()) + .temperature(0.5F).downfall(0.5F) + .func_235097_a_(new BiomeAmbience.Builder().setWaterColor(4159204).setWaterFogColor(329011).setFogColor(0) + .func_242539_d(0x111111).build()) .func_242458_a(new MobSpawnInfo.Builder().func_242572_a(0).func_242577_b()).func_242455_a(); } diff --git a/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java b/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java index 58099bff5..6dd43671b 100644 --- a/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java +++ b/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java @@ -18,8 +18,12 @@ 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 net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; @@ -38,9 +42,7 @@ import net.minecraft.world.gen.WorldGenRegion; import net.minecraft.world.gen.feature.structure.StructureManager; import net.minecraft.world.gen.settings.DimensionStructuresSettings; -import java.util.Arrays; -import java.util.Collections; -import java.util.Optional; +import appeng.core.Api; /** * Chunk generator the spatial storage world. @@ -55,7 +57,8 @@ public class SpatialStorageChunkGenerator extends ChunkGenerator { * If it was not the same object, then the Object->ID lookup would fail since it * uses an identity hashmap internally. */ - public static final Codec CODEC = RegistryLookupCodec.func_244331_a(Registry.BIOME_KEY) + public static final Codec CODEC = RegistryLookupCodec + .func_244331_a(Registry.BIOME_KEY) .xmap(SpatialStorageChunkGenerator::new, SpatialStorageChunkGenerator::getBiomeRegistry).stable().codec(); private final Registry biomeRegistry; @@ -82,7 +85,8 @@ public class SpatialStorageChunkGenerator extends ChunkGenerator { } private static SingleBiomeProvider createBiomeSource(Registry biomeRegistry) { - return new SingleBiomeProvider(biomeRegistry.func_243576_d/*getOrThrow*/(SpatialStorageDimensionIds.BIOME_KEY)); + return new SingleBiomeProvider( + biomeRegistry.func_243576_d/* getOrThrow */(SpatialStorageDimensionIds.BIOME_KEY)); } public Registry getBiomeRegistry() { diff --git a/src/main/java/appeng/spatial/SpatialStorageDimensionIds.java b/src/main/java/appeng/spatial/SpatialStorageDimensionIds.java index 63e200243..5eb35c180 100644 --- a/src/main/java/appeng/spatial/SpatialStorageDimensionIds.java +++ b/src/main/java/appeng/spatial/SpatialStorageDimensionIds.java @@ -6,10 +6,10 @@ import net.minecraft.util.registry.Registry; import net.minecraft.world.Dimension; import net.minecraft.world.DimensionType; import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; import appeng.core.AppEng; import appeng.mixins.spatial.DimensionTypeMixin; -import net.minecraft.world.biome.Biome; /** * IDs for the spatial storage world related dimension objects. diff --git a/src/main/java/appeng/spatial/SpatialStorageHelper.java b/src/main/java/appeng/spatial/SpatialStorageHelper.java index 62cab5829..0a3c557dc 100644 --- a/src/main/java/appeng/spatial/SpatialStorageHelper.java +++ b/src/main/java/appeng/spatial/SpatialStorageHelper.java @@ -109,18 +109,19 @@ public class SpatialStorageHelper { newWorld.getChunkProvider().getChunk(MathHelper.floor(link.x) >> 4, MathHelper.floor(link.z) >> 4, ChunkStatus.FULL, true); - if (entity instanceof ServerPlayerEntity - && link.dim.func_234923_W_() == SpatialStorageDimensionIds.WORLD_ID) { + if (entity instanceof ServerPlayerEntity && link.dim.func_234923_W_() == SpatialStorageDimensionIds.WORLD_ID) { AppEng.instance().getAdvancementTriggers().getSpatialExplorer().trigger((ServerPlayerEntity) entity); } // Store in a threadlocal so that EntityMixin can return it for the Vanilla // logic to use - teleportTarget.set(new PortalInfo(new Vector3d(link.x, link.y, link.z), Vector3d.ZERO, entity.rotationYaw, entity.rotationPitch)); + teleportTarget.set(new PortalInfo(new Vector3d(link.x, link.y, link.z), Vector3d.ZERO, entity.rotationYaw, + entity.rotationPitch)); try { entity = entity.changeDimension(link.dim, new ITeleporter() { @Override - public Entity placeEntity(Entity entity, ServerWorld currentWorld, ServerWorld destWorld, float yaw, Function repositionEntity) { + public Entity placeEntity(Entity entity, ServerWorld currentWorld, ServerWorld destWorld, float yaw, + Function repositionEntity) { return repositionEntity.apply(false); } }); diff --git a/src/main/java/appeng/worldgen/BiomeModifier.java b/src/main/java/appeng/worldgen/BiomeModifier.java index bdd326f0e..7de9a18fe 100644 --- a/src/main/java/appeng/worldgen/BiomeModifier.java +++ b/src/main/java/appeng/worldgen/BiomeModifier.java @@ -1,18 +1,20 @@ package appeng.worldgen; -import appeng.mixins.structure.BiomeAccessor; -import appeng.mixins.structure.GenerationSettingsAccessor; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; + import com.google.common.collect.Lists; + import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.StructureFeature; import net.minecraft.world.gen.feature.structure.Structure; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; +import appeng.mixins.structure.BiomeAccessor; +import appeng.mixins.structure.GenerationSettingsAccessor; public final class BiomeModifier { diff --git a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java index 9935f24e6..e211b36bb 100644 --- a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java +++ b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java @@ -26,7 +26,8 @@ public class ChargedQuartzOreFeature extends Feature { } @Override - public boolean func_241855_a(ISeedReader worldIn, ChunkGenerator generator, Random rand, BlockPos pos, ChargedQuartzOreConfig config) { + public boolean func_241855_a(ISeedReader worldIn, 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/MeteoriteStructureStart.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java index fec081530..07ae74b4d 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java @@ -37,8 +37,8 @@ public class MeteoriteStructureStart extends StructureStart { } @Override - public void func_230364_a_(DynamicRegistries dynamicRegistryManager, ChunkGenerator generator, TemplateManager templateManager, int chunkX, int chunkZ, - Biome biome, NoFeatureConfig config) { + public void func_230364_a_(DynamicRegistries dynamicRegistryManager, ChunkGenerator generator, + TemplateManager templateManager, int chunkX, int chunkZ, Biome biome, NoFeatureConfig config) { final int centerX = chunkX * 16 + this.rand.nextInt(16); final int centerZ = chunkZ * 16 + this.rand.nextInt(16); final float meteoriteRadius = (this.rand.nextFloat() * 6.0f) + 2;