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

1.16 port

Browse Source
This commit is contained in:
yueh
2020-07-22 16:44:42 +02:00
parent 662dbca3e1
commit 56ecda5173
225 changed files with 1214 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/AEConfig.java
+3 -2
View File
@@ -35,7 +35,8 @@ import com.google.common.base.Strings;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.DimensionType;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeConfigSpec;
import net.minecraftforge.common.ForgeConfigSpec.BooleanValue;
import net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
@@ -579,7 +580,7 @@ public final class AEConfig {
this.spawnChargedChance = builder.defineInRange("spawnChargedChance", 0.08, 0.0, 1.0);
this.meteoriteMaximumSpawnHeight = builder.define("meteoriteMaximumSpawnHeight", 180);
List<String> defaultDimensionWhitelist = new ArrayList<>();
defaultDimensionWhitelist.add(DimensionType.getKey(DimensionType.OVERWORLD).toString());
defaultDimensionWhitelist.add(World.field_234918_g_.getRegistryName().toString());
this.meteoriteDimensionWhitelist = builder.defineList("meteoriteDimensionWhitelist",
defaultDimensionWhitelist, obj -> true);
src/main/java/appeng/core/Registration.java
+7 -5
View File
@@ -31,8 +31,9 @@ import net.minecraft.item.crafting.IRecipeSerializer;
import net.minecraft.particles.ParticleType;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.DimensionType;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.gen.GenerationStage;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.IFeatureConfig;
@@ -632,7 +633,7 @@ final class Registration {
// FIXME: registries.worldgen().disableWorldGenForProviderID( type,
// StorageWorldProvider.class );
registries.worldgen().disableWorldGenForDimension(type, DimensionType.THE_NETHER.getRegistryName());
registries.worldgen().disableWorldGenForDimension(type, World.field_234919_h_.getRegistryName());
}
// whitelist from config
@@ -657,10 +658,11 @@ final class Registration {
return;
}
b.addStructure(MeteoriteStructure.INSTANCE.withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG));
b.func_235063_a_(MeteoriteStructure.INSTANCE.func_236391_a_(IFeatureConfig.NO_FEATURE_CONFIG));
b.addFeature(GenerationStage.Decoration.TOP_LAYER_MODIFICATION,
MeteoriteStructure.INSTANCE.withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG)
.withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG)));
MeteoriteStructure.INSTANCE.func_236391_a_(IFeatureConfig.NO_FEATURE_CONFIG)
//.withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG))
);
}
private static void addQuartzWorldGen(Biome b) {
src/main/java/appeng/core/features/registries/MovableTileRegistry.java
+3 -3
View File
@@ -27,7 +27,7 @@ import java.util.Set;
import net.minecraft.block.Block;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.Tag;
import net.minecraft.tags.ITag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
@@ -51,8 +51,8 @@ public class MovableTileRegistry implements IMovableRegistry {
private final List<IMovableHandler> handlers = new ArrayList<>();
private final DefaultSpatialHandler dsh = new DefaultSpatialHandler();
private final IMovableHandler nullHandler = new DefaultSpatialHandler();
private final Tag<Block> blockTagWhiteList;
private final Tag<Block> blockTagBlackList;
private final ITag<Block> blockTagWhiteList;
private final ITag<Block> blockTagBlackList;
public MovableTileRegistry() {
this.blockTagWhiteList = BlockTags.getCollection().getOrCreate(TAG_WHITELIST);
src/main/java/appeng/core/features/registries/WorldGenRegistry.java
+1 -1
View File
@@ -21,8 +21,8 @@ package appeng.core.features.registries;
import java.util.HashSet;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.Dimension;
import net.minecraft.world.IWorld;
import net.minecraft.world.dimension.Dimension;
import appeng.api.features.IWorldGen;
src/main/java/appeng/core/localization/GuiText.java
+2 -3
View File
@@ -18,7 +18,6 @@
package appeng.core.localization;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;
@@ -93,9 +92,9 @@ public enum GuiText {
GuiText(final String r) {
this.root = r;
}
public String getLocal() {
return I18n.format(this.getTranslationKey());
return this.textComponent().getString();
}
public String getTranslationKey() {
src/main/java/appeng/core/sync/network/NetworkHandler.java
+1 -1
View File
@@ -26,7 +26,7 @@ import net.minecraft.network.ThreadQuickExitException;
import net.minecraft.network.play.ServerPlayNetHandler;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.DimensionType;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.LogicalSide;
src/main/java/appeng/core/sync/network/TargetPoint.java
+1 -1
View File
@@ -1,7 +1,7 @@
package appeng.core.sync.network;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.DimensionType;
/**
* Created by covers1624 on 1/6/20.
src/main/java/appeng/core/sync/packets/ClickPacket.java
+3 -3
View File
@@ -29,7 +29,7 @@ import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.vector.Vector3d;
import appeng.api.definitions.IComparableDefinition;
import appeng.api.definitions.IItems;
@@ -131,7 +131,7 @@ public class ClickPacket extends BasePacket {
final Block block = player.world.getBlockState(pos).getBlock();
if (block instanceof CableBusBlock) {
((CableBusBlock) block).onBlockClickPacket(player.world, pos, player, this.hand,
new Vec3d(this.hitX, this.hitY, this.hitZ));
new Vector3d(this.hitX, this.hitY, this.hitZ));
}
} else {
if (!is.isEmpty()) {
@@ -141,7 +141,7 @@ public class ClickPacket extends BasePacket {
if (hasBlockContext()) {
// Reconstruct an item use context
ItemUseContext useContext = new ItemUseContext(player, hand,
new BlockRayTraceResult(new Vec3d(hitX, hitY, hitZ), side, pos, false));
new BlockRayTraceResult(new Vector3d(hitX, hitY, hitZ), side, pos, false));
tnt.serverSideToolLogic(useContext);
} else {
ContainerOpener.openContainer(NetworkToolContainer.TYPE, player,
src/main/java/appeng/core/worlddata/WorldData.java
+1 -1
View File
@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
import com.google.common.base.Preconditions;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.DimensionType;
import net.minecraft.world.server.ServerWorld;
import appeng.services.CompassService;