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

Formatting Fixes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-08-01 17:24:48 +02:00
parent 1b31185cdb
commit a6fb17b008
24 changed files with 137 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/datagen/java/appeng/data/Entrypoint.java
+9 -8
View File
@@ -1,19 +1,20 @@
package appeng.data; package appeng.data;
import java.io.File;
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.AEConfig;
import appeng.core.Api; import appeng.core.Api;
import appeng.core.CreativeTab; import appeng.core.CreativeTab;
import appeng.data.providers.loot.BlockDropProvider; import appeng.data.providers.loot.BlockDropProvider;
import appeng.data.providers.recipes.SlabStairRecipes; import appeng.data.providers.recipes.SlabStairRecipes;
import appeng.data.providers.tags.ConventionTagProvider; 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.Path;
import java.nio.file.Paths;
import java.util.Collections;
public class Entrypoint implements PreLaunchEntrypoint { public class Entrypoint implements PreLaunchEntrypoint {
src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
+2 -1
View File
@@ -95,7 +95,8 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
@Override @Override
public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
this.textRenderer.method_30883(matrices, this.getGuiDisplayName(GuiText.InterfaceTerminal.text()), 8, 6, 4210752); this.textRenderer.method_30883(matrices, this.getGuiDisplayName(GuiText.InterfaceTerminal.text()), 8, 6,
4210752);
this.textRenderer.method_30883(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752); this.textRenderer.method_30883(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752);
final int ex = this.getScrollBar().getCurrentScroll(); final int ex = this.getScrollBar().getCurrentScroll();
src/main/java/appeng/client/gui/implementations/QNBScreen.java
+2 -1
View File
@@ -35,7 +35,8 @@ public class QNBScreen extends AEBaseScreen<QNBContainer> {
@Override @Override
public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
this.textRenderer.method_30883(matrices, this.getGuiDisplayName(GuiText.QuantumLinkChamber.text()), 8, 6, 4210752); this.textRenderer.method_30883(matrices, this.getGuiDisplayName(GuiText.QuantumLinkChamber.text()), 8, 6,
4210752);
this.textRenderer.method_30883(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752); this.textRenderer.method_30883(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752);
} }
src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java
+2 -1
View File
@@ -59,7 +59,8 @@ public class QuartzKnifeScreen extends AEBaseScreen<QuartzKnifeContainer> {
@Override @Override
public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
this.textRenderer.method_30883(matrices, this.getGuiDisplayName(GuiText.QuartzCuttingKnife.text()), 8, 6, 4210752); this.textRenderer.method_30883(matrices, this.getGuiDisplayName(GuiText.QuartzCuttingKnife.text()), 8, 6,
4210752);
this.textRenderer.method_30883(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752); this.textRenderer.method_30883(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752);
} }
src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java
+2 -2
View File
@@ -63,8 +63,8 @@ public class SpatialIOPortScreen extends AEBaseScreen<SpatialIOPortContainer> {
.withSuffix(": " + this.handler.xSize + "x" + this.handler.ySize + "x" + this.handler.zSize); .withSuffix(": " + this.handler.xSize + "x" + this.handler.ySize + "x" + this.handler.zSize);
this.textRenderer.method_30883(matrices, text, 13, 93, 4210752); this.textRenderer.method_30883(matrices, text, 13, 93, 4210752);
} else { } else {
this.textRenderer.method_30883(matrices, GuiText.SCSSize.withSuffix(": ").append(GuiText.SCSInvalid.text()), 13, 93, this.textRenderer.method_30883(matrices, GuiText.SCSSize.withSuffix(": ").append(GuiText.SCSInvalid.text()),
4210752); 13, 93, 4210752);
} }
} }
src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java
+2 -1
View File
@@ -51,7 +51,8 @@ public class VibrationChamberScreen extends AEBaseScreen<VibrationChamberContain
@Override @Override
public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) { public void drawFG(MatrixStack matrices, final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
this.textRenderer.method_30883(matrices, this.getGuiDisplayName(GuiText.VibrationChamber.text()), 8, 6, 4210752); this.textRenderer.method_30883(matrices, this.getGuiDisplayName(GuiText.VibrationChamber.text()), 8, 6,
4210752);
this.textRenderer.method_30883(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752); this.textRenderer.method_30883(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752);
this.pb.setFullMsg(new LiteralText(VibrationChamberBlockEntity.POWER_PER_TICK this.pb.setFullMsg(new LiteralText(VibrationChamberBlockEntity.POWER_PER_TICK
src/main/java/appeng/client/render/StackSizeRenderer.java
+2 -2
View File
@@ -25,6 +25,8 @@ import net.minecraft.client.render.Tessellator;
import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.util.math.AffineTransformation; import net.minecraft.client.util.math.AffineTransformation;
import net.minecraft.client.util.math.Vector3f; import net.minecraft.client.util.math.Vector3f;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.core.AEConfig; import appeng.core.AEConfig;
@@ -32,8 +34,6 @@ import appeng.core.localization.GuiText;
import appeng.util.ISlimReadableNumberConverter; import appeng.util.ISlimReadableNumberConverter;
import appeng.util.IWideReadableNumberConverter; import appeng.util.IWideReadableNumberConverter;
import appeng.util.ReadableNumberConverter; import appeng.util.ReadableNumberConverter;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
/** /**
* @author AlgorithmX2 * @author AlgorithmX2
src/main/java/appeng/core/AppEngBase.java
+64 -60
View File
@@ -1,5 +1,56 @@
package appeng.core; 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.util.Identifier;
import net.minecraft.util.registry.BuiltinRegistries;
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.config.Upgrades;
import appeng.api.definitions.IBlocks; import appeng.api.definitions.IBlocks;
import appeng.api.definitions.IItems; import appeng.api.definitions.IItems;
@@ -102,56 +153,6 @@ import appeng.worldgen.BiomeModifier;
import appeng.worldgen.ChargedQuartzOreConfig; import appeng.worldgen.ChargedQuartzOreConfig;
import appeng.worldgen.ChargedQuartzOreFeature; import appeng.worldgen.ChargedQuartzOreFeature;
import appeng.worldgen.meteorite.MeteoriteStructure; 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.util.Identifier;
import net.minecraft.util.registry.BuiltinRegistries;
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 { public abstract class AppEngBase implements AppEng {
@@ -426,7 +427,7 @@ public abstract class AppEngBase implements AppEng {
@Override @Override
public void sendToAllNearExcept(final PlayerEntity p, final double x, final double y, final double z, 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()) { if (w.isClient()) {
return; return;
} }
@@ -450,7 +451,7 @@ public abstract class AppEngBase implements AppEng {
} }
protected final <T extends IBootstrapComponent> void callDeferredBootstrapComponents(Class<T> componentClass, protected final <T extends IBootstrapComponent> void callDeferredBootstrapComponents(Class<T> componentClass,
Consumer<T> invoker) { Consumer<T> invoker) {
final ApiDefinitions definitions = Api.INSTANCE.definitions(); final ApiDefinitions definitions = Api.INSTANCE.definitions();
definitions.getRegistry().getBootstrapComponents(componentClass).forEachRemaining(invoker); definitions.getRegistry().getBootstrapComponents(componentClass).forEachRemaining(invoker);
} }
@@ -552,7 +553,7 @@ public abstract class AppEngBase implements AppEng {
} }
private <T extends AEBaseContainer> ScreenHandlerType<T> registerScreenHandler(String id, private <T extends AEBaseContainer> ScreenHandlerType<T> registerScreenHandler(String id,
ScreenHandlerRegistry.ExtendedClientHandlerFactory<T> factory, ContainerOpener.Opener<T> opener) { ScreenHandlerRegistry.ExtendedClientHandlerFactory<T> factory, ContainerOpener.Opener<T> opener) {
ScreenHandlerType<T> type = ScreenHandlerRegistry.registerExtended(AppEng.makeId(id), factory); ScreenHandlerType<T> type = ScreenHandlerRegistry.registerExtended(AppEng.makeId(id), factory);
ContainerOpener.addOpener(type, opener); ContainerOpener.addOpener(type, opener);
return type; return type;
@@ -592,10 +593,12 @@ public abstract class AppEngBase implements AppEng {
BiomeModifier modifier = new BiomeModifier(b); BiomeModifier modifier = new BiomeModifier(b);
BlockState quartzOre = Api.instance().definitions().blocks().quartzOre().block().getDefaultState(); BlockState quartzOre = Api.instance().definitions().blocks().quartzOre().block().getDefaultState();
modifier.addFeature(GenerationStep.Feature.UNDERGROUND_ORES, Feature.ORE modifier.addFeature(GenerationStep.Feature.UNDERGROUND_ORES,
.configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, quartzOre, Feature.ORE
AEConfig.instance().getQuartzOresPerCluster())) .configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, quartzOre,
.decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(12, 12, 72))).spreadHorizontally().repeat(AEConfig.instance().getQuartzOresClusterAmount())); AEConfig.instance().getQuartzOresPerCluster()))
.decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(12, 12, 72))).spreadHorizontally()
.repeat(AEConfig.instance().getQuartzOresClusterAmount()));
if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) { if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) {
@@ -622,10 +625,11 @@ public abstract class AppEngBase implements AppEng {
Registry.register(Registry.CHUNK_GENERATOR, AppEng.makeId("storage"), StorageChunkGenerator.CODEC); Registry.register(Registry.CHUNK_GENERATOR, AppEng.makeId("storage"), StorageChunkGenerator.CODEC);
RegisterDimensionTypeCallback.EVENT.register(registryTracker -> { RegisterDimensionTypeCallback.EVENT.register(registryTracker -> {
DimensionType dimensionType = new DimensionType(OptionalLong.of(12000), false, false, false, false, false, false, true, false, DimensionType dimensionType = new DimensionType(OptionalLong.of(12000), false, false, false, false, false,
false, 256, BlockTags.INFINIBURN_OVERWORLD.getId(), 1.0f); false, true, false, false, 256, BlockTags.INFINIBURN_OVERWORLD.getId(), 1.0f);
Registry.register(registryTracker.getDimensionTypes(), SpatialDimensionManager.STORAGE_DIMENSION_TYPE.getValue(), dimensionType); Registry.register(registryTracker.getDimensionTypes(),
SpatialDimensionManager.STORAGE_DIMENSION_TYPE.getValue(), dimensionType);
}); });
} }
src/main/java/appeng/core/api/definitions/ApiBlocks.java
+1 -1
View File
@@ -21,7 +21,6 @@ package appeng.core.api.definitions;
import static appeng.block.AEBaseBlock.defaultProps; import static appeng.block.AEBaseBlock.defaultProps;
import static appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; import static appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType;
import appeng.block.storage.ChestBlock;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -52,6 +51,7 @@ import appeng.block.spatial.MatrixFrameBlock;
import appeng.block.spatial.SpatialIOPortBlock; import appeng.block.spatial.SpatialIOPortBlock;
import appeng.block.spatial.SpatialPylonBlock; import appeng.block.spatial.SpatialPylonBlock;
import appeng.block.storage.*; import appeng.block.storage.*;
import appeng.block.storage.ChestBlock;
import appeng.bootstrap.*; import appeng.bootstrap.*;
import appeng.bootstrap.components.IInitComponent; import appeng.bootstrap.components.IInitComponent;
import appeng.bootstrap.definitions.TileEntityDefinition; import appeng.bootstrap.definitions.TileEntityDefinition;
src/main/java/appeng/debug/ItemGenBlockEntity.java
+1
View File
@@ -36,6 +36,7 @@ import alexiil.mc.lib.attributes.Simulation;
import alexiil.mc.lib.attributes.item.ItemExtractable; import alexiil.mc.lib.attributes.item.ItemExtractable;
import alexiil.mc.lib.attributes.item.filter.ExactItemStackFilter; import alexiil.mc.lib.attributes.item.filter.ExactItemStackFilter;
import alexiil.mc.lib.attributes.item.filter.ItemFilter; import alexiil.mc.lib.attributes.item.filter.ItemFilter;
import appeng.debug.ItemGenBlockEntity.QueuedItemHandler; import appeng.debug.ItemGenBlockEntity.QueuedItemHandler;
import appeng.tile.AEBaseBlockEntity; import appeng.tile.AEBaseBlockEntity;
src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java
+2 -1
View File
@@ -125,7 +125,8 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
@Override @Override
public void drawFG(MatrixStack matrices, int offsetX, int offsetY, int mouseX, int mouseY) { public void drawFG(MatrixStack matrices, int offsetX, int offsetY, int mouseX, int mouseY) {
this.textRenderer.method_30883(matrices, this.getGuiDisplayName(new LiteralText("Fluid Terminal")), 8, 6, 4210752); this.textRenderer.method_30883(matrices, this.getGuiDisplayName(new LiteralText("Fluid Terminal")), 8, 6,
4210752);
this.textRenderer.method_30883(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752); this.textRenderer.method_30883(matrices, GuiText.inventory.text(), 8, this.backgroundHeight - 96 + 3, 4210752);
} }
src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java
+3 -3
View File
@@ -23,6 +23,9 @@ import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
import net.minecraft.text.LiteralText;
import net.minecraft.text.StringRenderable;
import net.minecraft.text.Text;
import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEFluidStack;
import appeng.client.render.StackSizeRenderer; import appeng.client.render.StackSizeRenderer;
@@ -30,9 +33,6 @@ import appeng.core.AEConfig;
import appeng.util.ISlimReadableNumberConverter; import appeng.util.ISlimReadableNumberConverter;
import appeng.util.IWideReadableNumberConverter; import appeng.util.IWideReadableNumberConverter;
import appeng.util.ReadableNumberConverter; import appeng.util.ReadableNumberConverter;
import net.minecraft.text.LiteralText;
import net.minecraft.text.StringRenderable;
import net.minecraft.text.Text;
/** /**
* @author AlgorithmX2 * @author AlgorithmX2
src/main/java/appeng/fluids/parts/FluidImportBusPart.java
+1
View File
@@ -26,6 +26,7 @@ import javax.annotation.Nonnull;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.Simulation;
import alexiil.mc.lib.attributes.fluid.FluidAttributes; import alexiil.mc.lib.attributes.fluid.FluidAttributes;
import alexiil.mc.lib.attributes.fluid.FluidExtractable; import alexiil.mc.lib.attributes.fluid.FluidExtractable;
src/main/java/appeng/mixins/BiomeAccessor.java
+6 -5
View File
@@ -1,13 +1,14 @@
package appeng.mixins; package appeng.mixins;
import java.util.List;
import java.util.Map;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.GenerationSettings; import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.feature.StructureFeature; import net.minecraft.world.gen.feature.StructureFeature;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.List;
import java.util.Map;
@Mixin(Biome.class) @Mixin(Biome.class)
public interface BiomeAccessor { public interface BiomeAccessor {
src/main/java/appeng/mixins/DimensionTypeMixin.java
+3 -2
View File
@@ -1,11 +1,11 @@
package appeng.mixins; package appeng.mixins;
import net.minecraft.util.registry.DynamicRegistryManager;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.util.registry.DynamicRegistryManager;
import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.dimension.DimensionType;
import appeng.hooks.RegisterDimensionTypeCallback; import appeng.hooks.RegisterDimensionTypeCallback;
@@ -14,7 +14,8 @@ import appeng.hooks.RegisterDimensionTypeCallback;
public class DimensionTypeMixin { public class DimensionTypeMixin {
@Inject(method = "addRegistryDefaults", at = @At("TAIL")) @Inject(method = "addRegistryDefaults", at = @At("TAIL"))
private static void addRegistryDefaults(DynamicRegistryManager.Impl registryTracker, CallbackInfoReturnable<?> cir) { private static void addRegistryDefaults(DynamicRegistryManager.Impl registryTracker,
CallbackInfoReturnable<?> cir) {
RegisterDimensionTypeCallback.EVENT.invoker().addDimensionTypes(registryTracker); RegisterDimensionTypeCallback.EVENT.invoker().addDimensionTypes(registryTracker);
} }
src/main/java/appeng/mixins/GenerationSettingsAccessor.java
+6 -5
View File
@@ -1,13 +1,14 @@
package appeng.mixins; package appeng.mixins;
import java.util.List;
import java.util.function.Supplier;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import net.minecraft.world.biome.GenerationSettings; import net.minecraft.world.biome.GenerationSettings;
import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature; import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.List;
import java.util.function.Supplier;
@Mixin(GenerationSettings.class) @Mixin(GenerationSettings.class)
public interface GenerationSettingsAccessor { public interface GenerationSettingsAccessor {
src/main/java/appeng/mixins/MinecraftServerMixin.java
+3 -2
View File
@@ -6,13 +6,13 @@ import java.util.concurrent.Executor;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import net.minecraft.util.registry.DynamicRegistryManager;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.WorldGenerationProgressListener; import net.minecraft.server.WorldGenerationProgressListener;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.registry.DynamicRegistryManager;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraft.util.registry.RegistryKey; import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.SaveProperties; import net.minecraft.world.SaveProperties;
@@ -94,7 +94,8 @@ public class MinecraftServerMixin implements DynamicDimensions {
RegistryKey<DimensionOptions> dimOptKey = RegistryKey.of(Registry.DIMENSION_OPTIONS, worldId.getValue()); RegistryKey<DimensionOptions> dimOptKey = RegistryKey.of(Registry.DIMENSION_OPTIONS, worldId.getValue());
generatorOptions.getDimensionMap().add(dimOptKey, dimensionOptions); generatorOptions.getDimensionMap().add(dimOptKey, dimensionOptions);
// FIXME FABRIC: might not be needed anymore if dimensions will save regardless // FIXME FABRIC: might not be needed anymore if dimensions will save regardless
// FIXME FABRIC generatorOptions.getDimensionMap().markLoaded(dimOptKey); // Otherwise it wont be saved // FIXME FABRIC generatorOptions.getDimensionMap().markLoaded(dimOptKey); //
// Otherwise it wont be saved
// Ensure the save properties are saved, or the world will potentially be lost // Ensure the save properties are saved, or the world will potentially be lost
// on restart // on restart
this.session.method_27426(this.registryManager, this.saveProperties, self.getPlayerManager().getUserData()); this.session.method_27426(this.registryManager, this.saveProperties, self.getPlayerManager().getUserData());
src/main/java/appeng/parts/PartPlacement.java
+1
View File
@@ -39,6 +39,7 @@ import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.world.RayTraceContext; import net.minecraft.world.RayTraceContext;
import net.minecraft.world.World; import net.minecraft.world.World;
import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlockDefinition;
import appeng.api.parts.*; import appeng.api.parts.*;
import appeng.api.util.AEPartLocation; import appeng.api.util.AEPartLocation;
src/main/java/appeng/spatial/StorageCellBiome.java
+2 -5
View File
@@ -34,11 +34,8 @@ public class StorageCellBiome {
.precipitation(Biome.Precipitation.NONE).category(Biome.Category.NONE).depth(0).scale(1) .precipitation(Biome.Precipitation.NONE).category(Biome.Category.NONE).depth(0).scale(1)
// Copied from the vanilla void biome // Copied from the vanilla void biome
.temperature(0.5F).downfall(0.5F) .temperature(0.5F).downfall(0.5F)
.effects(new BiomeEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(0).skyColor(0x111111).build()) .effects(new BiomeEffects.Builder().waterColor(4159204).waterFogColor(329011).fogColor(0).skyColor(0x111111)
.parent(null)
.spawnSettings(new SpawnSettings.Builder()
.creatureSpawnProbability(0)
.build()) .build())
.build(); .parent(null).spawnSettings(new SpawnSettings.Builder().creatureSpawnProbability(0).build()).build();
} }
src/main/java/appeng/tile/storage/ChestBlockEntity.java
+1
View File
@@ -39,6 +39,7 @@ import net.minecraft.util.Tickable;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.world.World; import net.minecraft.world.World;
import alexiil.mc.lib.attributes.AttributeList; import alexiil.mc.lib.attributes.AttributeList;
import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.Simulation;
import alexiil.mc.lib.attributes.fluid.FluidInsertable; import alexiil.mc.lib.attributes.fluid.FluidInsertable;
src/main/java/appeng/worldgen/BiomeModifier.java
+12 -8
View File
@@ -1,18 +1,20 @@
package appeng.worldgen; package appeng.worldgen;
import appeng.mixins.BiomeAccessor; import java.util.ArrayList;
import appeng.mixins.GenerationSettingsAccessor; import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature; import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
import net.minecraft.world.gen.feature.StructureFeature; import net.minecraft.world.gen.feature.StructureFeature;
import java.util.ArrayList; import appeng.mixins.BiomeAccessor;
import java.util.List; import appeng.mixins.GenerationSettingsAccessor;
import java.util.Map;
import java.util.function.Supplier;
public final class BiomeModifier { public final class BiomeModifier {
@@ -29,7 +31,8 @@ public final class BiomeModifier {
public void addFeature(GenerationStep.Feature step, ConfiguredFeature<?, ?> feature) { public void addFeature(GenerationStep.Feature step, ConfiguredFeature<?, ?> feature) {
int stepIndex = step.ordinal(); int stepIndex = step.ordinal();
List<List<Supplier<ConfiguredFeature<?, ?>>>> featuresByStep = new ArrayList<>(generationSettingsAccessor.getFeatures()); List<List<Supplier<ConfiguredFeature<?, ?>>>> featuresByStep = new ArrayList<>(
generationSettingsAccessor.getFeatures());
while (featuresByStep.size() <= stepIndex) { while (featuresByStep.size() <= stepIndex) {
featuresByStep.add(Lists.newArrayList()); featuresByStep.add(Lists.newArrayList());
@@ -44,7 +47,8 @@ public final class BiomeModifier {
} }
public void addStructureFeature(ConfiguredStructureFeature<?, ?> structure) { public void addStructureFeature(ConfiguredStructureFeature<?, ?> structure) {
List<Supplier<ConfiguredStructureFeature<?, ?>>> features = new ArrayList<>(generationSettingsAccessor.getStructureFeatures()); List<Supplier<ConfiguredStructureFeature<?, ?>>> features = new ArrayList<>(
generationSettingsAccessor.getStructureFeatures());
features.add(() -> structure); features.add(() -> structure);
generationSettingsAccessor.setStructureFeatures(features); generationSettingsAccessor.setStructureFeatures(features);
src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java
+3 -1
View File
@@ -3,6 +3,7 @@ package appeng.worldgen;
import java.util.Random; import java.util.Random;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.Heightmap; import net.minecraft.world.Heightmap;
@@ -25,7 +26,8 @@ public class ChargedQuartzOreFeature extends Feature<ChargedQuartzOreConfig> {
} }
@Override @Override
public boolean generate(StructureWorldAccess worldIn, ChunkGenerator generator, Random rand, BlockPos pos, ChargedQuartzOreConfig config) { public boolean generate(StructureWorldAccess worldIn, ChunkGenerator generator, Random rand, BlockPos pos,
ChargedQuartzOreConfig config) {
ChunkPos chunkPos = new ChunkPos(pos); ChunkPos chunkPos = new ChunkPos(pos);
BlockPos.Mutable bpos = new BlockPos.Mutable(); BlockPos.Mutable bpos = new BlockPos.Mutable();
src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java
+2 -2
View File
@@ -85,8 +85,8 @@ public class MeteoriteStructurePiece extends StructurePiece {
} }
@Override @Override
public boolean generate(StructureWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, public boolean generate(StructureWorldAccess world, StructureAccessor structureAccessor,
Random random, BlockBox bounds, ChunkPos chunkPos, BlockPos blockPos) { ChunkGenerator chunkGenerator, Random random, BlockBox bounds, ChunkPos chunkPos, BlockPos blockPos) {
MeteoritePlacer placer = new MeteoritePlacer(world, settings, bounds); MeteoritePlacer placer = new MeteoritePlacer(world, settings, bounds);
placer.place(); placer.place();
src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java
+5 -2
View File
@@ -37,7 +37,9 @@ public class MeteoriteStructureStart extends StructureStart<DefaultFeatureConfig
} }
@Override @Override
public void init(DynamicRegistryManager dynamicRegistryManager, ChunkGenerator generator, StructureManager structureManager, int chunkX, int chunkZ, Biome biome, DefaultFeatureConfig featureConfig) { public void init(DynamicRegistryManager dynamicRegistryManager, ChunkGenerator generator,
StructureManager structureManager, int chunkX, int chunkZ, Biome biome,
DefaultFeatureConfig featureConfig) {
final int centerX = chunkX * 16 + this.random.nextInt(16); final int centerX = chunkX * 16 + this.random.nextInt(16);
final int centerZ = chunkZ * 16 + this.random.nextInt(16); final int centerZ = chunkZ * 16 + this.random.nextInt(16);
final float meteoriteRadius = (this.random.nextFloat() * 6.0f) + 2; final float meteoriteRadius = (this.random.nextFloat() * 6.0f) + 2;
@@ -75,7 +77,8 @@ public class MeteoriteStructureStart extends StructureStart<DefaultFeatureConfig
boolean craterLake = this.locateWaterAroundTheCrater(generator, actualPos, meteoriteRadius); boolean craterLake = this.locateWaterAroundTheCrater(generator, actualPos, meteoriteRadius);
CraterType craterType = this.determineCraterType(spawnBiome); CraterType craterType = this.determineCraterType(spawnBiome);
boolean pureCrater = this.random.nextFloat() > .9f; boolean pureCrater = this.random.nextFloat() > .9f;
FalloutMode fallout = getFalloutFromBaseBlock(spawnBiome.getGenerationSettings().getSurfaceConfig().getTopMaterial()); FalloutMode fallout = getFalloutFromBaseBlock(
spawnBiome.getGenerationSettings().getSurfaceConfig().getTopMaterial());
children.add( children.add(
new MeteoriteStructurePiece(actualPos, meteoriteRadius, craterType, fallout, pureCrater, craterLake)); new MeteoriteStructurePiece(actualPos, meteoriteRadius, craterType, fallout, pureCrater, craterLake));