Compiles again.

This commit is contained in:
Sebastian Hartte
2020-07-27 23:50:28 +02:00
parent 56ecda5173
commit 84e6aaa122
136 changed files with 1004 additions and 1108 deletions
+1 -1
View File
@@ -119,7 +119,7 @@ public enum Upgrades {
if (namesAdded.add(name)) {
// append the supported count only if its > 1
if (supported.maxCount > 1) {
name = name.deepCopy().appendText(" (" + supported.maxCount + ")");
name = name.deepCopy().func_240702_b_(" (" + supported.maxCount + ")");
}
supportedTooltipLines.add(name);
}
@@ -26,16 +26,15 @@ package appeng.api.features;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.Dimension;
import net.minecraft.world.IWorld;
import net.minecraft.world.server.ServerWorld;
public interface IWorldGen {
void disableWorldGenForProviderID(WorldGenType type, Class<? extends Dimension> provider);
void enableWorldGenForDimension(WorldGenType type, ResourceLocation dimID);
void disableWorldGenForDimension(WorldGenType type, ResourceLocation dimID);
boolean isWorldGenEnabled(WorldGenType type, IWorld w);
boolean isWorldGenEnabled(WorldGenType type, ServerWorld w);
enum WorldGenType {
CERTUS_QUARTZ, CHARGED_CERTUS_QUARTZ, METEORITES
@@ -25,11 +25,13 @@ package appeng.api.implementations.items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.RegistryKey;
import net.minecraft.world.DimensionType;
import net.minecraft.world.World;
import appeng.api.implementations.TransitionResult;
import appeng.api.util.WorldCoord;
import net.minecraft.world.server.ServerWorld;
/**
* Implemented on a {@link Item}
@@ -57,7 +59,7 @@ public interface ISpatialStorageCell {
*
* @return dimension id or -1
*/
DimensionType getStoredDimension(ItemStack is);
RegistryKey<World> getStoredDimension(ItemStack is);
/**
* Perform a spatial swap with the contents of the cell, and the world.
@@ -70,5 +72,5 @@ public interface ISpatialStorageCell {
*
* @return result of transition
*/
TransitionResult doSpatialTransition(ItemStack is, World w, WorldCoord min, WorldCoord max, int playerId);
TransitionResult doSpatialTransition(ItemStack is, ServerWorld w, WorldCoord min, WorldCoord max, int playerId);
}
@@ -22,29 +22,31 @@ import java.util.List;
import javax.annotation.Nullable;
import net.minecraft.util.RegistryKey;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.DimensionType;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
public interface ISpatialDimension {
ServerWorld getWorld(DimensionType cellDim);
ServerWorld getWorld(RegistryKey<World> cellDim);
@Nullable
DimensionType createNewCellDimension(BlockPos capacity);
RegistryKey<World> createNewCellDimension(BlockPos capacity);
void deleteCellDimension(DimensionType cellDim);
void deleteCellDimension(RegistryKey<World> cellDim);
boolean isCellDimension(DimensionType cellDim);
boolean isCellDimension(RegistryKey<World> cellDim);
BlockPos getCellDimensionOrigin(DimensionType cellDim);
BlockPos getCellDimensionOrigin(RegistryKey<World> cellDim);
BlockPos getCellDimensionSize(DimensionType cellDim);
BlockPos getCellDimensionSize(RegistryKey<World> cellDim);
/**
* Adds a user-facing tooltip that describes this dimension so that a player can
* keep storage cells apart.
*/
void addCellDimensionTooltip(DimensionType cellDim, List<ITextComponent> lines);
void addCellDimensionTooltip(RegistryKey<World> cellDim, List<ITextComponent> lines);
}