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

Migrations

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 16:18:20 +02:00
parent d638d083c2
commit ba71a82288
303 changed files with 1216 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/integration/abstraction/IAEFacade.java
+5 -5
View File
@@ -22,9 +22,9 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.util.Direction;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.BlockView;
import team.chisel.ctm.api.IFacade;
@@ -35,17 +35,17 @@ import team.chisel.ctm.api.IFacade;
*/
public interface IAEFacade extends IFacade {
BlockState getFacadeState(IBlockReader world, BlockPos pos, @Nullable Direction side);
BlockState getFacadeState(BlockView world, BlockPos pos, @Nullable Direction side);
@Nonnull
@Override
default BlockState getFacade(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nullable Direction side) {
default BlockState getFacade(@Nonnull BlockView world, @Nonnull BlockPos pos, @Nullable Direction side) {
return getFacadeState(world, pos, side);
}
@Nonnull
@Override
default BlockState getFacade(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nullable Direction side,
default BlockState getFacade(@Nonnull BlockView world, @Nonnull BlockPos pos, @Nullable Direction side,
@Nonnull BlockPos connection) {
return getFacadeState(world, pos, side);
}
src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java
+3 -3
View File
@@ -28,7 +28,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.container.Container;
import net.minecraft.inventory.container.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListNBT;
import mezz.jei.api.gui.IRecipeLayout;
@@ -66,7 +66,7 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
Map<Integer, ? extends IGuiIngredient<ItemStack>> ingredients = recipeLayout.getItemStacks()
.getGuiIngredients();
final CompoundNBT recipe = new CompoundNBT();
final CompoundTag recipe = new CompoundTag();
int slotIndex = 0;
for (Map.Entry<Integer, ? extends IGuiIngredient<ItemStack>> ingredientEntry : ingredients.entrySet()) {
@@ -97,7 +97,7 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
}
for (final ItemStack is : list) {
final CompoundNBT tag = new CompoundNBT();
final CompoundTag tag = new CompoundTag();
is.write(tag);
tags.add(tag);
}
src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java
+2 -2
View File
@@ -20,7 +20,7 @@ package appeng.integration.modules.theoneprobe.part;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.World;
import mcjty.theoneprobe.api.IProbeHitData;
@@ -42,7 +42,7 @@ public class ChannelInfoProvider implements IPartProbInfoProvider {
final int maxChannels = (part instanceof SmartDenseCablePart) ? 32 : 8;
if (part.getGridNode().isActive()) {
final CompoundNBT tmp = new CompoundNBT();
final CompoundTag tmp = new CompoundTag();
part.writeToNBT(tmp);
usedChannels = tmp.getByte("usedChannels");
} else {