diff --git a/api/src/main/java/appeng/api/config/Actionable.java b/api/src/main/java/appeng/api/config/Actionable.java index 76948f9be..e695e4a4e 100644 --- a/api/src/main/java/appeng/api/config/Actionable.java +++ b/api/src/main/java/appeng/api/config/Actionable.java @@ -23,26 +23,15 @@ package appeng.api.config; -import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; - public enum Actionable { /** * Perform the intended action. */ - MODULATE(FluidAction.EXECUTE), + MODULATE, /** * Pretend to perform the action. */ - SIMULATE(FluidAction.SIMULATE); + SIMULATE - private final FluidAction fluidAction; - - Actionable(FluidAction fluidAction) { - this.fluidAction = fluidAction; - } - - public FluidAction getFluidAction() { - return fluidAction; - } } diff --git a/api/src/main/java/appeng/api/config/PowerUnits.java b/api/src/main/java/appeng/api/config/PowerUnits.java index f5816baa4..de515e4af 100644 --- a/api/src/main/java/appeng/api/config/PowerUnits.java +++ b/api/src/main/java/appeng/api/config/PowerUnits.java @@ -23,8 +23,8 @@ package appeng.api.config; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; public enum PowerUnits { AE("gui.appliedenergistics2.units.appliedenergstics"), // Native Units - AE Energy @@ -61,8 +61,8 @@ public enum PowerUnits { return (value * this.conversionRatio) / target.conversionRatio; } - public ITextComponent textComponent() { - return new TranslationTextComponent(unlocalizedName); + public Text textComponent() { + return new TranslatableText(unlocalizedName); } } \ No newline at end of file diff --git a/api/src/main/java/appeng/api/definitions/ITileDefinition.java b/api/src/main/java/appeng/api/definitions/ITileDefinition.java index 9e05c6fc5..b49190921 100644 --- a/api/src/main/java/appeng/api/definitions/ITileDefinition.java +++ b/api/src/main/java/appeng/api/definitions/ITileDefinition.java @@ -20,11 +20,11 @@ package appeng.api.definitions; import java.util.Optional; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; public interface ITileDefinition extends IBlockDefinition { /** - * @return the {@link TileEntity} Class if applicable. + * @return the {@link BlockEntity} Class if applicable. */ - Optional> maybeEntity(); + Optional> maybeEntity(); } diff --git a/api/src/main/java/appeng/api/definitions/IdHelper.java b/api/src/main/java/appeng/api/definitions/IdHelper.java index ddcb55db3..c130773b9 100644 --- a/api/src/main/java/appeng/api/definitions/IdHelper.java +++ b/api/src/main/java/appeng/api/definitions/IdHelper.java @@ -1,6 +1,6 @@ package appeng.api.definitions; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; // Private helper class to create AE2 resource locations final class IdHelper { @@ -11,8 +11,8 @@ final class IdHelper { /** * Creates a ResourceLocation namespaced to AE2. */ - static ResourceLocation id(String id) { - return new ResourceLocation("appliedenergistics2", id); + static Identifier id(String id) { + return new Identifier("appliedenergistics2", id); } } diff --git a/api/src/main/java/appeng/api/events/LocatableEventAnnounce.java b/api/src/main/java/appeng/api/events/LocatableEventAnnounce.java index 88199b69e..1f8470c2a 100644 --- a/api/src/main/java/appeng/api/events/LocatableEventAnnounce.java +++ b/api/src/main/java/appeng/api/events/LocatableEventAnnounce.java @@ -23,24 +23,24 @@ package appeng.api.events; -import net.minecraftforge.eventbus.api.Event; - import appeng.api.features.ILocatable; +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; /** * Input Event: - * + *

* Used to Notify the Location Registry of objects, and their availability. */ -public class LocatableEventAnnounce extends Event { +public interface LocatableEventAnnounce { - public final ILocatable target; - public final LocatableEvent change; + Event EVENT = EventFactory.createArrayBacked(LocatableEventAnnounce.class, listeners -> (ILocatable o, LocatableEvent evt) -> { + for (LocatableEventAnnounce listener : listeners) { + listener.onLocatableAnnounce(o, evt); + } + }); - public LocatableEventAnnounce(final ILocatable o, final LocatableEvent ev) { - this.target = o; - this.change = ev; - } + void onLocatableAnnounce(final ILocatable o, final LocatableEvent ev); public enum LocatableEvent { /** diff --git a/api/src/main/java/appeng/api/events/LocatableEventCallback.java b/api/src/main/java/appeng/api/events/LocatableEventCallback.java new file mode 100644 index 000000000..3f69e3bb6 --- /dev/null +++ b/api/src/main/java/appeng/api/events/LocatableEventCallback.java @@ -0,0 +1,8 @@ +package appeng.api.events; + +@FunctionalInterface +public interface LocatableEventCallback { + + void onLocatable(LocatableEventAnnounce.LocatableEvent evt); + +} diff --git a/api/src/main/java/appeng/api/features/IMatterCannonAmmoRegistry.java b/api/src/main/java/appeng/api/features/IMatterCannonAmmoRegistry.java index 556f6e159..cd0406367 100644 --- a/api/src/main/java/appeng/api/features/IMatterCannonAmmoRegistry.java +++ b/api/src/main/java/appeng/api/features/IMatterCannonAmmoRegistry.java @@ -25,7 +25,7 @@ package appeng.api.features; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; public interface IMatterCannonAmmoRegistry { @@ -45,7 +45,7 @@ public interface IMatterCannonAmmoRegistry { * @param ammoTag item tag id * @param weight atomic weight */ - void registerAmmoTag(ResourceLocation ammoTag, double weight); + void registerAmmoTag(Identifier ammoTag, double weight); /** * get the penetration value for a particular ammo, 0 indicates a non-ammo. diff --git a/api/src/main/java/appeng/api/features/IP2PTunnelRegistry.java b/api/src/main/java/appeng/api/features/IP2PTunnelRegistry.java index 1a50c16a2..1b031953a 100644 --- a/api/src/main/java/appeng/api/features/IP2PTunnelRegistry.java +++ b/api/src/main/java/appeng/api/features/IP2PTunnelRegistry.java @@ -27,7 +27,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.capabilities.Capability; import appeng.api.config.TunnelType; @@ -48,8 +47,6 @@ public interface IP2PTunnelRegistry { void addNewAttunement(@Nonnull String ModId, @Nullable TunnelType type); - void addNewAttunement(@Nonnull Capability cap, @Nullable TunnelType type); - /** * returns null if no attunement can be found. * diff --git a/api/src/main/java/appeng/api/features/IWorldGen.java b/api/src/main/java/appeng/api/features/IWorldGen.java index a03fe81d4..e109272f7 100644 --- a/api/src/main/java/appeng/api/features/IWorldGen.java +++ b/api/src/main/java/appeng/api/features/IWorldGen.java @@ -23,19 +23,16 @@ package appeng.api.features; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.IWorld; -import net.minecraft.world.dimension.Dimension; +import net.minecraft.util.Identifier; +import net.minecraft.world.ServerWorldAccess; public interface IWorldGen { - void disableWorldGenForProviderID(WorldGenType type, Class provider); + void enableWorldGenForDimension(WorldGenType type, Identifier dimID); - void enableWorldGenForDimension(WorldGenType type, ResourceLocation dimID); + void disableWorldGenForDimension(WorldGenType type, Identifier dimID); - void disableWorldGenForDimension(WorldGenType type, ResourceLocation dimID); - - boolean isWorldGenEnabled(WorldGenType type, IWorld w); + boolean isWorldGenEnabled(WorldGenType type, ServerWorldAccess w); enum WorldGenType { CERTUS_QUARTZ, CHARGED_CERTUS_QUARTZ, METEORITES diff --git a/api/src/main/java/appeng/api/implementations/IUpgradeableHost.java b/api/src/main/java/appeng/api/implementations/IUpgradeableHost.java index 5f39fec70..8c6aa5e52 100644 --- a/api/src/main/java/appeng/api/implementations/IUpgradeableHost.java +++ b/api/src/main/java/appeng/api/implementations/IUpgradeableHost.java @@ -23,7 +23,7 @@ package appeng.api.implementations; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import appeng.api.config.Upgrades; import appeng.api.implementations.tiles.ISegmentedInventory; @@ -41,5 +41,5 @@ public interface IUpgradeableHost extends IConfigurableObject, ISegmentedInvento * * @return tile entity */ - TileEntity getTile(); + BlockEntity getTile(); } diff --git a/api/src/main/java/appeng/api/implementations/guiobjects/INetworkTool.java b/api/src/main/java/appeng/api/implementations/guiobjects/INetworkTool.java index 10d073ef4..b0624a16f 100644 --- a/api/src/main/java/appeng/api/implementations/guiobjects/INetworkTool.java +++ b/api/src/main/java/appeng/api/implementations/guiobjects/INetworkTool.java @@ -23,7 +23,7 @@ package appeng.api.implementations.guiobjects; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.networking.IGridHost; @@ -33,5 +33,5 @@ import appeng.api.networking.IGridHost; public interface INetworkTool extends IGuiItemObject { IGridHost getGridHost(); // null for most purposes. - IItemHandler getInventory(); + ItemTransferable getInventory(); } diff --git a/api/src/main/java/appeng/api/implementations/tiles/ISegmentedInventory.java b/api/src/main/java/appeng/api/implementations/tiles/ISegmentedInventory.java index 6be6a1ce2..baee72cf3 100644 --- a/api/src/main/java/appeng/api/implementations/tiles/ISegmentedInventory.java +++ b/api/src/main/java/appeng/api/implementations/tiles/ISegmentedInventory.java @@ -23,7 +23,7 @@ package appeng.api.implementations.tiles; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public interface ISegmentedInventory { @@ -36,5 +36,5 @@ public interface ISegmentedInventory { * * @return inventory with inventory name */ - IItemHandler getInventoryByName(String name); + ItemTransferable getInventoryByName(String name); } diff --git a/api/src/main/java/appeng/api/implementations/tiles/IViewCellStorage.java b/api/src/main/java/appeng/api/implementations/tiles/IViewCellStorage.java index 829a0ce18..925a8f4ed 100644 --- a/api/src/main/java/appeng/api/implementations/tiles/IViewCellStorage.java +++ b/api/src/main/java/appeng/api/implementations/tiles/IViewCellStorage.java @@ -23,7 +23,7 @@ package appeng.api.implementations.tiles; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public interface IViewCellStorage { @@ -32,5 +32,5 @@ public interface IViewCellStorage { * * @return inventory with at least 5 slot */ - IItemHandler getViewCellStorage(); + ItemTransferable getViewCellStorage(); } diff --git a/api/src/main/java/appeng/api/movable/IMovableHandler.java b/api/src/main/java/appeng/api/movable/IMovableHandler.java index 7dec94c1f..1e87ac146 100644 --- a/api/src/main/java/appeng/api/movable/IMovableHandler.java +++ b/api/src/main/java/appeng/api/movable/IMovableHandler.java @@ -23,7 +23,7 @@ package appeng.api.movable; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -38,7 +38,7 @@ public interface IMovableHandler { * * @return true if it can handle moving */ - boolean canHandle(Class myClass, TileEntity tile); + boolean canHandle(Class myClass, BlockEntity tile); /** * request that the handler move the the tile from its current location to the @@ -64,5 +64,5 @@ public interface IMovableHandler { * @param world world of tile * @param newPosition the new location */ - void moveTile(TileEntity tile, World world, BlockPos newPosition); + void moveTile(BlockEntity tile, World world, BlockPos newPosition); } \ No newline at end of file diff --git a/api/src/main/java/appeng/api/movable/IMovableRegistry.java b/api/src/main/java/appeng/api/movable/IMovableRegistry.java index 5a6e1b2f4..f56c01a87 100644 --- a/api/src/main/java/appeng/api/movable/IMovableRegistry.java +++ b/api/src/main/java/appeng/api/movable/IMovableRegistry.java @@ -24,7 +24,7 @@ package appeng.api.movable; import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; /** * Used to determine if a tile is marked as movable, a block will be considered @@ -36,7 +36,7 @@ import net.minecraft.tileentity.TileEntity; * 2. The Tile implements IMovableTile * * 3. A IMovableHandler is register that returns canHandle = true for the - * {@link TileEntity} subclass + * {@link BlockEntity} subclass * * * The movement process is as follows, @@ -72,21 +72,21 @@ public interface IMovableRegistry { * If you tile is handled with IMovableHandler or IMovableTile you do not need * to white list it. */ - void whiteListTileEntity(Class c); + void whiteListTileEntity(Class c); /** * @param te to be moved tile entity * * @return true if the tile has accepted your request to move it */ - boolean askToMove(TileEntity te); + boolean askToMove(BlockEntity te); /** * tells the tile you are done moving it. * * @param te moved tile entity */ - void doneMoving(TileEntity te); + void doneMoving(BlockEntity te); /** * add a new handler movable handler. @@ -105,7 +105,7 @@ public interface IMovableRegistry { * * @return moving handler of tile entity */ - IMovableHandler getHandler(TileEntity te); + IMovableHandler getHandler(BlockEntity te); /** * @return a copy of the default handler diff --git a/api/src/main/java/appeng/api/networking/IGridHost.java b/api/src/main/java/appeng/api/networking/IGridHost.java index 17e5f456c..8dbf3e19e 100644 --- a/api/src/main/java/appeng/api/networking/IGridHost.java +++ b/api/src/main/java/appeng/api/networking/IGridHost.java @@ -26,14 +26,14 @@ package appeng.api.networking; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import appeng.api.parts.IPart; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; /** - * Implement to create a networked {@link TileEntity} or {@link IPart} must be + * Implement to create a networked {@link BlockEntity} or {@link IPart} must be * implemented for a part, or tile entity to become part of a grid. */ public interface IGridHost { diff --git a/api/src/main/java/appeng/api/networking/IGridNode.java b/api/src/main/java/appeng/api/networking/IGridNode.java index 6604880a1..b8f72156e 100644 --- a/api/src/main/java/appeng/api/networking/IGridNode.java +++ b/api/src/main/java/appeng/api/networking/IGridNode.java @@ -28,7 +28,7 @@ import java.util.EnumSet; import javax.annotation.Nonnull; import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import appeng.api.IAppEngApi; import appeng.api.util.AEPartLocation; @@ -89,7 +89,7 @@ public interface IGridNode { * @return the world the node is located in */ @Nonnull - IWorld getWorld(); + WorldAccess getWorld(); /** * @return a set of the connected sides, INTERNAL represents an invisible diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingCPU.java b/api/src/main/java/appeng/api/networking/crafting/ICraftingCPU.java index cdb52c20a..602564a49 100644 --- a/api/src/main/java/appeng/api/networking/crafting/ICraftingCPU.java +++ b/api/src/main/java/appeng/api/networking/crafting/ICraftingCPU.java @@ -23,7 +23,7 @@ package appeng.api.networking.crafting; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.networking.security.IActionSource; import appeng.api.networking.storage.IBaseMonitor; @@ -54,5 +54,5 @@ public interface ICraftingCPU extends IBaseMonitor { /** * @return a null or the name of the cpu. */ - ITextComponent getName(); + Text getName(); } diff --git a/api/src/main/java/appeng/api/parts/IFacadeContainer.java b/api/src/main/java/appeng/api/parts/IFacadeContainer.java index 1615b5cc2..67ae95a1a 100644 --- a/api/src/main/java/appeng/api/parts/IFacadeContainer.java +++ b/api/src/main/java/appeng/api/parts/IFacadeContainer.java @@ -26,7 +26,7 @@ package appeng.api.parts; import java.io.IOException; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.util.AEPartLocation; @@ -75,7 +75,7 @@ public interface IFacadeContainer { * * @throws IOException */ - boolean readFromStream(PacketBuffer data) throws IOException; + boolean readFromStream(PacketByteBuf data) throws IOException; /** * read from NBT @@ -91,7 +91,7 @@ public interface IFacadeContainer { * * @throws IOException */ - void writeToStream(PacketBuffer data) throws IOException; + void writeToStream(PacketByteBuf data) throws IOException; /** * @return true if there are no facades. diff --git a/api/src/main/java/appeng/api/parts/IPart.java b/api/src/main/java/appeng/api/parts/IPart.java index 4c8d0cb3a..11fe8b460 100644 --- a/api/src/main/java/appeng/api/parts/IPart.java +++ b/api/src/main/java/appeng/api/parts/IPart.java @@ -29,27 +29,24 @@ import java.util.Random; import javax.annotation.Nonnull; -import com.mojang.blaze3d.matrix.MatrixStack; +import alexiil.mc.lib.attributes.AttributeList; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.model.data.EmptyModelData; -import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; import appeng.api.networking.IGridNode; import appeng.api.util.AECableType; @@ -80,8 +77,8 @@ public interface IPart extends ICustomCableConnection { * part has to return true for {@link #requireDynamicRender()} in order for this * method to be called. */ - @OnlyIn(Dist.CLIENT) - default void renderDynamic(float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffers, + @Environment(EnvType.CLIENT) + default void renderDynamic(float partialTicks, MatrixStack matrixStack, VertexConsumerProvider buffers, int combinedLightIn, int combinedOverlayIn) { } @@ -155,7 +152,7 @@ public interface IPart extends ICustomCableConnection { * * @throws IOException */ - void writeToStream(PacketBuffer data) throws IOException; + void writeToStream(PacketByteBuf data) throws IOException; /** * read data from bus packet. @@ -166,7 +163,7 @@ public interface IPart extends ICustomCableConnection { * * @throws IOException */ - boolean readFromStream(PacketBuffer data) throws IOException; + boolean readFromStream(PacketByteBuf data) throws IOException; /** * get the Grid Node for the Bus, be sure your IGridBlock is NOT @@ -209,7 +206,7 @@ public interface IPart extends ICustomCableConnection { * @param host part side * @param tile tile entity of part */ - void setPartHostInfo(AEPartLocation side, IPartHost host, TileEntity tile); + void setPartHostInfo(AEPartLocation side, IPartHost host, BlockEntity tile); /** * Called when you right click the part, very similar to Block.onActivateBlock @@ -345,24 +342,11 @@ public interface IPart extends ICustomCableConnection { * capabilities on the cable bus will be forwarded to parts on the appropriate * side. * - * @see TileEntity#getCapability(Capability, net.minecraft.util.math.Direction) + * @see alexiil.mc.lib.attributes.AttributeProvider * * @return The capability or null. */ - default LazyOptional getCapability(Capability capabilityClass) { - return LazyOptional.empty(); - } - - /** - * Additional model data to be passed to the models for rendering this part. - * - * @return The model data to pass to the model. Only useful if custom models are - * used. - */ - @Nonnull - default IModelData getModelData() { - return EmptyModelData.INSTANCE; - } + default void addAllAttributes(AttributeList to) {} /** * add your collision information to the the list. diff --git a/api/src/main/java/appeng/api/parts/IPartHost.java b/api/src/main/java/appeng/api/parts/IPartHost.java index 94175fc78..b50de95f1 100644 --- a/api/src/main/java/appeng/api/parts/IPartHost.java +++ b/api/src/main/java/appeng/api/parts/IPartHost.java @@ -27,7 +27,7 @@ import java.util.Set; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; @@ -118,7 +118,7 @@ public interface IPartHost extends ICustomCableConnection { * @return the tile entity for the host, this can either be an FMP tile, or a AE * tile */ - TileEntity getTile(); + BlockEntity getTile(); /** * @return the color of the host type ( this is determined by the middle cable. diff --git a/api/src/main/java/appeng/api/parts/IPartModel.java b/api/src/main/java/appeng/api/parts/IPartModel.java index 64e311e58..723a30305 100644 --- a/api/src/main/java/appeng/api/parts/IPartModel.java +++ b/api/src/main/java/appeng/api/parts/IPartModel.java @@ -28,10 +28,10 @@ import java.util.List; import javax.annotation.Nonnull; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; /** - * A container to store a collection of {@link ResourceLocation} as models for a + * A container to store a collection of {@link Identifier} as models for a * part as well as other properties. */ public interface IPartModel { @@ -49,12 +49,12 @@ public interface IPartModel { } /** - * A collection of {@link ResourceLocation} used as models for a part. + * A collection of {@link Identifier} used as models for a part. * * @return a collection of models, never null. */ @Nonnull - default List getModels() { + default List getModels() { return Collections.emptyList(); } diff --git a/api/src/main/java/appeng/api/parts/IPartModels.java b/api/src/main/java/appeng/api/parts/IPartModels.java index f7dffd397..67d0f9647 100644 --- a/api/src/main/java/appeng/api/parts/IPartModels.java +++ b/api/src/main/java/appeng/api/parts/IPartModels.java @@ -21,7 +21,7 @@ package appeng.api.parts; import java.util.Arrays; import java.util.Collection; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.AEInjectable; @@ -41,12 +41,12 @@ public interface IPartModels { * This method must be called during the pre-init phase (as part of your * plugin's constructor). */ - void registerModels(Collection partModels); + void registerModels(Collection partModels); /** * Convenience overload of {@link #registerModels(Collection)} */ - default void registerModels(ResourceLocation... partModels) { + default void registerModels(Identifier... partModels) { registerModels(Arrays.asList(partModels)); } } diff --git a/api/src/main/java/appeng/api/parts/LayerBase.java b/api/src/main/java/appeng/api/parts/LayerBase.java index 13655caeb..22499f3cb 100644 --- a/api/src/main/java/appeng/api/parts/LayerBase.java +++ b/api/src/main/java/appeng/api/parts/LayerBase.java @@ -25,8 +25,8 @@ package appeng.api.parts; import java.util.Set; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import appeng.api.util.AEPartLocation; @@ -38,10 +38,10 @@ import appeng.api.util.AEPartLocation; * * TODO: Consider removing and replacing with capabilities. */ -public abstract class LayerBase extends TileEntity // implements IPartHost +public abstract class LayerBase extends BlockEntity // implements IPartHost { - public LayerBase(TileEntityType tileEntityTypeIn) { + public LayerBase(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); // TODO Auto-generated constructor stub } diff --git a/api/src/main/java/appeng/api/storage/ISpatialDimension.java b/api/src/main/java/appeng/api/storage/ISpatialDimension.java index 18eb95c8b..25231a28e 100644 --- a/api/src/main/java/appeng/api/storage/ISpatialDimension.java +++ b/api/src/main/java/appeng/api/storage/ISpatialDimension.java @@ -23,9 +23,9 @@ import java.util.List; import javax.annotation.Nullable; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.dimension.DimensionType; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; public interface ISpatialDimension { ServerWorld getWorld(DimensionType cellDim); @@ -45,6 +45,6 @@ public interface ISpatialDimension { * Adds a user-facing tooltip that describes this dimension so that a player can * keep storage cells apart. */ - void addCellDimensionTooltip(DimensionType cellDim, List lines); + void addCellDimensionTooltip(DimensionType cellDim, List lines); } diff --git a/api/src/main/java/appeng/api/storage/IStorageChannel.java b/api/src/main/java/appeng/api/storage/IStorageChannel.java index f2cd9e486..f693bf5ba 100644 --- a/api/src/main/java/appeng/api/storage/IStorageChannel.java +++ b/api/src/main/java/appeng/api/storage/IStorageChannel.java @@ -30,8 +30,7 @@ import javax.annotation.Nullable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fluids.FluidStack; +import net.minecraft.network.PacketByteBuf; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; @@ -92,7 +91,7 @@ public interface IStorageChannel> { * @throws IOException */ @Nullable - T readFromPacket(@Nonnull PacketBuffer input); + T readFromPacket(@Nonnull PacketByteBuf input); /** * create from nbt data diff --git a/api/src/main/java/appeng/api/storage/cells/ICellInventory.java b/api/src/main/java/appeng/api/storage/cells/ICellInventory.java index 846f3a6e7..af39efb53 100644 --- a/api/src/main/java/appeng/api/storage/cells/ICellInventory.java +++ b/api/src/main/java/appeng/api/storage/cells/ICellInventory.java @@ -23,8 +23,8 @@ package appeng.api.storage.cells; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import appeng.api.config.FuzzyMode; import appeng.api.storage.IMEInventory; @@ -50,12 +50,12 @@ public interface ICellInventory> extends IMEInventory { /** * @return access configured list */ - IItemHandler getConfigInventory(); + ItemTransferable getConfigInventory(); /** * @return access installed upgrades. */ - IItemHandler getUpgradesInventory(); + ItemTransferable getUpgradesInventory(); /** * @return How many bytes are used for each type? diff --git a/api/src/main/java/appeng/api/storage/cells/ICellWorkbenchItem.java b/api/src/main/java/appeng/api/storage/cells/ICellWorkbenchItem.java index 68bd04076..6260485da 100644 --- a/api/src/main/java/appeng/api/storage/cells/ICellWorkbenchItem.java +++ b/api/src/main/java/appeng/api/storage/cells/ICellWorkbenchItem.java @@ -23,8 +23,8 @@ package appeng.api.storage.cells; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import appeng.api.config.FuzzyMode; @@ -47,7 +47,7 @@ public interface ICellWorkbenchItem { * * onInventoryChange will be called when saving is needed. */ - IItemHandler getUpgradesInventory(ItemStack is); + ItemTransferable getUpgradesInventory(ItemStack is); /** * Used to extract, or mirror the contents of the work bench onto the cell. @@ -56,7 +56,7 @@ public interface ICellWorkbenchItem { * * onInventoryChange will be called when saving is needed. */ - IItemHandler getConfigInventory(ItemStack is); + ItemTransferable getConfigInventory(ItemStack is); /** * @return the current fuzzy status. diff --git a/api/src/main/java/appeng/api/storage/data/IAEFluidStack.java b/api/src/main/java/appeng/api/storage/data/IAEFluidStack.java index a1d20a17e..d03a725c2 100644 --- a/api/src/main/java/appeng/api/storage/data/IAEFluidStack.java +++ b/api/src/main/java/appeng/api/storage/data/IAEFluidStack.java @@ -23,8 +23,8 @@ package appeng.api.storage.data; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraft.fluid.Fluid; -import net.minecraftforge.fluids.FluidStack; /** * An alternate version of FluidStack for AE to keep tabs on things easier, and @@ -45,7 +45,7 @@ public interface IAEFluidStack extends IAEStack { * * @return new FluidStack */ - FluidStack getFluidStack(); + FluidVolume getFluidStack(); /** * Combines two IAEItemStacks via addition. diff --git a/api/src/main/java/appeng/api/storage/data/IAEStack.java b/api/src/main/java/appeng/api/storage/data/IAEStack.java index 453c702da..66eafdc48 100644 --- a/api/src/main/java/appeng/api/storage/data/IAEStack.java +++ b/api/src/main/java/appeng/api/storage/data/IAEStack.java @@ -27,7 +27,7 @@ import java.io.IOException; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.FuzzyMode; import appeng.api.storage.IStorageChannel; @@ -162,7 +162,7 @@ public interface IAEStack> { * * @throws IOException */ - void writeToPacket(PacketBuffer data); + void writeToPacket(PacketByteBuf data); /** * Clone the Item / Fluid Stack diff --git a/api/src/main/java/appeng/api/util/AEAxisAlignedBB.java b/api/src/main/java/appeng/api/util/AEAxisAlignedBB.java index 200cfd841..50d971314 100644 --- a/api/src/main/java/appeng/api/util/AEAxisAlignedBB.java +++ b/api/src/main/java/appeng/api/util/AEAxisAlignedBB.java @@ -18,7 +18,7 @@ package appeng.api.util; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; /** * Mutable stand in for Axis Aligned BB, this was used to prevent GC Thrashing.. @@ -35,8 +35,8 @@ public class AEAxisAlignedBB { public double maxY; public double maxZ; - public AxisAlignedBB getBoundingBox() { - return new AxisAlignedBB(this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ); + public Box getBoundingBox() { + return new Box(this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ); } public AEAxisAlignedBB(final double a, final double b, final double c, final double d, final double e, @@ -54,7 +54,7 @@ public class AEAxisAlignedBB { return new AEAxisAlignedBB(a, b, c, d, e, f); } - public static AEAxisAlignedBB fromBounds(final AxisAlignedBB bb) { + public static AEAxisAlignedBB fromBounds(final Box bb) { return new AEAxisAlignedBB(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); } } diff --git a/api/src/main/java/appeng/api/util/AEColor.java b/api/src/main/java/appeng/api/util/AEColor.java index 85e8de1d5..7d8564d63 100644 --- a/api/src/main/java/appeng/api/util/AEColor.java +++ b/api/src/main/java/appeng/api/util/AEColor.java @@ -26,8 +26,8 @@ package appeng.api.util; import java.util.Arrays; import java.util.List; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.item.DyeColor; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.util.DyeColor; /** * List of all colors supported by AE, their names, and various colors for @@ -75,25 +75,25 @@ public enum AEColor { PINK, GRAY, LIGHT_GRAY, CYAN, PURPLE, BLUE, BROWN, GREEN, RED, BLACK); /** - * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to + * The {@link BakedQuad#getColorIndex() tint index} that can normally be used to * get the {@link #blackVariant dark variant} of the apprioriate AE color. */ public static final int TINTINDEX_DARK = 1; /** - * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to + * The {@link BakedQuad#getColorIndex() tint index} that can normally be used to * get the {@link #mediumVariant medium variant} of the apprioriate AE color. */ public static final int TINTINDEX_MEDIUM = 2; /** - * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to + * The {@link BakedQuad#getColorIndex() tint index} that can normally be used to * get the {@link #whiteVariant bright variant} of the apprioriate AE color. */ public static final int TINTINDEX_BRIGHT = 3; /** - * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to + * The {@link BakedQuad#getColorIndex() tint index} that can normally be used to * get a color between the {@link #mediumVariant medium} and * {@link #whiteVariant bright variant} of the apprioriate AE color. */ @@ -145,7 +145,7 @@ public enum AEColor { * Will return a variant of this color based on the given tint index. * * @param tintIndex A tint index as it can be used for - * {@link BakedQuad#getTintIndex()}. + * {@link BakedQuad#getColorIndex()}. * @return The appropriate color variant, or -1. */ public int getVariantByTintIndex(int tintIndex) { diff --git a/api/src/main/java/appeng/api/util/AEColoredItemDefinition.java b/api/src/main/java/appeng/api/util/AEColoredItemDefinition.java index 8e43e977a..2b19f1eb4 100644 --- a/api/src/main/java/appeng/api/util/AEColoredItemDefinition.java +++ b/api/src/main/java/appeng/api/util/AEColoredItemDefinition.java @@ -24,9 +24,9 @@ package appeng.api.util; import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public interface AEColoredItemDefinition { @@ -41,9 +41,9 @@ public interface AEColoredItemDefinition { Item item(AEColor color); /** - * @return the {@link TileEntity} Class if applicable. + * @return the {@link BlockEntity} Class if applicable. */ - Class entity(AEColor color); + Class entity(AEColor color); /** * @return an {@link ItemStack} with specified quantity of this item. diff --git a/api/src/main/java/appeng/api/util/DimensionalCoord.java b/api/src/main/java/appeng/api/util/DimensionalCoord.java index 0b0112d8f..9e1f02efe 100644 --- a/api/src/main/java/appeng/api/util/DimensionalCoord.java +++ b/api/src/main/java/appeng/api/util/DimensionalCoord.java @@ -23,18 +23,18 @@ package appeng.api.util; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; -import net.minecraft.world.dimension.Dimension; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.dimension.DimensionType; /** * Represents a location in the Minecraft Universe */ public class DimensionalCoord extends WorldCoord { - private final IWorld world; - private final Dimension dimension; + private final WorldAccess world; + private final DimensionType dimension; public DimensionalCoord(final DimensionalCoord coordinate) { super(coordinate.x, coordinate.y, coordinate.z); @@ -42,19 +42,19 @@ public class DimensionalCoord extends WorldCoord { this.dimension = coordinate.dimension; } - public DimensionalCoord(final TileEntity tileEntity) { + public DimensionalCoord(final BlockEntity tileEntity) { super(tileEntity); this.world = tileEntity.getWorld(); this.dimension = this.world.getDimension(); } - public DimensionalCoord(final IWorld world, final int x, final int y, final int z) { + public DimensionalCoord(final WorldAccess world, final int x, final int y, final int z) { super(x, y, z); this.world = world; this.dimension = world.getDimension(); } - public DimensionalCoord(final IWorld world, final BlockPos pos) { + public DimensionalCoord(final WorldAccess world, final BlockPos pos) { super(pos); this.world = world; this.dimension = world.getDimension(); @@ -80,11 +80,11 @@ public class DimensionalCoord extends WorldCoord { return "dimension=" + this.dimension + ", " + super.toString(); } - public boolean isInWorld(final IWorld world) { + public boolean isInWorld(final WorldAccess world) { return this.world == world; } - public IWorld getWorld() { + public WorldAccess getWorld() { return this.world; } diff --git a/api/src/main/java/appeng/api/util/IClientHelper.java b/api/src/main/java/appeng/api/util/IClientHelper.java index 00d51ae46..b73253111 100644 --- a/api/src/main/java/appeng/api/util/IClientHelper.java +++ b/api/src/main/java/appeng/api/util/IClientHelper.java @@ -25,7 +25,7 @@ package appeng.api.util; import java.util.List; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.storage.cells.ICellInventoryHandler; import appeng.api.storage.data.IAEStack; @@ -37,6 +37,6 @@ public interface IClientHelper { * @param handler Cell handler. * @param lines List of lines to add to. */ - > void addCellInformation(ICellInventoryHandler handler, List lines); + > void addCellInformation(ICellInventoryHandler handler, List lines); } diff --git a/api/src/main/java/appeng/api/util/INetworkToolAgent.java b/api/src/main/java/appeng/api/util/INetworkToolAgent.java index bd4f3e193..52ba41d8e 100644 --- a/api/src/main/java/appeng/api/util/INetworkToolAgent.java +++ b/api/src/main/java/appeng/api/util/INetworkToolAgent.java @@ -23,7 +23,7 @@ package appeng.api.util; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.hit.HitResult; /** * Implement on Tile or part to customize if the info gui opens, or an action is @@ -31,5 +31,5 @@ import net.minecraft.util.math.RayTraceResult; */ public interface INetworkToolAgent { - boolean showNetworkInfo(RayTraceResult where); + boolean showNetworkInfo(HitResult where); } diff --git a/api/src/main/java/appeng/api/util/WorldCoord.java b/api/src/main/java/appeng/api/util/WorldCoord.java index 570847bff..c53c0441c 100644 --- a/api/src/main/java/appeng/api/util/WorldCoord.java +++ b/api/src/main/java/appeng/api/util/WorldCoord.java @@ -23,7 +23,7 @@ package appeng.api.util; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; /** @@ -38,7 +38,7 @@ public class WorldCoord { public int y; public int z; - public WorldCoord(final TileEntity s) { + public WorldCoord(final BlockEntity s) { this(s.getPos()); } diff --git a/build.gradle b/build.gradle index 0e52b9fad..35cd62f67 100644 --- a/build.gradle +++ b/build.gradle @@ -51,6 +51,10 @@ allprojects { repositories { maven { url = "http://maven.fabricmc.net/" } + maven { + name = "BuildCraft" + url = "https://mod-buildcraft.com/maven" + } } minecraft { @@ -66,6 +70,8 @@ allprojects { modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" + modCompile "alexiil.mc.lib:libblockattributes-all:0.7.0" + compile 'com.google.code.findbugs:jsr305:3.0.2' } } diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 6ed9ca97f..07f6e065b 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -37,7 +37,7 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.World; import net.minecraftforge.common.ToolType; @@ -105,7 +105,7 @@ public abstract class AEBaseBlock extends Block { /** * Rotates around the given Axis (usually the current up axis). */ - public boolean rotateAroundFaceAxis(IWorld w, BlockPos pos, Direction face) { + public boolean rotateAroundFaceAxis(WorldAccess w, BlockPos pos, Direction face) { final IOrientable rotatable = this.getOrientable(w, pos); if (rotatable != null && rotatable.canBeRotated()) { @@ -216,7 +216,7 @@ public abstract class AEBaseBlock extends Block { return null; } - protected boolean isValidOrientation(final IWorld w, final BlockPos pos, final Direction forward, + protected boolean isValidOrientation(final WorldAccess w, final BlockPos pos, final Direction forward, final Direction up) { return true; } diff --git a/src/main/java/appeng/block/AEBaseBlockItem.java b/src/main/java/appeng/block/AEBaseBlockItem.java index a527b2c6b..4299a3120 100644 --- a/src/main/java/appeng/block/AEBaseBlockItem.java +++ b/src/main/java/appeng/block/AEBaseBlockItem.java @@ -20,6 +20,7 @@ package appeng.block; import java.util.List; +import net.fabricmc.api.EnvType; import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; @@ -29,10 +30,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; @@ -52,14 +52,14 @@ public class AEBaseBlockItem extends BlockItem { } @Override - @OnlyIn(Dist.CLIENT) - public final void addInformation(final ItemStack itemStack, final World world, final List toolTip, + @Environment(EnvType.CLIENT) + public final void addInformation(final ItemStack itemStack, final World world, final List toolTip, final ITooltipFlag advancedTooltips) { this.addCheckedInformation(itemStack, world, toolTip, advancedTooltips); } - @OnlyIn(Dist.CLIENT) - public void addCheckedInformation(final ItemStack itemStack, final World world, final List toolTip, + @Environment(EnvType.CLIENT) + public void addCheckedInformation(final ItemStack itemStack, final World world, final List toolTip, final ITooltipFlag advancedTooltips) { this.blockType.addInformation(itemStack, world, toolTip, advancedTooltips); } diff --git a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java index 0410a6b74..b0a49531e 100644 --- a/src/main/java/appeng/block/AEBaseBlockItemChargeable.java +++ b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java @@ -21,16 +21,16 @@ package appeng.block; import java.text.MessageFormat; import java.util.List; +import net.fabricmc.api.EnvType; import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.util.Identifier; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import appeng.api.AEApi; import appeng.api.config.AccessRestriction; @@ -45,7 +45,7 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte public AEBaseBlockItemChargeable(Block id, Properties props) { super(id, props); - addPropertyOverride(new ResourceLocation("appliedenergistics2:fill_level"), (is, world, entity) -> { + addPropertyOverride(new Identifier("appliedenergistics2:fill_level"), (is, world, entity) -> { double curPower = getAECurrentPower(is); double maxPower = getAEMaxPower(is); @@ -54,8 +54,8 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte } @Override - @OnlyIn(Dist.CLIENT) - public void addCheckedInformation(final ItemStack stack, final World world, final List lines, + @Environment(EnvType.CLIENT) + public void addCheckedInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { double internalCurrentPower = 0; final double internalMaxPower = this.getMaxEnergyCapacity(); @@ -70,7 +70,7 @@ public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEIte lines.add(GuiText.StoredEnergy.textComponent() .appendText(':' + MessageFormat.format(" {0,number,#} ", internalCurrentPower)) - .appendSibling(new TranslationTextComponent(PowerUnits.AE.unlocalizedName)) + .appendSibling(new TranslatableText(PowerUnits.AE.unlocalizedName)) .appendText(" - " + MessageFormat.format("{0,number,#.##%}", percent))); } } diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index da3d36137..dc52f42d6 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -29,21 +29,21 @@ import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.DyeColor; +import net.minecraft.util.DyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.BlockView; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.World; import net.minecraftforge.items.ItemHandlerHelper; @@ -102,7 +102,7 @@ public abstract class AEBaseTileBlock extends AEBase return null; } - final TileEntity te = w.getTileEntity(pos); + final BlockEntity te = w.getTileEntity(pos); // FIXME: This gets called as part of building the block state cache if (this.tileEntityClass != null && this.tileEntityClass.isInstance(te)) { return this.tileEntityClass.cast(te); @@ -112,7 +112,7 @@ public abstract class AEBaseTileBlock extends AEBase } @Override - public final TileEntity createTileEntity(BlockState state, BlockView world) { + public final BlockEntity createTileEntity(BlockState state, BlockView world) { return this.tileEntityFactory.get(); } @@ -145,9 +145,9 @@ public abstract class AEBaseTileBlock extends AEBase } @Override - public boolean recolorBlock(BlockState state, final IWorld world, final BlockPos pos, final Direction side, + public boolean recolorBlock(BlockState state, final WorldAccess world, final BlockPos pos, final Direction side, final DyeColor color) { - final TileEntity te = this.getTileEntity(world, pos); + final BlockEntity te = this.getTileEntity(world, pos); if (te instanceof IColorableTile) { final IColorableTile ct = (IColorableTile) te; @@ -166,7 +166,7 @@ public abstract class AEBaseTileBlock extends AEBase @Override public int getComparatorOutput(BlockState state, final World w, final BlockPos pos) { - final TileEntity te = this.getTileEntity(w, pos); + final BlockEntity te = this.getTileEntity(w, pos); if (te instanceof AEBaseInvTileEntity) { AEBaseInvTileEntity invTile = (AEBaseInvTileEntity) te; if (invTile.getInternalInventory().getSlots() > 0) { @@ -180,7 +180,7 @@ public abstract class AEBaseTileBlock extends AEBase public boolean eventReceived(final BlockState state, final World worldIn, final BlockPos pos, final int eventID, final int eventParam) { super.eventReceived(state, worldIn, pos, eventID, eventParam); - final TileEntity tileentity = worldIn.getTileEntity(pos); + final BlockEntity tileentity = worldIn.getTileEntity(pos); return tileentity != null ? tileentity.receiveClientEvent(eventID, eventParam) : false; } @@ -194,7 +194,7 @@ public abstract class AEBaseTileBlock extends AEBase // I18N strings and we would translate it using the server's locale :-( AEBaseTileEntity te = this.getTileEntity(w, pos); if (te != null && is.hasDisplayName()) { - ITextComponent displayName = is.getDisplayName(); + Text displayName = is.getDisplayName(); if (displayName instanceof StringTextComponent) { te.setName(((StringTextComponent) displayName).getText()); } @@ -291,7 +291,7 @@ public abstract class AEBaseTileBlock extends AEBase * returned unchanged, this is also the case if the given block state does not * belong to this block. */ - public final BlockState getTileEntityBlockState(BlockState current, TileEntity te) { + public final BlockState getTileEntityBlockState(BlockState current, BlockEntity te) { if (current.getBlock() != this || !tileEntityClass.isInstance(te)) { return current; } diff --git a/src/main/java/appeng/block/grindstone/CrankBlock.java b/src/main/java/appeng/block/grindstone/CrankBlock.java index dd6b4c04e..692d7141b 100644 --- a/src/main/java/appeng/block/grindstone/CrankBlock.java +++ b/src/main/java/appeng/block/grindstone/CrankBlock.java @@ -23,21 +23,21 @@ import javax.annotation.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.block.ShapeContext; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; @@ -95,8 +95,8 @@ public class CrankBlock extends AEBaseTileBlock { } @Override - public boolean isValidOrientation(final IWorld w, final BlockPos pos, final Direction forward, final Direction up) { - final TileEntity te = w.getTileEntity(pos); + public boolean isValidOrientation(final WorldAccess w, final BlockPos pos, final Direction forward, final Direction up) { + final BlockEntity te = w.getTileEntity(pos); return !(te instanceof CrankTileEntity) || this.isCrankable(w, pos, up.getOpposite()); } @@ -111,7 +111,7 @@ public class CrankBlock extends AEBaseTileBlock { private boolean isCrankable(final BlockView world, final BlockPos pos, final Direction offset) { final BlockPos o = pos.offset(offset); - final TileEntity te = world.getTileEntity(o); + final BlockEntity te = world.getTileEntity(o); return te instanceof ICrankable && ((ICrankable) te).canCrankAttach(offset.getOpposite()); } @@ -156,7 +156,7 @@ public class CrankBlock extends AEBaseTileBlock { final double yOff = -0.15 * up.getYOffset(); final double zOff = -0.15 * up.getZOffset(); return VoxelShapes.create( - new AxisAlignedBB(xOff + 0.15, yOff + 0.15, zOff + 0.15, xOff + 0.85, yOff + 0.85, zOff + 0.85)); + new Box(xOff + 0.15, yOff + 0.15, zOff + 0.15, xOff + 0.85, yOff + 0.85, zOff + 0.85)); } } diff --git a/src/main/java/appeng/block/misc/ChargerBlock.java b/src/main/java/appeng/block/misc/ChargerBlock.java index 79385ef05..e5e7fc508 100644 --- a/src/main/java/appeng/block/misc/ChargerBlock.java +++ b/src/main/java/appeng/block/misc/ChargerBlock.java @@ -23,6 +23,9 @@ import java.util.function.Function; import javax.annotation.Nullable; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.util.math.Box; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; @@ -38,7 +41,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.block.ShapeContext; @@ -46,8 +48,6 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.AEApi; import appeng.api.util.AEAxisAlignedBB; @@ -91,7 +91,7 @@ public class ChargerBlock extends AEBaseTileBlock { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void animateTick(final BlockState state, final World w, final BlockPos pos, final Random r) { if (!AEConfig.instance().isEnableEffects()) { return; @@ -168,21 +168,21 @@ public class ChargerBlock extends AEBaseTileBlock { return VoxelShapes.create(bb.getBoundingBox()); } - return VoxelShapes.create(new AxisAlignedBB(0.0, 0, 0.0, 1.0, 1.0, 1.0)); + return VoxelShapes.create(new Box(0.0, 0, 0.0, 1.0, 1.0, 1.0)); } @Override public VoxelShape getCollisionShape(BlockState state, BlockView worldIn, BlockPos pos, ShapeContext context) { - return VoxelShapes.create(new AxisAlignedBB(0.0, 0.0, 0.0, 1.0, 1.0, 1.0)); + return VoxelShapes.create(new Box(0.0, 0.0, 0.0, 1.0, 1.0, 1.0)); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public static Function> createTesr() { return dispatcher -> new ModularTESR<>(dispatcher, new ItemRenderable<>(ChargerBlock::getRenderedItem)); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private static Pair getRenderedItem(ChargerTileEntity tile) { TransformationMatrix transform = new TransformationMatrix(new Vector3f(0.5f, 0.375f, 0.5f), null, null, null); return new ImmutablePair<>(tile.getInternalInventory().getStackInSlot(0), transform); diff --git a/src/main/java/appeng/block/misc/InscriberRendering.java b/src/main/java/appeng/block/misc/InscriberRendering.java index 0aa5c4caf..8511a3bed 100644 --- a/src/main/java/appeng/block/misc/InscriberRendering.java +++ b/src/main/java/appeng/block/misc/InscriberRendering.java @@ -1,8 +1,8 @@ package appeng.block.misc; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.bootstrap.TileEntityRendering; import appeng.bootstrap.TileEntityRenderingCustomizer; @@ -11,7 +11,7 @@ import appeng.tile.misc.InscriberTileEntity; public class InscriberRendering extends TileEntityRenderingCustomizer { - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(InscriberTESR::new); diff --git a/src/main/java/appeng/block/misc/LightDetectorBlock.java b/src/main/java/appeng/block/misc/LightDetectorBlock.java index 52399142c..0f909ac9a 100644 --- a/src/main/java/appeng/block/misc/LightDetectorBlock.java +++ b/src/main/java/appeng/block/misc/LightDetectorBlock.java @@ -26,14 +26,14 @@ import net.minecraft.block.Material; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.block.ShapeContext; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; @@ -87,7 +87,7 @@ public class LightDetectorBlock extends AEBaseTileBlock } @Override - public boolean isValidOrientation(final IWorld w, final BlockPos pos, final Direction forward, final Direction up) { + public boolean isValidOrientation(final WorldAccess w, final BlockPos pos, final Direction forward, final Direction up) { return this.canPlaceAt(w, pos, up.getOpposite()); } @@ -108,7 +108,7 @@ public class LightDetectorBlock extends AEBaseTileBlock final double yOff = -0.3 * up.getYOffset(); final double zOff = -0.3 * up.getZOffset(); return VoxelShapes - .create(new AxisAlignedBB(xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7)); + .create(new Box(xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7)); } @Override diff --git a/src/main/java/appeng/block/misc/QuartzFixtureBlock.java b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java index a870ec324..ac0a0c437 100644 --- a/src/main/java/appeng/block/misc/QuartzFixtureBlock.java +++ b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java @@ -34,18 +34,18 @@ import net.minecraft.state.BooleanProperty; import net.minecraft.state.DirectionProperty; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.block.ShapeContext; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; @@ -68,7 +68,7 @@ public class QuartzFixtureBlock extends AEBaseBlock implements IOrientableBlock final double yOff = -0.3 * facing.getYOffset(); final double zOff = -0.3 * facing.getZOffset(); VoxelShape shape = VoxelShapes - .create(new AxisAlignedBB(xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7)); + .create(new Box(xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7)); SHAPES.put(facing, shape); } } @@ -117,7 +117,7 @@ public class QuartzFixtureBlock extends AEBaseBlock implements IOrientableBlock // Break the fixture if the block it is attached to is changed so that it could // no longer be placed @Override - public BlockState updatePostPlacement(BlockState state, Direction facing, BlockState facingState, IWorld worldIn, + public BlockState updatePostPlacement(BlockState state, Direction facing, BlockState facingState, WorldAccess worldIn, BlockPos pos, BlockPos facingPos) { Direction fixtureFacing = state.get(FACING); if (facing.getOpposite() == fixtureFacing && !canPlaceAt(worldIn, pos, facing)) { @@ -127,7 +127,7 @@ public class QuartzFixtureBlock extends AEBaseBlock implements IOrientableBlock } @Override - public boolean isValidOrientation(final IWorld w, final BlockPos pos, final Direction forward, final Direction up) { + public boolean isValidOrientation(final WorldAccess w, final BlockPos pos, final Direction forward, final Direction up) { // FIXME: I think this entire method -> not required, but not sure... are quartz // fixtures rotateable??? return this.canPlaceAt(w, pos, up.getOpposite()); @@ -146,7 +146,7 @@ public class QuartzFixtureBlock extends AEBaseBlock implements IOrientableBlock } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void animateTick(final BlockState state, final World w, final BlockPos pos, final Random r) { if (!AEConfig.instance().isEnableEffects()) { return; diff --git a/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java b/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java index ee8c93af5..85fdb4ea6 100644 --- a/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java +++ b/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java @@ -20,6 +20,7 @@ package appeng.block.misc; import java.util.Random; +import net.fabricmc.api.EnvType; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.sound.BlockSoundGroup; @@ -30,8 +31,7 @@ import net.minecraft.state.StateContainer; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import appeng.api.util.IOrientableBlock; import appeng.block.AEBaseTileBlock; @@ -62,7 +62,7 @@ public class QuartzGrowthAcceleratorBlock extends AEBaseTileBlock { } @Override - public boolean isValidOrientation(final IWorld w, final BlockPos pos, final Direction forward, final Direction up) { + public boolean isValidOrientation(final WorldAccess w, final BlockPos pos, final Direction forward, final Direction up) { final SkyCompassTileEntity sc = this.getTileEntity(w, pos); if (sc != null) { return false; @@ -139,7 +139,7 @@ public class SkyCompassBlock extends AEBaseTileBlock { break; } - return VoxelShapes.create(new AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ)); + return VoxelShapes.create(new Box(minX, minY, minZ, maxX, maxY, maxZ)); } return VoxelShapes.empty(); } diff --git a/src/main/java/appeng/block/misc/SkyCompassRendering.java b/src/main/java/appeng/block/misc/SkyCompassRendering.java index a850d9b17..9eadbc208 100644 --- a/src/main/java/appeng/block/misc/SkyCompassRendering.java +++ b/src/main/java/appeng/block/misc/SkyCompassRendering.java @@ -18,8 +18,8 @@ package appeng.block.misc; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.bootstrap.TileEntityRendering; import appeng.bootstrap.TileEntityRenderingCustomizer; @@ -29,7 +29,7 @@ import appeng.tile.misc.SkyCompassTileEntity; public class SkyCompassRendering extends TileEntityRenderingCustomizer { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(SkyCompassTESR::new); } diff --git a/src/main/java/appeng/block/misc/TinyTNTBlock.java b/src/main/java/appeng/block/misc/TinyTNTBlock.java index 4b00f7ffc..98263f902 100644 --- a/src/main/java/appeng/block/misc/TinyTNTBlock.java +++ b/src/main/java/appeng/block/misc/TinyTNTBlock.java @@ -32,7 +32,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.block.ShapeContext; @@ -41,7 +41,7 @@ import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.Explosion; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import appeng.block.AEBaseBlock; import appeng.entity.TinyTNTPrimedEntity; @@ -49,7 +49,7 @@ import appeng.entity.TinyTNTPrimedEntity; public class TinyTNTBlock extends AEBaseBlock { private static final VoxelShape SHAPE = VoxelShapes - .create(new AxisAlignedBB(0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f)); + .create(new Box(0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f)); public TinyTNTBlock(Settings props) { super(props); diff --git a/src/main/java/appeng/block/networking/CableBusBlock.java b/src/main/java/appeng/block/networking/CableBusBlock.java index 6cf4571b4..b02ba9a88 100644 --- a/src/main/java/appeng/block/networking/CableBusBlock.java +++ b/src/main/java/appeng/block/networking/CableBusBlock.java @@ -24,37 +24,37 @@ import java.util.Random; import javax.annotation.Nullable; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.ParticleManager; -import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.render.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.IFluidState; import net.minecraft.item.BlockItemUseContext; -import net.minecraft.item.DyeColor; +import net.minecraft.util.DyeColor; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.*; -import net.minecraft.util.math.RayTraceResult.Type; +import net.minecraft.util.hit.HitResult.Type; import net.minecraft.block.ShapeContext; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IFacadePart; @@ -166,7 +166,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - public ItemStack getPickBlock(BlockState state, RayTraceResult target, BlockView world, BlockPos pos, + public ItemStack getPickBlock(BlockState state, HitResult target, BlockView world, BlockPos pos, PlayerEntity player) { final Vec3d v3 = target.getHitVec().subtract(pos.getX(), pos.getY(), pos.getZ()); final SelectedPart sp = this.cb(world, pos).selectPart(v3); @@ -181,8 +181,8 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - @OnlyIn(Dist.CLIENT) - public boolean addHitEffects(final BlockState state, final World world, final RayTraceResult target, + @Environment(EnvType.CLIENT) + public boolean addHitEffects(final BlockState state, final World world, final HitResult target, final ParticleManager effectRenderer) { // Half the particle rate. Since we're spawning concentrated on a specific spot, @@ -226,7 +226,7 @@ public class CableBusBlock extends AEBaseTileBlock implement return true; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override public boolean addDestroyEffects(BlockState state, World world, BlockPos pos, ParticleManager effectRenderer) { ICableBusContainer cb = this.cb(world, pos); @@ -281,7 +281,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } private ICableBusContainer cb(final BlockView w, final BlockPos pos) { - final TileEntity te = w.getTileEntity(pos); + final BlockEntity te = w.getTileEntity(pos); ICableBusContainer out = null; if (te instanceof CableBusTileEntity) { @@ -293,7 +293,7 @@ public class CableBusBlock extends AEBaseTileBlock implement @Nullable private IFacadeContainer fc(final BlockView w, final BlockPos pos) { - final TileEntity te = w.getTileEntity(pos); + final BlockEntity te = w.getTileEntity(pos); IFacadeContainer out = null; if (te instanceof CableBusTileEntity) { @@ -306,7 +306,7 @@ public class CableBusBlock extends AEBaseTileBlock implement @Override public void onBlockClicked(BlockState state, World worldIn, BlockPos pos, PlayerEntity player) { if (worldIn.isRemote()) { - final RayTraceResult rtr = Minecraft.getInstance().objectMouseOver; + final HitResult rtr = Minecraft.getInstance().objectMouseOver; if (rtr instanceof BlockRayTraceResult) { BlockRayTraceResult brtr = (BlockRayTraceResult) rtr; if (brtr.getPos().equals(pos)) { @@ -335,7 +335,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - public boolean recolorBlock(BlockState state, IWorld world, BlockPos pos, Direction side, DyeColor color) { + public boolean recolorBlock(BlockState state, WorldAccess world, BlockPos pos, Direction side, DyeColor color) { return recolorBlock(world, pos, side, color, null); } @@ -349,7 +349,7 @@ public class CableBusBlock extends AEBaseTileBlock implement } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void fillItemGroup(ItemGroup group, NonNullList itemStacks) { // do nothing } diff --git a/src/main/java/appeng/block/networking/CableBusColor.java b/src/main/java/appeng/block/networking/CableBusColor.java index 41e701202..d5e147d2d 100644 --- a/src/main/java/appeng/block/networking/CableBusColor.java +++ b/src/main/java/appeng/block/networking/CableBusColor.java @@ -21,12 +21,12 @@ package appeng.block.networking; import javax.annotation.Nullable; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.renderer.color.IBlockColor; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ILightReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.api.util.AEColor; import appeng.parts.CableBusContainer; @@ -36,7 +36,7 @@ import appeng.tile.networking.CableBusTileEntity; * Exposes the cable bus color as tint indices 0 (dark variant), 1 (medium * variant) and 2 (bright variant). */ -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class CableBusColor implements IBlockColor { @Override @@ -45,7 +45,7 @@ public class CableBusColor implements IBlockColor { AEColor busColor = AEColor.TRANSPARENT; if (worldIn != null && pos != null) { - TileEntity tileEntity = worldIn.getTileEntity(pos); + BlockEntity tileEntity = worldIn.getTileEntity(pos); if (tileEntity instanceof CableBusTileEntity) { CableBusContainer container = ((CableBusTileEntity) tileEntity).getCableBus(); busColor = container.getColor(); diff --git a/src/main/java/appeng/block/networking/CableBusRendering.java b/src/main/java/appeng/block/networking/CableBusRendering.java index 6fff06680..a134d2260 100644 --- a/src/main/java/appeng/block/networking/CableBusRendering.java +++ b/src/main/java/appeng/block/networking/CableBusRendering.java @@ -18,8 +18,8 @@ package appeng.block.networking; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; @@ -32,7 +32,7 @@ import appeng.bootstrap.IItemRendering; public class CableBusRendering extends BlockRenderingCustomizer { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(rt -> true); diff --git a/src/main/java/appeng/block/networking/ControllerBlock.java b/src/main/java/appeng/block/networking/ControllerBlock.java index 431145dee..1a0498d1c 100644 --- a/src/main/java/appeng/block/networking/ControllerBlock.java +++ b/src/main/java/appeng/block/networking/ControllerBlock.java @@ -26,7 +26,7 @@ import net.minecraft.state.StateContainer; import net.minecraft.util.math.Direction; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -86,7 +86,7 @@ public class ControllerBlock extends AEBaseTileBlock { * texture feel for the controller based on how it is placed. */ @Override - public BlockState updatePostPlacement(BlockState state, Direction facing, BlockState facingState, IWorld world, + public BlockState updatePostPlacement(BlockState state, Direction facing, BlockState facingState, WorldAccess world, BlockPos pos, BlockPos facingPos) { // FIXME: this might work, or might _NOT_ work, but needs to be investigated diff --git a/src/main/java/appeng/block/networking/EnergyCellBlock.java b/src/main/java/appeng/block/networking/EnergyCellBlock.java index 8cf356c58..08101f255 100644 --- a/src/main/java/appeng/block/networking/EnergyCellBlock.java +++ b/src/main/java/appeng/block/networking/EnergyCellBlock.java @@ -18,6 +18,8 @@ package appeng.block.networking; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.item.ItemGroup; @@ -26,8 +28,6 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.state.IntegerProperty; import net.minecraft.state.StateContainer; import net.minecraft.util.NonNullList; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.block.AEBaseTileBlock; import appeng.helpers.AEGlassMaterial; @@ -42,7 +42,7 @@ public class EnergyCellBlock extends AEBaseTileBlock { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void fillItemGroup(ItemGroup group, NonNullList itemStacks) { super.fillItemGroup(group, itemStacks); diff --git a/src/main/java/appeng/block/networking/WirelessBlock.java b/src/main/java/appeng/block/networking/WirelessBlock.java index 9e3fccdfd..89ee082a1 100644 --- a/src/main/java/appeng/block/networking/WirelessBlock.java +++ b/src/main/java/appeng/block/networking/WirelessBlock.java @@ -27,7 +27,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.block.ShapeContext; @@ -153,7 +153,7 @@ public class WirelessBlock extends AEBaseTileBlock { break; } - return VoxelShapes.create(new AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ)); + return VoxelShapes.create(new Box(minX, minY, minZ, maxX, maxY, maxZ)); } return VoxelShapes.empty(); } @@ -213,7 +213,7 @@ public class WirelessBlock extends AEBaseTileBlock { break; } - return VoxelShapes.create(new AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ)); + return VoxelShapes.create(new Box(minX, minY, minZ, maxX, maxY, maxZ)); } else { return VoxelShapes.empty(); } diff --git a/src/main/java/appeng/block/networking/WirelessRendering.java b/src/main/java/appeng/block/networking/WirelessRendering.java index a09789711..1fadfe77e 100644 --- a/src/main/java/appeng/block/networking/WirelessRendering.java +++ b/src/main/java/appeng/block/networking/WirelessRendering.java @@ -2,8 +2,8 @@ package appeng.block.networking; import net.minecraft.client.renderer.RenderType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.api.util.AEColor; import appeng.bootstrap.BlockRenderingCustomizer; @@ -13,7 +13,7 @@ import appeng.client.render.StaticBlockColor; public class WirelessRendering extends BlockRenderingCustomizer { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); rendering.blockColor(new StaticBlockColor(AEColor.TRANSPARENT)); diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java index 82e6d42b2..6865fc377 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java @@ -13,13 +13,13 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.data.IDynamicBakedModel; import net.minecraftforge.client.model.data.IModelData; @@ -36,11 +36,11 @@ import appeng.tile.misc.PaintSplotchesTileEntity; class PaintSplotchesBakedModel implements IDynamicBakedModel { private static final Material TEXTURE_PAINT1 = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "block/paint1")); + new Identifier(AppEng.MOD_ID, "block/paint1")); private static final Material TEXTURE_PAINT2 = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "block/paint2")); + new Identifier(AppEng.MOD_ID, "block/paint2")); private static final Material TEXTURE_PAINT3 = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "block/paint3")); + new Identifier(AppEng.MOD_ID, "block/paint3")); private final TextureAtlasSprite[] textures; diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java index 6d020e6be..ec2eb68d1 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java @@ -33,8 +33,8 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.block.AEBaseTileBlock; import appeng.tile.misc.PaintSplotchesTileEntity; @@ -48,7 +48,7 @@ public class PaintSplotchesBlock extends AEBaseTileBlock itemStacks) { // do nothing } diff --git a/src/main/java/appeng/block/paint/PaintSplotchesModel.java b/src/main/java/appeng/block/paint/PaintSplotchesModel.java index 85d2a095b..71e3add47 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesModel.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesModel.java @@ -7,14 +7,14 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -23,13 +23,13 @@ public class PaintSplotchesModel implements IModelGeometry @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { return new PaintSplotchesBakedModel(spriteGetter); } @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return PaintSplotchesBakedModel.getRequiredTextures(); } diff --git a/src/main/java/appeng/block/paint/PaintSplotchesRendering.java b/src/main/java/appeng/block/paint/PaintSplotchesRendering.java index f6808ed03..68d00d069 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesRendering.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesRendering.java @@ -2,8 +2,8 @@ package appeng.block.paint; import net.minecraft.client.renderer.RenderType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; @@ -12,7 +12,7 @@ import appeng.bootstrap.IItemRendering; public class PaintSplotchesRendering extends BlockRenderingCustomizer { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); // Disable auto rotation diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index a92f5ce79..23327fda4 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -14,14 +14,14 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.data.IDynamicBakedModel; import net.minecraftforge.client.model.data.IModelData; @@ -33,17 +33,17 @@ import appeng.tile.qnb.QuantumBridgeTileEntity; class QnbFormedBakedModel implements IDynamicBakedModel { private static final Material TEXTURE_LINK = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "block/quantum_link")); + new Identifier(AppEng.MOD_ID, "block/quantum_link")); private static final Material TEXTURE_RING = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "block/quantum_ring")); + new Identifier(AppEng.MOD_ID, "block/quantum_ring")); private static final Material TEXTURE_RING_LIGHT = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "block/quantum_ring_light")); + new Identifier(AppEng.MOD_ID, "block/quantum_ring_light")); private static final Material TEXTURE_RING_LIGHT_CORNER = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "block/quantum_ring_light_corner")); + new Identifier(AppEng.MOD_ID, "block/quantum_ring_light_corner")); private static final Material TEXTURE_CABLE_GLASS = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "parts/cable/glass/transparent")); + new Identifier(AppEng.MOD_ID, "parts/cable/glass/transparent")); private static final Material TEXTURE_COVERED_CABLE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "parts/cable/covered/transparent")); + new Identifier(AppEng.MOD_ID, "parts/cable/covered/transparent")); private static final float DEFAULT_RENDER_MIN = 2.0f; private static final float DEFAULT_RENDER_MAX = 14.0f; diff --git a/src/main/java/appeng/block/qnb/QnbFormedModel.java b/src/main/java/appeng/block/qnb/QnbFormedModel.java index af4ac7a9a..4771d1a8d 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedModel.java @@ -7,14 +7,14 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -22,19 +22,19 @@ import appeng.core.AppEng; public class QnbFormedModel implements IModelGeometry { - private static final ResourceLocation MODEL_RING = new ResourceLocation(AppEng.MOD_ID, "block/qnb/ring"); + private static final Identifier MODEL_RING = new Identifier(AppEng.MOD_ID, "block/qnb/ring"); @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { IBakedModel ringModel = bakery.getBakedModel(MODEL_RING, modelTransform, spriteGetter); return new QnbFormedBakedModel(ringModel, spriteGetter); } @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return QnbFormedBakedModel.getRequiredTextures(); } diff --git a/src/main/java/appeng/block/qnb/QuantumBaseBlock.java b/src/main/java/appeng/block/qnb/QuantumBaseBlock.java index f654b58f7..404e28c14 100644 --- a/src/main/java/appeng/block/qnb/QuantumBaseBlock.java +++ b/src/main/java/appeng/block/qnb/QuantumBaseBlock.java @@ -22,7 +22,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.block.ShapeContext; import net.minecraft.util.shape.VoxelShape; @@ -41,7 +41,7 @@ public abstract class QuantumBaseBlock extends AEBaseTileBlock itemStacks) { // do nothing } diff --git a/src/main/java/appeng/block/storage/ChestRendering.java b/src/main/java/appeng/block/storage/ChestRendering.java index 12cebfc99..3a9e87434 100644 --- a/src/main/java/appeng/block/storage/ChestRendering.java +++ b/src/main/java/appeng/block/storage/ChestRendering.java @@ -18,9 +18,9 @@ package appeng.block.storage; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.RenderType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.util.AEColor; import appeng.bootstrap.BlockRenderingCustomizer; @@ -32,7 +32,7 @@ import appeng.client.render.StaticItemColor; public class ChestRendering extends BlockRenderingCustomizer { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); diff --git a/src/main/java/appeng/block/storage/SkyChestBlock.java b/src/main/java/appeng/block/storage/SkyChestBlock.java index 769374ef1..2034e67dc 100644 --- a/src/main/java/appeng/block/storage/SkyChestBlock.java +++ b/src/main/java/appeng/block/storage/SkyChestBlock.java @@ -25,9 +25,9 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.block.ShapeContext; @@ -88,11 +88,11 @@ public class SkyChestBlock extends AEBaseTileBlock { @Override public VoxelShape getShape(BlockState state, BlockView worldIn, BlockPos pos, ShapeContext context) { // TODO Cache this! It can't be that hard! - AxisAlignedBB aabb = computeAABB(worldIn, pos); + Box aabb = computeAABB(worldIn, pos); return VoxelShapes.create(aabb); } - private AxisAlignedBB computeAABB(final BlockView w, final BlockPos pos) { + private Box computeAABB(final BlockView w, final BlockPos pos) { final SkyChestTileEntity sk = this.getTileEntity(w, pos); Direction o = Direction.UP; @@ -119,6 +119,6 @@ public class SkyChestBlock extends AEBaseTileBlock { final double maxZ = Math.min(1.0, 1.0 - offsetZ - (o.getZOffset() < 0 ? AABB_OFFSET_TOP : (o.getZOffset() * AABB_OFFSET_BOTTOM))); - return new AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ); + return new Box(minX, minY, minZ, maxX, maxY, maxZ); } } diff --git a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java index 0779207e1..b9a3bcfcb 100644 --- a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java @@ -27,12 +27,12 @@ import java.util.function.Supplier; import javax.annotation.Nullable; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import appeng.api.definitions.IBlockDefinition; import appeng.api.features.AEFeature; @@ -69,10 +69,10 @@ class BlockDefinitionBuilder implements IBlockBuilder { private BiFunction itemFactory; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private BlockRendering blockRendering; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private ItemRendering itemRendering; BlockDefinitionBuilder(FeatureFactory factory, String id, Supplier blockSupplier) { @@ -132,7 +132,7 @@ class BlockDefinitionBuilder implements IBlockBuilder { return this; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private void customizeForClient(BlockRenderingCustomizer callback) { callback.customize(this.blockRendering, this.itemRendering); } diff --git a/src/main/java/appeng/bootstrap/BlockRendering.java b/src/main/java/appeng/bootstrap/BlockRendering.java index 9e8895fe3..394432c11 100644 --- a/src/main/java/appeng/bootstrap/BlockRendering.java +++ b/src/main/java/appeng/bootstrap/BlockRendering.java @@ -21,13 +21,13 @@ package appeng.bootstrap; import java.util.function.BiFunction; import java.util.function.Predicate; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.color.IBlockColor; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.util.Identifier; import appeng.block.AEBaseTileBlock; import appeng.bootstrap.components.BlockColorComponent; @@ -36,26 +36,26 @@ import appeng.client.render.model.AutoRotatingBakedModel; class BlockRendering implements IBlockRendering { - @OnlyIn(Dist.CLIENT) - private BiFunction modelCustomizer; + @Environment(EnvType.CLIENT) + private BiFunction modelCustomizer; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private IBlockColor blockColor; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private RenderType renderType; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private Predicate renderTypes; @Override - @OnlyIn(Dist.CLIENT) - public IBlockRendering modelCustomizer(BiFunction customizer) { + @Environment(EnvType.CLIENT) + public IBlockRendering modelCustomizer(BiFunction customizer) { this.modelCustomizer = customizer; return this; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override public IBlockRendering blockColor(IBlockColor blockColor) { this.blockColor = blockColor; diff --git a/src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java b/src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java index 90ebb6ce9..7b3f31704 100644 --- a/src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java +++ b/src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java @@ -18,8 +18,8 @@ package appeng.bootstrap; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; /** * A callback that allows the rendering of a block to be customized. Sadly this @@ -28,7 +28,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; */ public abstract class BlockRenderingCustomizer { - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public abstract void customize(IBlockRendering rendering, IItemRendering itemRendering); } diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index 52a2b817e..70035f2b5 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -29,16 +29,16 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; -import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.render.model.IBakedModel; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.Identifier; +import net.fabricmc.api.EnvType; import appeng.api.features.AEFeature; import appeng.bootstrap.components.ModelOverrideComponent; @@ -51,7 +51,7 @@ public class FeatureFactory { private final Map, List> bootstrapComponents; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private ModelOverrideComponent modelOverrideComponent; public FeatureFactory() { @@ -86,7 +86,7 @@ public class FeatureFactory { } public TileEntityBuilder tileEntity(String id, Class teClass, - Function, T> factory) { + Function, T> factory) { return new TileEntityBuilder<>(this, id, teClass, factory).features(this.defaultFeatures); } @@ -104,8 +104,8 @@ public class FeatureFactory { this.bootstrapComponents.computeIfAbsent(eventType, c -> new ArrayList()).add(component); } - @OnlyIn(Dist.CLIENT) - void addModelOverride(String resourcePath, BiFunction customizer) { + @Environment(EnvType.CLIENT) + void addModelOverride(String resourcePath, BiFunction customizer) { this.modelOverrideComponent.addOverride(resourcePath, customizer); } diff --git a/src/main/java/appeng/bootstrap/IBlockRendering.java b/src/main/java/appeng/bootstrap/IBlockRendering.java index a3e482d3b..1b00626d0 100644 --- a/src/main/java/appeng/bootstrap/IBlockRendering.java +++ b/src/main/java/appeng/bootstrap/IBlockRendering.java @@ -21,12 +21,12 @@ package appeng.bootstrap; import java.util.function.BiFunction; import java.util.function.Predicate; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.color.IBlockColor; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.util.Identifier; /** * Allows for client-side rendering to be customized in the context of @@ -34,16 +34,16 @@ import net.minecraftforge.api.distmarker.OnlyIn; */ public interface IBlockRendering { - @OnlyIn(Dist.CLIENT) - IBlockRendering modelCustomizer(BiFunction customizer); + @Environment(EnvType.CLIENT) + IBlockRendering modelCustomizer(BiFunction customizer); - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) IBlockRendering blockColor(IBlockColor blockColor); - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) IBlockRendering renderType(RenderType type); - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) IBlockRendering renderType(Predicate type); } diff --git a/src/main/java/appeng/bootstrap/IItemRendering.java b/src/main/java/appeng/bootstrap/IItemRendering.java index cfeac9ce8..3c71c6cb9 100644 --- a/src/main/java/appeng/bootstrap/IItemRendering.java +++ b/src/main/java/appeng/bootstrap/IItemRendering.java @@ -19,8 +19,8 @@ package appeng.bootstrap; import net.minecraft.client.renderer.color.IItemColor; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; /** * Allows the rendering of an item to be customized. @@ -31,7 +31,7 @@ public interface IItemRendering { * Registers a custom item color definition that inspects an item stack and tint * and returns a color multiplier. */ - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) IItemRendering color(IItemColor itemColor); } diff --git a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java index cd4f37a6d..259b1ddeb 100644 --- a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java @@ -30,8 +30,8 @@ import net.minecraft.block.DispenserBlock; import net.minecraft.dispenser.IDispenseItemBehavior; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.api.features.AEFeature; import appeng.bootstrap.components.IInitComponent; @@ -58,7 +58,7 @@ class ItemDefinitionBuilder implements IItemBuilder { private Supplier dispenserBehaviorSupplier; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private ItemRendering itemRendering; private ItemGroup itemGroup = CreativeTab.INSTANCE; @@ -118,7 +118,7 @@ class ItemDefinitionBuilder implements IItemBuilder { return this; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private void customizeForClient(ItemRenderingCustomizer callback) { callback.customize(this.itemRendering); } diff --git a/src/main/java/appeng/bootstrap/ItemRendering.java b/src/main/java/appeng/bootstrap/ItemRendering.java index 0e37a3e90..56dacb12d 100644 --- a/src/main/java/appeng/bootstrap/ItemRendering.java +++ b/src/main/java/appeng/bootstrap/ItemRendering.java @@ -18,20 +18,20 @@ package appeng.bootstrap; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.item.Item; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import appeng.bootstrap.components.ItemColorComponent; class ItemRendering implements IItemRendering { - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private IItemColor itemColor; @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public IItemRendering color(IItemColor itemColor) { this.itemColor = itemColor; return this; diff --git a/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java b/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java index e8167ad85..0ec135187 100644 --- a/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java +++ b/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java @@ -18,8 +18,8 @@ package appeng.bootstrap; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; +import net.fabricmc.api.EnvType; /** * A callback that allows the rendering of a item to be customized. Sadly this @@ -28,6 +28,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; */ public abstract class ItemRenderingCustomizer { - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public abstract void customize(IItemRendering rendering); } diff --git a/src/main/java/appeng/bootstrap/TileEntityBuilder.java b/src/main/java/appeng/bootstrap/TileEntityBuilder.java index a14b93c46..31e6d34fc 100644 --- a/src/main/java/appeng/bootstrap/TileEntityBuilder.java +++ b/src/main/java/appeng/bootstrap/TileEntityBuilder.java @@ -9,10 +9,10 @@ import java.util.function.Supplier; import com.google.common.base.Preconditions; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.block.entity.BlockEntityType; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.client.registry.ClientRegistry; @@ -42,12 +42,12 @@ public class TileEntityBuilder { // The tile entity class private final Class tileClass; - private TileEntityType type; + private BlockEntityType type; // The factory for creating tile entity objects - private final Function, T> supplier; + private final Function, T> supplier; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private TileEntityRendering tileEntityRendering; private final List blocks = new ArrayList<>(); @@ -55,7 +55,7 @@ public class TileEntityBuilder { private final EnumSet features = EnumSet.noneOf(AEFeature.class); public TileEntityBuilder(FeatureFactory factory, String registryName, Class tileClass, - Function, T> supplier) { + Function, T> supplier) { this.factory = factory; this.registryName = registryName; this.tileClass = tileClass; @@ -78,7 +78,7 @@ public class TileEntityBuilder { } public TileEntityBuilder rendering(TileEntityRenderingCustomizer customizer) { - DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> customizer.customize(tileEntityRendering)); + DistExecutor.runWhenOn(EnvType.CLIENT, () -> () -> customizer.customize(tileEntityRendering)); return this; } @@ -91,7 +91,7 @@ public class TileEntityBuilder { } Supplier factory = () -> supplier.apply(type); - type = TileEntityType.Builder.create(factory, blocks.toArray(new Block[0])).build(null); + type = BlockEntityType.Builder.create(factory, blocks.toArray(new Block[0])).build(null); type.setRegistryName(AppEng.MOD_ID, registryName); registry.register(type); @@ -105,13 +105,13 @@ public class TileEntityBuilder { } }); - DistExecutor.runWhenOn(Dist.CLIENT, () -> this::buildClient); + DistExecutor.runWhenOn(EnvType.CLIENT, () -> this::buildClient); return new TileEntityDefinition(this::addBlock); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private void buildClient() { this.factory.addBootstrapComponent((IClientSetupComponent) () -> { if (tileEntityRendering.tileEntityRenderer != null) { diff --git a/src/main/java/appeng/bootstrap/TileEntityRendering.java b/src/main/java/appeng/bootstrap/TileEntityRendering.java index dc4bcf33c..4e3e02f1f 100644 --- a/src/main/java/appeng/bootstrap/TileEntityRendering.java +++ b/src/main/java/appeng/bootstrap/TileEntityRendering.java @@ -22,17 +22,17 @@ import java.util.function.Function; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.tile.AEBaseTileEntity; public class TileEntityRendering { - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) Function> tileEntityRenderer; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public TileEntityRendering tileEntityRenderer( Function> tileEntityRenderer) { this.tileEntityRenderer = tileEntityRenderer; diff --git a/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java b/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java index f084c69ef..eb314d8a1 100644 --- a/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java +++ b/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java @@ -18,8 +18,8 @@ package appeng.bootstrap; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.tile.AEBaseTileEntity; @@ -30,7 +30,7 @@ import appeng.tile.AEBaseTileEntity; */ public abstract class TileEntityRenderingCustomizer { - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public abstract void customize(TileEntityRendering rendering); } diff --git a/src/main/java/appeng/bootstrap/components/IBlockRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/IBlockRegistrationComponent.java index 8418465f4..cdb82a313 100644 --- a/src/main/java/appeng/bootstrap/components/IBlockRegistrationComponent.java +++ b/src/main/java/appeng/bootstrap/components/IBlockRegistrationComponent.java @@ -1,13 +1,13 @@ package appeng.bootstrap.components; +import net.fabricmc.api.EnvType; import net.minecraft.block.Block; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.registries.IForgeRegistry; import appeng.bootstrap.IBootstrapComponent; @FunctionalInterface public interface IBlockRegistrationComponent extends IBootstrapComponent { - void blockRegistration(Dist dist, IForgeRegistry blockRegistry); + void blockRegistration(EnvType dist, IForgeRegistry blockRegistry); } diff --git a/src/main/java/appeng/bootstrap/components/IItemRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/IItemRegistrationComponent.java index ffb82b25f..3661221b8 100644 --- a/src/main/java/appeng/bootstrap/components/IItemRegistrationComponent.java +++ b/src/main/java/appeng/bootstrap/components/IItemRegistrationComponent.java @@ -2,12 +2,12 @@ package appeng.bootstrap.components; import net.minecraft.item.Item; -import net.minecraftforge.api.distmarker.Dist; +import net.fabricmc.api.EnvType; import net.minecraftforge.registries.IForgeRegistry; import appeng.bootstrap.IBootstrapComponent; @FunctionalInterface public interface IItemRegistrationComponent extends IBootstrapComponent { - void itemRegistration(Dist dist, IForgeRegistry itemRegistry); + void itemRegistration(EnvType dist, IForgeRegistry itemRegistry); } diff --git a/src/main/java/appeng/bootstrap/components/IRecipeRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/IRecipeRegistrationComponent.java index 46a4b9dfa..fc95be8fe 100644 --- a/src/main/java/appeng/bootstrap/components/IRecipeRegistrationComponent.java +++ b/src/main/java/appeng/bootstrap/components/IRecipeRegistrationComponent.java @@ -1,13 +1,13 @@ package appeng.bootstrap.components; +import net.fabricmc.api.EnvType; import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.registries.IForgeRegistry; import appeng.bootstrap.IBootstrapComponent; @FunctionalInterface public interface IRecipeRegistrationComponent extends IBootstrapComponent { - void recipeRegistration(Dist dist, IForgeRegistry> recipeRegistry); + void recipeRegistration(EnvType dist, IForgeRegistry> recipeRegistry); } diff --git a/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java index 29f20e8bb..498a055b5 100644 --- a/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java +++ b/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java @@ -1,11 +1,11 @@ package appeng.bootstrap.components; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraftforge.registries.IForgeRegistry; import appeng.bootstrap.IBootstrapComponent; @FunctionalInterface public interface ITileEntityRegistrationComponent extends IBootstrapComponent { - void register(IForgeRegistry> registry); + void register(IForgeRegistry> registry); } diff --git a/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java b/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java index 9af970c13..accc7cf62 100644 --- a/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java +++ b/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java @@ -25,9 +25,9 @@ import java.util.function.BiFunction; import com.google.common.collect.Sets; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ModelBakery; -import net.minecraft.util.ResourceLocation; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ModelBakery; +import net.minecraft.util.Identifier; import net.minecraftforge.client.event.ModelBakeEvent; import appeng.core.AppEng; @@ -35,19 +35,19 @@ import appeng.core.AppEng; public class ModelOverrideComponent implements IModelBakeComponent { // Maps from resource path to customizer - private final Map> customizer = new HashMap<>(); + private final Map> customizer = new HashMap<>(); - public void addOverride(String resourcePath, BiFunction customizer) { + public void addOverride(String resourcePath, BiFunction customizer) { this.customizer.put(resourcePath, customizer); } @Override public void onModelBakeEvent(final ModelBakeEvent event) { - Map modelRegistry = event.getModelRegistry(); - Set keys = Sets.newHashSet(modelRegistry.keySet()); + Map modelRegistry = event.getModelRegistry(); + Set keys = Sets.newHashSet(modelRegistry.keySet()); IBakedModel missingModel = modelRegistry.get(ModelBakery.MODEL_MISSING); - for (ResourceLocation location : keys) { + for (Identifier location : keys) { if (!location.getNamespace().equals(AppEng.MOD_ID)) { continue; } @@ -59,7 +59,7 @@ public class ModelOverrideComponent implements IModelBakeComponent { continue; } - BiFunction customizer = this.customizer.get(location.getPath()); + BiFunction customizer = this.customizer.get(location.getPath()); if (customizer != null) { IBakedModel newModel = customizer.apply(location, orgModel); diff --git a/src/main/java/appeng/capabilities/NullSpatialDimension.java b/src/main/java/appeng/capabilities/NullSpatialDimension.java index 9c5b157a4..caf9d08ce 100644 --- a/src/main/java/appeng/capabilities/NullSpatialDimension.java +++ b/src/main/java/appeng/capabilities/NullSpatialDimension.java @@ -21,9 +21,9 @@ package appeng.capabilities; import java.util.List; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.dimension.DimensionType; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import appeng.api.storage.ISpatialDimension; @@ -48,7 +48,7 @@ class NullSpatialDimension implements ISpatialDimension { } @Override - public void addCellDimensionTooltip(DimensionType cellDim, List tooltip) { + public void addCellDimensionTooltip(DimensionType cellDim, List tooltip) { } @Override diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 5d7700ccb..822f753e6 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -27,9 +27,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.client.event.InputEvent; @@ -74,7 +74,7 @@ public class ClientHelper extends ServerHelper { } @Override - public void bindTileEntitySpecialRenderer(final Class tile, final AEBaseBlock blk) { + public void bindTileEntitySpecialRenderer(final Class tile, final AEBaseBlock blk) { } @@ -125,7 +125,7 @@ public class ClientHelper extends ServerHelper { } @Override - public RayTraceResult getRTR() { + public HitResult getRTR() { return Minecraft.getInstance().objectMouseOver; } diff --git a/src/main/java/appeng/client/gui/AEBaseMEScreen.java b/src/main/java/appeng/client/gui/AEBaseMEScreen.java index 8a9285dcc..e76fbcd7a 100644 --- a/src/main/java/appeng/client/gui/AEBaseMEScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseMEScreen.java @@ -25,7 +25,7 @@ import java.util.Locale; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.TextFormatting; import appeng.api.storage.data.IAEItemStack; @@ -36,7 +36,7 @@ import appeng.core.localization.ButtonToolTips; public abstract class AEBaseMEScreen extends AEBaseScreen { - public AEBaseMEScreen(T container, PlayerInventory playerInventory, ITextComponent title) { + public AEBaseMEScreen(T container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index 772609354..6ac91d1fb 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -51,8 +51,8 @@ import net.minecraft.inventory.container.ClickType; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.Identifier; +import net.minecraft.text.Text; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fml.client.gui.GuiUtils; @@ -100,7 +100,7 @@ public abstract class AEBaseScreen extends ContainerS private Slot bl_clicked; protected final List guiSlots = new ArrayList<>(); - public AEBaseScreen(T container, PlayerInventory playerInventory, ITextComponent title) { + public AEBaseScreen(T container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); } @@ -587,7 +587,7 @@ public abstract class AEBaseScreen extends ContainerS } public void bindTexture(final String base, final String file) { - final ResourceLocation loc = new ResourceLocation(base, "textures/" + file); + final Identifier loc = new Identifier(base, "textures/" + file); getMinecraft().getTextureManager().bindTexture(loc); } @@ -646,7 +646,7 @@ public abstract class AEBaseScreen extends ContainerS final Fluid fluid = fs.getFluid(); FluidAttributes fluidAttributes = fluid.getAttributes(); bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - ResourceLocation fluidStillTexture = fluidAttributes.getStillTexture(fs.getFluidStack()); + Identifier fluidStillTexture = fluidAttributes.getStillTexture(fs.getFluidStack()); final TextureAtlasSprite sprite = getMinecraft() .getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(fluidStillTexture); @@ -762,11 +762,11 @@ public abstract class AEBaseScreen extends ContainerS } public void bindTexture(final String file) { - final ResourceLocation loc = new ResourceLocation(AppEng.MOD_ID, "textures/" + file); + final Identifier loc = new Identifier(AppEng.MOD_ID, "textures/" + file); getMinecraft().getTextureManager().bindTexture(loc); } - public void bindTexture(final ResourceLocation loc) { + public void bindTexture(final Identifier loc) { getMinecraft().getTextureManager().bindTexture(loc); } diff --git a/src/main/java/appeng/client/gui/Size1Slot.java b/src/main/java/appeng/client/gui/Size1Slot.java index 47934052d..b73967a4f 100644 --- a/src/main/java/appeng/client/gui/Size1Slot.java +++ b/src/main/java/appeng/client/gui/Size1Slot.java @@ -6,8 +6,8 @@ import javax.annotation.Nonnull; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraftforge.items.SlotItemHandler; /** @@ -58,7 +58,7 @@ class Size1Slot extends SlotItemHandler { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public boolean isEnabled() { return this.delegate.isEnabled(); } diff --git a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java index 14d7e0e2f..6c3a75815 100644 --- a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java @@ -20,9 +20,9 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.config.ActionItems; import appeng.api.config.CopyMode; @@ -43,7 +43,7 @@ public class CellWorkbenchScreen extends UpgradeableScreen { - public ChestScreen(ChestContainer container, PlayerInventory playerInventory, ITextComponent title) { + public ChestScreen(ChestContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 166; } diff --git a/src/main/java/appeng/client/gui/implementations/CondenserScreen.java b/src/main/java/appeng/client/gui/implementations/CondenserScreen.java index 0853bfa88..5e8beda10 100644 --- a/src/main/java/appeng/client/gui/implementations/CondenserScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CondenserScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.config.CondenserOutput; @@ -36,7 +36,7 @@ public class CondenserScreen extends AEBaseScreen { private SettingToggleButton mode; - public CondenserScreen(CondenserContainer container, PlayerInventory playerInventory, ITextComponent title) { + public CondenserScreen(CondenserContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 197; } diff --git a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java index 629b7ac80..708d8ca91 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java @@ -21,7 +21,7 @@ package appeng.client.gui.implementations; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.gui.AEBaseScreen; @@ -39,7 +39,7 @@ public class CraftAmountScreen extends AEBaseScreen { private Button next; - public CraftAmountScreen(CraftAmountContainer container, PlayerInventory playerInventory, ITextComponent title) { + public CraftAmountScreen(CraftAmountContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.subGui = new AESubScreen(this, container.getTarget()); } diff --git a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java index 5c631e4e6..0dc4aa465 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java @@ -30,7 +30,7 @@ import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.AEApi; @@ -64,7 +64,7 @@ public class CraftConfirmScreen extends AEBaseScreen { private Button selectCPU; private int tooltip = -1; - public CraftConfirmScreen(CraftConfirmContainer container, PlayerInventory playerInventory, ITextComponent title) { + public CraftConfirmScreen(CraftConfirmContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.subGui = new AESubScreen(this, container.getTarget()); this.xSize = 238; diff --git a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java index 341c6cd25..ba660f51a 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java @@ -31,7 +31,7 @@ import org.apache.commons.lang3.time.DurationFormatUtils; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.AEApi; @@ -90,7 +90,7 @@ public class CraftingCPUScreen extends AEBaseScr private Button cancel; private int tooltip = -1; - public CraftingCPUScreen(T container, PlayerInventory playerInventory, ITextComponent title) { + public CraftingCPUScreen(T container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = GUI_HEIGHT; this.xSize = GUI_WIDTH; diff --git a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java index 6f5493946..063923eea 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java @@ -24,7 +24,7 @@ package appeng.client.gui.implementations; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.container.implementations.CraftingStatusContainer; import appeng.core.localization.GuiText; @@ -38,7 +38,7 @@ public class CraftingStatusScreen extends CraftingCPUScreen { - public CraftingTermScreen(CraftingTermContainer container, PlayerInventory playerInventory, ITextComponent title) { + public CraftingTermScreen(CraftingTermContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.setReservedSpace(73); } diff --git a/src/main/java/appeng/client/gui/implementations/DriveScreen.java b/src/main/java/appeng/client/gui/implementations/DriveScreen.java index e7f0a4112..76385f929 100644 --- a/src/main/java/appeng/client/gui/implementations/DriveScreen.java +++ b/src/main/java/appeng/client/gui/implementations/DriveScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.gui.AEBaseScreen; @@ -32,7 +32,7 @@ import appeng.core.sync.packets.SwitchGuisPacket; public class DriveScreen extends AEBaseScreen { - public DriveScreen(DriveContainer container, PlayerInventory playerInventory, ITextComponent title) { + public DriveScreen(DriveContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 199; } diff --git a/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java b/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java index 9cae57199..9e296ee9e 100644 --- a/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java +++ b/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; @@ -38,7 +38,7 @@ public class FormationPlaneScreen extends UpgradeableScreen placeMode; public FormationPlaneScreen(FormationPlaneContainer container, PlayerInventory playerInventory, - ITextComponent title) { + Text title) { super(container, playerInventory, title); this.ySize = 251; } diff --git a/src/main/java/appeng/client/gui/implementations/GrinderScreen.java b/src/main/java/appeng/client/gui/implementations/GrinderScreen.java index 1e19a1263..085371df5 100644 --- a/src/main/java/appeng/client/gui/implementations/GrinderScreen.java +++ b/src/main/java/appeng/client/gui/implementations/GrinderScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.gui.AEBaseScreen; @@ -28,7 +28,7 @@ import appeng.core.localization.GuiText; public class GrinderScreen extends AEBaseScreen { - public GrinderScreen(GrinderContainer container, PlayerInventory playerInventory, ITextComponent title) { + public GrinderScreen(GrinderContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 176; } diff --git a/src/main/java/appeng/client/gui/implementations/IOPortScreen.java b/src/main/java/appeng/client/gui/implementations/IOPortScreen.java index 5760e4f52..9d60bbe28 100644 --- a/src/main/java/appeng/client/gui/implementations/IOPortScreen.java +++ b/src/main/java/appeng/client/gui/implementations/IOPortScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.AEApi; import appeng.api.config.FullnessMode; @@ -37,7 +37,7 @@ public class IOPortScreen extends UpgradeableScreen { private SettingToggleButton fullMode; private SettingToggleButton operationMode; - public IOPortScreen(IOPortContainer container, PlayerInventory playerInventory, ITextComponent title) { + public IOPortScreen(IOPortContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 166; } diff --git a/src/main/java/appeng/client/gui/implementations/InscriberScreen.java b/src/main/java/appeng/client/gui/implementations/InscriberScreen.java index 246124986..a4e9dbb6d 100644 --- a/src/main/java/appeng/client/gui/implementations/InscriberScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InscriberScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.gui.AEBaseScreen; @@ -32,7 +32,7 @@ public class InscriberScreen extends AEBaseScreen { private ProgressBar pb; - public InscriberScreen(InscriberContainer container, PlayerInventory playerInventory, ITextComponent title) { + public InscriberScreen(InscriberContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 176; this.xSize = this.hasToolbox() ? 246 : 211; diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java index 7ff929395..73965d366 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.config.Settings; import appeng.api.config.YesNo; @@ -39,7 +39,7 @@ public class InterfaceScreen extends UpgradeableScreen { private SettingToggleButton blockMode; private ToggleButton interfaceMode; - public InterfaceScreen(InterfaceContainer container, PlayerInventory playerInventory, ITextComponent title) { + public InterfaceScreen(InterfaceContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 211; } diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java index e10fec30b..6c4ae3994 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java @@ -37,7 +37,7 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.AEApi; @@ -68,7 +68,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen private SettingToggleButton levelMode; private SettingToggleButton craftingMode; - public LevelEmitterScreen(LevelEmitterContainer container, PlayerInventory playerInventory, ITextComponent title) { + public LevelEmitterScreen(LevelEmitterContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java index 229410b01..8e725e316 100644 --- a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java +++ b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java @@ -26,7 +26,7 @@ import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.config.*; import appeng.api.implementations.guiobjects.IPortableCell; @@ -87,7 +87,7 @@ public class MEMonitorableScreen extends AEBas private int currentMouseX = 0; private int currentMouseY = 0; - public MEMonitorableScreen(T container, PlayerInventory playerInventory, ITextComponent title) { + public MEMonitorableScreen(T container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); final Scrollbar scrollbar = new Scrollbar(); diff --git a/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java b/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java index 11717c749..41ff82311 100644 --- a/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java +++ b/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java @@ -19,14 +19,14 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.container.implementations.MEPortableCellContainer; public class MEPortableCellScreen extends MEMonitorableScreen { public MEPortableCellScreen(MEPortableCellContainer container, PlayerInventory playerInventory, - ITextComponent title) { + Text title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java b/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java index 5845666ad..2f909482e 100644 --- a/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java +++ b/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; @@ -34,7 +34,7 @@ public class MolecularAssemblerScreen extends UpgradeableScreen im private int tooltip = -1; public NetworkStatusScreen(NetworkStatusContainer container, PlayerInventory playerInventory, - ITextComponent title) { + Text title) { super(container, playerInventory, title); final Scrollbar scrollbar = new Scrollbar(); diff --git a/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java b/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java index 50ca9a241..14d7603a6 100644 --- a/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java +++ b/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.gui.AEBaseScreen; @@ -33,7 +33,7 @@ public class NetworkToolScreen extends AEBaseScreen { private ToggleButton tFacades; - public NetworkToolScreen(NetworkToolContainer container, PlayerInventory playerInventory, ITextComponent title) { + public NetworkToolScreen(NetworkToolContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 166; } diff --git a/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java b/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java index 1461b52d0..5cabe9d4f 100644 --- a/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java +++ b/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java @@ -21,7 +21,7 @@ package appeng.client.gui.implementations; import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.config.ActionItems; import appeng.client.gui.widgets.ActionButton; @@ -48,7 +48,7 @@ public class PatternTermScreen extends MEMonitorableScreen private ActionButton substitutionsEnabledBtn; private ActionButton substitutionsDisabledBtn; - public PatternTermScreen(PatternTermContainer container, PlayerInventory playerInventory, ITextComponent title) { + public PatternTermScreen(PatternTermContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.setReservedSpace(81); } diff --git a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java index b35902cb5..45c98e3f4 100644 --- a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java +++ b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java @@ -21,7 +21,7 @@ package appeng.client.gui.implementations; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.NumberBox; @@ -37,7 +37,7 @@ public class PriorityScreen extends AEBaseScreen { private NumberBox priority; - public PriorityScreen(PriorityContainer container, PlayerInventory playerInventory, ITextComponent title) { + public PriorityScreen(PriorityContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.subGui = new AESubScreen(this, container.getPriorityHost()); } diff --git a/src/main/java/appeng/client/gui/implementations/QNBScreen.java b/src/main/java/appeng/client/gui/implementations/QNBScreen.java index 0baa0a4d9..e64cc1442 100644 --- a/src/main/java/appeng/client/gui/implementations/QNBScreen.java +++ b/src/main/java/appeng/client/gui/implementations/QNBScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.gui.AEBaseScreen; @@ -28,7 +28,7 @@ import appeng.core.localization.GuiText; public class QNBScreen extends AEBaseScreen { - public QNBScreen(QNBContainer container, PlayerInventory playerInventory, ITextComponent title) { + public QNBScreen(QNBContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 166; } diff --git a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java index 390951f58..0949bab80 100644 --- a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java +++ b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java @@ -23,7 +23,7 @@ import org.lwjgl.glfw.GLFW; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.ActionKey; @@ -38,7 +38,7 @@ public class QuartzKnifeScreen extends AEBaseScreen { private TextFieldWidget name; - public QuartzKnifeScreen(QuartzKnifeContainer container, PlayerInventory playerInventory, ITextComponent title) { + public QuartzKnifeScreen(QuartzKnifeContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 184; } diff --git a/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java b/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java index 7ea9bbe48..09f5985fe 100644 --- a/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java +++ b/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.config.SecurityPermissions; import appeng.api.config.SortOrder; @@ -38,7 +38,7 @@ public class SecurityStationScreen extends MEMonitorableScreen { - private static final ResourceLocation TEXTURE = new ResourceLocation(AppEng.MOD_ID, "textures/guis/skychest.png"); + private static final Identifier TEXTURE = new Identifier(AppEng.MOD_ID, "textures/guis/skychest.png"); - public SkyChestScreen(SkyChestContainer container, PlayerInventory playerInv, ITextComponent title) { + public SkyChestScreen(SkyChestContainer container, PlayerInventory playerInv, Text title) { super(container, playerInv, title); this.ySize = 195; } diff --git a/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java b/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java index a63492009..2b897f22c 100644 --- a/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java +++ b/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.gui.AEBaseScreen; @@ -31,7 +31,7 @@ import appeng.util.Platform; public class SpatialIOPortScreen extends AEBaseScreen { public SpatialIOPortScreen(SpatialIOPortContainer container, PlayerInventory playerInventory, - ITextComponent title) { + Text title) { super(container, playerInventory, title); this.ySize = 199; } diff --git a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java index 700c7bf2f..ad0e2276e 100644 --- a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java +++ b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.config.AccessRestriction; import appeng.api.config.ActionItems; @@ -42,7 +42,7 @@ public class StorageBusScreen extends UpgradeableScreen { private SettingToggleButton rwMode; private SettingToggleButton storageFilter; - public StorageBusScreen(StorageBusContainer container, PlayerInventory playerInventory, ITextComponent title) { + public StorageBusScreen(StorageBusContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 251; } diff --git a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java index 71add3ef1..4ed2ba14f 100644 --- a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java +++ b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.config.FuzzyMode; @@ -47,7 +47,7 @@ public class UpgradeableScreen extends AEBaseScr protected SettingToggleButton craftMode; protected SettingToggleButton schedulingMode; - public UpgradeableScreen(T container, PlayerInventory playerInventory, ITextComponent title) { + public UpgradeableScreen(T container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.cvb = container; diff --git a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java index 2568cbd8e..7a11caac9 100644 --- a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java +++ b/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java @@ -21,7 +21,7 @@ package appeng.client.gui.implementations; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.gui.AEBaseScreen; @@ -36,7 +36,7 @@ public class VibrationChamberScreen extends AEBaseScreen { - public WirelessScreen(WirelessContainer container, PlayerInventory playerInventory, ITextComponent title) { + public WirelessScreen(WirelessContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); this.ySize = 166; } diff --git a/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java b/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java index 39ed3df42..056edaad0 100644 --- a/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java +++ b/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java @@ -19,7 +19,7 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.container.implementations.MEPortableCellContainer; @@ -27,7 +27,7 @@ import appeng.container.implementations.MEPortableCellContainer; public class WirelessTermScreen extends MEMonitorableScreen { public WirelessTermScreen(MEPortableCellContainer container, PlayerInventory playerInventory, - ITextComponent title) { + Text title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/client/gui/widgets/IconButton.java b/src/main/java/appeng/client/gui/widgets/IconButton.java index 40091320f..a29a7eeb7 100644 --- a/src/main/java/appeng/client/gui/widgets/IconButton.java +++ b/src/main/java/appeng/client/gui/widgets/IconButton.java @@ -23,11 +23,11 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.fml.client.gui.GuiUtils; public abstract class IconButton extends Button implements ITooltip { - public static final ResourceLocation TEXTURE_STATES = new ResourceLocation("appliedenergistics2", + public static final Identifier TEXTURE_STATES = new Identifier("appliedenergistics2", "textures/guis/states.png"); private boolean halfSize = false; diff --git a/src/main/java/appeng/client/gui/widgets/ProgressBar.java b/src/main/java/appeng/client/gui/widgets/ProgressBar.java index eefff2b91..b6b2a80af 100644 --- a/src/main/java/appeng/client/gui/widgets/ProgressBar.java +++ b/src/main/java/appeng/client/gui/widgets/ProgressBar.java @@ -20,7 +20,7 @@ package appeng.client.gui.widgets; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.Widget; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.container.interfaces.IProgressProvider; @@ -29,7 +29,7 @@ import appeng.core.localization.GuiText; public class ProgressBar extends Widget implements ITooltip { private final IProgressProvider source; - private final ResourceLocation texture; + private final Identifier texture; private final int fill_u; private final int fill_v; private final Direction layout; @@ -45,7 +45,7 @@ public class ProgressBar extends Widget implements ITooltip { final int u, final int y, final int width, final int height, final Direction dir, final String title) { super(posX, posY, width, height, ""); this.source = source; - this.texture = new ResourceLocation("appliedenergistics2", "textures/" + texture); + this.texture = new Identifier("appliedenergistics2", "textures/" + texture); this.fill_u = u; this.fill_v = y; this.layout = dir; diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java index 50ddad377..b84bb9da6 100644 --- a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java @@ -26,7 +26,7 @@ import java.util.regex.Pattern; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.config.AccessRestriction; import appeng.api.config.CondenserOutput; @@ -234,7 +234,7 @@ public class SettingToggleButton> extends IconButton { } private static void registerApp(final int iconIndex, final Settings setting, final Enum val, - final ButtonToolTips title, final ITextComponent hint) { + final ButtonToolTips title, final Text hint) { final ButtonAppearance a = new ButtonAppearance(); a.displayName = title.getTranslationKey(); a.displayValue = hint; @@ -279,8 +279,8 @@ public class SettingToggleButton> extends IconButton { @Override public String getMessage() { - ITextComponent displayName = null; - ITextComponent displayValue = null; + Text displayName = null; + Text displayValue = null; if (this.buttonSetting != null && this.currentValue != null) { final ButtonAppearance buttonAppearance = appearances @@ -355,7 +355,7 @@ public class SettingToggleButton> extends IconButton { private static class ButtonAppearance { public int index; - public ITextComponent displayName; - public ITextComponent displayValue; + public Text displayName; + public Text displayValue; } } diff --git a/src/main/java/appeng/client/gui/widgets/TabButton.java b/src/main/java/appeng/client/gui/widgets/TabButton.java index 6ae1e69f9..1637f8479 100644 --- a/src/main/java/appeng/client/gui/widgets/TabButton.java +++ b/src/main/java/appeng/client/gui/widgets/TabButton.java @@ -25,10 +25,10 @@ import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; public class TabButton extends Button implements ITooltip { - public static final ResourceLocation TEXTURE_STATES = new ResourceLocation("appliedenergistics2", + public static final Identifier TEXTURE_STATES = new Identifier("appliedenergistics2", "textures/guis/states.png"); private final ItemRenderer itemRenderer; private int hideEdge = 0; diff --git a/src/main/java/appeng/client/gui/widgets/ToggleButton.java b/src/main/java/appeng/client/gui/widgets/ToggleButton.java index 8d2f63560..3f0606b60 100644 --- a/src/main/java/appeng/client/gui/widgets/ToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/ToggleButton.java @@ -25,11 +25,11 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.resources.I18n; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.fml.client.gui.GuiUtils; public class ToggleButton extends Button implements ITooltip { - public static final ResourceLocation TEXTURE_STATES = new ResourceLocation("appliedenergistics2", + public static final Identifier TEXTURE_STATES = new Identifier("appliedenergistics2", "textures/guis/states.png"); private static final Pattern PATTERN_NEW_LINE = Pattern.compile("\\n", Pattern.LITERAL); private final int iconIdxOn; diff --git a/src/main/java/appeng/client/me/ClientDCInternalInv.java b/src/main/java/appeng/client/me/ClientDCInternalInv.java index 979cc720c..fc5964f57 100644 --- a/src/main/java/appeng/client/me/ClientDCInternalInv.java +++ b/src/main/java/appeng/client/me/ClientDCInternalInv.java @@ -20,7 +20,7 @@ package appeng.client.me; import javax.annotation.Nonnull; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.tile.inventory.AppEngInternalInventory; @@ -33,7 +33,7 @@ public class ClientDCInternalInv implements Comparable { private final long id; private final long sortBy; - public ClientDCInternalInv(final int size, final long id, final long sortBy, final ITextComponent name) { + public ClientDCInternalInv(final int size, final long id, final long sortBy, final Text name) { this.inventory = new AppEngInternalInventory(null, size); this.searchName = name.getString().toLowerCase(); this.formattedName = name.getFormattedText(); diff --git a/src/main/java/appeng/client/me/FluidRepo.java b/src/main/java/appeng/client/me/FluidRepo.java index b3e7b0eb6..f46ca1dd3 100644 --- a/src/main/java/appeng/client/me/FluidRepo.java +++ b/src/main/java/appeng/client/me/FluidRepo.java @@ -25,7 +25,7 @@ import java.util.regex.Pattern; import javax.annotation.Nonnull; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.AEApi; import appeng.api.config.Settings; @@ -117,9 +117,9 @@ public class FluidRepo { } if (terminalSearchToolTips && notDone && !searchMod) { - final List tooltip = Platform.getTooltip(fs); + final List tooltip = Platform.getTooltip(fs); - for (final ITextComponent line : tooltip) { + for (final Text line : tooltip) { if (m.matcher(line.getString()).find()) { foundMatchingFluidStack = true; break; diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index 964f45a48..ba92b0c42 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -26,7 +26,7 @@ import java.util.regex.Pattern; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.AEApi; import appeng.api.config.SearchBoxMode; @@ -155,9 +155,9 @@ public class ItemRepo { } if (terminalSearchToolTips && notDone && !searchMod) { - final List tooltip = Platform.getTooltip(is); + final List tooltip = Platform.getTooltip(is); - for (final ITextComponent line : tooltip) { + for (final Text line : tooltip) { if (m.matcher(line.getString()).find()) { foundMatchingItemStack = true; notDone = false; diff --git a/src/main/java/appeng/client/render/ColorableTileBlockColor.java b/src/main/java/appeng/client/render/ColorableTileBlockColor.java index 0a629ed33..a6223fa02 100644 --- a/src/main/java/appeng/client/render/ColorableTileBlockColor.java +++ b/src/main/java/appeng/client/render/ColorableTileBlockColor.java @@ -21,8 +21,8 @@ package appeng.client.render; import javax.annotation.Nullable; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.renderer.color.IBlockColor; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ILightReader; @@ -41,7 +41,7 @@ public class ColorableTileBlockColor implements IBlockColor { AEColor color = AEColor.TRANSPARENT; // Default to a neutral color if (worldIn != null && pos != null) { - TileEntity te = worldIn.getTileEntity(pos); + BlockEntity te = worldIn.getTileEntity(pos); if (te instanceof IColorableTile) { color = ((IColorableTile) te).getColor(); } diff --git a/src/main/java/appeng/client/render/DelegateBakedModel.java b/src/main/java/appeng/client/render/DelegateBakedModel.java index 54be8c892..e0919c155 100644 --- a/src/main/java/appeng/client/render/DelegateBakedModel.java +++ b/src/main/java/appeng/client/render/DelegateBakedModel.java @@ -23,13 +23,13 @@ import java.util.Random; import javax.annotation.Nullable; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemCameraTransforms; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.Direction; diff --git a/src/main/java/appeng/client/render/DummyFluidBakedModel.java b/src/main/java/appeng/client/render/DummyFluidBakedModel.java index 8ca3bb14f..254de4755 100644 --- a/src/main/java/appeng/client/render/DummyFluidBakedModel.java +++ b/src/main/java/appeng/client/render/DummyFluidBakedModel.java @@ -26,9 +26,9 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.Direction; diff --git a/src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java b/src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java index d5b5d1e46..bd4367503 100644 --- a/src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java +++ b/src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java @@ -25,25 +25,25 @@ import java.util.function.Function; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import com.google.common.collect.ImmutableList; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.TransformationMatrix; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.LivingEntity; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.world.World; import net.minecraftforge.client.model.ItemLayerModel; import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.FluidStack; import appeng.fluids.items.FluidDummyItem; @@ -94,13 +94,13 @@ public class DummyFluidDispatcherBakedModel extends DelegateBakedModel { FluidDummyItem itemFacade = (FluidDummyItem) stack.getItem(); - FluidStack fluidStack = itemFacade.getFluidStack(stack); + FluidVolume fluidStack = itemFacade.getFluidStack(stack); if (fluidStack.isEmpty()) { - fluidStack = new FluidStack(Fluids.WATER, FluidAttributes.BUCKET_VOLUME); + fluidStack = new FluidVolume(Fluids.WATER, FluidAttributes.BUCKET_VOLUME); } FluidAttributes attributes = fluidStack.getFluid().getAttributes(); - ResourceLocation stillTexture = attributes.getStillTexture(fluidStack); + Identifier stillTexture = attributes.getStillTexture(fluidStack); Material stillMaterial = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, stillTexture); TextureAtlasSprite sprite = DummyFluidDispatcherBakedModel.this.bakedTextureGetter.apply(stillMaterial); if (sprite == null) { diff --git a/src/main/java/appeng/client/render/DummyFluidItemModel.java b/src/main/java/appeng/client/render/DummyFluidItemModel.java index 80770b11d..b586cf5c2 100644 --- a/src/main/java/appeng/client/render/DummyFluidItemModel.java +++ b/src/main/java/appeng/client/render/DummyFluidItemModel.java @@ -25,14 +25,14 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -44,13 +44,13 @@ import appeng.core.AppEng; */ public class DummyFluidItemModel implements IModelGeometry { // We use this to get the default item transforms and make our lives easier - private static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, + private static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "item/dummy_fluid_item_base"); @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { IBakedModel bakedBaseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter); return new DummyFluidDispatcherBakedModel(bakedBaseModel, spriteGetter); @@ -58,7 +58,7 @@ public class DummyFluidItemModel implements IModelGeometry @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Collections.emptyList(); } diff --git a/src/main/java/appeng/client/render/FacadeBakedItemModel.java b/src/main/java/appeng/client/render/FacadeBakedItemModel.java index fb69aec14..53d50a1f3 100644 --- a/src/main/java/appeng/client/render/FacadeBakedItemModel.java +++ b/src/main/java/appeng/client/render/FacadeBakedItemModel.java @@ -26,9 +26,9 @@ import java.util.Random; import javax.annotation.Nullable; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.EmptyModelData; diff --git a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java index cc08c4068..b96d6e806 100644 --- a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java +++ b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java @@ -20,8 +20,8 @@ package appeng.client.render; import java.util.Objects; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/appeng/client/render/FacadeItemModel.java b/src/main/java/appeng/client/render/FacadeItemModel.java index 0102a3550..87b8ee4cb 100644 --- a/src/main/java/appeng/client/render/FacadeItemModel.java +++ b/src/main/java/appeng/client/render/FacadeItemModel.java @@ -24,9 +24,9 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.render.model.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -40,12 +40,12 @@ import appeng.core.AppEng; public class FacadeItemModel implements IModelGeometry { // We use this to get the default item transforms and make our lives easier - private static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "item/facade_base"); + private static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "item/facade_base"); @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { IBakedModel bakedBaseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter); FacadeBuilder facadeBuilder = new FacadeBuilder(); @@ -54,7 +54,7 @@ public class FacadeItemModel implements IModelGeometry { @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return modelGetter.apply(MODEL_BASE).getTextures(modelGetter, missingTextureErrors); } diff --git a/src/main/java/appeng/client/render/FacingToRotation.java b/src/main/java/appeng/client/render/FacingToRotation.java index d10306819..fa19ad4bc 100644 --- a/src/main/java/appeng/client/render/FacingToRotation.java +++ b/src/main/java/appeng/client/render/FacingToRotation.java @@ -18,7 +18,7 @@ package appeng.client.render; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.Quaternion; diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java index cb1edbacc..2ed10bb3e 100644 --- a/src/main/java/appeng/client/render/SpatialSkyRender.java +++ b/src/main/java/appeng/client/render/SpatialSkyRender.java @@ -20,7 +20,7 @@ package appeng.client.render; import java.util.Random; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/appeng/client/render/StackSizeRenderer.java b/src/main/java/appeng/client/render/StackSizeRenderer.java index dc7c19266..82abd5e71 100644 --- a/src/main/java/appeng/client/render/StackSizeRenderer.java +++ b/src/main/java/appeng/client/render/StackSizeRenderer.java @@ -21,7 +21,7 @@ package appeng.client.render; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.TransformationMatrix; import net.minecraft.client.renderer.Vector3f; @@ -75,7 +75,7 @@ public class StackSizeRenderer { final int X = (int) ((xPos + offset + 16.0f - fontRenderer.getStringWidth(text) * scaleFactor) * inverseScaleFactor); final int Y = (int) ((yPos + offset + 16.0f - 7.0f * scaleFactor) * inverseScaleFactor); - IRenderTypeBuffer.Impl buffer = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); + VertexConsumerProvider.Impl buffer = VertexConsumerProvider.getImpl(Tessellator.getInstance().getBuffer()); fontRenderer.renderString(text, X, Y, 16777215, true, tm.getMatrix(), buffer, false, 0, 15728880); buffer.finish(); RenderSystem.enableBlend(); diff --git a/src/main/java/appeng/client/render/TesrRenderHelper.java b/src/main/java/appeng/client/render/TesrRenderHelper.java index 7b8d3b18c..2f77b67fe 100644 --- a/src/main/java/appeng/client/render/TesrRenderHelper.java +++ b/src/main/java/appeng/client/render/TesrRenderHelper.java @@ -18,13 +18,13 @@ package appeng.client.render; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Vector3f; -import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.render.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; @@ -81,8 +81,8 @@ public class TesrRenderHelper { /** * Render an item in 2D. */ - public static void renderItem2d(MatrixStack matrixStack, IRenderTypeBuffer buffers, ItemStack itemStack, - float scale, int combinedLightIn, int combinedOverlayIn) { + public static void renderItem2d(MatrixStack matrixStack, VertexConsumerProvider buffers, ItemStack itemStack, + float scale, int combinedLightIn, int combinedOverlayIn) { if (!itemStack.isEmpty()) { matrixStack.push(); // Push it out of the block face a bit to avoid z-fighting @@ -110,7 +110,7 @@ public class TesrRenderHelper { * @param combinedLightIn * @param combinedOverlayIn */ - public static void renderItem2dWithAmount(MatrixStack matrixStack, IRenderTypeBuffer buffers, + public static void renderItem2dWithAmount(MatrixStack matrixStack, VertexConsumerProvider buffers, IAEItemStack itemStack, float itemScale, float spacing, int combinedLightIn, int combinedOverlayIn) { final ItemStack renderStack = itemStack.asItemStackRepresentation(); diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java index fb0b3ed94..2f958e9d6 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java @@ -25,12 +25,12 @@ import java.util.EnumSet; import java.util.List; import java.util.function.Function; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.Material; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.Direction; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.util.AECableType; import appeng.api.util.AEColor; @@ -100,7 +100,7 @@ class CableBuilder { } return new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, textureFolder + color.name().toLowerCase())); + new Identifier(AppEng.MOD_ID, textureFolder + color.name().toLowerCase())); } /** diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java index 0fd08e95c..964d4e5f5 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java @@ -32,14 +32,14 @@ import javax.annotation.Nullable; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemCameraTransforms; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.MissingTextureSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; @@ -56,12 +56,12 @@ public class CableBusBakedModel implements IBakedModel { private final FacadeBuilder facadeBuilder; - private final Map partModels; + private final Map partModels; private final TextureAtlasSprite particleTexture; CableBusBakedModel(CableBuilder cableBuilder, FacadeBuilder facadeBuilder, - Map partModels, TextureAtlasSprite particleTexture) { + Map partModels, TextureAtlasSprite particleTexture) { this.cableBuilder = cableBuilder; this.facadeBuilder = facadeBuilder; this.partModels = partModels; @@ -111,7 +111,7 @@ public class CableBusBakedModel implements IBakedModel { partModelData = EmptyModelData.INSTANCE; } - for (ResourceLocation model : partModel.getModels()) { + for (Identifier model : partModel.getModels()) { IBakedModel bakedModel = this.partModels.get(model); if (bakedModel == null) { @@ -281,7 +281,7 @@ public class CableBusBakedModel implements IBakedModel { for (Direction side : renderState.getAttachments().keySet()) { IPartModel partModel = renderState.getAttachments().get(side); - for (ResourceLocation model : partModel.getModels()) { + for (Identifier model : partModel.getModels()) { IBakedModel bakedModel = this.partModels.get(model); if (bakedModel == null) { diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java b/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java index bd239903f..77f2662f3 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java @@ -4,12 +4,12 @@ import net.minecraft.client.particle.IParticleRenderType; import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; // Derived from Vanilla's BreakingParticle, but allows // a texture to be specified directly rather than via an itemstack -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class CableBusBreakingParticle extends SpriteTexturedParticle { private final float field_217571_C; diff --git a/src/main/java/appeng/client/render/cablebus/CableBusModel.java b/src/main/java/appeng/client/render/cablebus/CableBusModel.java index 5c14b2f82..479504654 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusModel.java @@ -27,14 +27,14 @@ import java.util.function.Function; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -56,8 +56,8 @@ public class CableBusModel implements IModelGeometry { @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { - Map partModels = this.loadPartModels(bakery, spriteGetter, modelTransform); + ItemOverrideList overrides, Identifier modelLocation) { + Map partModels = this.loadPartModels(bakery, spriteGetter, modelTransform); CableBuilder cableBuilder = new CableBuilder(spriteGetter); FacadeBuilder facadeBuilder = new FacadeBuilder(); @@ -72,15 +72,15 @@ public class CableBusModel implements IModelGeometry { @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Collections.unmodifiableList(CableBuilder.getTextures()); } - private Map loadPartModels(ModelBakery bakery, - Function spriteGetterIn, IModelTransform transformIn) { - ImmutableMap.Builder result = ImmutableMap.builder(); + private Map loadPartModels(ModelBakery bakery, + Function spriteGetterIn, IModelTransform transformIn) { + ImmutableMap.Builder result = ImmutableMap.builder(); - for (ResourceLocation location : this.partModels.getModels()) { + for (Identifier location : this.partModels.getModels()) { IBakedModel bakedModel = bakery.getBakedModel(location, transformIn, spriteGetterIn); if (bakedModel == null) { AELog.warn("Failed to bake part model {}", location); diff --git a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java index a8a0413f7..f59fa729f 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Objects; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ILightReader; import net.minecraftforge.client.model.data.IModelData; @@ -87,7 +87,7 @@ public class CableBusRenderState { // cut out holes for the parts. This // list is only populated if there are // facades on this cable bus - private List boundingBoxes = new ArrayList<>(); + private List boundingBoxes = new ArrayList<>(); // Additional model data passed to the part models private EnumMap partModelData = new EnumMap<>(Direction.class); @@ -168,7 +168,7 @@ public class CableBusRenderState { this.pos = pos; } - public List getBoundingBoxes() { + public List getBoundingBoxes() { return this.boundingBoxes; } diff --git a/src/main/java/appeng/client/render/cablebus/CableCoreType.java b/src/main/java/appeng/client/render/cablebus/CableCoreType.java index 4cdb6aefe..d4e291898 100644 --- a/src/main/java/appeng/client/render/cablebus/CableCoreType.java +++ b/src/main/java/appeng/client/render/cablebus/CableCoreType.java @@ -23,9 +23,9 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; -import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.render.model.Material; import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.util.AECableType; import appeng.api.util.AEColor; @@ -74,7 +74,7 @@ public enum CableCoreType { public Material getTexture(AEColor color) { return new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, this.textureFolder + "/" + color.name().toLowerCase())); + new Identifier(AppEng.MOD_ID, this.textureFolder + "/" + color.name().toLowerCase())); } } diff --git a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java index c02a77217..bd6f55048 100644 --- a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java @@ -26,7 +26,7 @@ import java.util.List; import com.google.common.base.Preconditions; import net.minecraft.client.renderer.Vector4f; -import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.render.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormatElement; diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java b/src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java index e358b83d8..be1a61b1d 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java @@ -21,8 +21,8 @@ package appeng.client.render.cablebus; import javax.annotation.Nullable; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.fluid.IFluidState; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ILightReader; @@ -51,7 +51,7 @@ public class FacadeBlockAccess implements ILightReader { @Nullable @Override - public TileEntity getTileEntity(BlockPos pos) { + public BlockEntity getTileEntity(BlockPos pos) { return this.world.getTileEntity(pos); } diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index 8733efb52..d272fbb9a 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -35,14 +35,14 @@ import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.color.BlockColors; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction.Axis; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ILightReader; import net.minecraftforge.client.ForgeHooksClient; @@ -72,21 +72,21 @@ public class FacadeBuilder { public static final double THICK_THICKNESS = 2D / 16D; public static final double THIN_THICKNESS = 1D / 16D; - public static final AxisAlignedBB[] THICK_FACADE_BOXES = new AxisAlignedBB[] { - new AxisAlignedBB(0.0, 0.0, 0.0, 1.0, THICK_THICKNESS, 1.0), - new AxisAlignedBB(0.0, 1.0 - THICK_THICKNESS, 0.0, 1.0, 1.0, 1.0), - new AxisAlignedBB(0.0, 0.0, 0.0, 1.0, 1.0, THICK_THICKNESS), - new AxisAlignedBB(0.0, 0.0, 1.0 - THICK_THICKNESS, 1.0, 1.0, 1.0), - new AxisAlignedBB(0.0, 0.0, 0.0, THICK_THICKNESS, 1.0, 1.0), - new AxisAlignedBB(1.0 - THICK_THICKNESS, 0.0, 0.0, 1.0, 1.0, 1.0) }; + public static final Box[] THICK_FACADE_BOXES = new Box[] { + new Box(0.0, 0.0, 0.0, 1.0, THICK_THICKNESS, 1.0), + new Box(0.0, 1.0 - THICK_THICKNESS, 0.0, 1.0, 1.0, 1.0), + new Box(0.0, 0.0, 0.0, 1.0, 1.0, THICK_THICKNESS), + new Box(0.0, 0.0, 1.0 - THICK_THICKNESS, 1.0, 1.0, 1.0), + new Box(0.0, 0.0, 0.0, THICK_THICKNESS, 1.0, 1.0), + new Box(1.0 - THICK_THICKNESS, 0.0, 0.0, 1.0, 1.0, 1.0) }; - public static final AxisAlignedBB[] THIN_FACADE_BOXES = new AxisAlignedBB[] { - new AxisAlignedBB(0.0, 0.0, 0.0, 1.0, THIN_THICKNESS, 1.0), - new AxisAlignedBB(0.0, 1.0 - THIN_THICKNESS, 0.0, 1.0, 1.0, 1.0), - new AxisAlignedBB(0.0, 0.0, 0.0, 1.0, 1.0, THIN_THICKNESS), - new AxisAlignedBB(0.0, 0.0, 1.0 - THIN_THICKNESS, 1.0, 1.0, 1.0), - new AxisAlignedBB(0.0, 0.0, 0.0, THIN_THICKNESS, 1.0, 1.0), - new AxisAlignedBB(1.0 - THIN_THICKNESS, 0.0, 0.0, 1.0, 1.0, 1.0) }; + public static final Box[] THIN_FACADE_BOXES = new Box[] { + new Box(0.0, 0.0, 0.0, 1.0, THIN_THICKNESS, 1.0), + new Box(0.0, 1.0 - THIN_THICKNESS, 0.0, 1.0, 1.0, 1.0), + new Box(0.0, 0.0, 0.0, 1.0, 1.0, THIN_THICKNESS), + new Box(0.0, 0.0, 1.0 - THIN_THICKNESS, 1.0, 1.0, 1.0), + new Box(0.0, 0.0, 0.0, THIN_THICKNESS, 1.0, 1.0), + new Box(1.0 - THIN_THICKNESS, 0.0, 0.0, 1.0, 1.0, 1.0) }; private final ThreadLocal pipelines = ThreadLocal.withInitial(() -> BakedPipeline.builder() // Clamper is responsible for clamping the vertex to the bounds specified. @@ -105,12 +105,12 @@ public class FacadeBuilder { private final ThreadLocal collectors = ThreadLocal.withInitial(Quad::new); public void buildFacadeQuads(RenderType layer, CableBusRenderState renderState, Random rand, List quads, - Function modelLookup) { + Function modelLookup) { BakedPipeline pipeline = this.pipelines.get(); Quad collectorQuad = this.collectors.get(); boolean transparent = AEApi.instance().partHelper().getCableRenderMode().transparentFacades; Map facadeStates = renderState.getFacades(); - List partBoxes = renderState.getBoundingBoxes(); + List partBoxes = renderState.getBoundingBoxes(); Set sidesWithParts = renderState.getAttachments().keySet(); ILightReader parentWorld = renderState.getWorld(); BlockPos pos = renderState.getPos(); @@ -123,7 +123,7 @@ public class FacadeBuilder { FacadeRenderState facadeRenderState = entry.getValue(); boolean renderStilt = !sidesWithParts.contains(side); if (layer == RenderType.getCutout() && renderStilt) { - for (ResourceLocation part : CableAnchorPart.FACADE_MODELS.getModels()) { + for (Identifier part : CableAnchorPart.FACADE_MODELS.getModels()) { IBakedModel partModel = modelLookup.apply(part); QuadRotator rotator = new QuadRotator(); quads.addAll(rotator.rotateQuads(gatherQuads(partModel, null, rand, EmptyModelData.INSTANCE), side, @@ -143,8 +143,8 @@ public class FacadeBuilder { } } - AxisAlignedBB fullBounds = thinFacades ? THIN_FACADE_BOXES[sideIndex] : THICK_FACADE_BOXES[sideIndex]; - AxisAlignedBB facadeBox = fullBounds; + Box fullBounds = thinFacades ? THIN_FACADE_BOXES[sideIndex] : THICK_FACADE_BOXES[sideIndex]; + Box facadeBox = fullBounds; // If we are a transparent facade, we need to modify out BB. if (facadeRenderState.isTransparent()) { double offset = thinFacades ? THIN_THICKNESS : THICK_THICKNESS; @@ -188,7 +188,7 @@ public class FacadeBuilder { } AEAxisAlignedBB cutOutBox = getCutOutBox(facadeBox, partBoxes); - List holeStrips = getBoxes(facadeBox, cutOutBox, side.getAxis()); + List holeStrips = getBoxes(facadeBox, cutOutBox, side.getAxis()); ILightReader facadeAccess = new FacadeBlockAccess(parentWorld, pos, side, blockState); BlockRendererDispatcher dispatcher = Minecraft.getInstance().getBlockRendererDispatcher(); @@ -253,9 +253,9 @@ public class FacadeBuilder { CachedFormat format = CachedFormat.lookup(DefaultVertexFormats.BLOCK); // If this quad has a tint index, setup the tinter. if (quad.hasTintIndex()) { - tinter.setTint(blockColors.getColor(blockState, facadeAccess, pos, quad.getTintIndex())); + tinter.setTint(blockColors.getColor(blockState, facadeAccess, pos, quad.getColorIndex())); } - for (AxisAlignedBB box : holeStrips) { + for (Box box : holeStrips) { // setup the clamper for this box clamper.setClampBounds(box); // Reset the pipeline, clears all enabled/disabled states. @@ -307,7 +307,7 @@ public class FacadeBuilder { collectorQuad.reset(format); // If we have a tint index, setup the tinter and enable it. if (quad.hasTintIndex()) { - tinter.setTint(Minecraft.getInstance().getItemColors().getColor(textureItem, quad.getTintIndex())); + tinter.setTint(Minecraft.getInstance().getItemColors().getColor(textureItem, quad.getColorIndex())); pipeline.enableElement("tinter"); } // Disable elements we don't need for items. @@ -343,9 +343,9 @@ public class FacadeBuilder { * box. This AABB will need to be "cut out" when the facade is rendered. */ @Nullable - private static AEAxisAlignedBB getCutOutBox(AxisAlignedBB facadeBox, List partBoxes) { + private static AEAxisAlignedBB getCutOutBox(Box facadeBox, List partBoxes) { AEAxisAlignedBB b = null; - for (AxisAlignedBB bb : partBoxes) { + for (Box bb : partBoxes) { if (bb.intersects(facadeBox)) { if (b == null) { b = AEAxisAlignedBB.fromBounds(bb); @@ -372,34 +372,34 @@ public class FacadeBuilder { * * @return The box segments. */ - private static List getBoxes(AxisAlignedBB fb, AEAxisAlignedBB hole, Axis axis) { + private static List getBoxes(Box fb, AEAxisAlignedBB hole, Axis axis) { if (hole == null) { return Collections.singletonList(fb); } - List boxes = new ArrayList<>(); + List boxes = new ArrayList<>(); switch (axis) { case Y: - boxes.add(new AxisAlignedBB(fb.minX, fb.minY, fb.minZ, hole.minX, fb.maxY, fb.maxZ)); - boxes.add(new AxisAlignedBB(hole.maxX, fb.minY, fb.minZ, fb.maxX, fb.maxY, fb.maxZ)); + boxes.add(new Box(fb.minX, fb.minY, fb.minZ, hole.minX, fb.maxY, fb.maxZ)); + boxes.add(new Box(hole.maxX, fb.minY, fb.minZ, fb.maxX, fb.maxY, fb.maxZ)); - boxes.add(new AxisAlignedBB(hole.minX, fb.minY, fb.minZ, hole.maxX, fb.maxY, hole.minZ)); - boxes.add(new AxisAlignedBB(hole.minX, fb.minY, hole.maxZ, hole.maxX, fb.maxY, fb.maxZ)); + boxes.add(new Box(hole.minX, fb.minY, fb.minZ, hole.maxX, fb.maxY, hole.minZ)); + boxes.add(new Box(hole.minX, fb.minY, hole.maxZ, hole.maxX, fb.maxY, fb.maxZ)); break; case Z: - boxes.add(new AxisAlignedBB(fb.minX, fb.minY, fb.minZ, fb.maxX, hole.minY, fb.maxZ)); - boxes.add(new AxisAlignedBB(fb.minX, hole.maxY, fb.minZ, fb.maxX, fb.maxY, fb.maxZ)); + boxes.add(new Box(fb.minX, fb.minY, fb.minZ, fb.maxX, hole.minY, fb.maxZ)); + boxes.add(new Box(fb.minX, hole.maxY, fb.minZ, fb.maxX, fb.maxY, fb.maxZ)); - boxes.add(new AxisAlignedBB(fb.minX, hole.minY, fb.minZ, hole.minX, hole.maxY, fb.maxZ)); - boxes.add(new AxisAlignedBB(hole.maxX, hole.minY, fb.minZ, fb.maxX, hole.maxY, fb.maxZ)); + boxes.add(new Box(fb.minX, hole.minY, fb.minZ, hole.minX, hole.maxY, fb.maxZ)); + boxes.add(new Box(hole.maxX, hole.minY, fb.minZ, fb.maxX, hole.maxY, fb.maxZ)); break; case X: - boxes.add(new AxisAlignedBB(fb.minX, fb.minY, fb.minZ, fb.maxX, hole.minY, fb.maxZ)); - boxes.add(new AxisAlignedBB(fb.minX, hole.maxY, fb.minZ, fb.maxX, fb.maxY, fb.maxZ)); + boxes.add(new Box(fb.minX, fb.minY, fb.minZ, fb.maxX, hole.minY, fb.maxZ)); + boxes.add(new Box(fb.minX, hole.maxY, fb.minZ, fb.maxX, fb.maxY, fb.maxZ)); - boxes.add(new AxisAlignedBB(fb.minX, hole.minY, fb.minZ, fb.maxX, hole.maxY, hole.minZ)); - boxes.add(new AxisAlignedBB(fb.minX, hole.minY, hole.maxZ, fb.maxX, hole.maxY, fb.maxZ)); + boxes.add(new Box(fb.minX, hole.minY, fb.minZ, fb.maxX, hole.maxY, hole.minZ)); + boxes.add(new Box(fb.minX, hole.minY, hole.maxZ, fb.maxX, hole.maxY, fb.maxZ)); break; default: // should never happen. @@ -413,11 +413,11 @@ public class FacadeBuilder { * Determines if any of the part's bounding boxes intersects with the outside 2 * voxel wide layer. If so, we should use thinner facades (1 voxel deep). */ - private static boolean isUseThinFacades(List partBoxes) { + private static boolean isUseThinFacades(List partBoxes) { final double min = 2.0 / 16.0; final double max = 14.0 / 16.0; - for (AxisAlignedBB bb : partBoxes) { + for (Box bb : partBoxes) { int o = 0; o += bb.maxX > max ? 1 : 0; o += bb.maxY > max ? 1 : 0; diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java index 68dded78e..fc8830679 100644 --- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java +++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java @@ -10,8 +10,8 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.IDynamicBakedModel; diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java index d89254a7f..185da62cd 100644 --- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java +++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java @@ -7,15 +7,15 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -23,12 +23,12 @@ import appeng.core.AppEng; public class P2PTunnelFrequencyModel implements IModelGeometry { private static final Material TEXTURE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "parts/p2p_tunnel_frequency")); + new Identifier(AppEng.MOD_ID, "parts/p2p_tunnel_frequency")); @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { try { final TextureAtlasSprite texture = spriteGetter.apply(TEXTURE); return new P2PTunnelFrequencyBakedModel(texture); @@ -39,7 +39,7 @@ public class P2PTunnelFrequencyModel implements IModelGeometry getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Collections.singleton(TEXTURE); } diff --git a/src/main/java/appeng/client/render/cablebus/QuadRotator.java b/src/main/java/appeng/client/render/cablebus/QuadRotator.java index 4a44b9669..bc93c8f98 100644 --- a/src/main/java/appeng/client/render/cablebus/QuadRotator.java +++ b/src/main/java/appeng/client/render/cablebus/QuadRotator.java @@ -23,7 +23,7 @@ import java.util.List; import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.Vector3f; -import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.render.model.BakedQuad; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.math.Direction; diff --git a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java index 93610b014..ba9d1a626 100644 --- a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java +++ b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java @@ -21,10 +21,10 @@ package appeng.client.render.cablebus; import java.util.Arrays; import java.util.function.Function; -import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.render.model.Material; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.core.AppEng; @@ -34,16 +34,16 @@ import appeng.core.AppEng; public class SmartCableTextures { public static final Material[] SMART_CHANNELS_TEXTURES = Arrays - .stream(new ResourceLocation[] { new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_00"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_01"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_02"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_03"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_04"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_10"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_11"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_12"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_13"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_14")// + .stream(new Identifier[] { new Identifier(AppEng.MOD_ID, "parts/cable/smart/channels_00"), // + new Identifier(AppEng.MOD_ID, "parts/cable/smart/channels_01"), // + new Identifier(AppEng.MOD_ID, "parts/cable/smart/channels_02"), // + new Identifier(AppEng.MOD_ID, "parts/cable/smart/channels_03"), // + new Identifier(AppEng.MOD_ID, "parts/cable/smart/channels_04"), // + new Identifier(AppEng.MOD_ID, "parts/cable/smart/channels_10"), // + new Identifier(AppEng.MOD_ID, "parts/cable/smart/channels_11"), // + new Identifier(AppEng.MOD_ID, "parts/cable/smart/channels_12"), // + new Identifier(AppEng.MOD_ID, "parts/cable/smart/channels_13"), // + new Identifier(AppEng.MOD_ID, "parts/cable/smart/channels_14")// }).map(e -> new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, e)).toArray(Material[]::new); // Textures used to display channels on smart cables. There's two sets of 5 diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java index 52676117c..40c5e83be 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java @@ -28,8 +28,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.IDynamicBakedModel; diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java index 728af1061..9d20d4d35 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java @@ -25,15 +25,15 @@ import java.util.function.Function; import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -68,7 +68,7 @@ class CraftingCubeModel implements IModelGeometry { @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return ImmutableList.of(RING_CORNER, RING_SIDE_HOR, RING_SIDE_VER, UNIT_BASE, LIGHT_BASE, ACCELERATOR_LIGHT, STORAGE_1K_LIGHT, STORAGE_4K_LIGHT, STORAGE_16K_LIGHT, STORAGE_64K_LIGHT, MONITOR_BASE, MONITOR_LIGHT_DARK, MONITOR_LIGHT_MEDIUM, MONITOR_LIGHT_BRIGHT); @@ -77,7 +77,7 @@ class CraftingCubeModel implements IModelGeometry { @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { // Retrieve our textures and pass them on to the baked model TextureAtlasSprite ringCorner = spriteGetter.apply(RING_CORNER); TextureAtlasSprite ringSideHor = spriteGetter.apply(RING_SIDE_HOR); @@ -122,6 +122,6 @@ class CraftingCubeModel implements IModelGeometry { private static Material texture(String name) { return new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "block/crafting/" + name)); + new Identifier(AppEng.MOD_ID, "block/crafting/" + name)); } } diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java b/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java index 92e25128e..00549877f 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java @@ -18,9 +18,9 @@ package appeng.client.render.crafting; +import net.fabricmc.api.Environment; import net.minecraft.client.renderer.RenderType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; @@ -31,7 +31,7 @@ import appeng.bootstrap.IItemRendering; */ public class CraftingCubeRendering extends BlockRenderingCustomizer { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); // Disable auto-rotation diff --git a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java b/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java index 457d83922..208cc613f 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java +++ b/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java @@ -18,14 +18,14 @@ package appeng.client.render.crafting; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.fabricmc.api.Environment; +import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.math.Direction; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import appeng.api.storage.data.IAEItemStack; import appeng.client.render.TesrRenderHelper; @@ -34,7 +34,7 @@ import appeng.tile.crafting.CraftingMonitorTileEntity; /** * Renders the item currently being crafted */ -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class CraftingMonitorTESR extends TileEntityRenderer { public CraftingMonitorTESR(TileEntityRendererDispatcher rendererDispatcherIn) { @@ -43,7 +43,7 @@ public class CraftingMonitorTESR extends TileEntityRenderer { - private final ResourceLocation baseModel; + private final Identifier baseModel; - public EncodedPatternModel(ResourceLocation baseModel) { + public EncodedPatternModel(Identifier baseModel) { this.baseModel = baseModel; } @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return modelGetter.apply(baseModel).getTextures(modelGetter, missingTextureErrors); } @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { IBakedModel baseModel = bakery.getBakedModel(this.baseModel, modelTransform, spriteGetter); return new EncodedPatternBakedModel(baseModel); } diff --git a/src/main/java/appeng/client/render/crafting/EncodedPatternModelLoader.java b/src/main/java/appeng/client/render/crafting/EncodedPatternModelLoader.java index 8ffa8cf54..f558f9385 100644 --- a/src/main/java/appeng/client/render/crafting/EncodedPatternModelLoader.java +++ b/src/main/java/appeng/client/render/crafting/EncodedPatternModelLoader.java @@ -4,8 +4,8 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import net.minecraft.resources.IResourceManager; +import net.minecraft.util.Identifier; import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelLoader; /** @@ -23,7 +23,7 @@ public class EncodedPatternModelLoader implements IModelLoader { private final IAnimatedSprite spriteSet; diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index 569070ade..3d0dd3678 100644 --- a/src/main/java/appeng/client/render/effects/CraftingFx.java +++ b/src/main/java/appeng/client/render/effects/CraftingFx.java @@ -20,6 +20,7 @@ package appeng.client.render.effects; import com.mojang.blaze3d.vertex.IVertexBuilder; +import net.fabricmc.api.EnvType; import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.particle.IParticleFactory; import net.minecraft.client.particle.IParticleRenderType; @@ -31,12 +32,9 @@ import net.minecraft.particles.BasicParticleType; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; -import appeng.core.AppEng; - -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class CraftingFx extends SpriteTexturedParticle { // Offset relative to center of block, is the starting point of the particle @@ -127,7 +125,7 @@ public class CraftingFx extends SpriteTexturedParticle { } } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public static class Factory implements IParticleFactory { private final IAnimatedSprite spriteSet; diff --git a/src/main/java/appeng/client/render/effects/EnergyFx.java b/src/main/java/appeng/client/render/effects/EnergyFx.java index 7a9dd4e3d..6223264fe 100644 --- a/src/main/java/appeng/client/render/effects/EnergyFx.java +++ b/src/main/java/appeng/client/render/effects/EnergyFx.java @@ -20,16 +20,14 @@ package appeng.client.render.effects; import com.mojang.blaze3d.vertex.IVertexBuilder; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.particle.*; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.core.AppEng; - -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class EnergyFx extends SpriteTexturedParticle { private final int startBlkX; @@ -98,7 +96,7 @@ public class EnergyFx extends SpriteTexturedParticle { this.motionZ = motionZ; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public static class Factory implements IParticleFactory { private final IAnimatedSprite spriteSet; diff --git a/src/main/java/appeng/client/render/effects/EnergyParticleData.java b/src/main/java/appeng/client/render/effects/EnergyParticleData.java index 313a880fd..8e3cc63f4 100644 --- a/src/main/java/appeng/client/render/effects/EnergyParticleData.java +++ b/src/main/java/appeng/client/render/effects/EnergyParticleData.java @@ -23,7 +23,7 @@ import java.util.Locale; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.particles.IParticleData; import net.minecraft.particles.ParticleType; @@ -54,7 +54,7 @@ public class EnergyParticleData implements IParticleData { } @Override - public EnergyParticleData read(ParticleType particleTypeIn, PacketBuffer buffer) { + public EnergyParticleData read(ParticleType particleTypeIn, PacketByteBuf buffer) { boolean forItem = buffer.readBoolean(); AEPartLocation direction = AEPartLocation.values()[buffer.readByte()]; return new EnergyParticleData(forItem, direction); @@ -67,7 +67,7 @@ public class EnergyParticleData implements IParticleData { } @Override - public void write(PacketBuffer buffer) { + public void write(PacketByteBuf buffer) { buffer.writeBoolean(forItem); buffer.writeByte((byte) direction.ordinal()); } diff --git a/src/main/java/appeng/client/render/effects/LightningArcFX.java b/src/main/java/appeng/client/render/effects/LightningArcFX.java index 969beb04b..cd0b6573b 100644 --- a/src/main/java/appeng/client/render/effects/LightningArcFX.java +++ b/src/main/java/appeng/client/render/effects/LightningArcFX.java @@ -20,17 +20,15 @@ package appeng.client.render.effects; import java.util.Random; +import net.fabricmc.api.Environment; import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.particle.IParticleFactory; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; -import appeng.core.AppEng; - -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class LightningArcFX extends LightningFX { private static final Random RANDOM_GENERATOR = new Random(); @@ -68,7 +66,7 @@ public class LightningArcFX extends LightningFX { } } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public static class Factory implements IParticleFactory { private final IAnimatedSprite spriteSet; diff --git a/src/main/java/appeng/client/render/effects/LightningArcParticleData.java b/src/main/java/appeng/client/render/effects/LightningArcParticleData.java index cb9992091..2b290dd81 100644 --- a/src/main/java/appeng/client/render/effects/LightningArcParticleData.java +++ b/src/main/java/appeng/client/render/effects/LightningArcParticleData.java @@ -5,7 +5,7 @@ import java.util.Locale; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.particles.IParticleData; import net.minecraft.particles.ParticleType; import net.minecraft.util.math.Vec3d; @@ -37,7 +37,7 @@ public class LightningArcParticleData implements IParticleData { @Override public LightningArcParticleData read(ParticleType particleTypeIn, - PacketBuffer buffer) { + PacketByteBuf buffer) { float x = buffer.readFloat(); float y = buffer.readFloat(); float z = buffer.readFloat(); @@ -51,7 +51,7 @@ public class LightningArcParticleData implements IParticleData { } @Override - public void write(PacketBuffer buffer) { + public void write(PacketByteBuf buffer) { buffer.writeFloat((float) target.x); buffer.writeFloat((float) target.y); buffer.writeFloat((float) target.z); diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index 072e4def3..7add976d8 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -22,6 +22,8 @@ import java.util.Random; import com.mojang.blaze3d.vertex.IVertexBuilder; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.particle.IParticleFactory; @@ -34,12 +36,8 @@ import net.minecraft.particles.BasicParticleType; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.core.AppEng; - -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class LightningFX extends SpriteTexturedParticle { private static final Random RANDOM_GENERATOR = new Random(); @@ -246,7 +244,7 @@ public class LightningFX extends SpriteTexturedParticle { return this.precomputedSteps; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public static class Factory implements IParticleFactory { private final IAnimatedSprite spriteSet; diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java index aaef5fbb3..7d65274c4 100644 --- a/src/main/java/appeng/client/render/effects/MatterCannonFX.java +++ b/src/main/java/appeng/client/render/effects/MatterCannonFX.java @@ -18,14 +18,13 @@ package appeng.client.render.effects; +import net.fabricmc.api.EnvType; import net.minecraft.client.particle.*; import net.minecraft.particles.BasicParticleType; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import appeng.api.util.AEPartLocation; -import appeng.core.AppEng; public class MatterCannonFX extends SpriteTexturedParticle { @@ -73,7 +72,7 @@ public class MatterCannonFX extends SpriteTexturedParticle { this.particleAlpha *= 0.59f; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public static class Factory implements IParticleFactory { private final IAnimatedSprite spriteSet; diff --git a/src/main/java/appeng/client/render/effects/VibrantFX.java b/src/main/java/appeng/client/render/effects/VibrantFX.java index 39f34bcc0..81509eb31 100644 --- a/src/main/java/appeng/client/render/effects/VibrantFX.java +++ b/src/main/java/appeng/client/render/effects/VibrantFX.java @@ -18,6 +18,8 @@ package appeng.client.render.effects; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.particle.IParticleFactory; import net.minecraft.client.particle.IParticleRenderType; @@ -25,12 +27,8 @@ import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.particles.BasicParticleType; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.core.AppEng; - -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class VibrantFX extends SpriteTexturedParticle { public VibrantFX(final World par1World, final double x, final double y, final double z, final double par8, @@ -81,7 +79,7 @@ public class VibrantFX extends SpriteTexturedParticle { this.maxAge--; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public static class Factory implements IParticleFactory { private final IAnimatedSprite spriteSet; diff --git a/src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java b/src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java index ff44160a8..6e5f1883c 100644 --- a/src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java +++ b/src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java @@ -33,10 +33,10 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.Vector4f; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemCameraTransforms; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormatElement; @@ -106,7 +106,7 @@ public class AutoRotatingBakedModel implements IBakedModel { // the normal back to a byte-based format, which then re-applies Forge's own bug // when piping it // to the AO lighter, thus fixing our problem. - BakedQuad packedQuad = new BakedQuad(unpackedQuad.getVertexData(), quad.getTintIndex(), + BakedQuad packedQuad = new BakedQuad(unpackedQuad.getVertexData(), quad.getColorIndex(), unpackedQuad.getFace(), quad.func_187508_a(), quad.shouldApplyDiffuseLighting()); rotated.add(packedQuad); } diff --git a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java index ff0d97161..d0106d7a8 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java @@ -11,13 +11,13 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableList; import com.mojang.authlib.GameProfile; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemCameraTransforms; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/client/render/model/BiometricCardModel.java b/src/main/java/appeng/client/render/model/BiometricCardModel.java index b3738cc4d..9a1346557 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardModel.java @@ -9,15 +9,15 @@ import javax.annotation.Nullable; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -29,13 +29,13 @@ import appeng.core.AppEng; */ public class BiometricCardModel implements IModelGeometry { - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "item/biometric_card_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "item/biometric_card_base"); private static final Material TEXTURE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "item/biometric_card_hash")); + new Identifier(AppEng.MOD_ID, "item/biometric_card_hash")); @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Collections.singleton(TEXTURE); } @@ -43,7 +43,7 @@ public class BiometricCardModel implements IModelGeometry { @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform transformIn, - ItemOverrideList overrides, ResourceLocation locationIn) { + ItemOverrideList overrides, Identifier locationIn) { TextureAtlasSprite texture = spriteGetter.apply(TEXTURE); IBakedModel baseModel = bakery.getBakedModel(MODEL_BASE, transformIn, spriteGetter); diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java index 2797cbcc6..e1ba0f7ff 100644 --- a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java +++ b/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java @@ -7,14 +7,14 @@ import java.util.Random; import javax.annotation.Nullable; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.ItemCameraTransforms; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.PerspectiveMapWrapper; diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java index 03e6a1dbd..fa5e307b1 100644 --- a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java +++ b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java @@ -7,15 +7,15 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -27,26 +27,26 @@ import appeng.core.AppEng; */ public class ColorApplicatorModel implements IModelGeometry { - private static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, + private static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "item/color_applicator_colored"); private static final Material TEXTURE_DARK = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "item/color_applicator_tip_dark")); + new Identifier(AppEng.MOD_ID, "item/color_applicator_tip_dark")); private static final Material TEXTURE_MEDIUM = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "item/color_applicator_tip_medium")); + new Identifier(AppEng.MOD_ID, "item/color_applicator_tip_medium")); private static final Material TEXTURE_BRIGHT = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "item/color_applicator_tip_bright")); + new Identifier(AppEng.MOD_ID, "item/color_applicator_tip_bright")); @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Arrays.asList(TEXTURE_DARK, TEXTURE_MEDIUM, TEXTURE_DARK); } @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { IBakedModel baseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter); TextureAtlasSprite texDark = spriteGetter.apply(TEXTURE_DARK); diff --git a/src/main/java/appeng/client/render/model/DriveBakedModel.java b/src/main/java/appeng/client/render/model/DriveBakedModel.java index 0030747ad..07076e7e2 100644 --- a/src/main/java/appeng/client/render/model/DriveBakedModel.java +++ b/src/main/java/appeng/client/render/model/DriveBakedModel.java @@ -28,8 +28,8 @@ import javax.annotation.Nullable; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; import net.minecraft.item.Item; import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.IModelData; diff --git a/src/main/java/appeng/client/render/model/DriveModel.java b/src/main/java/appeng/client/render/model/DriveModel.java index e5cf9100f..1aee171da 100644 --- a/src/main/java/appeng/client/render/model/DriveModel.java +++ b/src/main/java/appeng/client/render/model/DriveModel.java @@ -29,14 +29,14 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -44,21 +44,21 @@ import appeng.block.storage.DriveSlotCellType; public class DriveModel implements IModelGeometry { - private static final ResourceLocation MODEL_BASE = new ResourceLocation( + private static final Identifier MODEL_BASE = new Identifier( "appliedenergistics2:block/drive/drive_base"); - private static final Map MODELS_CELLS = ImmutableMap.of( - DriveSlotCellType.EMPTY, new ResourceLocation("appliedenergistics2:block/drive/drive_cell_empty"), - DriveSlotCellType.ITEM, new ResourceLocation("appliedenergistics2:block/drive/drive_cell_items"), - DriveSlotCellType.FLUID, new ResourceLocation("appliedenergistics2:block/drive/drive_cell_fluids")); + private static final Map MODELS_CELLS = ImmutableMap.of( + DriveSlotCellType.EMPTY, new Identifier("appliedenergistics2:block/drive/drive_cell_empty"), + DriveSlotCellType.ITEM, new Identifier("appliedenergistics2:block/drive/drive_cell_items"), + DriveSlotCellType.FLUID, new Identifier("appliedenergistics2:block/drive/drive_cell_fluids")); - public static final Set DEPENDENCIES = ImmutableSet.builder() + public static final Set DEPENDENCIES = ImmutableSet.builder() .addAll(MODELS_CELLS.values()).add(MODEL_BASE).build(); @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { EnumMap cellModels = new EnumMap<>(DriveSlotCellType.class); // Load the base model and the model for each cell state. @@ -73,7 +73,7 @@ public class DriveModel implements IModelGeometry { @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Collections.emptyList(); } diff --git a/src/main/java/appeng/client/render/model/GlassBakedModel.java b/src/main/java/appeng/client/render/model/GlassBakedModel.java index a7aa0e856..090489b81 100644 --- a/src/main/java/appeng/client/render/model/GlassBakedModel.java +++ b/src/main/java/appeng/client/render/model/GlassBakedModel.java @@ -32,15 +32,15 @@ import javax.annotation.Nullable; import com.google.common.base.Strings; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormatElement; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; @@ -65,13 +65,13 @@ class GlassBakedModel implements IDynamicBakedModel { // Alternating textures based on position static final Material TEXTURE_A = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation("appliedenergistics2:block/glass/quartz_glass_a")); + new Identifier("appliedenergistics2:block/glass/quartz_glass_a")); static final Material TEXTURE_B = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation("appliedenergistics2:block/glass/quartz_glass_b")); + new Identifier("appliedenergistics2:block/glass/quartz_glass_b")); static final Material TEXTURE_C = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation("appliedenergistics2:block/glass/quartz_glass_c")); + new Identifier("appliedenergistics2:block/glass/quartz_glass_c")); static final Material TEXTURE_D = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation("appliedenergistics2:block/glass/quartz_glass_d")); + new Identifier("appliedenergistics2:block/glass/quartz_glass_d")); // Frame texture static final Material[] TEXTURES_FRAME = generateTexturesFrame(); @@ -79,7 +79,7 @@ class GlassBakedModel implements IDynamicBakedModel { // Generates the required textures for the frame private static Material[] generateTexturesFrame() { return IntStream.range(1, 16).mapToObj(Integer::toBinaryString).map(s -> Strings.padStart(s, 4, '0')) - .map(s -> new ResourceLocation("appliedenergistics2:block/glass/quartz_glass_frame" + s)) + .map(s -> new Identifier("appliedenergistics2:block/glass/quartz_glass_frame" + s)) .map(rl -> new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, rl)).toArray(Material[]::new); } diff --git a/src/main/java/appeng/client/render/model/GlassModel.java b/src/main/java/appeng/client/render/model/GlassModel.java index 0773803aa..fd7231338 100644 --- a/src/main/java/appeng/client/render/model/GlassModel.java +++ b/src/main/java/appeng/client/render/model/GlassModel.java @@ -25,14 +25,14 @@ import java.util.function.Function; import com.google.common.collect.ImmutableSet; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -44,13 +44,13 @@ public class GlassModel implements IModelGeometry { @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { return new GlassBakedModel(spriteGetter); } @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return ImmutableSet .builder().add(GlassBakedModel.TEXTURE_A, GlassBakedModel.TEXTURE_B, GlassBakedModel.TEXTURE_C, GlassBakedModel.TEXTURE_D) diff --git a/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java b/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java index ab9bbb8c6..6b6829f21 100644 --- a/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java +++ b/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java @@ -11,13 +11,13 @@ import javax.annotation.Nullable; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableList; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemCameraTransforms; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/client/render/model/MemoryCardModel.java b/src/main/java/appeng/client/render/model/MemoryCardModel.java index e6e82260e..b6ad588cb 100644 --- a/src/main/java/appeng/client/render/model/MemoryCardModel.java +++ b/src/main/java/appeng/client/render/model/MemoryCardModel.java @@ -9,15 +9,15 @@ import javax.annotation.Nullable; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -29,13 +29,13 @@ import appeng.core.AppEng; */ public class MemoryCardModel implements IModelGeometry { - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "item/memory_card_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "item/memory_card_base"); private static final Material TEXTURE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "item/memory_card_hash")); + new Identifier(AppEng.MOD_ID, "item/memory_card_hash")); @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Collections.singleton(TEXTURE); } @@ -43,7 +43,7 @@ public class MemoryCardModel implements IModelGeometry { @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { TextureAtlasSprite texture = spriteGetter.apply(TEXTURE); IBakedModel baseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter); diff --git a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java index b85bcf01f..9b2c363de 100644 --- a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java +++ b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java @@ -28,10 +28,10 @@ import net.minecraft.block.BlockState; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.Quaternion; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemCameraTransforms; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/appeng/client/render/model/SkyCompassModel.java b/src/main/java/appeng/client/render/model/SkyCompassModel.java index 2e7ef4592..648edc578 100644 --- a/src/main/java/appeng/client/render/model/SkyCompassModel.java +++ b/src/main/java/appeng/client/render/model/SkyCompassModel.java @@ -27,14 +27,14 @@ import java.util.function.Function; import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -44,18 +44,18 @@ import net.minecraftforge.client.model.geometry.IModelGeometry; */ public class SkyCompassModel implements IModelGeometry { - private static final ResourceLocation MODEL_BASE = new ResourceLocation( + private static final Identifier MODEL_BASE = new Identifier( "appliedenergistics2:block/sky_compass_base"); - private static final ResourceLocation MODEL_POINTER = new ResourceLocation( + private static final Identifier MODEL_POINTER = new Identifier( "appliedenergistics2:block/sky_compass_pointer"); - public static final List DEPENDENCIES = ImmutableList.of(MODEL_BASE, MODEL_POINTER); + public static final List DEPENDENCIES = ImmutableList.of(MODEL_BASE, MODEL_POINTER); @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { IBakedModel baseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter); IBakedModel pointerModel = bakery.getBakedModel(MODEL_POINTER, modelTransform, spriteGetter); return new SkyCompassBakedModel(baseModel, pointerModel); @@ -63,7 +63,7 @@ public class SkyCompassModel implements IModelGeometry { @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Collections.emptyList(); } diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index 6b4b40afb..ccb6e8f9d 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -31,32 +31,32 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.Identifier; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.TransformationMatrix; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.BlockFaceUV; -import net.minecraft.client.renderer.model.BlockModel; -import net.minecraft.client.renderer.model.BlockPart; -import net.minecraft.client.renderer.model.BlockPartFace; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverride; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.ItemTransformVec3f; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.BlockFaceUV; +import net.minecraft.client.render.model.BlockModel; +import net.minecraft.client.render.model.BlockPart; +import net.minecraft.client.render.model.BlockPartFace; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemCameraTransforms; +import net.minecraft.client.render.model.ItemOverride; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.ItemTransformVec3f; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.resources.IResourceManager; import net.minecraft.util.math.Direction; import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelBuilder; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.IModelLoader; @@ -144,7 +144,7 @@ public class UVLModelLoader implements IModelLoader spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { TextureAtlasSprite particle = spriteGetter.apply(owner.resolveTexture("particle")); IModelBuilder builder = IModelBuilder.of(owner, overrides, particle); @@ -192,7 +192,7 @@ public class UVLModelLoader implements IModelLoader getTextures(IModelConfiguration owner, - Function modelGetter, + Function modelGetter, Set> missingTextureErrors) { return parent.getTextures(modelGetter, missingTextureErrors); } diff --git a/src/main/java/appeng/client/render/renderable/ItemRenderable.java b/src/main/java/appeng/client/render/renderable/ItemRenderable.java index 2330c27df..6e2b2926f 100644 --- a/src/main/java/appeng/client/render/renderable/ItemRenderable.java +++ b/src/main/java/appeng/client/render/renderable/ItemRenderable.java @@ -20,16 +20,16 @@ package appeng.client.render.renderable; import java.util.function.Function; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.client.render.VertexConsumerProvider; import org.apache.commons.lang3.tuple.Pair; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.TransformationMatrix; -import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.render.model.ItemCameraTransforms; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -public class ItemRenderable implements Renderable { +public class ItemRenderable implements Renderable { private final Function> f; @@ -38,8 +38,8 @@ public class ItemRenderable implements Renderable { } @Override - public void renderTileEntityAt(T te, float partialTicks, com.mojang.blaze3d.matrix.MatrixStack matrixStack, - IRenderTypeBuffer buffers, int combinedLight, int combinedOverlay) { + public void renderTileEntityAt(T te, float partialTicks, net.minecraft.client.util.math.MatrixStack matrixStack, + VertexConsumerProvider buffers, int combinedLight, int combinedOverlay) { Pair pair = this.f.apply(te); if (pair != null && pair.getLeft() != null) { if (pair.getRight() != null) { diff --git a/src/main/java/appeng/client/render/renderable/Renderable.java b/src/main/java/appeng/client/render/renderable/Renderable.java index e6b3410e5..a8c39a33f 100644 --- a/src/main/java/appeng/client/render/renderable/Renderable.java +++ b/src/main/java/appeng/client/render/renderable/Renderable.java @@ -18,14 +18,14 @@ package appeng.client.render.renderable; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; -public interface Renderable { +public interface Renderable { - void renderTileEntityAt(T te, float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffers, + void renderTileEntityAt(T te, float partialTicks, MatrixStack matrixStack, VertexConsumerProvider buffers, int combinedLight, int combinedOverlay); } diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java index a5980f81f..c7177dfdf 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java @@ -28,8 +28,8 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.IDynamicBakedModel; diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java index 2b60c7b5c..b9c00c2bd 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java @@ -28,15 +28,15 @@ import java.util.stream.Collectors; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -47,7 +47,7 @@ public class SpatialPylonModel implements IModelGeometry { @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { Map textures = new EnumMap<>(SpatialPylonTextureType.class); for (SpatialPylonTextureType type : SpatialPylonTextureType.values()) { @@ -59,14 +59,14 @@ public class SpatialPylonModel implements IModelGeometry { @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Arrays.stream(SpatialPylonTextureType.values()).map(SpatialPylonModel::getTexturePath) .collect(Collectors.toList()); } private static Material getTexturePath(SpatialPylonTextureType type) { return new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "block/spatial_pylon/" + type.name().toLowerCase())); + new Identifier(AppEng.MOD_ID, "block/spatial_pylon/" + type.name().toLowerCase())); } } diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java b/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java index 8ad1e3f40..f1c90696a 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java @@ -18,20 +18,18 @@ package appeng.client.render.spatial; +import net.fabricmc.api.EnvType; import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; import appeng.bootstrap.IItemRendering; -import appeng.core.AppEng; public class SpatialPylonRendering extends BlockRenderingCustomizer { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); } diff --git a/src/main/java/appeng/client/render/tesr/CrankTESR.java b/src/main/java/appeng/client/render/tesr/CrankTESR.java index df7f03b95..2d8881eb9 100644 --- a/src/main/java/appeng/client/render/tesr/CrankTESR.java +++ b/src/main/java/appeng/client/render/tesr/CrankTESR.java @@ -18,20 +18,20 @@ package appeng.client.render.tesr; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.util.math.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.BlockRendererDispatcher; -import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Quaternion; -import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.render.model.IBakedModel; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.client.render.FacingToRotation; import appeng.tile.grindstone.CrankTileEntity; @@ -40,7 +40,7 @@ import appeng.tile.grindstone.CrankTileEntity; * This FastTESR only handles the animated model of the turning crank. When the * crank is at rest, it is rendered using a normal model. */ -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class CrankTESR extends TileEntityRenderer { public CrankTESR(TileEntityRendererDispatcher rendererDispatcherIn) { @@ -48,7 +48,7 @@ public class CrankTESR extends TileEntityRenderer { } @Override - public void render(CrankTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, + public void render(CrankTileEntity te, float partialTicks, MatrixStack ms, VertexConsumerProvider buffers, int combinedLightIn, int combinedOverlayIn) { // Apply GL transformations relative to the center of the block: 1) TE rotation diff --git a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java index 426ab87a2..e184a8b75 100644 --- a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java +++ b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java @@ -2,18 +2,18 @@ package appeng.client.render.tesr; import java.util.EnumMap; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.renderer.RenderState; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import appeng.block.storage.DriveSlotState; @@ -23,7 +23,7 @@ import appeng.tile.storage.DriveTileEntity; /** * Renders the drive cell status indicators. */ -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class DriveLedTileEntityRenderer extends TileEntityRenderer { private static final EnumMap STATE_COLORS; @@ -68,7 +68,7 @@ public class DriveLedTileEntityRenderer extends TileEntityRenderer private static final float ITEM_RENDER_SCALE = 1.0f / 1.2f; private static final Material TEXTURE_INSIDE = new Material(PlayerContainer.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "block/inscriber_inside")); + new Identifier(AppEng.MOD_ID, "block/inscriber_inside")); public InscriberTESR(TileEntityRendererDispatcher rendererDispatcherIn) { super(rendererDispatcherIn); } @Override - public void render(InscriberTileEntity tile, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, + public void render(InscriberTileEntity tile, float partialTicks, MatrixStack ms, VertexConsumerProvider buffers, int combinedLight, int combinedOverlay) { // render inscriber @@ -126,7 +126,7 @@ public final class InscriberTESR extends TileEntityRenderer // render items. - IItemHandler tileInv = tile.getInternalInventory(); + ItemTransferable tileInv = tile.getInternalInventory(); int items = 0; if (!tileInv.getStackInSlot(0).isEmpty()) { @@ -182,9 +182,9 @@ public final class InscriberTESR extends TileEntityRenderer vb.endVertex(); } - private static final ResourceLocation TAG_STORAGE_BLOCKS = new ResourceLocation("forge:storage_blocks"); + private static final Identifier TAG_STORAGE_BLOCKS = new Identifier("forge:storage_blocks"); - private void renderItem(MatrixStack ms, final ItemStack stack, final float o, IRenderTypeBuffer buffers, + private void renderItem(MatrixStack ms, final ItemStack stack, final float o, VertexConsumerProvider buffers, int combinedLight, int combinedOverlay) { if (!stack.isEmpty()) { ms.push(); diff --git a/src/main/java/appeng/client/render/tesr/ModularTESR.java b/src/main/java/appeng/client/render/tesr/ModularTESR.java index 34f71dd48..bea742317 100644 --- a/src/main/java/appeng/client/render/tesr/ModularTESR.java +++ b/src/main/java/appeng/client/render/tesr/ModularTESR.java @@ -21,19 +21,19 @@ package appeng.client.render.tesr; import java.util.List; import com.google.common.collect.ImmutableList; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.client.render.FacingToRotation; import appeng.client.render.renderable.Renderable; import appeng.tile.AEBaseTileEntity; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class ModularTESR extends TileEntityRenderer { private final List> renderables; @@ -45,8 +45,8 @@ public class ModularTESR extends TileEntityRenderer< } @Override - public void render(T te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int combinedLight, - int combinedOverlay) { + public void render(T te, float partialTicks, MatrixStack ms, VertexConsumerProvider buffers, int combinedLight, + int combinedOverlay) { ms.push(); ms.translate(0.5, 0.5, 0.5); FacingToRotation.get(te.getForward(), te.getUp()).push(ms); diff --git a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java index 866f57ddf..c5fa129eb 100644 --- a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java @@ -18,21 +18,21 @@ package appeng.client.render.tesr; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.util.math.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.Block; import net.minecraft.client.renderer.Atlases; -import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.Vector3f; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelRenderer; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.util.Identifier; import net.minecraftforge.client.event.TextureStitchEvent; import appeng.block.storage.SkyChestBlock; @@ -41,13 +41,13 @@ import appeng.core.AppEng; import appeng.tile.storage.SkyChestTileEntity; // This is mostly a copy&paste job of the vanilla chest TESR -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class SkyChestTESR extends TileEntityRenderer { public static final Material TEXTURE_STONE = new Material(Atlases.CHEST_ATLAS, - new ResourceLocation(AppEng.MOD_ID, "models/skychest")); + new Identifier(AppEng.MOD_ID, "models/skychest")); public static final Material TEXTURE_BLOCK = new Material(Atlases.CHEST_ATLAS, - new ResourceLocation(AppEng.MOD_ID, "models/skyblockchest")); + new Identifier(AppEng.MOD_ID, "models/skyblockchest")); private final ModelRenderer singleLid; private final ModelRenderer singleBottom; @@ -69,7 +69,7 @@ public class SkyChestTESR extends TileEntityRenderer { @Override public void render(SkyChestTileEntity tileEntityIn, float partialTicks, MatrixStack matrixStackIn, - IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) { + VertexConsumerProvider bufferIn, int combinedLightIn, int combinedOverlayIn) { matrixStackIn.push(); float f = tileEntityIn.getForward().getHorizontalAngle(); matrixStackIn.translate(0.5D, 0.5D, 0.5D); diff --git a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java index 314a9b1e8..1ad57bac1 100644 --- a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java @@ -18,27 +18,27 @@ package appeng.client.render.tesr; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.fabricmc.api.EnvType; +import net.minecraft.client.util.math.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.BlockRendererDispatcher; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.model.IBakedModel; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.math.Direction; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import net.minecraftforge.client.model.data.ModelDataMap; import appeng.client.render.FacingToRotation; import appeng.client.render.model.SkyCompassBakedModel; import appeng.tile.misc.SkyCompassTileEntity; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class SkyCompassTESR extends TileEntityRenderer { private static BlockRendererDispatcher blockRenderer; @@ -48,7 +48,7 @@ public class SkyCompassTESR extends TileEntityRenderer { } @Override - public void render(SkyCompassTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, + public void render(SkyCompassTileEntity te, float partialTicks, MatrixStack ms, VertexConsumerProvider buffers, int combinedLightIn, int combinedOverlayIn) { if (blockRenderer == null) { diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index f1cef6287..684ddad5c 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -24,6 +24,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; @@ -33,8 +35,6 @@ import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.IContainerListener; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.PlayerInvWrapper; import appeng.api.AEApi; @@ -81,7 +81,7 @@ public abstract class AEBaseContainer extends Container { private final PlayerInventory invPlayer; private final IActionSource mySrc; private final HashSet locked = new HashSet<>(); - private final TileEntity tileEntity; + private final BlockEntity tileEntity; private final IPart part; private final IGuiItemObject obj; private final HashMap syncData = new HashMap<>(); @@ -96,12 +96,12 @@ public abstract class AEBaseContainer extends Container { // Slots that were created to represent the player inventory private List playerInventorySlots = null; - public AEBaseContainer(ContainerType containerType, int id, final PlayerInventory ip, final TileEntity myTile, + public AEBaseContainer(ContainerType containerType, int id, final PlayerInventory ip, final BlockEntity myTile, final IPart myPart) { this(containerType, id, ip, myTile, myPart, null); } - public AEBaseContainer(ContainerType containerType, int id, final PlayerInventory ip, final TileEntity myTile, + public AEBaseContainer(ContainerType containerType, int id, final PlayerInventory ip, final BlockEntity myTile, final IPart myPart, final IGuiItemObject gio) { super(containerType, id); this.invPlayer = ip; @@ -115,7 +115,7 @@ public abstract class AEBaseContainer extends Container { public AEBaseContainer(ContainerType containerType, int id, final PlayerInventory ip, final Object anchor) { super(containerType, id); this.invPlayer = ip; - this.tileEntity = anchor instanceof TileEntity ? (TileEntity) anchor : null; + this.tileEntity = anchor instanceof BlockEntity ? (BlockEntity) anchor : null; this.part = anchor instanceof IPart ? (IPart) anchor : null; this.obj = anchor instanceof IGuiItemObject ? (IGuiItemObject) anchor : null; @@ -242,7 +242,7 @@ public abstract class AEBaseContainer extends Container { return this.getPlayerInventory(); } - public TileEntity getTileEntity() { + public BlockEntity getTileEntity() { return this.tileEntity; } @@ -262,7 +262,7 @@ public abstract class AEBaseContainer extends Container { } protected void bindPlayerInventory(final PlayerInventory PlayerInventory, final int offsetX, final int offsetY) { - IItemHandler ih = new PlayerInvWrapper(PlayerInventory); + ItemTransferable ih = new PlayerInvWrapper(PlayerInventory); // bind player inventory for (int i = 0; i < 3; i++) { diff --git a/src/main/java/appeng/container/ContainerLocator.java b/src/main/java/appeng/container/ContainerLocator.java index afcec020c..1c5dec62e 100644 --- a/src/main/java/appeng/container/ContainerLocator.java +++ b/src/main/java/appeng/container/ContainerLocator.java @@ -22,11 +22,11 @@ import com.google.common.base.Preconditions; import io.netty.handler.codec.DecoderException; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; @@ -74,7 +74,7 @@ public final class ContainerLocator { this.side = side; } - public static ContainerLocator forTileEntity(TileEntity te) { + public static ContainerLocator forTileEntity(BlockEntity te) { if (te.getWorld() == null) { throw new IllegalArgumentException("Cannot open a tile entity that is not in a world"); } @@ -82,7 +82,7 @@ public final class ContainerLocator { return new ContainerLocator(Type.BLOCK, -1, dimensionId, te.getPos(), null); } - public static ContainerLocator forTileEntitySide(TileEntity te, Direction side) { + public static ContainerLocator forTileEntitySide(BlockEntity te, Direction side) { if (te.getWorld() == null) { throw new IllegalArgumentException("Cannot open a tile entity that is not in a world"); } @@ -164,7 +164,7 @@ public final class ContainerLocator { return side; } - public void write(PacketBuffer buf) { + public void write(PacketByteBuf buf) { switch (type) { case PLAYER_INVENTORY: buf.writeByte(0); @@ -193,7 +193,7 @@ public final class ContainerLocator { } } - public static ContainerLocator read(PacketBuffer buf) { + public static ContainerLocator read(PacketByteBuf buf) { byte type = buf.readByte(); switch (type) { case 0: diff --git a/src/main/java/appeng/container/guisync/SyncData.java b/src/main/java/appeng/container/guisync/SyncData.java index 3d3662315..523b14029 100644 --- a/src/main/java/appeng/container/guisync/SyncData.java +++ b/src/main/java/appeng/container/guisync/SyncData.java @@ -25,7 +25,7 @@ import java.util.Objects; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.IContainerListener; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.container.AEBaseContainer; import appeng.core.AELog; @@ -80,18 +80,18 @@ public class SyncData { } private void send(final IContainerListener o, Object val) { - if (fieldType.isAssignableFrom(ITextComponent.class)) { + if (fieldType.isAssignableFrom(Text.class)) { if (o instanceof ServerPlayerEntity) { String json = ""; if (val != null) { - json = ITextComponent.Serializer.toJson((ITextComponent) val); + json = Text.Serializer.toJson((Text) val); } NetworkHandler.instance().sendTo(new ConfigValuePacket("SyncDat." + this.channel, json), (ServerPlayerEntity) o); } } - // Types other than ITextComponent must be non-null + // Types other than Text must be non-null if (val == null) { return; } @@ -123,11 +123,11 @@ public class SyncData { try { final Object oldValue = this.getter.invoke(source); if (val instanceof String) { - if (this.fieldType.isAssignableFrom(ITextComponent.class)) { + if (this.fieldType.isAssignableFrom(Text.class)) { String json = (String) val; - ITextComponent text = null; + Text text = null; if (!json.isEmpty()) { - text = ITextComponent.Serializer.fromJson((String) val); + text = Text.Serializer.fromJson((String) val); } this.updateTextComponent(text); } else { @@ -149,7 +149,7 @@ public class SyncData { } } - private void updateTextComponent(final ITextComponent val) { + private void updateTextComponent(final Text val) { try { this.setter.invoke(source, val); } catch (Throwable e) { diff --git a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java index 44c318444..4a63154c7 100644 --- a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java +++ b/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java @@ -20,6 +20,7 @@ package appeng.container.implementations; import java.util.Iterator; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; @@ -27,8 +28,7 @@ import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.IContainerListener; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; import net.minecraftforge.items.wrapper.EmptyHandler; import appeng.api.AEApi; @@ -72,7 +72,7 @@ public class CellWorkbenchContainer extends UpgradeableContainer { this.workBench = te; } - public static CellWorkbenchContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CellWorkbenchContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -102,11 +102,11 @@ public class CellWorkbenchContainer extends UpgradeableContainer { @Override protected void setupConfig() { - final IItemHandler cell = this.getUpgradeable().getInventoryByName("cell"); + final ItemTransferable cell = this.getUpgradeable().getInventoryByName("cell"); this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.WORKBENCH_CELL, cell, 0, 152, 8, this.getPlayerInv())); - final IItemHandler inv = this.getUpgradeable().getInventoryByName("config"); + final ItemTransferable inv = this.getUpgradeable().getInventoryByName("config"); final WrapperSupplierItemHandler upgradeInventory = new WrapperSupplierItemHandler( this::getCellUpgradeInventory); // null, 3 * 8 ); @@ -182,8 +182,8 @@ public class CellWorkbenchContainer extends UpgradeableContainer { return idx < this.availableUpgrades(); } - public IItemHandler getCellUpgradeInventory() { - final IItemHandler upgradeInventory = this.workBench.getCellUpgradeInventory(); + public ItemTransferable getCellUpgradeInventory() { + final ItemTransferable upgradeInventory = this.workBench.getCellUpgradeInventory(); return upgradeInventory == null ? EmptyHandler.INSTANCE : upgradeInventory; } @@ -212,7 +212,7 @@ public class CellWorkbenchContainer extends UpgradeableContainer { public void partition() { - final IItemHandler inv = this.getUpgradeable().getInventoryByName("config"); + final ItemTransferable inv = this.getUpgradeable().getInventoryByName("config"); final ItemStack is = this.getUpgradeable().getInventoryByName("cell").getStackInSlot(0); final IStorageChannel channel = is.getItem() instanceof IStorageCell diff --git a/src/main/java/appeng/container/implementations/ChestContainer.java b/src/main/java/appeng/container/implementations/ChestContainer.java index 851b8acbd..5326b2743 100644 --- a/src/main/java/appeng/container/implementations/ChestContainer.java +++ b/src/main/java/appeng/container/implementations/ChestContainer.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; @@ -45,7 +45,7 @@ public class ChestContainer extends AEBaseContainer { this.bindPlayerInventory(ip, 0, 166 - /* height of player inventory */82); } - public static ChestContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static ChestContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/CondenserContainer.java b/src/main/java/appeng/container/implementations/CondenserContainer.java index b2e71c6a8..18c2d7b09 100644 --- a/src/main/java/appeng/container/implementations/CondenserContainer.java +++ b/src/main/java/appeng/container/implementations/CondenserContainer.java @@ -21,8 +21,8 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.config.CondenserOutput; import appeng.api.config.Settings; @@ -54,7 +54,7 @@ public class CondenserContainer extends AEBaseContainer implements IProgressProv super(TYPE, id, ip, condenser, null); this.condenser = condenser; - IItemHandler inv = condenser.getInternalInventory(); + ItemTransferable inv = condenser.getInternalInventory(); this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.TRASH, inv, 0, 51, 52, ip)); this.addSlot(new OutputSlot(inv, 1, 105, 52, -1)); @@ -65,7 +65,7 @@ public class CondenserContainer extends AEBaseContainer implements IProgressProv this.bindPlayerInventory(ip, 0, 197 - /* height of player inventory */82); } - public static CondenserContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CondenserContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/ContainerHelper.java b/src/main/java/appeng/container/implementations/ContainerHelper.java index ba1f3f5a7..e97277deb 100644 --- a/src/main/java/appeng/container/implementations/ContainerHelper.java +++ b/src/main/java/appeng/container/implementations/ContainerHelper.java @@ -6,12 +6,12 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.INamedContainerProvider; import net.minecraft.inventory.container.SimpleNamedContainerProvider; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.TranslatableText; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; @@ -58,7 +58,7 @@ public final class ContainerHelper { * Opens a container that is based around a single tile entity. The tile * entity's position is encoded in the packet buffer. */ - public C fromNetwork(int windowId, PlayerInventory inv, PacketBuffer packetBuf) { + public C fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf packetBuf) { I host = getHostFromLocator(inv.player, ContainerLocator.read(packetBuf)); if (host != null) { return factory.create(windowId, inv, host); @@ -83,7 +83,7 @@ public final class ContainerHelper { return false; } - ITextComponent title = findContainerTitle(player.world, locator, accessInterface); + Text title = findContainerTitle(player.world, locator, accessInterface); INamedContainerProvider container = new SimpleNamedContainerProvider((wnd, p, pl) -> { C c = factory.create(wnd, p, accessInterface); @@ -97,7 +97,7 @@ public final class ContainerHelper { return true; } - private ITextComponent findContainerTitle(World world, ContainerLocator locator, I accessInterface) { + private Text findContainerTitle(World world, ContainerLocator locator, I accessInterface) { if (accessInterface instanceof ICustomNameObject) { ICustomNameObject customNameObject = (ICustomNameObject) accessInterface; @@ -112,7 +112,7 @@ public final class ContainerHelper { // FIXME: Should move this up, because at this point, it's hard to know where // the terminal host came from (part or tile) if (locator.hasBlockPos()) { - return new TranslationTextComponent( + return new TranslatableText( world.getBlockState(locator.getBlockPos()).getBlock().getTranslationKey()); } @@ -129,7 +129,7 @@ public final class ContainerHelper { return null; // No block was clicked } - TileEntity tileEntity = player.world.getTileEntity(locator.getBlockPos()); + BlockEntity tileEntity = player.world.getTileEntity(locator.getBlockPos()); // The tile entity itself can host a terminal (i.e. Chest!) if (interfaceClass.isInstance(tileEntity)) { diff --git a/src/main/java/appeng/container/implementations/CraftAmountContainer.java b/src/main/java/appeng/container/implementations/CraftAmountContainer.java index 68cd508a1..ece0c87a6 100644 --- a/src/main/java/appeng/container/implementations/CraftAmountContainer.java +++ b/src/main/java/appeng/container/implementations/CraftAmountContainer.java @@ -24,7 +24,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.Slot; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.world.World; import appeng.api.config.SecurityPermissions; @@ -56,7 +56,7 @@ public class CraftAmountContainer extends AEBaseContainer { this.addSlot(this.getCraftingItem()); } - public static CraftAmountContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CraftAmountContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java index 27ecceada..682bfd4d0 100644 --- a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java +++ b/src/main/java/appeng/container/implementations/CraftConfirmContainer.java @@ -32,8 +32,8 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.IContainerListener; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; @@ -74,7 +74,7 @@ public class CraftConfirmContainer extends AEBaseContainer { private static final ContainerHelper helper = new ContainerHelper<>( CraftConfirmContainer::new, ITerminalHost.class, SecurityPermissions.CRAFT); - public static CraftConfirmContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CraftConfirmContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -100,7 +100,7 @@ public class CraftConfirmContainer extends AEBaseContainer { @GuiSync(6) public boolean noCPU = true; @GuiSync(7) - public ITextComponent myName; + public Text myName; public CraftConfirmContainer(int id, PlayerInventory ip, ITerminalHost te) { super(TYPE, id, ip, te); @@ -390,11 +390,11 @@ public class CraftConfirmContainer extends AEBaseContainer { this.selectedCpu = selectedCpu; } - public ITextComponent getName() { + public Text getName() { return this.myName; } - private void setName(@Nullable final ITextComponent myName) { + private void setName(@Nullable final Text myName) { this.myName = myName; } diff --git a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java index 026ee194c..085504f14 100644 --- a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java +++ b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java @@ -25,8 +25,8 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.IContainerListener; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.text.Text; import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; @@ -64,7 +64,7 @@ public class CraftingCPUContainer extends AEBaseContainer .createList(); private IGrid network; private CraftingCPUCluster monitor = null; - private ITextComponent cpuName = null; + private Text cpuName = null; @GuiSync(0) public long eta = -1; @@ -90,7 +90,7 @@ public class CraftingCPUContainer extends AEBaseContainer } } - public static CraftingCPUContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CraftingCPUContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -220,7 +220,7 @@ public class CraftingCPUContainer extends AEBaseContainer } @Override - public ITextComponent getCustomInventoryName() { + public Text getCustomInventoryName() { return this.cpuName; } diff --git a/src/main/java/appeng/container/implementations/CraftingCPURecord.java b/src/main/java/appeng/container/implementations/CraftingCPURecord.java index d2d0ee459..e99030186 100644 --- a/src/main/java/appeng/container/implementations/CraftingCPURecord.java +++ b/src/main/java/appeng/container/implementations/CraftingCPURecord.java @@ -20,12 +20,12 @@ package appeng.container.implementations; import javax.annotation.Nonnull; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.networking.crafting.ICraftingCPU; public class CraftingCPURecord implements Comparable { - private final ITextComponent myName; + private final Text myName; private final ICraftingCPU cpu; private final long size; private final int processors; @@ -50,7 +50,7 @@ public class CraftingCPURecord implements Comparable { return this.cpu; } - ITextComponent getName() { + Text getName() { return this.myName; } diff --git a/src/main/java/appeng/container/implementations/CraftingStatusContainer.java b/src/main/java/appeng/container/implementations/CraftingStatusContainer.java index 2b5d61912..534e276e3 100644 --- a/src/main/java/appeng/container/implementations/CraftingStatusContainer.java +++ b/src/main/java/appeng/container/implementations/CraftingStatusContainer.java @@ -27,8 +27,8 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.text.Text; import appeng.api.config.SecurityPermissions; import appeng.api.networking.crafting.ICraftingCPU; @@ -45,7 +45,7 @@ public class CraftingStatusContainer extends CraftingCPUContainer { private static final ContainerHelper helper = new ContainerHelper<>( CraftingStatusContainer::new, ITerminalHost.class, SecurityPermissions.CRAFT); - public static CraftingStatusContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CraftingStatusContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -59,7 +59,7 @@ public class CraftingStatusContainer extends CraftingCPUContainer { @GuiSync(6) public boolean noCPU = true; @GuiSync(7) - public ITextComponent myName; + public Text myName; public CraftingStatusContainer(int id, final PlayerInventory ip, final ITerminalHost te) { super(TYPE, id, ip, te); diff --git a/src/main/java/appeng/container/implementations/CraftingTermContainer.java b/src/main/java/appeng/container/implementations/CraftingTermContainer.java index d6b17caf1..4ecbc418d 100644 --- a/src/main/java/appeng/container/implementations/CraftingTermContainer.java +++ b/src/main/java/appeng/container/implementations/CraftingTermContainer.java @@ -18,6 +18,7 @@ package appeng.container.implementations; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.CraftingInventory; @@ -26,9 +27,8 @@ import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.PlayerInvWrapper; import appeng.api.config.SecurityPermissions; @@ -52,7 +52,7 @@ public class CraftingTermContainer extends MEMonitorableContainer private static final ContainerHelper helper = new ContainerHelper<>( CraftingTermContainer::new, ITerminalHost.class, SecurityPermissions.CRAFT); - public static CraftingTermContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static CraftingTermContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -70,7 +70,7 @@ public class CraftingTermContainer extends MEMonitorableContainer super(TYPE, id, ip, monitorable, false); this.ct = (CraftingTerminalPart) monitorable; - final IItemHandler crafting = this.ct.getInventoryByName("crafting"); + final ItemTransferable crafting = this.ct.getInventoryByName("crafting"); for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { @@ -120,13 +120,13 @@ public class CraftingTermContainer extends MEMonitorableContainer } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("player")) { return new PlayerInvWrapper(this.getPlayerInventory()); } diff --git a/src/main/java/appeng/container/implementations/DriveContainer.java b/src/main/java/appeng/container/implementations/DriveContainer.java index cbc23d6ab..16bc51157 100644 --- a/src/main/java/appeng/container/implementations/DriveContainer.java +++ b/src/main/java/appeng/container/implementations/DriveContainer.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; @@ -35,7 +35,7 @@ public class DriveContainer extends AEBaseContainer { private static final ContainerHelper helper = new ContainerHelper<>( DriveContainer::new, DriveTileEntity.class); - public static DriveContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static DriveContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java index 21830b75d..5b917edf0 100644 --- a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java +++ b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java @@ -18,11 +18,11 @@ package appeng.container.implementations; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.FuzzyMode; import appeng.api.config.SecurityPermissions; @@ -44,7 +44,7 @@ public class FormationPlaneContainer extends UpgradeableContainer { private static final ContainerHelper helper = new ContainerHelper<>( FormationPlaneContainer::new, FormationPlanePart.class, SecurityPermissions.BUILD); - public static FormationPlaneContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FormationPlaneContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -69,7 +69,7 @@ public class FormationPlaneContainer extends UpgradeableContainer { final int xo = 8; final int yo = 23 + 6; - final IItemHandler config = this.getUpgradeable().getInventoryByName("config"); + final ItemTransferable config = this.getUpgradeable().getInventoryByName("config"); for (int y = 0; y < 7; y++) { for (int x = 0; x < 9; x++) { if (y < 2) { @@ -80,7 +80,7 @@ public class FormationPlaneContainer extends UpgradeableContainer { } } - final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); + final ItemTransferable upgrades = this.getUpgradeable().getInventoryByName("upgrades"); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, diff --git a/src/main/java/appeng/container/implementations/GrinderContainer.java b/src/main/java/appeng/container/implementations/GrinderContainer.java index 49c97bda6..09459dcb8 100644 --- a/src/main/java/appeng/container/implementations/GrinderContainer.java +++ b/src/main/java/appeng/container/implementations/GrinderContainer.java @@ -21,8 +21,8 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; @@ -38,7 +38,7 @@ public class GrinderContainer extends AEBaseContainer { private static final ContainerHelper helper = new ContainerHelper<>( GrinderContainer::new, GrinderTileEntity.class); - public static GrinderContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static GrinderContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -49,7 +49,7 @@ public class GrinderContainer extends AEBaseContainer { public GrinderContainer(int id, final PlayerInventory ip, final GrinderTileEntity grinder) { super(TYPE, id, ip, grinder, null); - IItemHandler inv = grinder.getInternalInventory(); + ItemTransferable inv = grinder.getInternalInventory(); this.addSlot(new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.ORE, inv, 0, 12, 17, this.getPlayerInventory())); diff --git a/src/main/java/appeng/container/implementations/IOPortContainer.java b/src/main/java/appeng/container/implementations/IOPortContainer.java index e06699f45..50bb5d175 100644 --- a/src/main/java/appeng/container/implementations/IOPortContainer.java +++ b/src/main/java/appeng/container/implementations/IOPortContainer.java @@ -18,11 +18,11 @@ package appeng.container.implementations; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.FullnessMode; import appeng.api.config.OperationMode; @@ -43,7 +43,7 @@ public class IOPortContainer extends UpgradeableContainer { private static final ContainerHelper helper = new ContainerHelper<>( IOPortContainer::new, IOPortTileEntity.class, SecurityPermissions.BUILD); - public static IOPortContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static IOPortContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -70,7 +70,7 @@ public class IOPortContainer extends UpgradeableContainer { int offX = 19; int offY = 17; - final IItemHandler cells = this.getUpgradeable().getInventoryByName("cells"); + final ItemTransferable cells = this.getUpgradeable().getInventoryByName("cells"); for (int y = 0; y < 3; y++) { for (int x = 0; x < 2; x++) { @@ -88,7 +88,7 @@ public class IOPortContainer extends UpgradeableContainer { } } - final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); + final ItemTransferable upgrades = this.getUpgradeable().getInventoryByName("upgrades"); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, diff --git a/src/main/java/appeng/container/implementations/InscriberContainer.java b/src/main/java/appeng/container/implementations/InscriberContainer.java index 9c238092b..6f72c69dc 100644 --- a/src/main/java/appeng/container/implementations/InscriberContainer.java +++ b/src/main/java/appeng/container/implementations/InscriberContainer.java @@ -23,8 +23,8 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.AEApi; import appeng.api.definitions.IItemDefinition; @@ -50,7 +50,7 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres private static final ContainerHelper helper = new ContainerHelper<>( InscriberContainer::new, InscriberTileEntity.class); - public static InscriberContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static InscriberContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -74,7 +74,7 @@ public class InscriberContainer extends UpgradeableContainer implements IProgres super(TYPE, id, ip, te); this.ti = te; - IItemHandler inv = te.getInternalInventory(); + ItemTransferable inv = te.getInternalInventory(); RestrictedInputSlot top = new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.INSCRIBER_PLATE, inv, 0, 45, 16, this.getPlayerInventory()); diff --git a/src/main/java/appeng/container/implementations/InterfaceContainer.java b/src/main/java/appeng/container/implementations/InterfaceContainer.java index 694e9ae36..c4319f0c9 100644 --- a/src/main/java/appeng/container/implementations/InterfaceContainer.java +++ b/src/main/java/appeng/container/implementations/InterfaceContainer.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.SecurityPermissions; import appeng.api.config.Settings; @@ -42,7 +42,7 @@ public class InterfaceContainer extends UpgradeableContainer { private static final ContainerHelper helper = new ContainerHelper<>( InterfaceContainer::new, IInterfaceHost.class, SecurityPermissions.BUILD); - public static InterfaceContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static InterfaceContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java b/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java index cca3410a5..4e985dcb4 100644 --- a/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java +++ b/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java @@ -29,9 +29,9 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.text.Text; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.config.SecurityPermissions; import appeng.api.config.Settings; @@ -67,7 +67,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { private static final ContainerHelper helper = new ContainerHelper<>( InterfaceTerminalContainer::new, InterfaceTerminalPart.class, SecurityPermissions.BUILD); - public static InterfaceTerminalContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static InterfaceTerminalContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -196,7 +196,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { final InventoryAdaptor playerHand = new AdaptorItemHandler(new WrapperCursorItemHandler(player.inventory)); - final IItemHandler theSlot = new WrapperFilteredItemHandler( + final ItemTransferable theSlot = new WrapperFilteredItemHandler( new WrapperRangeItemHandler(inv.server, slot, slot + 1), new PatternSlotFilter()); final InventoryAdaptor interfaceSlot = new AdaptorItemHandler(theSlot); @@ -333,7 +333,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { if (tag.isEmpty()) { tag.putLong("sortBy", inv.sortBy); - tag.putString("un", ITextComponent.Serializer.toJson(inv.name)); + tag.putString("un", Text.Serializer.toJson(inv.name)); } for (int x = 0; x < length; x++) { @@ -358,11 +358,11 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { private final long sortBy; private final long which = autoBase++; - private final ITextComponent name; - private final IItemHandler client; - private final IItemHandler server; + private final Text name; + private final ItemTransferable client; + private final ItemTransferable server; - public InvTracker(final DualityInterface dual, final IItemHandler patterns, final ITextComponent name) { + public InvTracker(final DualityInterface dual, final ItemTransferable patterns, final Text name) { this.server = patterns; this.client = new AppEngInternalInventory(null, this.server.getSlots()); this.name = name; @@ -372,12 +372,12 @@ public final class InterfaceTerminalContainer extends AEBaseContainer { private static class PatternSlotFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return true; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { return !stack.isEmpty() && stack.getItem() instanceof EncodedPatternItem; } } diff --git a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java index fc0bdd4d1..73ea9a556 100644 --- a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java +++ b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java @@ -18,14 +18,14 @@ package appeng.container.implementations; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.FuzzyMode; import appeng.api.config.LevelType; @@ -47,7 +47,7 @@ public class LevelEmitterContainer extends UpgradeableContainer { private static final ContainerHelper helper = new ContainerHelper<>( LevelEmitterContainer::new, LevelEmitterPart.class, SecurityPermissions.BUILD); - public static LevelEmitterContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static LevelEmitterContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -57,7 +57,7 @@ public class LevelEmitterContainer extends UpgradeableContainer { private final LevelEmitterPart lvlEmitter; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private TextFieldWidget textField; @GuiSync(2) public LevelType lvType; @@ -71,7 +71,7 @@ public class LevelEmitterContainer extends UpgradeableContainer { this.lvlEmitter = te; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void setTextField(final TextFieldWidget level) { this.textField = level; this.textField.setText(String.valueOf(this.EmitterValue)); @@ -84,7 +84,7 @@ public class LevelEmitterContainer extends UpgradeableContainer { @Override protected void setupConfig() { - final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); + final ItemTransferable upgrades = this.getUpgradeable().getInventoryByName("upgrades"); if (this.availableUpgrades() > 0) { this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); @@ -102,7 +102,7 @@ public class LevelEmitterContainer extends UpgradeableContainer { 8 + 18 * 3, this.getPlayerInventory())).setNotDraggable()); } - final IItemHandler inv = this.getUpgradeable().getInventoryByName("config"); + final ItemTransferable inv = this.getUpgradeable().getInventoryByName("config"); final int y = 40; final int x = 80 + 44; this.addSlot(new FakeTypeOnlySlot(inv, 0, x, y)); diff --git a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java index ed8438156..4d93dc813 100644 --- a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java +++ b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java @@ -29,8 +29,8 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.IContainerListener; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntity; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -83,7 +83,7 @@ public class MEMonitorableContainer extends AEBaseContainer private static final ContainerHelper helper = new ContainerHelper<>( MEMonitorableContainer::new, ITerminalHost.class); - public static MEMonitorableContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static MEMonitorableContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -111,7 +111,7 @@ public class MEMonitorableContainer extends AEBaseContainer public MEMonitorableContainer(ContainerType containerType, int id, PlayerInventory ip, final ITerminalHost monitorable, final boolean bindInventory) { - super(containerType, id, ip, monitorable instanceof TileEntity ? (TileEntity) monitorable : null, + super(containerType, id, ip, monitorable instanceof BlockEntity ? (BlockEntity) monitorable : null, monitorable instanceof IPart ? (IPart) monitorable : null, monitorable instanceof IGuiItemObject ? (IGuiItemObject) monitorable : null); diff --git a/src/main/java/appeng/container/implementations/MEPortableCellContainer.java b/src/main/java/appeng/container/implementations/MEPortableCellContainer.java index 39509ee9c..6eeff0efb 100644 --- a/src/main/java/appeng/container/implementations/MEPortableCellContainer.java +++ b/src/main/java/appeng/container/implementations/MEPortableCellContainer.java @@ -22,7 +22,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -37,7 +37,7 @@ public class MEPortableCellContainer extends MEMonitorableContainer { private static final ContainerHelper helper = new ContainerHelper<>( MEPortableCellContainer::new, IPortableCell.class); - public static MEPortableCellContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static MEPortableCellContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java b/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java index 341602fbe..401033eaa 100644 --- a/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java +++ b/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java @@ -18,14 +18,14 @@ package appeng.container.implementations; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import appeng.api.config.RedstoneMode; import appeng.api.config.SecurityPermissions; @@ -49,7 +49,7 @@ public class MolecularAssemblerContainer extends UpgradeableContainer implements private static final ContainerHelper helper = new ContainerHelper<>( MolecularAssemblerContainer::new, MolecularAssemblerTileEntity.class); - public static MolecularAssemblerContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static MolecularAssemblerContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -70,7 +70,7 @@ public class MolecularAssemblerContainer extends UpgradeableContainer implements } public boolean isValidItemForSlot(final int slotIndex, final ItemStack i) { - final IItemHandler mac = this.getUpgradeable().getInventoryByName(MolecularAssemblerTileEntity.INVENTORY_MAIN); + final ItemTransferable mac = this.getUpgradeable().getInventoryByName(MolecularAssemblerTileEntity.INVENTORY_MAIN); final ItemStack is = mac.getStackInSlot(10); if (is.isEmpty()) { @@ -99,7 +99,7 @@ public class MolecularAssemblerContainer extends UpgradeableContainer implements int offX = 29; int offY = 30; - final IItemHandler mac = this.getUpgradeable().getInventoryByName(MolecularAssemblerTileEntity.INVENTORY_MAIN); + final ItemTransferable mac = this.getUpgradeable().getInventoryByName(MolecularAssemblerTileEntity.INVENTORY_MAIN); for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { @@ -120,7 +120,7 @@ public class MolecularAssemblerContainer extends UpgradeableContainer implements offX = 122; offY = 17; - final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); + final ItemTransferable upgrades = this.getUpgradeable().getInventoryByName("upgrades"); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, diff --git a/src/main/java/appeng/container/implementations/NetworkStatusContainer.java b/src/main/java/appeng/container/implementations/NetworkStatusContainer.java index a1d6b778f..dca667045 100644 --- a/src/main/java/appeng/container/implementations/NetworkStatusContainer.java +++ b/src/main/java/appeng/container/implementations/NetworkStatusContainer.java @@ -25,7 +25,7 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.AEApi; import appeng.api.implementations.guiobjects.INetworkTool; @@ -53,7 +53,7 @@ public class NetworkStatusContainer extends AEBaseContainer { private static final ContainerHelper helper = new ContainerHelper<>( NetworkStatusContainer::new, INetworkTool.class); - public static NetworkStatusContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static NetworkStatusContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/NetworkToolContainer.java b/src/main/java/appeng/container/implementations/NetworkToolContainer.java index ca7b33245..edfe54ec5 100644 --- a/src/main/java/appeng/container/implementations/NetworkToolContainer.java +++ b/src/main/java/appeng/container/implementations/NetworkToolContainer.java @@ -23,7 +23,7 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.implementations.guiobjects.INetworkTool; import appeng.container.AEBaseContainer; @@ -38,7 +38,7 @@ public class NetworkToolContainer extends AEBaseContainer { private static final ContainerHelper helper = new ContainerHelper<>( NetworkToolContainer::new, INetworkTool.class); - public static NetworkToolContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static NetworkToolContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/PatternTermContainer.java b/src/main/java/appeng/container/implementations/PatternTermContainer.java index cebca7eb1..4cf36bee4 100644 --- a/src/main/java/appeng/container/implementations/PatternTermContainer.java +++ b/src/main/java/appeng/container/implementations/PatternTermContainer.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; @@ -37,9 +38,8 @@ import net.minecraft.item.crafting.IRecipeType; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.INBT; import net.minecraft.nbt.ListNBT; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.PlayerInvWrapper; import appeng.api.AEApi; @@ -82,7 +82,7 @@ public class PatternTermContainer extends MEMonitorableContainer private static final ContainerHelper helper = new ContainerHelper<>( PatternTermContainer::new, ITerminalHost.class, SecurityPermissions.CRAFT); - public static PatternTermContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static PatternTermContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -92,7 +92,7 @@ public class PatternTermContainer extends MEMonitorableContainer private final PatternTerminalPart patternTerminal; private final AppEngInternalInventory cOut = new AppEngInternalInventory(null, 1); - private final IItemHandler crafting; + private final ItemTransferable crafting; private final FakeCraftingMatrixSlot[] craftingSlots = new FakeCraftingMatrixSlot[9]; private final OptionalFakeSlot[] outputSlots = new OptionalFakeSlot[3]; private final PatternTermSlot craftSlot; @@ -109,8 +109,8 @@ public class PatternTermContainer extends MEMonitorableContainer super(TYPE, id, ip, monitorable, false); this.patternTerminal = (PatternTerminalPart) monitorable; - final IItemHandler patternInv = this.getPatternTerminal().getInventoryByName("pattern"); - final IItemHandler output = this.getPatternTerminal().getInventoryByName("output"); + final ItemTransferable patternInv = this.getPatternTerminal().getInventoryByName("pattern"); + final ItemTransferable output = this.getPatternTerminal().getInventoryByName("output"); this.crafting = this.getPatternTerminal().getInventoryByName("crafting"); @@ -194,8 +194,8 @@ public class PatternTermContainer extends MEMonitorableContainer } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { } @@ -487,7 +487,7 @@ public class PatternTermContainer extends MEMonitorableContainer } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("player")) { return new PlayerInvWrapper(this.getPlayerInventory()); } diff --git a/src/main/java/appeng/container/implementations/PriorityContainer.java b/src/main/java/appeng/container/implementations/PriorityContainer.java index 549bc43e1..d3d67ced4 100644 --- a/src/main/java/appeng/container/implementations/PriorityContainer.java +++ b/src/main/java/appeng/container/implementations/PriorityContainer.java @@ -18,14 +18,14 @@ package appeng.container.implementations; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.network.PacketByteBuf; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.api.config.SecurityPermissions; import appeng.api.parts.IPart; @@ -42,7 +42,7 @@ public class PriorityContainer extends AEBaseContainer { private static final ContainerHelper helper = new ContainerHelper<>( PriorityContainer::new, IPriorityHost.class, SecurityPermissions.BUILD); - public static PriorityContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static PriorityContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -52,18 +52,18 @@ public class PriorityContainer extends AEBaseContainer { private final IPriorityHost priHost; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private TextFieldWidget textField; @GuiSync(2) public long PriorityValue = -1; public PriorityContainer(int id, final PlayerInventory ip, final IPriorityHost te) { - super(TYPE, id, ip, (TileEntity) (te instanceof TileEntity ? te : null), + super(TYPE, id, ip, (BlockEntity) (te instanceof BlockEntity ? te : null), (IPart) (te instanceof IPart ? te : null)); this.priHost = te; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void setTextField(final TextFieldWidget level) { this.textField = level; this.textField.setText(String.valueOf(this.PriorityValue)); diff --git a/src/main/java/appeng/container/implementations/QNBContainer.java b/src/main/java/appeng/container/implementations/QNBContainer.java index d584048a3..d661611ca 100644 --- a/src/main/java/appeng/container/implementations/QNBContainer.java +++ b/src/main/java/appeng/container/implementations/QNBContainer.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; @@ -36,7 +36,7 @@ public class QNBContainer extends AEBaseContainer { private static final ContainerHelper helper = new ContainerHelper<>( QNBContainer::new, QuantumBridgeTileEntity.class, SecurityPermissions.BUILD); - public static QNBContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static QNBContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java index 3b92cc26e..4f772edbf 100644 --- a/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java +++ b/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java @@ -20,15 +20,15 @@ package appeng.container.implementations; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.container.AEBaseContainer; @@ -47,7 +47,7 @@ public class QuartzKnifeContainer extends AEBaseContainer { private static final ContainerHelper helper = new ContainerHelper<>( QuartzKnifeContainer::new, QuartzKnifeObj.class); - public static QuartzKnifeContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static QuartzKnifeContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -57,7 +57,7 @@ public class QuartzKnifeContainer extends AEBaseContainer { private final QuartzKnifeObj toolInv; - private final IItemHandler inSlot = new AppEngInternalInventory(null, 1, 1); + private final ItemTransferable inSlot = new AppEngInternalInventory(null, 1, 1); private String myName = ""; public QuartzKnifeContainer(int id, final PlayerInventory ip, final QuartzKnifeObj te) { @@ -105,13 +105,13 @@ public class QuartzKnifeContainer extends AEBaseContainer { } private class QuartzKniveSlot extends OutputSlot { - QuartzKniveSlot(IItemHandler a, int b, int c, int d, int i) { + QuartzKniveSlot(ItemTransferable a, int b, int c, int d, int i) { super(a, b, c, d, i); } @Override public ItemStack getStack() { - final IItemHandler baseInv = this.getItemHandler(); + final ItemTransferable baseInv = this.getItemHandler(); final ItemStack input = baseInv.getStackInSlot(0); if (input == ItemStack.EMPTY) { return ItemStack.EMPTY; diff --git a/src/main/java/appeng/container/implementations/SecurityStationContainer.java b/src/main/java/appeng/container/implementations/SecurityStationContainer.java index bfdf27c06..a40785606 100644 --- a/src/main/java/appeng/container/implementations/SecurityStationContainer.java +++ b/src/main/java/appeng/container/implementations/SecurityStationContainer.java @@ -23,8 +23,8 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.IContainerListener; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; @@ -74,7 +74,7 @@ public class SecurityStationContainer extends MEMonitorableContainer implements this.bindPlayerInventory(ip, 0, 0); } - public static SecurityStationContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static SecurityStationContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -139,8 +139,8 @@ public class SecurityStationContainer extends MEMonitorableContainer implements } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { if (!this.wirelessOut.getHasStack()) { if (this.wirelessIn.getHasStack()) { final ItemStack term = this.wirelessIn.getStack().copy(); diff --git a/src/main/java/appeng/container/implementations/SkyChestContainer.java b/src/main/java/appeng/container/implementations/SkyChestContainer.java index cef59e279..98b60b5da 100644 --- a/src/main/java/appeng/container/implementations/SkyChestContainer.java +++ b/src/main/java/appeng/container/implementations/SkyChestContainer.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; @@ -52,7 +52,7 @@ public class SkyChestContainer extends AEBaseContainer { this.bindPlayerInventory(ip, 0, 195 - /* height of player inventory */82); } - public static SkyChestContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static SkyChestContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java b/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java index e6fe36bea..e82831b81 100644 --- a/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java +++ b/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.SecurityPermissions; import appeng.api.networking.IGrid; @@ -77,7 +77,7 @@ public class SpatialIOPortContainer extends AEBaseContainer { this.bindPlayerInventory(ip, 0, 197 - /* height of player inventory */82); } - public static SpatialIOPortContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static SpatialIOPortContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/StorageBusContainer.java b/src/main/java/appeng/container/implementations/StorageBusContainer.java index b5e0fb3a9..b3f2a7fda 100644 --- a/src/main/java/appeng/container/implementations/StorageBusContainer.java +++ b/src/main/java/appeng/container/implementations/StorageBusContainer.java @@ -20,12 +20,12 @@ package appeng.container.implementations; import java.util.Iterator; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; import appeng.api.AEApi; import appeng.api.config.AccessRestriction; @@ -55,7 +55,7 @@ public class StorageBusContainer extends UpgradeableContainer { private static final ContainerHelper helper = new ContainerHelper<>( StorageBusContainer::new, StorageBusPart.class, SecurityPermissions.BUILD); - public static StorageBusContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static StorageBusContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -86,7 +86,7 @@ public class StorageBusContainer extends UpgradeableContainer { final int xo = 8; final int yo = 23 + 6; - final IItemHandler config = this.getUpgradeable().getInventoryByName("config"); + final ItemTransferable config = this.getUpgradeable().getInventoryByName("config"); for (int y = 0; y < 7; y++) { for (int x = 0; x < 9; x++) { if (y < 2) { @@ -97,7 +97,7 @@ public class StorageBusContainer extends UpgradeableContainer { } } - final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); + final ItemTransferable upgrades = this.getUpgradeable().getInventoryByName("upgrades"); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, @@ -148,7 +148,7 @@ public class StorageBusContainer extends UpgradeableContainer { } public void partition() { - final IItemHandler inv = this.getUpgradeable().getInventoryByName("config"); + final ItemTransferable inv = this.getUpgradeable().getInventoryByName("config"); final IMEInventory cellInv = this.storageBus.getInternalHandler(); diff --git a/src/main/java/appeng/container/implementations/UpgradeableContainer.java b/src/main/java/appeng/container/implementations/UpgradeableContainer.java index f6abbd227..d38b10c41 100644 --- a/src/main/java/appeng/container/implementations/UpgradeableContainer.java +++ b/src/main/java/appeng/container/implementations/UpgradeableContainer.java @@ -18,16 +18,16 @@ package appeng.container.implementations; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.config.FuzzyMode; import appeng.api.config.RedstoneMode; @@ -60,7 +60,7 @@ public class UpgradeableContainer extends AEBaseContainer implements IOptionalSl private static final ContainerHelper helper = new ContainerHelper<>( UpgradeableContainer::new, IUpgradeableHost.class, SecurityPermissions.BUILD); - public static UpgradeableContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static UpgradeableContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -86,7 +86,7 @@ public class UpgradeableContainer extends AEBaseContainer implements IOptionalSl public UpgradeableContainer(ContainerType containerType, int id, final PlayerInventory ip, final IUpgradeableHost te) { - super(containerType, id, ip, (TileEntity) (te instanceof TileEntity ? te : null), + super(containerType, id, ip, (BlockEntity) (te instanceof BlockEntity ? te : null), (IPart) (te instanceof IPart ? te : null)); this.upgradeable = te; @@ -95,8 +95,8 @@ public class UpgradeableContainer extends AEBaseContainer implements IOptionalSl int yCoord = 0; int zCoord = 0; - if (te instanceof TileEntity) { - final TileEntity myTile = (TileEntity) te; + if (te instanceof BlockEntity) { + final BlockEntity myTile = (BlockEntity) te; w = myTile.getWorld(); xCoord = myTile.getPos().getX(); yCoord = myTile.getPos().getY(); @@ -104,7 +104,7 @@ public class UpgradeableContainer extends AEBaseContainer implements IOptionalSl } if (te instanceof IPart) { - final TileEntity mk = te.getTile(); + final BlockEntity mk = te.getTile(); w = mk.getWorld(); xCoord = mk.getPos().getX(); yCoord = mk.getPos().getY(); @@ -149,7 +149,7 @@ public class UpgradeableContainer extends AEBaseContainer implements IOptionalSl protected void setupConfig() { this.setupUpgrades(); - final IItemHandler inv = this.getUpgradeable().getInventoryByName("config"); + final ItemTransferable inv = this.getUpgradeable().getInventoryByName("config"); final int y = 40; final int x = 80; this.addSlot(new FakeTypeOnlySlot(inv, 0, x, y)); @@ -168,7 +168,7 @@ public class UpgradeableContainer extends AEBaseContainer implements IOptionalSl } protected void setupUpgrades() { - final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); + final ItemTransferable upgrades = this.getUpgradeable().getInventoryByName("upgrades"); if (this.availableUpgrades() > 0) { this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); diff --git a/src/main/java/appeng/container/implementations/VibrationChamberContainer.java b/src/main/java/appeng/container/implementations/VibrationChamberContainer.java index 8676798a0..b5b34c75a 100644 --- a/src/main/java/appeng/container/implementations/VibrationChamberContainer.java +++ b/src/main/java/appeng/container/implementations/VibrationChamberContainer.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; @@ -38,7 +38,7 @@ public class VibrationChamberContainer extends AEBaseContainer implements IProgr private static final ContainerHelper helper = new ContainerHelper<>( VibrationChamberContainer::new, VibrationChamberTileEntity.class); - public static VibrationChamberContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static VibrationChamberContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/WirelessContainer.java b/src/main/java/appeng/container/implementations/WirelessContainer.java index ecd6438ef..e4764b45c 100644 --- a/src/main/java/appeng/container/implementations/WirelessContainer.java +++ b/src/main/java/appeng/container/implementations/WirelessContainer.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; @@ -38,7 +38,7 @@ public class WirelessContainer extends AEBaseContainer { private static final ContainerHelper helper = new ContainerHelper<>( WirelessContainer::new, WirelessTileEntity.class, SecurityPermissions.BUILD); - public static WirelessContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static WirelessContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/implementations/WirelessTermContainer.java b/src/main/java/appeng/container/implementations/WirelessTermContainer.java index 0c6459941..167966fe7 100644 --- a/src/main/java/appeng/container/implementations/WirelessTermContainer.java +++ b/src/main/java/appeng/container/implementations/WirelessTermContainer.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.container.ContainerLocator; import appeng.core.AEConfig; @@ -36,7 +36,7 @@ public class WirelessTermContainer extends MEPortableCellContainer { private static final ContainerHelper helper = new ContainerHelper<>( WirelessTermContainer::new, WirelessTerminalGuiObject.class); - public static WirelessTermContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static WirelessTermContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java index ed9861409..cc9d3ce94 100644 --- a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java +++ b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java @@ -18,6 +18,7 @@ package appeng.container.slot; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; @@ -25,7 +26,6 @@ import net.minecraft.item.crafting.IRecipeType; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.hooks.BasicEventHooks; -import net.minecraftforge.items.IItemHandler; import appeng.util.helpers.ItemHandlerUtil; import appeng.util.inv.WrapperInvItemHandler; @@ -35,7 +35,7 @@ public class AppEngCraftingSlot extends AppEngSlot { /** * The craft matrix inventory linked to this result slot. */ - private final IItemHandler craftMatrix; + private final ItemTransferable craftMatrix; /** * The player that is using the GUI where this slot resides. @@ -48,8 +48,8 @@ public class AppEngCraftingSlot extends AppEngSlot { */ private int amountCrafted; - public AppEngCraftingSlot(final PlayerEntity par1PlayerEntity, final IItemHandler par2IInventory, - final IItemHandler par3IInventory, final int par4, final int par5, final int par6) { + public AppEngCraftingSlot(final PlayerEntity par1PlayerEntity, final ItemTransferable par2IInventory, + final ItemTransferable par3IInventory, final int par4, final int par5, final int par6) { super(par3IInventory, par4, par5, par6); this.thePlayer = par1PlayerEntity; this.craftMatrix = par2IInventory; diff --git a/src/main/java/appeng/container/slot/AppEngSlot.java b/src/main/java/appeng/container/slot/AppEngSlot.java index 7daf8d83f..3d4cbbe61 100644 --- a/src/main/java/appeng/container/slot/AppEngSlot.java +++ b/src/main/java/appeng/container/slot/AppEngSlot.java @@ -20,21 +20,21 @@ package appeng.container.slot; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Inventory; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.IItemHandler; import appeng.container.AEBaseContainer; import appeng.util.helpers.ItemHandlerUtil; public class AppEngSlot extends Slot { private static IInventory emptyInventory = new Inventory(0); - private final IItemHandler itemHandler; + private final ItemTransferable itemHandler; private final int index; private final int defX; @@ -46,7 +46,7 @@ public class AppEngSlot extends Slot { private CalculatedValidity isValid; private boolean isDisplay = false; - public AppEngSlot(final IItemHandler inv, final int idx, final int x, final int y) { + public AppEngSlot(final ItemTransferable inv, final int idx, final int x, final int y) { super(emptyInventory, idx, x, y); this.itemHandler = inv; this.index = idx; @@ -115,7 +115,7 @@ public class AppEngSlot extends Slot { } } - public IItemHandler getItemHandler() { + public ItemTransferable getItemHandler() { return this.itemHandler; } @@ -156,7 +156,7 @@ public class AppEngSlot extends Slot { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public boolean isEnabled() { return this.isSlotEnabled(); } diff --git a/src/main/java/appeng/container/slot/CraftingMatrixSlot.java b/src/main/java/appeng/container/slot/CraftingMatrixSlot.java index 163ea77c1..c3e3963d0 100644 --- a/src/main/java/appeng/container/slot/CraftingMatrixSlot.java +++ b/src/main/java/appeng/container/slot/CraftingMatrixSlot.java @@ -18,9 +18,9 @@ package appeng.container.slot; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import appeng.container.AEBaseContainer; import appeng.util.inv.WrapperInvItemHandler; @@ -29,8 +29,8 @@ public class CraftingMatrixSlot extends AppEngSlot { private final AEBaseContainer c; private final IInventory wrappedInventory; - public CraftingMatrixSlot(final AEBaseContainer c, final IItemHandler par1iInventory, final int par2, - final int par3, final int par4) { + public CraftingMatrixSlot(final AEBaseContainer c, final ItemTransferable par1iInventory, final int par2, + final int par3, final int par4) { super(par1iInventory, par2, par3, par4); this.c = c; this.wrappedInventory = new WrapperInvItemHandler(par1iInventory); diff --git a/src/main/java/appeng/container/slot/CraftingTermSlot.java b/src/main/java/appeng/container/slot/CraftingTermSlot.java index 410c5cfa9..f7d536d84 100644 --- a/src/main/java/appeng/container/slot/CraftingTermSlot.java +++ b/src/main/java/appeng/container/slot/CraftingTermSlot.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.Item; @@ -31,7 +32,6 @@ import net.minecraft.item.crafting.IRecipeType; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -57,8 +57,8 @@ import appeng.util.item.AEItemStack; public class CraftingTermSlot extends AppEngCraftingSlot { - private final IItemHandler craftInv; - private final IItemHandler pattern; + private final ItemTransferable craftInv; + private final ItemTransferable pattern; private final IActionSource mySrc; private final IEnergySource energySrc; @@ -66,8 +66,8 @@ public class CraftingTermSlot extends AppEngCraftingSlot { private final IContainerCraftingPacket container; public CraftingTermSlot(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc, - final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix, - final IItemHandler output, final int x, final int y, final IContainerCraftingPacket ccp) { + final IStorageMonitorable storage, final ItemTransferable cMatrix, final ItemTransferable secondMatrix, + final ItemTransferable output, final int x, final int y, final IContainerCraftingPacket ccp) { super(player, cMatrix, output, 0, x, y); this.energySrc = energySrc; this.storage = storage; @@ -77,7 +77,7 @@ public class CraftingTermSlot extends AppEngCraftingSlot { this.container = ccp; } - public IItemHandler getCraftingMatrix() { + public ItemTransferable getCraftingMatrix() { return this.craftInv; } @@ -286,7 +286,7 @@ public class CraftingTermSlot extends AppEngCraftingSlot { } } - IItemHandler getPattern() { + ItemTransferable getPattern() { return this.pattern; } } diff --git a/src/main/java/appeng/container/slot/DisabledSlot.java b/src/main/java/appeng/container/slot/DisabledSlot.java index 15864f92e..75ced5168 100644 --- a/src/main/java/appeng/container/slot/DisabledSlot.java +++ b/src/main/java/appeng/container/slot/DisabledSlot.java @@ -20,11 +20,11 @@ package appeng.container.slot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class DisabledSlot extends AppEngSlot { - public DisabledSlot(final IItemHandler par1iInventory, final int slotIndex, final int x, final int y) { + public DisabledSlot(final ItemTransferable par1iInventory, final int slotIndex, final int x, final int y) { super(par1iInventory, slotIndex, x, y); } diff --git a/src/main/java/appeng/container/slot/FakeBlacklistSlot.java b/src/main/java/appeng/container/slot/FakeBlacklistSlot.java index 3fb2fac8a..6a95caca7 100644 --- a/src/main/java/appeng/container/slot/FakeBlacklistSlot.java +++ b/src/main/java/appeng/container/slot/FakeBlacklistSlot.java @@ -18,11 +18,11 @@ package appeng.container.slot; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class FakeBlacklistSlot extends FakeTypeOnlySlot { - public FakeBlacklistSlot(final IItemHandler inv, final int idx, final int x, final int y) { + public FakeBlacklistSlot(final ItemTransferable inv, final int idx, final int x, final int y) { super(inv, idx, x, y); } diff --git a/src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java b/src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java index 6634f7209..c2e0fa8d0 100644 --- a/src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java +++ b/src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java @@ -18,11 +18,11 @@ package appeng.container.slot; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class FakeCraftingMatrixSlot extends FakeSlot { - public FakeCraftingMatrixSlot(final IItemHandler inv, final int idx, final int x, final int y) { + public FakeCraftingMatrixSlot(final ItemTransferable inv, final int idx, final int x, final int y) { super(inv, idx, x, y); } } diff --git a/src/main/java/appeng/container/slot/FakeSlot.java b/src/main/java/appeng/container/slot/FakeSlot.java index a60ed6308..0becf58a9 100644 --- a/src/main/java/appeng/container/slot/FakeSlot.java +++ b/src/main/java/appeng/container/slot/FakeSlot.java @@ -18,13 +18,13 @@ package appeng.container.slot; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; public class FakeSlot extends AppEngSlot { - public FakeSlot(final IItemHandler inv, final int idx, final int x, final int y) { + public FakeSlot(final ItemTransferable inv, final int idx, final int x, final int y) { super(inv, idx, x, y); } diff --git a/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java b/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java index 169938ab5..b6503b862 100644 --- a/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java +++ b/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java @@ -18,12 +18,12 @@ package appeng.container.slot; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; public class FakeTypeOnlySlot extends FakeSlot { - public FakeTypeOnlySlot(final IItemHandler inv, final int idx, final int x, final int y) { + public FakeTypeOnlySlot(final ItemTransferable inv, final int idx, final int x, final int y) { super(inv, idx, x, y); } diff --git a/src/main/java/appeng/container/slot/InaccessibleSlot.java b/src/main/java/appeng/container/slot/InaccessibleSlot.java index 4f72271a6..8eccad6eb 100644 --- a/src/main/java/appeng/container/slot/InaccessibleSlot.java +++ b/src/main/java/appeng/container/slot/InaccessibleSlot.java @@ -20,13 +20,13 @@ package appeng.container.slot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class InaccessibleSlot extends AppEngSlot { private ItemStack dspStack = ItemStack.EMPTY; - public InaccessibleSlot(final IItemHandler i, final int slotIdx, final int x, final int y) { + public InaccessibleSlot(final ItemTransferable i, final int slotIdx, final int x, final int y) { super(i, slotIdx, x, y); } diff --git a/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java b/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java index b05f032b6..c90ff2906 100644 --- a/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java +++ b/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java @@ -19,7 +19,7 @@ package appeng.container.slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.container.implementations.MolecularAssemblerContainer; @@ -27,8 +27,8 @@ public class MolecularAssemblerPatternSlot extends AppEngSlot { private final MolecularAssemblerContainer mac; - public MolecularAssemblerPatternSlot(final MolecularAssemblerContainer mac, final IItemHandler i, final int slotIdx, - final int x, final int y) { + public MolecularAssemblerPatternSlot(final MolecularAssemblerContainer mac, final ItemTransferable i, final int slotIdx, + final int x, final int y) { super(i, slotIdx, x, y); this.mac = mac; } diff --git a/src/main/java/appeng/container/slot/NormalSlot.java b/src/main/java/appeng/container/slot/NormalSlot.java index 55304cb39..6bad7f785 100644 --- a/src/main/java/appeng/container/slot/NormalSlot.java +++ b/src/main/java/appeng/container/slot/NormalSlot.java @@ -18,11 +18,11 @@ package appeng.container.slot; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class NormalSlot extends AppEngSlot { - public NormalSlot(final IItemHandler inv, final int slot, final int xPos, final int yPos) { + public NormalSlot(final ItemTransferable inv, final int slot, final int xPos, final int yPos) { super(inv, slot, xPos, yPos); } } diff --git a/src/main/java/appeng/container/slot/OptionalFakeSlot.java b/src/main/java/appeng/container/slot/OptionalFakeSlot.java index f3d5c7a3e..b1982b457 100644 --- a/src/main/java/appeng/container/slot/OptionalFakeSlot.java +++ b/src/main/java/appeng/container/slot/OptionalFakeSlot.java @@ -21,7 +21,7 @@ package appeng.container.slot; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class OptionalFakeSlot extends FakeSlot implements IOptionalSlot { @@ -31,8 +31,8 @@ public class OptionalFakeSlot extends FakeSlot implements IOptionalSlot { private final IOptionalSlotHost host; private boolean renderDisabled = true; - public OptionalFakeSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x, - final int y, final int offX, final int offY, final int groupNum) { + public OptionalFakeSlot(final ItemTransferable inv, final IOptionalSlotHost containerBus, final int idx, final int x, + final int y, final int offX, final int offY, final int groupNum) { super(inv, idx, x + offX * 18, y + offY * 18); this.srcX = x; this.srcY = y; diff --git a/src/main/java/appeng/container/slot/OptionalNormalSlot.java b/src/main/java/appeng/container/slot/OptionalNormalSlot.java index 35d625f45..635ef62a2 100644 --- a/src/main/java/appeng/container/slot/OptionalNormalSlot.java +++ b/src/main/java/appeng/container/slot/OptionalNormalSlot.java @@ -18,15 +18,15 @@ package appeng.container.slot; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class OptionalNormalSlot extends AppEngSlot implements IOptionalSlot { private final int groupNum; private final IOptionalSlotHost host; - public OptionalNormalSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int slot, - final int xPos, final int yPos, final int groupNum) { + public OptionalNormalSlot(final ItemTransferable inv, final IOptionalSlotHost containerBus, final int slot, + final int xPos, final int yPos, final int groupNum) { super(inv, slot, xPos, yPos); this.groupNum = groupNum; this.host = containerBus; diff --git a/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java b/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java index c4460a2e8..fe17b46ac 100644 --- a/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java +++ b/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java @@ -18,16 +18,16 @@ package appeng.container.slot; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerInventory; -import net.minecraftforge.items.IItemHandler; public class OptionalRestrictedInputSlot extends RestrictedInputSlot { private final int groupNum; private final IOptionalSlotHost host; - public OptionalRestrictedInputSlot(final PlacableItemType valid, final IItemHandler i, final IOptionalSlotHost host, - final int slotIndex, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) { + public OptionalRestrictedInputSlot(final PlacableItemType valid, final ItemTransferable i, final IOptionalSlotHost host, + final int slotIndex, final int x, final int y, final int grpNum, final PlayerInventory invPlayer) { super(valid, i, slotIndex, x, y, invPlayer); this.groupNum = grpNum; this.host = host; diff --git a/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java b/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java index e523a8a4b..ddc0e10a4 100644 --- a/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java +++ b/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java @@ -19,12 +19,12 @@ package appeng.container.slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class OptionalTypeOnlyFakeSlot extends OptionalFakeSlot { - public OptionalTypeOnlyFakeSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, - final int x, final int y, final int offX, final int offY, final int groupNum) { + public OptionalTypeOnlyFakeSlot(final ItemTransferable inv, final IOptionalSlotHost containerBus, final int idx, + final int x, final int y, final int offX, final int offY, final int groupNum) { super(inv, containerBus, idx, x, y, offX, offY, groupNum); } diff --git a/src/main/java/appeng/container/slot/OutputSlot.java b/src/main/java/appeng/container/slot/OutputSlot.java index 0c8778620..63d49805e 100644 --- a/src/main/java/appeng/container/slot/OutputSlot.java +++ b/src/main/java/appeng/container/slot/OutputSlot.java @@ -19,11 +19,11 @@ package appeng.container.slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class OutputSlot extends AppEngSlot { - public OutputSlot(final IItemHandler a, final int b, final int c, final int d, final int i) { + public OutputSlot(final ItemTransferable a, final int b, final int c, final int d, final int i) { super(a, b, c, d); this.setIIcon(i); } diff --git a/src/main/java/appeng/container/slot/PatternOutputsSlot.java b/src/main/java/appeng/container/slot/PatternOutputsSlot.java index 81be5c9cf..3915150a8 100644 --- a/src/main/java/appeng/container/slot/PatternOutputsSlot.java +++ b/src/main/java/appeng/container/slot/PatternOutputsSlot.java @@ -18,12 +18,12 @@ package appeng.container.slot; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class PatternOutputsSlot extends OptionalFakeSlot { - public PatternOutputsSlot(final IItemHandler inv, final IOptionalSlotHost containerBus, final int idx, final int x, - final int y, final int offX, final int offY, final int groupNum) { + public PatternOutputsSlot(final ItemTransferable inv, final IOptionalSlotHost containerBus, final int idx, final int x, + final int y, final int offX, final int offY, final int groupNum) { super(inv, containerBus, idx, x, y, offX, offY, groupNum); } diff --git a/src/main/java/appeng/container/slot/PatternTermSlot.java b/src/main/java/appeng/container/slot/PatternTermSlot.java index 49c1cf72d..66a2809f7 100644 --- a/src/main/java/appeng/container/slot/PatternTermSlot.java +++ b/src/main/java/appeng/container/slot/PatternTermSlot.java @@ -18,9 +18,9 @@ package appeng.container.slot; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.networking.energy.IEnergySource; @@ -37,9 +37,9 @@ public class PatternTermSlot extends CraftingTermSlot { private final IOptionalSlotHost host; public PatternTermSlot(final PlayerEntity player, final IActionSource mySrc, final IEnergySource energySrc, - final IStorageMonitorable storage, final IItemHandler cMatrix, final IItemHandler secondMatrix, - final IItemHandler output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber, - final IContainerCraftingPacket c) { + final IStorageMonitorable storage, final ItemTransferable cMatrix, final ItemTransferable secondMatrix, + final ItemTransferable output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber, + final IContainerCraftingPacket c) { super(player, mySrc, energySrc, storage, cMatrix, secondMatrix, output, x, y, c); this.host = h; diff --git a/src/main/java/appeng/container/slot/PlayerHotBarSlot.java b/src/main/java/appeng/container/slot/PlayerHotBarSlot.java index f8e29d0e7..ecaeb3c52 100644 --- a/src/main/java/appeng/container/slot/PlayerHotBarSlot.java +++ b/src/main/java/appeng/container/slot/PlayerHotBarSlot.java @@ -18,11 +18,11 @@ package appeng.container.slot; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; public class PlayerHotBarSlot extends AppEngSlot { - public PlayerHotBarSlot(final IItemHandler par1iInventory, final int par2, final int par3, final int par4) { + public PlayerHotBarSlot(final ItemTransferable par1iInventory, final int par2, final int par3, final int par4) { super(par1iInventory, par2, par3, par4); this.setPlayerSide(true); } diff --git a/src/main/java/appeng/container/slot/PlayerInvSlot.java b/src/main/java/appeng/container/slot/PlayerInvSlot.java index 921c65752..786a525c5 100644 --- a/src/main/java/appeng/container/slot/PlayerInvSlot.java +++ b/src/main/java/appeng/container/slot/PlayerInvSlot.java @@ -18,13 +18,13 @@ package appeng.container.slot; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; // there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot. public class PlayerInvSlot extends AppEngSlot { - public PlayerInvSlot(final IItemHandler par1iInventory, final int idx, final int x, final int y) { + public PlayerInvSlot(final ItemTransferable par1iInventory, final int idx, final int x, final int y) { super(par1iInventory, idx, x, y); this.setPlayerSide(true); diff --git a/src/main/java/appeng/container/slot/RestrictedInputSlot.java b/src/main/java/appeng/container/slot/RestrictedInputSlot.java index c76e30392..fb58e2f31 100644 --- a/src/main/java/appeng/container/slot/RestrictedInputSlot.java +++ b/src/main/java/appeng/container/slot/RestrictedInputSlot.java @@ -21,6 +21,7 @@ package appeng.container.slot; import java.util.List; import java.util.Set; +import alexiil.mc.lib.attributes.item.ItemTransferable; import com.google.common.collect.ImmutableList; import net.minecraft.entity.player.PlayerEntity; @@ -28,10 +29,9 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.definitions.IDefinitions; @@ -58,20 +58,20 @@ import appeng.util.Platform; */ public class RestrictedInputSlot extends AppEngSlot { - private static final List METAL_INGOT_TAGS = ImmutableList.of( - new ResourceLocation("forge:ingots/copper"), new ResourceLocation("forge:ingots/tin"), - new ResourceLocation("forge:ingots/iron"), new ResourceLocation("forge:ingots/gold"), - new ResourceLocation("forge:ingots/lead"), new ResourceLocation("forge:ingots/bronze"), - new ResourceLocation("forge:ingots/brass"), new ResourceLocation("forge:ingots/nickel"), - new ResourceLocation("forge:ingots/aluminium")); + private static final List METAL_INGOT_TAGS = ImmutableList.of( + new Identifier("forge:ingots/copper"), new Identifier("forge:ingots/tin"), + new Identifier("forge:ingots/iron"), new Identifier("forge:ingots/gold"), + new Identifier("forge:ingots/lead"), new Identifier("forge:ingots/bronze"), + new Identifier("forge:ingots/brass"), new Identifier("forge:ingots/nickel"), + new Identifier("forge:ingots/aluminium")); private final PlacableItemType which; private final PlayerInventory p; private boolean allowEdit = true; private int stackLimit = -1; - public RestrictedInputSlot(final PlacableItemType valid, final IItemHandler i, final int slotIndex, final int x, - final int y, final PlayerInventory p) { + public RestrictedInputSlot(final PlacableItemType valid, final ItemTransferable i, final int slotIndex, final int x, + final int y, final PlayerInventory p) { super(i, slotIndex, x, y); this.which = valid; this.setIIcon(valid.IIcon); @@ -247,8 +247,8 @@ public class RestrictedInputSlot extends AppEngSlot { return true; } - Set itemTags = i.getItem().getTags(); - for (ResourceLocation tagName : METAL_INGOT_TAGS) { + Set itemTags = i.getItem().getTags(); + for (Identifier tagName : METAL_INGOT_TAGS) { if (itemTags.contains(tagName)) { return true; } diff --git a/src/main/java/appeng/core/AERecipeType.java b/src/main/java/appeng/core/AERecipeType.java index 8d7a572df..2d20297ff 100644 --- a/src/main/java/appeng/core/AERecipeType.java +++ b/src/main/java/appeng/core/AERecipeType.java @@ -2,12 +2,12 @@ package appeng.core; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; public class AERecipeType> implements IRecipeType { private final String id; - public AERecipeType(ResourceLocation registryName) { + public AERecipeType(Identifier registryName) { this.id = registryName.toString(); } diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index be2469a96..a6080d6b4 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -25,6 +25,7 @@ import javax.annotation.Nonnull; import com.google.common.base.Stopwatch; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.ItemRenderer; @@ -33,12 +34,11 @@ import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.particles.ParticleType; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.ResourceLocation; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.feature.Feature; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.geometry.IModelGeometry; import net.minecraftforge.common.MinecraftForge; @@ -118,7 +118,7 @@ public final class AppEng { modEventBus.addGenericListener(Item.class, registration::registerItems); modEventBus.addGenericListener(EntityType.class, registration::registerEntities); modEventBus.addGenericListener(ParticleType.class, registration::registerParticleTypes); - modEventBus.addGenericListener(TileEntityType.class, registration::registerTileEntities); + modEventBus.addGenericListener(BlockEntityType.class, registration::registerTileEntities); modEventBus.addGenericListener(ContainerType.class, registration::registerContainerTypes); modEventBus.addGenericListener(IRecipeSerializer.class, registration::registerRecipeSerializers); modEventBus.addGenericListener(Feature.class, registration::registerWorldGen); @@ -130,8 +130,8 @@ public final class AppEng { modEventBus.addListener(this::commonSetup); // Register client-only events - DistExecutor.runWhenOn(Dist.CLIENT, () -> registration::registerClientEvents); - DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> modEventBus.addListener(this::clientSetup)); + DistExecutor.runWhenOn(EnvType.CLIENT, () -> registration::registerClientEvents); + DistExecutor.runWhenOn(EnvType.CLIENT, () -> () -> modEventBus.addListener(this::clientSetup)); MinecraftForge.EVENT_BUS.addListener(TickHandler.INSTANCE::unloadWorld); MinecraftForge.EVENT_BUS.addListener(TickHandler.INSTANCE::onTick); @@ -159,7 +159,7 @@ public final class AppEng { } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private void clientSetup(FMLClientSetupEvent event) { ((ClientHelper) proxy).clientInit(); @@ -189,21 +189,21 @@ public final class AppEng { addBuiltInModel("quantum_bridge_formed", QnbFormedModel::new); addBuiltInModel("p2p_tunnel_frequency", P2PTunnelFrequencyModel::new); addBuiltInModel("facade", FacadeItemModel::new); - ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "encoded_pattern"), + ModelLoaderRegistry.registerLoader(new Identifier(AppEng.MOD_ID, "encoded_pattern"), EncodedPatternModelLoader.INSTANCE); - ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "part_plane"), + ModelLoaderRegistry.registerLoader(new Identifier(AppEng.MOD_ID, "part_plane"), PlaneModelLoader.INSTANCE); - ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "crafting_cube"), + ModelLoaderRegistry.registerLoader(new Identifier(AppEng.MOD_ID, "crafting_cube"), CraftingCubeModelLoader.INSTANCE); - ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "uvlightmap"), UVLModelLoader.INSTANCE); - ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "cable_bus"), + ModelLoaderRegistry.registerLoader(new Identifier(AppEng.MOD_ID, "uvlightmap"), UVLModelLoader.INSTANCE); + ModelLoaderRegistry.registerLoader(new Identifier(AppEng.MOD_ID, "cable_bus"), new CableBusModelLoader((PartModels) Api.INSTANCE.registries().partModels())); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private static > void addBuiltInModel(String id, Supplier modelFactory) { - ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, id), + ModelLoaderRegistry.registerLoader(new Identifier(AppEng.MOD_ID, id), new SimpleModelLoader<>(modelFactory)); } @@ -278,7 +278,7 @@ public final class AppEng { AppEng.proxy.postInit(); AEConfig.instance().save(); - NetworkHandler.init(new ResourceLocation(MOD_ID, "main")); + NetworkHandler.init(new Identifier(MOD_ID, "main")); AELog.info("Post Initialization ( ended after " + start.elapsed(TimeUnit.MILLISECONDS) + "ms )"); } diff --git a/src/main/java/appeng/core/CommonHelper.java b/src/main/java/appeng/core/CommonHelper.java index 773612f12..cfe8851c8 100644 --- a/src/main/java/appeng/core/CommonHelper.java +++ b/src/main/java/appeng/core/CommonHelper.java @@ -25,8 +25,8 @@ import javax.annotation.Nonnull; import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.hit.HitResult; import net.minecraft.world.World; import appeng.api.parts.CableRenderMode; @@ -39,7 +39,7 @@ public abstract class CommonHelper { public abstract World getWorld(); - public abstract void bindTileEntitySpecialRenderer(Class tile, AEBaseBlock blk); + public abstract void bindTileEntitySpecialRenderer(Class tile, AEBaseBlock blk); public abstract List getPlayers(); @@ -51,7 +51,7 @@ public abstract class CommonHelper { public abstract boolean shouldAddParticles(Random r); - public abstract RayTraceResult getRTR(); + public abstract HitResult getRTR(); public abstract void postInit(); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 2f0dc473e..cc5b487bf 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -18,9 +18,12 @@ package appeng.core; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScreenManager; import net.minecraft.client.particle.ParticleManager; @@ -29,8 +32,7 @@ import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.particles.ParticleType; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.gen.GenerationStage; @@ -40,8 +42,6 @@ import net.minecraft.world.gen.feature.OreFeatureConfig; import net.minecraft.world.gen.placement.CountRangeConfig; import net.minecraft.world.gen.placement.IPlacementConfig; import net.minecraft.world.gen.placement.Placement; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.*; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.ModDimension; @@ -149,7 +149,7 @@ final class Registration { PartItemPredicate.register(); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void modelRegistryEvent(ModelRegistryEvent event) { registerSpecialModels(); } @@ -158,7 +158,7 @@ final class Registration { * Registers any JSON model files with Minecraft that are not referenced via * blockstates or item IDs */ - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private void registerSpecialModels() { SkyCompassModel.DEPENDENCIES.forEach(ModelLoader::addSpecialModel); ModelLoader.addSpecialModel(BiometricCardModel.MODEL_BASE); @@ -175,7 +175,7 @@ final class Registration { final IForgeRegistry registry = event.getRegistry(); // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); - final Dist dist = FMLEnvironment.dist; + final EnvType dist = FMLEnvironment.dist; definitions.getRegistry().getBootstrapComponents(IBlockRegistrationComponent.class) .forEachRemaining(b -> b.blockRegistration(dist, registry)); } @@ -184,13 +184,13 @@ final class Registration { final IForgeRegistry registry = event.getRegistry(); // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); - final Dist dist = FMLEnvironment.dist; + final EnvType dist = FMLEnvironment.dist; definitions.getRegistry().getBootstrapComponents(IItemRegistrationComponent.class) .forEachRemaining(b -> b.itemRegistration(dist, registry)); } - public void registerTileEntities(RegistryEvent.Register> event) { - final IForgeRegistry> registry = event.getRegistry(); + public void registerTileEntities(RegistryEvent.Register> event) { + final IForgeRegistry> registry = event.getRegistry(); // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); definitions.getRegistry().getBootstrapComponents(ITileEntityRegistrationComponent.class) @@ -277,7 +277,7 @@ final class Registration { FluidTerminalContainer.TYPE = registerContainer(registry, "fluid_terminal", FluidTerminalContainer::fromNetwork, FluidTerminalContainer::open); - DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> { + DistExecutor.runWhenOn(EnvType.CLIENT, () -> () -> { ScreenManager.registerFactory(GrinderContainer.TYPE, GrinderScreen::new); ScreenManager.registerFactory(QNBContainer.TYPE, QNBScreen::new); ScreenManager.registerFactory(SkyChestContainer.TYPE, SkyChestScreen::new); @@ -363,7 +363,7 @@ final class Registration { registry.register(ParticleTypes.VIBRANT); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void registerParticleFactories(ParticleFactoryRegisterEvent event) { ParticleManager particles = Minecraft.getInstance().particles; particles.registerFactory(ParticleTypes.CHARGED_ORE, ChargedOreFX.Factory::new); @@ -539,7 +539,7 @@ final class Registration { // whitelist from config for (final String dimension : AEConfig.instance().getMeteoriteDimensionWhitelist()) { registries.worldgen().enableWorldGenForDimension(IWorldGen.WorldGenType.METEORITES, - new ResourceLocation(dimension)); + new Identifier(dimension)); } ForgeRegistries.BIOMES.forEach(b -> { @@ -606,7 +606,7 @@ final class Registration { evt.getRegistry().register(StorageCellModDimension.INSTANCE); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void registerTextures(TextureStitchEvent.Pre event) { SkyChestTESR.registerTextures(event); InscriberTESR.registerTexture(event); @@ -616,7 +616,7 @@ final class Registration { new AECommand().register(evt.getCommandDispatcher()); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void registerItemColors(ColorHandlerEvent.Item event) { // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); @@ -624,7 +624,7 @@ final class Registration { .forEachRemaining(c -> c.register(event.getItemColors(), event.getBlockColors())); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void handleModelBake(ModelBakeEvent event) { // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); @@ -632,7 +632,7 @@ final class Registration { .forEachRemaining(c -> c.onModelBakeEvent(event)); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void registerClientEvents() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); diff --git a/src/main/java/appeng/core/api/ApiClientHelper.java b/src/main/java/appeng/core/api/ApiClientHelper.java index 235962e29..2456739b8 100644 --- a/src/main/java/appeng/core/api/ApiClientHelper.java +++ b/src/main/java/appeng/core/api/ApiClientHelper.java @@ -20,7 +20,7 @@ package appeng.core.api; import java.util.List; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; import appeng.api.config.IncludeExclude; @@ -33,7 +33,7 @@ import appeng.core.localization.GuiText; public class ApiClientHelper implements IClientHelper { @Override public > void addCellInformation(ICellInventoryHandler handler, - List lines) { + List lines) { if (handler == null) { return; } diff --git a/src/main/java/appeng/core/api/ApiStorage.java b/src/main/java/appeng/core/api/ApiStorage.java index 4dfdc8846..2e040e118 100644 --- a/src/main/java/appeng/core/api/ApiStorage.java +++ b/src/main/java/appeng/core/api/ApiStorage.java @@ -21,14 +21,14 @@ package appeng.core.api; import java.util.Collection; import java.util.Collections; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import com.google.common.base.Preconditions; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.MutableClassToInstanceMap; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fluids.FluidStack; +import net.minecraft.network.PacketByteBuf; import net.minecraftforge.fluids.FluidUtil; import appeng.api.config.Actionable; @@ -146,7 +146,7 @@ public class ApiStorage implements IStorageHelper { } @Override - public IAEItemStack readFromPacket(PacketBuffer input) { + public IAEItemStack readFromPacket(PacketByteBuf input) { Preconditions.checkNotNull(input); return AEItemStack.fromPacket(input); @@ -174,8 +174,8 @@ public class ApiStorage implements IStorageHelper { public IAEFluidStack createStack(Object input) { Preconditions.checkNotNull(input); - if (input instanceof FluidStack) { - return AEFluidStack.fromFluidStack((FluidStack) input); + if (input instanceof FluidVolume) { + return AEFluidStack.fromFluidStack((FluidVolume) input); } if (input instanceof ItemStack) { final ItemStack is = (ItemStack) input; @@ -190,7 +190,7 @@ public class ApiStorage implements IStorageHelper { } @Override - public IAEFluidStack readFromPacket(PacketBuffer input) { + public IAEFluidStack readFromPacket(PacketByteBuf input) { Preconditions.checkNotNull(input); return AEFluidStack.fromPacket(input); diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index cfafa48c6..a57e2fffc 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -20,7 +20,8 @@ package appeng.core.api.definitions; import static appeng.block.AEBaseBlock.defaultProps; -import net.minecraft.block.Block; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.DispenserBlock; import net.minecraft.block.SlabBlock; import net.minecraft.sound.BlockSoundGroup; @@ -28,8 +29,6 @@ import net.minecraft.block.StairsBlock; import net.minecraft.block.Material; import net.minecraft.client.renderer.RenderType; import net.minecraft.entity.EntityClassification; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ToolType; import appeng.api.definitions.IBlockDefinition; @@ -248,7 +247,7 @@ public final class ApiBlocks implements IBlocks { this.quartzOreCharged = registry.block("charged_quartz_ore", () -> new ChargedQuartzOreBlock(QUARTZ_PROPERTIES)) .features(AEFeature.CERTUS_ORE, AEFeature.CHARGED_CERTUS_ORE).rendering(new BlockRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); } @@ -265,7 +264,7 @@ public final class ApiBlocks implements IBlocks { .block("quartz_glass", () -> new QuartzGlassBlock(defaultProps(Material.GLASS).notSolid())) .rendering(new BlockRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); } @@ -276,7 +275,7 @@ public final class ApiBlocks implements IBlocks { .addFeatures(AEFeature.DECORATIVE_LIGHTS, AEFeature.QUARTZ_GLASS) .rendering(new BlockRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); } @@ -285,7 +284,7 @@ public final class ApiBlocks implements IBlocks { this.quartzFixture = registry.block("quartz_fixture", QuartzFixtureBlock::new) .features(AEFeature.DECORATIVE_LIGHTS).rendering(new BlockRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); } @@ -317,7 +316,7 @@ public final class ApiBlocks implements IBlocks { .tileEntity("sky_chest", SkyChestTileEntity.class, SkyChestTileEntity::new) .rendering(new TileEntityRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(SkyChestTESR::new); } @@ -348,7 +347,7 @@ public final class ApiBlocks implements IBlocks { .tileEntity(registry.tileEntity("crank", CrankTileEntity.class, CrankTileEntity::new) .rendering(new TileEntityRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(CrankTESR::new); } @@ -368,7 +367,7 @@ public final class ApiBlocks implements IBlocks { .tileEntity(registry.tileEntity("charger", ChargerTileEntity.class, ChargerTileEntity::new) .rendering(new TileEntityRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(ChargerBlock.createTesr()); } @@ -419,7 +418,7 @@ public final class ApiBlocks implements IBlocks { .tileEntity(registry.tileEntity("drive", DriveTileEntity.class, DriveTileEntity::new) .rendering(new TileEntityRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(DriveLedTileEntityRenderer::new); } @@ -518,7 +517,7 @@ public final class ApiBlocks implements IBlocks { .tileEntity(registry .tileEntity("crafting_monitor", CraftingMonitorTileEntity.class, CraftingMonitorTileEntity::new) .rendering(new TileEntityRenderingCustomizer() { - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(CraftingMonitorTESR::new); @@ -526,7 +525,7 @@ public final class ApiBlocks implements IBlocks { }).build()) .rendering(new BlockRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); rendering.modelCustomizer((path, model) -> { @@ -542,7 +541,7 @@ public final class ApiBlocks implements IBlocks { this.molecularAssembler = registry .block("molecular_assembler", () -> new MolecularAssemblerBlock(defaultProps(Material.IRON).notSolid())) .features(AEFeature.MOLECULAR_ASSEMBLER).rendering(new BlockRenderingCustomizer() { - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); @@ -553,7 +552,7 @@ public final class ApiBlocks implements IBlocks { MolecularAssemblerTileEntity::new) .rendering(new TileEntityRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(MolecularAssemblerRenderer::new); } @@ -567,7 +566,7 @@ public final class ApiBlocks implements IBlocks { .build()) .rendering(new BlockRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.renderType(RenderType.getCutout()); } @@ -615,7 +614,7 @@ public final class ApiBlocks implements IBlocks { .tileEntity(registry.tileEntity("cable_bus", CableBusTileEntity.class, CableBusTileEntity::new) .rendering(new TileEntityRenderingCustomizer() { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(TileEntityRendering rendering) { rendering.tileEntityRenderer(CableBusTESR::new); } diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index d750a8962..f2d568478 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -21,7 +21,7 @@ package appeng.core.api.definitions; import java.util.function.Function; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IParts; @@ -201,9 +201,9 @@ public final class ApiParts implements IParts { private void registerPartModels(PartModels partModels) { // Register the built-in models for annihilation planes - ResourceLocation fluidFormationPlaneTexture = new ResourceLocation(AppEng.MOD_ID, + Identifier fluidFormationPlaneTexture = new Identifier(AppEng.MOD_ID, "item/part/fluid_formation_plane"); - ResourceLocation fluidFormationPlaneOnTexture = new ResourceLocation(AppEng.MOD_ID, + Identifier fluidFormationPlaneOnTexture = new Identifier(AppEng.MOD_ID, "parts/fluid_formation_plane_on"); // Register all part models diff --git a/src/main/java/appeng/core/features/ColoredItemDefinition.java b/src/main/java/appeng/core/features/ColoredItemDefinition.java index 0ec7ed407..670a8c794 100644 --- a/src/main/java/appeng/core/features/ColoredItemDefinition.java +++ b/src/main/java/appeng/core/features/ColoredItemDefinition.java @@ -19,9 +19,9 @@ package appeng.core.features; import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import appeng.api.util.AEColor; import appeng.api.util.AEColoredItemDefinition; @@ -51,7 +51,7 @@ public final class ColoredItemDefinition implements AEColoredItemDefinition { } @Override - public Class entity(final AEColor color) { + public Class entity(final AEColor color) { return null; } diff --git a/src/main/java/appeng/core/features/TileDefinition.java b/src/main/java/appeng/core/features/TileDefinition.java index af3bb7cbb..5806d36b5 100644 --- a/src/main/java/appeng/core/features/TileDefinition.java +++ b/src/main/java/appeng/core/features/TileDefinition.java @@ -23,8 +23,8 @@ import java.util.Set; import javax.annotation.Nonnull; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.BlockItem; -import net.minecraft.tileentity.TileEntity; import appeng.api.definitions.ITileDefinition; import appeng.api.features.AEFeature; @@ -40,7 +40,7 @@ public final class TileDefinition extends BlockDefinition implements ITileDefini } @Override - public Optional> maybeEntity() { + public Optional> maybeEntity() { return Optional.of(this.block.getTileEntityClass()); } } diff --git a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java index 344401734..ac4895f9d 100644 --- a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java +++ b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java @@ -24,7 +24,7 @@ import java.util.Map; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.features.IMatterCannonAmmoRegistry; @@ -33,7 +33,7 @@ public class MatterCannonAmmoRegistry implements IMatterCannonAmmoRegistry { /** * Contains a mapping from */ - private final Map tagDamageModifiers = new HashMap<>(); + private final Map tagDamageModifiers = new HashMap<>(); private final Map itemDamageModifiers = new IdentityHashMap<>(); @@ -117,7 +117,7 @@ public class MatterCannonAmmoRegistry implements IMatterCannonAmmoRegistry { } @Override - public void registerAmmoTag(final ResourceLocation ammoTag, final double weight) { + public void registerAmmoTag(final Identifier ammoTag, final double weight) { this.tagDamageModifiers.put(ammoTag, weight); } @@ -131,7 +131,7 @@ public class MatterCannonAmmoRegistry implements IMatterCannonAmmoRegistry { } // Next, check each item tag - for (ResourceLocation tag : item.getTags()) { + for (Identifier tag : item.getTags()) { weight = tagDamageModifiers.get(tag); if (weight != null) { return weight.floatValue(); @@ -142,6 +142,6 @@ public class MatterCannonAmmoRegistry implements IMatterCannonAmmoRegistry { } private void addTagWeight(String name, final double weight) { - this.registerAmmoTag(new ResourceLocation(name), weight); + this.registerAmmoTag(new Identifier(name), weight); } } diff --git a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java index 579ace8c8..eff0c5286 100644 --- a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java +++ b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import appeng.api.exceptions.AppEngException; import appeng.api.movable.IMovableHandler; @@ -36,8 +36,8 @@ public class MovableTileRegistry implements IMovableRegistry { private final HashSet blacklisted = new HashSet<>(); - private final HashMap, IMovableHandler> Valid = new HashMap<>(); - private final List> test = new ArrayList<>(); + private final HashMap, IMovableHandler> Valid = new HashMap<>(); + private final List> test = new ArrayList<>(); private final List handlers = new ArrayList<>(); private final DefaultSpatialHandler dsh = new DefaultSpatialHandler(); @@ -49,8 +49,8 @@ public class MovableTileRegistry implements IMovableRegistry { } @Override - public void whiteListTileEntity(final Class c) { - if (c.getName().equals(TileEntity.class.getName())) { + public void whiteListTileEntity(final Class c) { + if (c.getName().equals(BlockEntity.class.getName())) { throw new IllegalArgumentException(new AppEngException("Someone tried to make all tiles movable with " + c + ", this is a clear violation of the purpose of the white list.")); } @@ -59,7 +59,7 @@ public class MovableTileRegistry implements IMovableRegistry { } @Override - public boolean askToMove(final TileEntity te) { + public boolean askToMove(final BlockEntity te) { final Class myClass = te.getClass(); IMovableHandler canMove = this.Valid.get(myClass); @@ -79,7 +79,7 @@ public class MovableTileRegistry implements IMovableRegistry { return false; } - private IMovableHandler testClass(final Class myClass, final TileEntity te) { + private IMovableHandler testClass(final Class myClass, final BlockEntity te) { IMovableHandler handler = null; // ask handlers... @@ -103,7 +103,7 @@ public class MovableTileRegistry implements IMovableRegistry { } // if you are on the white list your opted in. - for (final Class testClass : this.test) { + for (final Class testClass : this.test) { if (testClass.isAssignableFrom(myClass)) { this.Valid.put(myClass, this.dsh); return this.dsh; @@ -115,7 +115,7 @@ public class MovableTileRegistry implements IMovableRegistry { } @Override - public void doneMoving(final TileEntity te) { + public void doneMoving(final BlockEntity te) { if (te instanceof IMovableTile) { final IMovableTile mt = (IMovableTile) te; mt.doneMoving(); @@ -128,7 +128,7 @@ public class MovableTileRegistry implements IMovableRegistry { } @Override - public IMovableHandler getHandler(final TileEntity te) { + public IMovableHandler getHandler(final BlockEntity te) { final Class myClass = te.getClass(); final IMovableHandler h = this.Valid.get(myClass); return h == null ? this.dsh : h; diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index b42d18a5d..bbc4520ae 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -30,7 +30,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.math.Direction; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.registries.ForgeRegistries; @@ -243,7 +243,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry { @Nonnull private ItemStack getModItem(final String modID, final String name) { - final Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(modID + ":" + name)); + final Item item = ForgeRegistries.ITEMS.getValue(new Identifier(modID + ":" + name)); if (item == null) { return ItemStack.EMPTY; diff --git a/src/main/java/appeng/core/features/registries/PartModels.java b/src/main/java/appeng/core/features/registries/PartModels.java index c2528cea0..c6a637602 100644 --- a/src/main/java/appeng/core/features/registries/PartModels.java +++ b/src/main/java/appeng/core/features/registries/PartModels.java @@ -22,18 +22,18 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModels; public class PartModels implements IPartModels { - private final Set models = new HashSet<>(); + private final Set models = new HashSet<>(); private boolean initialized = false; @Override - public void registerModels(Collection partModels) { + public void registerModels(Collection partModels) { if (this.initialized) { throw new IllegalStateException("Cannot register models after the pre-initialization phase!"); } @@ -41,7 +41,7 @@ public class PartModels implements IPartModels { this.models.addAll(partModels); } - public Set getModels() { + public Set getModels() { return this.models; } diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 4b03b2c7b..84c5e327e 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -20,10 +20,9 @@ package appeng.core.features.registries; import java.util.HashSet; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraft.world.dimension.Dimension; +import net.minecraft.util.Identifier; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.dimension.DimensionType; import appeng.api.features.IWorldGen; @@ -55,7 +54,7 @@ public final class WorldGenRegistry implements IWorldGen { } @Override - public void enableWorldGenForDimension(final WorldGenType type, final ResourceLocation dimensionID) { + public void enableWorldGenForDimension(final WorldGenType type, final Identifier dimensionID) { if (type == null) { throw new IllegalArgumentException("Bad Type Passed"); } @@ -64,7 +63,7 @@ public final class WorldGenRegistry implements IWorldGen { } @Override - public void disableWorldGenForDimension(final WorldGenType type, final ResourceLocation dimensionID) { + public void disableWorldGenForDimension(final WorldGenType type, final Identifier dimensionID) { if (type == null) { throw new IllegalArgumentException("Bad Type Passed"); } @@ -73,7 +72,7 @@ public final class WorldGenRegistry implements IWorldGen { } @Override - public boolean isWorldGenEnabled(final WorldGenType type, final IWorld w) { + public boolean isWorldGenEnabled(final WorldGenType type, final WorldAccess w) { if (type == null) { throw new IllegalArgumentException("Bad Type Passed"); } @@ -82,7 +81,7 @@ public final class WorldGenRegistry implements IWorldGen { throw new IllegalArgumentException("Bad Provider Passed"); } - ResourceLocation id = w.getDimension().getType().getRegistryName(); + Identifier id = w.getDimension().getType().getRegistryName(); final boolean isBadProvider = this.types[type.ordinal()].badProviders.contains(w.getDimension().getClass()); final boolean isBadDimension = this.types[type.ordinal()].badDimensions.contains(id); final boolean isGoodDimension = this.types[type.ordinal()].enabledDimensions.contains(id); @@ -101,7 +100,7 @@ public final class WorldGenRegistry implements IWorldGen { private static class TypeSet { final HashSet> badProviders = new HashSet<>(); - final HashSet badDimensions = new HashSet<>(); - final HashSet enabledDimensions = new HashSet<>(); + final HashSet badDimensions = new HashSet<>(); + final HashSet enabledDimensions = new HashSet<>(); } } diff --git a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java index 94210396a..fd19c8e3c 100644 --- a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java +++ b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java @@ -1,9 +1,9 @@ package appeng.core.features.registries.cell; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import appeng.api.AEApi; import appeng.api.implementations.tiles.IChestOrDrive; @@ -27,6 +27,6 @@ public class BasicItemCellGuiHandler implements ICellGuiHandler { public void openChestGui(final PlayerEntity player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final IStorageChannel chan) { ContainerOpener.openContainer(MEMonitorableContainer.TYPE, player, - ContainerLocator.forTileEntitySide((TileEntity) chest, chest.getUp())); + ContainerLocator.forTileEntitySide((BlockEntity) chest, chest.getUp())); } } diff --git a/src/main/java/appeng/core/localization/ButtonToolTips.java b/src/main/java/appeng/core/localization/ButtonToolTips.java index 33af3b09e..035179722 100644 --- a/src/main/java/appeng/core/localization/ButtonToolTips.java +++ b/src/main/java/appeng/core/localization/ButtonToolTips.java @@ -18,8 +18,8 @@ package appeng.core.localization; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; public enum ButtonToolTips { PowerUnits, IOMode, CondenserOutput, RedstoneMode, MatchingFuzzy, @@ -85,8 +85,8 @@ public enum ButtonToolTips { return getTranslationKey().getFormattedText(); } - public ITextComponent getTranslationKey() { - return new TranslationTextComponent(this.root + '.' + this.toString()); + public Text getTranslationKey() { + return new TranslatableText(this.root + '.' + this.toString()); } } diff --git a/src/main/java/appeng/core/localization/GuiText.java b/src/main/java/appeng/core/localization/GuiText.java index dd4c201ef..a80956645 100644 --- a/src/main/java/appeng/core/localization/GuiText.java +++ b/src/main/java/appeng/core/localization/GuiText.java @@ -19,8 +19,8 @@ package appeng.core.localization; import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; public enum GuiText { inventory("container"), // mc's default Inventory localization. @@ -102,12 +102,12 @@ public enum GuiText { return this.root + '.' + this.toString(); } - public ITextComponent textComponent() { - return new TranslationTextComponent(getTranslationKey()); + public Text textComponent() { + return new TranslatableText(getTranslationKey()); } - public ITextComponent textComponent(Object... args) { - return new TranslationTextComponent(getTranslationKey(), args); + public Text textComponent(Object... args) { + return new TranslatableText(getTranslationKey(), args); } } diff --git a/src/main/java/appeng/core/localization/PlayerMessages.java b/src/main/java/appeng/core/localization/PlayerMessages.java index 15a4dac79..c9cfd3291 100644 --- a/src/main/java/appeng/core/localization/PlayerMessages.java +++ b/src/main/java/appeng/core/localization/PlayerMessages.java @@ -18,8 +18,8 @@ package appeng.core.localization; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; public enum PlayerMessages { ChestCannotReadStorageCell, InvalidMachine, LoadedSettings, SavedSettings, ResetSettings, MachineNotPowered, @@ -27,8 +27,8 @@ public enum PlayerMessages { isNowLocked, isNowUnlocked, AmmoDepleted, CommunicationError, OutOfRange, DeviceNotPowered, DeviceNotWirelessTerminal, DeviceNotLinked, StationCanNotBeLocated, SettingCleared,; - public ITextComponent get() { - return new TranslationTextComponent(this.getTranslationKey()); + public Text get() { + return new TranslatableText(this.getTranslationKey()); } String getTranslationKey() { diff --git a/src/main/java/appeng/core/localization/WailaText.java b/src/main/java/appeng/core/localization/WailaText.java index be2c62d69..71b2212dd 100644 --- a/src/main/java/appeng/core/localization/WailaText.java +++ b/src/main/java/appeng/core/localization/WailaText.java @@ -19,8 +19,8 @@ package appeng.core.localization; import net.minecraft.client.resources.I18n; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; public enum WailaText { Crafting, @@ -51,12 +51,12 @@ public enum WailaText { return this.root + '.' + this.toString(); } - public ITextComponent textComponent() { - return new TranslationTextComponent(this.root + '.' + this.toString()); + public Text textComponent() { + return new TranslatableText(this.root + '.' + this.toString()); } - public ITextComponent textComponent(Object... args) { - return new TranslationTextComponent(this.root + '.' + this.toString(), args); + public Text textComponent(Object... args) { + return new TranslatableText(this.root + '.' + this.toString(), args); } } diff --git a/src/main/java/appeng/core/stats/AeStats.java b/src/main/java/appeng/core/stats/AeStats.java index ba739464d..5c881cbc5 100644 --- a/src/main/java/appeng/core/stats/AeStats.java +++ b/src/main/java/appeng/core/stats/AeStats.java @@ -21,7 +21,7 @@ package appeng.core.stats; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.stats.IStatFormatter; import net.minecraft.stats.Stats; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import appeng.core.AppEng; @@ -37,24 +37,24 @@ public enum AeStats { // done TurnedCranks("turned_cranks"); - private final ResourceLocation registryName; + private final Identifier registryName; AeStats(String id) { - this.registryName = new ResourceLocation(AppEng.MOD_ID, id); + this.registryName = new Identifier(AppEng.MOD_ID, id); } public void addToPlayer(final PlayerEntity player, final int howMany) { player.addStat(this.registryName, howMany); } - public ResourceLocation getRegistryName() { + public Identifier getRegistryName() { return registryName; } public static void register() { for (AeStats stat : AeStats.values()) { // Compare with net.minecraft.stats.Stats#registerCustom - ResourceLocation registryName = stat.getRegistryName(); + Identifier registryName = stat.getRegistryName(); Registry.register(Registry.CUSTOM_STAT, registryName.getPath(), registryName); Stats.CUSTOM.get(registryName, IStatFormatter.DEFAULT); } diff --git a/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java b/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java index 36af1101e..5356988fa 100644 --- a/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java +++ b/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java @@ -33,22 +33,22 @@ import net.minecraft.advancements.PlayerAdvancements; import net.minecraft.advancements.criterion.CriterionInstance; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.core.AppEng; public class AppEngAdvancementTrigger implements ICriterionTrigger, IAdvancementTrigger { - private final ResourceLocation ID; + private final Identifier ID; private final Map listeners = new HashMap<>(); public AppEngAdvancementTrigger(String parString) { super(); - this.ID = new ResourceLocation(AppEng.MOD_ID, parString); + this.ID = new Identifier(AppEng.MOD_ID, parString); } @Override - public ResourceLocation getId() { + public Identifier getId() { return this.ID; } @@ -99,7 +99,7 @@ public class AppEngAdvancementTrigger } public static class Instance extends CriterionInstance { - public Instance(ResourceLocation parID) { + public Instance(Identifier parID) { super(parID); } diff --git a/src/main/java/appeng/core/stats/PartItemPredicate.java b/src/main/java/appeng/core/stats/PartItemPredicate.java index 198a9dd90..45c1dbb3c 100644 --- a/src/main/java/appeng/core/stats/PartItemPredicate.java +++ b/src/main/java/appeng/core/stats/PartItemPredicate.java @@ -23,7 +23,7 @@ import com.google.gson.JsonObject; import net.minecraft.advancements.criterion.ItemPredicate; import net.minecraft.item.ItemStack; import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.core.AppEng; import appeng.items.parts.PartItem; @@ -54,6 +54,6 @@ public class PartItemPredicate extends ItemPredicate { } public static void register() { - ItemPredicate.register(new ResourceLocation(AppEng.MOD_ID, "part"), PartItemPredicate::deserialize); + ItemPredicate.register(new Identifier(AppEng.MOD_ID, "part"), PartItemPredicate::deserialize); } } diff --git a/src/main/java/appeng/core/sync/BasePacket.java b/src/main/java/appeng/core/sync/BasePacket.java index f8f5172bd..8c6178b2b 100644 --- a/src/main/java/appeng/core/sync/BasePacket.java +++ b/src/main/java/appeng/core/sync/BasePacket.java @@ -18,11 +18,11 @@ package appeng.core.sync; +import net.minecraft.network.PacketByteBuf; import org.apache.commons.lang3.tuple.Pair; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.IPacket; -import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkDirection; import appeng.api.features.AEFeature; @@ -32,7 +32,7 @@ import appeng.core.sync.network.INetworkInfo; import appeng.core.sync.network.NetworkHandler; public abstract class BasePacket { - private PacketBuffer p; + private PacketByteBuf p; public void serverPacketData(final INetworkInfo manager, final PlayerEntity player) { throw new UnsupportedOperationException( @@ -48,7 +48,7 @@ public abstract class BasePacket { "This packet ( " + this.getPacketID() + " does not implement a client side handler."); } - protected void configureWrite(final PacketBuffer data) { + protected void configureWrite(final PacketByteBuf data) { data.capacity(data.readableBytes()); this.p = data; } diff --git a/src/main/java/appeng/core/sync/BasePacketHandler.java b/src/main/java/appeng/core/sync/BasePacketHandler.java index fac85e3e5..03dd4a4e8 100644 --- a/src/main/java/appeng/core/sync/BasePacketHandler.java +++ b/src/main/java/appeng/core/sync/BasePacketHandler.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.core.sync.packets.*; @@ -82,9 +82,9 @@ public class BasePacketHandler { PACKET_FLUID_TANK(FluidSlotPacket.class, FluidSlotPacket::new); - private final Function factory; + private final Function factory; - PacketTypes(Class packetClass, Function factory) { + PacketTypes(Class packetClass, Function factory) { this.factory = factory; REVERSE_LOOKUP.put(packetClass, this); @@ -98,7 +98,7 @@ public class BasePacketHandler { return REVERSE_LOOKUP.get(c); } - public BasePacket parsePacket(final PacketBuffer in) throws IllegalArgumentException { + public BasePacket parsePacket(final PacketByteBuf in) throws IllegalArgumentException { return this.factory.apply(in); } } diff --git a/src/main/java/appeng/core/sync/network/ClientPacketHandler.java b/src/main/java/appeng/core/sync/network/ClientPacketHandler.java index 60557ed74..8e587c604 100644 --- a/src/main/java/appeng/core/sync/network/ClientPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/ClientPacketHandler.java @@ -21,7 +21,7 @@ package appeng.core.sync.network; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.INetHandler; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.core.AELog; import appeng.core.sync.BasePacket; @@ -30,7 +30,7 @@ import appeng.core.sync.BasePacketHandler; public class ClientPacketHandler extends BasePacketHandler implements IPacketHandler { @Override - public void onPacketData(final INetworkInfo manager, final INetHandler handler, final PacketBuffer packet, + public void onPacketData(final INetworkInfo manager, final INetHandler handler, final PacketByteBuf packet, final PlayerEntity player) { try { final int packetType = packet.readInt(); diff --git a/src/main/java/appeng/core/sync/network/IPacketHandler.java b/src/main/java/appeng/core/sync/network/IPacketHandler.java index 7574770a6..2f99f7e4f 100644 --- a/src/main/java/appeng/core/sync/network/IPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/IPacketHandler.java @@ -20,10 +20,10 @@ package appeng.core.sync.network; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.INetHandler; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; public interface IPacketHandler { - void onPacketData(INetworkInfo manager, INetHandler handler, PacketBuffer packet, PlayerEntity player); + void onPacketData(INetworkInfo manager, INetHandler handler, PacketByteBuf packet, PlayerEntity player); } diff --git a/src/main/java/appeng/core/sync/network/NetworkHandler.java b/src/main/java/appeng/core/sync/network/NetworkHandler.java index bd6357931..71797dcfb 100644 --- a/src/main/java/appeng/core/sync/network/NetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/NetworkHandler.java @@ -25,7 +25,7 @@ import net.minecraft.network.IPacket; import net.minecraft.network.ThreadQuickExitException; import net.minecraft.network.play.ServerPlayNetHandler; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; @@ -41,12 +41,12 @@ import appeng.core.sync.BasePacket; public class NetworkHandler { private static NetworkHandler instance; - private final ResourceLocation myChannelName; + private final Identifier myChannelName; private final IPacketHandler clientHandler; private final IPacketHandler serverHandler; - public NetworkHandler(final ResourceLocation channelName) { + public NetworkHandler(final Identifier channelName) { EventNetworkChannel ec = NetworkRegistry.ChannelBuilder.named(myChannelName = channelName) .networkProtocolVersion(() -> "1").clientAcceptedVersions(s -> true).serverAcceptedVersions(s -> true) .eventNetworkChannel(); @@ -56,7 +56,7 @@ public class NetworkHandler { this.serverHandler = this.createServerSide(); } - public static void init(final ResourceLocation channelName) { + public static void init(final Identifier channelName) { instance = new NetworkHandler(channelName); } @@ -105,7 +105,7 @@ public class NetworkHandler { } } - public ResourceLocation getChannel() { + public Identifier getChannel() { return this.myChannelName; } diff --git a/src/main/java/appeng/core/sync/network/ServerPacketHandler.java b/src/main/java/appeng/core/sync/network/ServerPacketHandler.java index 0ed6f6d6e..2e4cf29ea 100644 --- a/src/main/java/appeng/core/sync/network/ServerPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/ServerPacketHandler.java @@ -20,7 +20,7 @@ package appeng.core.sync.network; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.INetHandler; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.core.AELog; import appeng.core.sync.BasePacket; @@ -29,7 +29,7 @@ import appeng.core.sync.BasePacketHandler; public final class ServerPacketHandler extends BasePacketHandler implements IPacketHandler { @Override - public void onPacketData(final INetworkInfo manager, final INetHandler handler, final PacketBuffer packet, + public void onPacketData(final INetworkInfo manager, final INetHandler handler, final PacketByteBuf packet, final PlayerEntity player) { try { final int packetType = packet.readInt(); diff --git a/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java b/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java index 63b63ef4b..9a1db8727 100644 --- a/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java +++ b/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java @@ -20,12 +20,12 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; +import net.fabricmc.api.Environment; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import appeng.api.storage.data.IAEItemStack; import appeng.core.sync.BasePacket; @@ -40,7 +40,7 @@ public class AssemblerAnimationPacket extends BasePacket { public final byte rate; public final IAEItemStack is; - public AssemblerAnimationPacket(final PacketBuffer stream) { + public AssemblerAnimationPacket(final PacketByteBuf stream) { this.pos = stream.readBlockPos(); this.rate = stream.readByte(); this.is = AEItemStack.fromPacket(stream); @@ -49,7 +49,7 @@ public class AssemblerAnimationPacket extends BasePacket { // api public AssemblerAnimationPacket(final BlockPos pos, final byte rate, final IAEItemStack is) { - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeBlockPos(this.pos = pos); @@ -61,9 +61,9 @@ public class AssemblerAnimationPacket extends BasePacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { - TileEntity te = player.getEntityWorld().getTileEntity(pos); + BlockEntity te = player.getEntityWorld().getTileEntity(pos); if (te instanceof MolecularAssemblerTileEntity) { MolecularAssemblerTileEntity ma = (MolecularAssemblerTileEntity) te; ma.setAnimationStatus(new AssemblerAnimationStatus(rate, is.asItemStackRepresentation())); diff --git a/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java b/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java index c6414cbc8..58684c34a 100644 --- a/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java +++ b/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java @@ -20,21 +20,21 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; +import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.network.PacketByteBuf; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SimpleSound; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; -import net.minecraft.network.PacketBuffer; import net.minecraft.tags.FluidTags; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import net.minecraftforge.registries.GameData; import appeng.api.util.AEPartLocation; @@ -67,7 +67,7 @@ public class BlockTransitionEffectPacket extends BasePacket { this.direction = direction; this.soundMode = soundMode; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeBlockPos(pos); @@ -81,7 +81,7 @@ public class BlockTransitionEffectPacket extends BasePacket { this.configureWrite(data); } - public BlockTransitionEffectPacket(final PacketBuffer stream) { + public BlockTransitionEffectPacket(final PacketByteBuf stream) { this.pos = stream.readBlockPos(); int blockStateId = stream.readInt(); @@ -96,7 +96,7 @@ public class BlockTransitionEffectPacket extends BasePacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { spawnParticles(); diff --git a/src/main/java/appeng/core/sync/packets/ClickPacket.java b/src/main/java/appeng/core/sync/packets/ClickPacket.java index 05e95338e..9c50f4ce1 100644 --- a/src/main/java/appeng/core/sync/packets/ClickPacket.java +++ b/src/main/java/appeng/core/sync/packets/ClickPacket.java @@ -24,7 +24,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; @@ -57,7 +57,7 @@ public class ClickPacket extends BasePacket { private Hand hand; private final boolean leftClick; - public ClickPacket(final PacketBuffer stream) { + public ClickPacket(final PacketByteBuf stream) { this.x = stream.readInt(); this.y = stream.readInt(); this.z = stream.readInt(); @@ -93,7 +93,7 @@ public class ClickPacket extends BasePacket { public ClickPacket(final BlockPos pos, final Direction side, final float hitX, final float hitY, final float hitZ, final Hand hand, boolean leftClick) { - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeInt(this.x = pos.getX()); diff --git a/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java b/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java index 0a7549df6..d3fd11c6a 100644 --- a/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java +++ b/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java @@ -22,7 +22,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.util.DimensionalCoord; import appeng.core.sync.BasePacket; @@ -40,7 +40,7 @@ public class CompassRequestPacket extends BasePacket implements ICompassCallback private PlayerEntity talkBackTo; - public CompassRequestPacket(final PacketBuffer stream) { + public CompassRequestPacket(final PacketByteBuf stream) { this.attunement = stream.readLong(); this.cx = stream.readInt(); this.cz = stream.readInt(); @@ -50,7 +50,7 @@ public class CompassRequestPacket extends BasePacket implements ICompassCallback // api public CompassRequestPacket(final long attunement, final int cx, final int cz, final int cdy) { - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeLong(this.attunement = attunement); diff --git a/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java b/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java index 519f63219..b33884a3b 100644 --- a/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java +++ b/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java @@ -21,7 +21,7 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; @@ -37,7 +37,7 @@ public class CompassResponsePacket extends BasePacket { private CompassResult cr; - public CompassResponsePacket(final PacketBuffer stream) { + public CompassResponsePacket(final PacketByteBuf stream) { this.attunement = stream.readLong(); this.cx = stream.readInt(); this.cz = stream.readInt(); @@ -50,7 +50,7 @@ public class CompassResponsePacket extends BasePacket { public CompassResponsePacket(final CompassRequestPacket req, final boolean hasResult, final boolean spin, final double radians) { - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeLong(this.attunement = req.attunement); diff --git a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java index 5e31aee4c..47495cdef 100644 --- a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java +++ b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java @@ -33,9 +33,9 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.network.PacketByteBuf; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.client.gui.implementations.InterfaceTerminalScreen; import appeng.core.sync.BasePacket; @@ -47,10 +47,10 @@ public class CompressedNBTPacket extends BasePacket { // input. private final CompoundTag in; // output... - private final PacketBuffer data; + private final PacketByteBuf data; private final GZIPOutputStream compressFrame; - public CompressedNBTPacket(final PacketBuffer stream) { + public CompressedNBTPacket(final PacketByteBuf stream) { this.data = null; this.compressFrame = null; @@ -74,7 +74,7 @@ public class CompressedNBTPacket extends BasePacket { // api public CompressedNBTPacket(final CompoundTag din) throws IOException { - this.data = new PacketBuffer(Unpooled.buffer(2048)); + this.data = new PacketByteBuf(Unpooled.buffer(2048)); this.data.writeInt(this.getPacketID()); this.in = din; @@ -94,7 +94,7 @@ public class CompressedNBTPacket extends BasePacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { final Screen gs = Minecraft.getInstance().currentScreen; diff --git a/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java b/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java index adea6dfe6..c2c9eada5 100644 --- a/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java +++ b/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java @@ -24,7 +24,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.Settings; import appeng.api.util.IConfigManager; @@ -38,7 +38,7 @@ public final class ConfigButtonPacket extends BasePacket { private final Settings option; private final boolean rotationDirection; - public ConfigButtonPacket(final PacketBuffer stream) { + public ConfigButtonPacket(final PacketByteBuf stream) { this.option = Settings.values()[stream.readInt()]; this.rotationDirection = stream.readBoolean(); } @@ -48,7 +48,7 @@ public final class ConfigButtonPacket extends BasePacket { this.option = option; this.rotationDirection = rotationDirection; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeInt(option.ordinal()); diff --git a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java index 1d7fb2ffc..85af328ca 100644 --- a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java +++ b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java @@ -25,7 +25,7 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Hand; import appeng.api.config.FuzzyMode; @@ -56,7 +56,7 @@ public class ConfigValuePacket extends BasePacket { private final String Name; private final String Value; - public ConfigValuePacket(final PacketBuffer stream) { + public ConfigValuePacket(final PacketByteBuf stream) { this.Name = stream.readString(); this.Value = stream.readString(); } @@ -66,7 +66,7 @@ public class ConfigValuePacket extends BasePacket { this.Name = name; this.Value = value; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); diff --git a/src/main/java/appeng/core/sync/packets/CraftRequestPacket.java b/src/main/java/appeng/core/sync/packets/CraftRequestPacket.java index 56bf5bce3..1f5ca4ebe 100644 --- a/src/main/java/appeng/core/sync/packets/CraftRequestPacket.java +++ b/src/main/java/appeng/core/sync/packets/CraftRequestPacket.java @@ -23,7 +23,7 @@ import java.util.concurrent.Future; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.networking.IGrid; import appeng.api.networking.IGridNode; @@ -43,7 +43,7 @@ public class CraftRequestPacket extends BasePacket { private final long amount; private final boolean heldShift; - public CraftRequestPacket(final PacketBuffer stream) { + public CraftRequestPacket(final PacketByteBuf stream) { this.heldShift = stream.readBoolean(); this.amount = stream.readLong(); } @@ -52,7 +52,7 @@ public class CraftRequestPacket extends BasePacket { this.amount = craftAmt; this.heldShift = shift; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeBoolean(shift); diff --git a/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java b/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java index 5a3dd3cb3..6d18bec0c 100644 --- a/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java +++ b/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java @@ -26,7 +26,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.storage.data.IAEFluidStack; import appeng.core.sync.BasePacket; @@ -37,7 +37,7 @@ import appeng.fluids.util.AEFluidStack; public class FluidSlotPacket extends BasePacket { private final Map list; - public FluidSlotPacket(final PacketBuffer stream) { + public FluidSlotPacket(final PacketByteBuf stream) { this.list = new HashMap<>(); CompoundTag tag = stream.readCompoundTag(); @@ -58,7 +58,7 @@ public class FluidSlotPacket extends BasePacket { sendTag.put(fs.getKey().toString(), tag); } - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeCompoundTag(sendTag); this.configureWrite(data); diff --git a/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java b/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java index 4bde52464..9991a440c 100644 --- a/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java +++ b/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java @@ -23,7 +23,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.storage.data.IAEItemStack; import appeng.container.AEBaseContainer; @@ -44,7 +44,7 @@ public class InventoryActionPacket extends BasePacket { private final long id; private final IAEItemStack slotItem; - public InventoryActionPacket(final PacketBuffer stream) { + public InventoryActionPacket(final PacketByteBuf stream) { this.action = InventoryAction.values()[stream.readInt()]; this.slot = stream.readInt(); this.id = stream.readLong(); @@ -68,7 +68,7 @@ public class InventoryActionPacket extends BasePacket { this.id = 0; this.slotItem = slotItem; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeInt(action.ordinal()); @@ -92,7 +92,7 @@ public class InventoryActionPacket extends BasePacket { this.id = id; this.slotItem = null; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeInt(action.ordinal()); diff --git a/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java b/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java index dabdebb11..2782cadd3 100644 --- a/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java +++ b/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java @@ -20,12 +20,12 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.util.AEPartLocation; import appeng.client.render.effects.EnergyParticleData; @@ -51,7 +51,7 @@ public class ItemTransitionEffectPacket extends BasePacket { this.z = z; this.d = direction; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeFloat((float) x); @@ -62,7 +62,7 @@ public class ItemTransitionEffectPacket extends BasePacket { this.configureWrite(data); } - public ItemTransitionEffectPacket(final PacketBuffer stream) { + public ItemTransitionEffectPacket(final PacketByteBuf stream) { this.x = stream.readFloat(); this.y = stream.readFloat(); this.z = stream.readFloat(); @@ -70,7 +70,7 @@ public class ItemTransitionEffectPacket extends BasePacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { final World world = AppEng.proxy.getWorld(); diff --git a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java index e41b8aaa1..4bba2b006 100644 --- a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java +++ b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java @@ -18,6 +18,7 @@ package appeng.core.sync.packets; +import alexiil.mc.lib.attributes.item.ItemTransferable; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; @@ -26,8 +27,7 @@ import net.minecraft.inventory.container.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -56,7 +56,7 @@ public class JEIRecipePacket extends BasePacket { private ItemStack[][] recipe; - public JEIRecipePacket(final PacketBuffer stream) { + public JEIRecipePacket(final PacketByteBuf stream) { final CompoundTag comp = stream.readCompoundTag(); if (comp != null) { this.recipe = new ItemStack[9][]; @@ -74,7 +74,7 @@ public class JEIRecipePacket extends BasePacket { // api public JEIRecipePacket(final CompoundTag recipe) { - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); @@ -108,8 +108,8 @@ public class JEIRecipePacket extends BasePacket { final IEnergyGrid energy = grid.getCache(IEnergyGrid.class); final ISecurityGrid security = grid.getCache(ISecurityGrid.class); final ICraftingGrid crafting = grid.getCache(ICraftingGrid.class); - final IItemHandler craftMatrix = cct.getInventoryByName("crafting"); - final IItemHandler playerInventory = cct.getInventoryByName("player"); + final ItemTransferable craftMatrix = cct.getInventoryByName("crafting"); + final ItemTransferable playerInventory = cct.getInventoryByName("player"); if (inv != null && this.recipe != null && security != null) { final IMEMonitor storage = inv diff --git a/src/main/java/appeng/core/sync/packets/LightningPacket.java b/src/main/java/appeng/core/sync/packets/LightningPacket.java index 666d552a6..57cb2bd36 100644 --- a/src/main/java/appeng/core/sync/packets/LightningPacket.java +++ b/src/main/java/appeng/core/sync/packets/LightningPacket.java @@ -20,11 +20,11 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; +import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.network.PacketByteBuf; +import net.fabricmc.api.EnvType; import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; @@ -38,7 +38,7 @@ public class LightningPacket extends BasePacket { private final double y; private final double z; - public LightningPacket(final PacketBuffer stream) { + public LightningPacket(final PacketByteBuf stream) { this.x = stream.readFloat(); this.y = stream.readFloat(); this.z = stream.readFloat(); @@ -50,7 +50,7 @@ public class LightningPacket extends BasePacket { this.y = y; this.z = z; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeFloat((float) x); @@ -61,7 +61,7 @@ public class LightningPacket extends BasePacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { try { if (Platform.isClient() && AEConfig.instance().isEnableEffects()) { diff --git a/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java b/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java index 10caeebd1..eecea9021 100644 --- a/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java +++ b/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java @@ -31,13 +31,13 @@ import javax.annotation.Nullable; import io.netty.buffer.Unpooled; +import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.IPacket; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.network.PacketByteBuf; +import net.fabricmc.api.EnvType; import net.minecraftforge.fml.network.NetworkDirection; import appeng.api.storage.data.IAEFluidStack; @@ -65,14 +65,14 @@ public class MEFluidInventoryUpdatePacket extends BasePacket { private final byte ref; @Nullable - private final PacketBuffer data; + private final PacketByteBuf data; @Nullable private final GZIPOutputStream compressFrame; private int writtenBytes = 0; private boolean empty = true; - public MEFluidInventoryUpdatePacket(final PacketBuffer stream) { + public MEFluidInventoryUpdatePacket(final PacketByteBuf stream) { this.data = null; this.compressFrame = null; this.list = new LinkedList<>(); @@ -89,7 +89,7 @@ public class MEFluidInventoryUpdatePacket extends BasePacket { } })) { - final PacketBuffer uncompressed = new PacketBuffer(Unpooled.buffer(stream.readableBytes())); + final PacketByteBuf uncompressed = new PacketByteBuf(Unpooled.buffer(stream.readableBytes())); final byte[] tmp = new byte[TEMP_BUFFER_SIZE]; while (gzReader.available() != 0) { @@ -118,7 +118,7 @@ public class MEFluidInventoryUpdatePacket extends BasePacket { // api public MEFluidInventoryUpdatePacket(final byte ref) throws IOException { this.ref = ref; - this.data = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT)); + this.data = new PacketByteBuf(Unpooled.buffer(OPERATION_BYTE_LIMIT)); this.data.writeInt(this.getPacketID()); this.data.writeByte(this.ref); @@ -133,7 +133,7 @@ public class MEFluidInventoryUpdatePacket extends BasePacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { final Screen gs = Minecraft.getInstance().currentScreen; @@ -158,7 +158,7 @@ public class MEFluidInventoryUpdatePacket extends BasePacket { } public void appendFluid(final IAEFluidStack fs) throws IOException, BufferOverflowException { - final PacketBuffer tmp = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT)); + final PacketByteBuf tmp = new PacketByteBuf(Unpooled.buffer(OPERATION_BYTE_LIMIT)); fs.writeToPacket(tmp); this.compressFrame.flush(); diff --git a/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java b/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java index 7fac77538..cf569c140 100644 --- a/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java +++ b/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java @@ -35,9 +35,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.IPacket; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.network.PacketByteBuf; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraftforge.fml.network.NetworkDirection; import appeng.api.storage.data.IAEItemStack; @@ -63,14 +63,14 @@ public class MEInventoryUpdatePacket extends BasePacket { private final byte ref; @Nullable - private final PacketBuffer data; + private final PacketByteBuf data; @Nullable private final GZIPOutputStream compressFrame; private int writtenBytes = 0; private boolean empty = true; - public MEInventoryUpdatePacket(final PacketBuffer stream) { + public MEInventoryUpdatePacket(final PacketByteBuf stream) { this.data = null; this.compressFrame = null; this.list = new ArrayList<>(); @@ -88,7 +88,7 @@ public class MEInventoryUpdatePacket extends BasePacket { return stream.readByte() & STREAM_MASK; } })) { - final PacketBuffer uncompressed = new PacketBuffer(Unpooled.buffer(stream.readableBytes())); + final PacketByteBuf uncompressed = new PacketByteBuf(Unpooled.buffer(stream.readableBytes())); final byte[] tmp = new byte[TEMP_BUFFER_SIZE]; while (gzReader.available() != 0) { @@ -117,7 +117,7 @@ public class MEInventoryUpdatePacket extends BasePacket { // api public MEInventoryUpdatePacket(final byte ref) throws IOException { this.ref = ref; - this.data = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT)); + this.data = new PacketByteBuf(Unpooled.buffer(OPERATION_BYTE_LIMIT)); this.data.writeInt(this.getPacketID()); this.data.writeByte(this.ref); @@ -132,7 +132,7 @@ public class MEInventoryUpdatePacket extends BasePacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { final Screen gs = Minecraft.getInstance().currentScreen; @@ -169,7 +169,7 @@ public class MEInventoryUpdatePacket extends BasePacket { } public void appendItem(final IAEItemStack is) throws IOException, BufferOverflowException { - final PacketBuffer tmp = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT)); + final PacketByteBuf tmp = new PacketByteBuf(Unpooled.buffer(OPERATION_BYTE_LIMIT)); is.writeToPacket(tmp); this.compressFrame.flush(); diff --git a/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java b/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java index 12a449021..1d82155d5 100644 --- a/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java +++ b/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java @@ -20,11 +20,11 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.network.PacketByteBuf; import appeng.client.render.effects.ParticleTypes; import appeng.core.sync.BasePacket; @@ -40,7 +40,7 @@ public class MatterCannonPacket extends BasePacket { private final double dz; private final byte len; - public MatterCannonPacket(final PacketBuffer stream) { + public MatterCannonPacket(final PacketByteBuf stream) { this.x = stream.readFloat(); this.y = stream.readFloat(); this.z = stream.readFloat(); @@ -64,7 +64,7 @@ public class MatterCannonPacket extends BasePacket { this.dz = dz / dlz; this.len = len; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeFloat((float) x); @@ -79,7 +79,7 @@ public class MatterCannonPacket extends BasePacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { try { for (int a = 1; a < this.len; a++) { diff --git a/src/main/java/appeng/core/sync/packets/MockExplosionPacket.java b/src/main/java/appeng/core/sync/packets/MockExplosionPacket.java index b4cae5f4b..7467c9a11 100644 --- a/src/main/java/appeng/core/sync/packets/MockExplosionPacket.java +++ b/src/main/java/appeng/core/sync/packets/MockExplosionPacket.java @@ -20,12 +20,12 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; +import net.fabricmc.api.Environment; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.particles.ParticleTypes; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import appeng.core.AppEng; import appeng.core.sync.BasePacket; @@ -37,7 +37,7 @@ public class MockExplosionPacket extends BasePacket { private final double y; private final double z; - public MockExplosionPacket(final PacketBuffer stream) { + public MockExplosionPacket(final PacketByteBuf stream) { this.x = stream.readDouble(); this.y = stream.readDouble(); this.z = stream.readDouble(); @@ -49,7 +49,7 @@ public class MockExplosionPacket extends BasePacket { this.y = y; this.z = z; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeDouble(x); @@ -60,7 +60,7 @@ public class MockExplosionPacket extends BasePacket { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void clientPacketData(final INetworkInfo network, final PlayerEntity player) { final World world = AppEng.proxy.getWorld(); world.addParticle(ParticleTypes.EXPLOSION, this.x, this.y, this.z, 1.0D, 0.0D, 0.0D); diff --git a/src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java b/src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java index a5dbeea92..deb7b4665 100644 --- a/src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java +++ b/src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java @@ -21,7 +21,7 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.util.AEColor; import appeng.core.sync.BasePacket; @@ -35,7 +35,7 @@ public class PaintedEntityPacket extends BasePacket { private final int entityId; private int ticks; - public PaintedEntityPacket(final PacketBuffer stream) { + public PaintedEntityPacket(final PacketByteBuf stream) { this.entityId = stream.readInt(); this.myColor = AEColor.values()[stream.readByte()]; this.ticks = stream.readInt(); @@ -44,7 +44,7 @@ public class PaintedEntityPacket extends BasePacket { // api public PaintedEntityPacket(final int myEntity, final AEColor myColor, final int ticksLeft) { - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeInt(this.entityId = myEntity); diff --git a/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java b/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java index 0b44f2819..64e4767fd 100644 --- a/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java +++ b/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java @@ -22,7 +22,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; @@ -41,7 +41,7 @@ public class PartPlacementPacket extends BasePacket { private float eyeHeight; private Hand hand; - public PartPlacementPacket(final PacketBuffer stream) { + public PartPlacementPacket(final PacketByteBuf stream) { this.x = stream.readInt(); this.y = stream.readInt(); this.z = stream.readInt(); @@ -52,7 +52,7 @@ public class PartPlacementPacket extends BasePacket { // api public PartPlacementPacket(final BlockPos pos, final Direction face, final float eyeHeight, final Hand hand) { - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeInt(pos.getX()); diff --git a/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java b/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java index 056b7f78f..80c6d64d7 100644 --- a/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java +++ b/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java @@ -18,12 +18,12 @@ package appeng.core.sync.packets; +import alexiil.mc.lib.attributes.item.ItemTransferable; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; @@ -41,7 +41,7 @@ public class PatternSlotPacket extends BasePacket { public final boolean shift; - public PatternSlotPacket(final PacketBuffer stream) { + public PatternSlotPacket(final PacketByteBuf stream) { this.shift = stream.readBoolean(); @@ -52,7 +52,7 @@ public class PatternSlotPacket extends BasePacket { } } - private IAEItemStack readItem(final PacketBuffer stream) { + private IAEItemStack readItem(final PacketByteBuf stream) { final boolean hasItem = stream.readBoolean(); if (hasItem) { @@ -63,12 +63,12 @@ public class PatternSlotPacket extends BasePacket { } // api - public PatternSlotPacket(final IItemHandler pat, final IAEItemStack slotItem, final boolean shift) { + public PatternSlotPacket(final ItemTransferable pat, final IAEItemStack slotItem, final boolean shift) { this.slotItem = slotItem; this.shift = shift; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); @@ -84,7 +84,7 @@ public class PatternSlotPacket extends BasePacket { this.configureWrite(data); } - private void writeItem(final IAEItemStack slotItem, final PacketBuffer data) { + private void writeItem(final IAEItemStack slotItem, final PacketByteBuf data) { if (slotItem == null) { data.writeBoolean(false); } else { diff --git a/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java b/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java index 1b98e5d10..cf659e344 100644 --- a/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java +++ b/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java @@ -22,7 +22,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.container.AEBaseContainer; import appeng.core.sync.BasePacket; @@ -33,7 +33,7 @@ public class ProgressBarPacket extends BasePacket { private final short id; private final long value; - public ProgressBarPacket(final PacketBuffer stream) { + public ProgressBarPacket(final PacketByteBuf stream) { this.id = stream.readShort(); this.value = stream.readLong(); } @@ -43,7 +43,7 @@ public class ProgressBarPacket extends BasePacket { this.id = (short) shortID; this.value = value; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeShort(shortID); diff --git a/src/main/java/appeng/core/sync/packets/SwapSlotsPacket.java b/src/main/java/appeng/core/sync/packets/SwapSlotsPacket.java index e32b77608..a9e14f143 100644 --- a/src/main/java/appeng/core/sync/packets/SwapSlotsPacket.java +++ b/src/main/java/appeng/core/sync/packets/SwapSlotsPacket.java @@ -21,7 +21,7 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.container.AEBaseContainer; import appeng.core.sync.BasePacket; @@ -32,14 +32,14 @@ public class SwapSlotsPacket extends BasePacket { private final int slotA; private final int slotB; - public SwapSlotsPacket(final PacketBuffer stream) { + public SwapSlotsPacket(final PacketByteBuf stream) { this.slotA = stream.readInt(); this.slotB = stream.readInt(); } // api public SwapSlotsPacket(final int slotA, final int slotB) { - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeInt(this.slotA = slotA); diff --git a/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java b/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java index 31f7a508e..df951b164 100644 --- a/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java +++ b/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java @@ -23,7 +23,7 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraftforge.registries.ForgeRegistries; import appeng.container.AEBaseContainer; @@ -36,7 +36,7 @@ public class SwitchGuisPacket extends BasePacket { private final ContainerType newGui; - public SwitchGuisPacket(final PacketBuffer stream) { + public SwitchGuisPacket(final PacketByteBuf stream) { this.newGui = ForgeRegistries.CONTAINERS.getValue(stream.readResourceLocation()); } @@ -44,7 +44,7 @@ public class SwitchGuisPacket extends BasePacket { public SwitchGuisPacket(final ContainerType newGui) { this.newGui = newGui; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); data.writeResourceLocation(newGui.getRegistryName()); diff --git a/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java b/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java index 6cc693a79..3d96057f7 100644 --- a/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java +++ b/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java @@ -21,7 +21,7 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.core.AELog; import appeng.core.sync.BasePacket; @@ -37,7 +37,7 @@ import appeng.fluids.util.AEFluidStack; public class TargetFluidStackPacket extends BasePacket { private AEFluidStack stack; - public TargetFluidStackPacket(final PacketBuffer stream) { + public TargetFluidStackPacket(final PacketByteBuf stream) { try { if (stream.readableBytes() > 0) { this.stack = (AEFluidStack) AEFluidStack.fromPacket(stream); @@ -55,7 +55,7 @@ public class TargetFluidStackPacket extends BasePacket { this.stack = stack; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); if (stack != null) { try { diff --git a/src/main/java/appeng/core/sync/packets/TargetItemStackPacket.java b/src/main/java/appeng/core/sync/packets/TargetItemStackPacket.java index bf700c139..1bf74c2b0 100644 --- a/src/main/java/appeng/core/sync/packets/TargetItemStackPacket.java +++ b/src/main/java/appeng/core/sync/packets/TargetItemStackPacket.java @@ -21,7 +21,7 @@ package appeng.core.sync.packets; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.container.AEBaseContainer; import appeng.core.AELog; @@ -32,7 +32,7 @@ import appeng.util.item.AEItemStack; public class TargetItemStackPacket extends BasePacket { private AEItemStack stack; - public TargetItemStackPacket(final PacketBuffer stream) { + public TargetItemStackPacket(final PacketByteBuf stream) { try { if (stream.readableBytes() > 0) { this.stack = AEItemStack.fromPacket(stream); @@ -50,7 +50,7 @@ public class TargetItemStackPacket extends BasePacket { this.stack = stack; - final PacketBuffer data = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf data = new PacketByteBuf(Unpooled.buffer()); data.writeInt(this.getPacketID()); if (stack != null) { try { diff --git a/src/main/java/appeng/core/worlddata/IWorldSpawnData.java b/src/main/java/appeng/core/worlddata/IWorldSpawnData.java index 467f0564e..919b482c5 100644 --- a/src/main/java/appeng/core/worlddata/IWorldSpawnData.java +++ b/src/main/java/appeng/core/worlddata/IWorldSpawnData.java @@ -21,7 +21,7 @@ package appeng.core.worlddata; import java.util.Collection; import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.dimension.Dimension; +import net.minecraft.world.dimension.DimensionType; /** * @author thatsIch diff --git a/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java index d33727c75..63728a630 100644 --- a/src/main/java/appeng/core/worlddata/WorldData.java +++ b/src/main/java/appeng/core/worlddata/WorldData.java @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import net.minecraft.server.MinecraftServer; import net.minecraft.world.dimension.DimensionType; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import appeng.services.CompassService; import appeng.services.compass.CompassThreadFactory; diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index 4033f009c..874ee3260 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.fml.hooks.BasicEventHooks; import appeng.api.AEApi; diff --git a/src/main/java/appeng/debug/ChunkLoaderTileEntity.java b/src/main/java/appeng/debug/ChunkLoaderTileEntity.java index 7c85bd99c..ae1741b0f 100644 --- a/src/main/java/appeng/debug/ChunkLoaderTileEntity.java +++ b/src/main/java/appeng/debug/ChunkLoaderTileEntity.java @@ -19,17 +19,17 @@ package appeng.debug; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import appeng.core.AELog; import appeng.tile.AEBaseTileEntity; public class ChunkLoaderTileEntity extends AEBaseTileEntity implements ITickableTileEntity { - public ChunkLoaderTileEntity(TileEntityType tileEntityTypeIn) { + public ChunkLoaderTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/debug/CubeGeneratorTileEntity.java b/src/main/java/appeng/debug/CubeGeneratorTileEntity.java index a1cd6e979..539a08eea 100644 --- a/src/main/java/appeng/debug/CubeGeneratorTileEntity.java +++ b/src/main/java/appeng/debug/CubeGeneratorTileEntity.java @@ -24,7 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.StringTextComponent; @@ -40,7 +40,7 @@ public class CubeGeneratorTileEntity extends AEBaseTileEntity implements ITickab private int countdown = 20 * 10; private PlayerEntity who = null; - public CubeGeneratorTileEntity(TileEntityType tileEntityTypeIn) { + public CubeGeneratorTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/debug/DebugCardItem.java b/src/main/java/appeng/debug/DebugCardItem.java index 304b20914..5687aae4c 100644 --- a/src/main/java/appeng/debug/DebugCardItem.java +++ b/src/main/java/appeng/debug/DebugCardItem.java @@ -25,7 +25,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; @@ -84,7 +84,7 @@ public class DebugCardItem extends AEBaseItem { this.outputMsg(player, "Grids: " + grids); this.outputMsg(player, "Total Nodes: " + totalNodes); } else { - final TileEntity te = world.getTileEntity(pos); + final BlockEntity te = world.getTileEntity(pos); if (te instanceof IGridHost) { final GridNode node = (GridNode) ((IGridHost) te).getGridNode(AEPartLocation.fromFacing(side)); diff --git a/src/main/java/appeng/debug/DebugPartPlacerItem.java b/src/main/java/appeng/debug/DebugPartPlacerItem.java index 86a75762b..ca928b10f 100644 --- a/src/main/java/appeng/debug/DebugPartPlacerItem.java +++ b/src/main/java/appeng/debug/DebugPartPlacerItem.java @@ -2,11 +2,11 @@ package appeng.debug; import java.util.Arrays; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; @@ -53,7 +53,7 @@ public class DebugPartPlacerItem extends AEBaseItem { return ActionResult.FAIL; } - TileEntity te = world.getTileEntity(pos); + BlockEntity te = world.getTileEntity(pos); if (!(te instanceof IPartHost)) { player.sendMessage(new StringTextComponent("Right-click something that will accept parts")); return ActionResult.FAIL; @@ -85,7 +85,7 @@ public class DebugPartPlacerItem extends AEBaseItem { continue; } - TileEntity t = world.getTileEntity(nextPos); + BlockEntity t = world.getTileEntity(nextPos); if (!(t instanceof IPartHost)) { continue; } diff --git a/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java b/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java index 893ec3647..be16fc8e3 100644 --- a/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java +++ b/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java @@ -22,9 +22,9 @@ import javax.annotation.Nullable; import com.google.common.math.IntMath; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; @@ -41,7 +41,7 @@ public class EnergyGeneratorTileEntity extends AEBaseTileEntity implements ITick */ private static final int BASE_ENERGY = 8; - public EnergyGeneratorTileEntity(TileEntityType tileEntityTypeIn) { + public EnergyGeneratorTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -54,7 +54,7 @@ public class EnergyGeneratorTileEntity extends AEBaseTileEntity implements ITick int tier = 1; for (Direction facing : Direction.values()) { - final TileEntity te = world.getTileEntity(this.getPos().offset(facing)); + final BlockEntity te = world.getTileEntity(this.getPos().offset(facing)); if (te instanceof EnergyGeneratorTileEntity) { tier++; @@ -64,7 +64,7 @@ public class EnergyGeneratorTileEntity extends AEBaseTileEntity implements ITick final int energyToInsert = IntMath.pow(BASE_ENERGY, tier); for (Direction facing : Direction.values()) { - final TileEntity te = this.getWorld().getTileEntity(this.getPos().offset(facing)); + final BlockEntity te = this.getWorld().getTileEntity(this.getPos().offset(facing)); final LazyOptional cap = te.getCapability(CapabilityEnergy.ENERGY, facing.getOpposite()); cap.ifPresent(consumer -> { diff --git a/src/main/java/appeng/debug/ItemGenTileEntity.java b/src/main/java/appeng/debug/ItemGenTileEntity.java index ce96d9435..f59ed71dd 100644 --- a/src/main/java/appeng/debug/ItemGenTileEntity.java +++ b/src/main/java/appeng/debug/ItemGenTileEntity.java @@ -24,16 +24,16 @@ import java.util.Queue; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.Direction; import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.registries.ForgeRegistries; import appeng.tile.AEBaseTileEntity; @@ -42,9 +42,9 @@ public class ItemGenTileEntity extends AEBaseTileEntity { private static final Queue POSSIBLE_ITEMS = new ArrayDeque<>(); - private final IItemHandler handler = new QueuedItemHandler(); + private final ItemTransferable handler = new QueuedItemHandler(); - public ItemGenTileEntity(TileEntityType tileEntityTypeIn) { + public ItemGenTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); if (POSSIBLE_ITEMS.isEmpty()) { for (final Item mi : ForgeRegistries.ITEMS) { @@ -81,7 +81,7 @@ public class ItemGenTileEntity extends AEBaseTileEntity { return super.getCapability(capability, facing); } - class QueuedItemHandler implements IItemHandler { + class QueuedItemHandler implements ItemTransferable { @Override @Nonnull diff --git a/src/main/java/appeng/debug/MeteoritePlacerItem.java b/src/main/java/appeng/debug/MeteoritePlacerItem.java index ec790daec..d5e8b24ea 100644 --- a/src/main/java/appeng/debug/MeteoritePlacerItem.java +++ b/src/main/java/appeng/debug/MeteoritePlacerItem.java @@ -33,7 +33,7 @@ import net.minecraft.util.math.MutableBoundingBox; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import appeng.items.AEBaseItem; import appeng.util.Platform; diff --git a/src/main/java/appeng/debug/PhantomNodeTileEntity.java b/src/main/java/appeng/debug/PhantomNodeTileEntity.java index 29a599b5a..cd5b650ae 100644 --- a/src/main/java/appeng/debug/PhantomNodeTileEntity.java +++ b/src/main/java/appeng/debug/PhantomNodeTileEntity.java @@ -20,7 +20,7 @@ package appeng.debug; import java.util.EnumSet; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import appeng.api.networking.IGridNode; @@ -33,7 +33,7 @@ public class PhantomNodeTileEntity extends AENetworkTileEntity { private AENetworkProxy proxy = null; private boolean crashMode = false; - public PhantomNodeTileEntity(TileEntityType tileEntityTypeIn) { + public PhantomNodeTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/debug/ReplicatorCardItem.java b/src/main/java/appeng/debug/ReplicatorCardItem.java index 6423a7c46..31593c339 100644 --- a/src/main/java/appeng/debug/ReplicatorCardItem.java +++ b/src/main/java/appeng/debug/ReplicatorCardItem.java @@ -25,7 +25,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; @@ -90,7 +90,7 @@ public class ReplicatorCardItem extends AEBaseItem { final int dimid = ish.getInt("dimid"); final World src_w = world.getServer().getWorld(DimensionType.getById(dimid)); - final TileEntity te = src_w.getTileEntity(new BlockPos(src_x, src_y, src_z)); + final BlockEntity te = src_w.getTileEntity(new BlockPos(src_x, src_y, src_z)); if (te instanceof IGridHost) { final IGridHost gh = (IGridHost) te; final Direction sideOff = Direction.values()[src_side]; @@ -131,8 +131,8 @@ public class ReplicatorCardItem extends AEBaseItem { world.setBlockState(d, state); if (blk != null && blk.hasTileEntity(state)) { - final TileEntity ote = src_w.getTileEntity(p); - final TileEntity nte = blk.createTileEntity(state, world); + final BlockEntity ote = src_w.getTileEntity(p); + final BlockEntity nte = blk.createTileEntity(state, world); final CompoundTag data = new CompoundTag(); ote.write(data); nte.read(data.copy()); diff --git a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java index efc9d9e6e..61f4c3b54 100644 --- a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java @@ -20,12 +20,12 @@ package appeng.decorative.solid; import java.util.Random; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; @@ -37,7 +37,7 @@ public class ChargedQuartzOreBlock extends QuartzOreBlock { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void animateTick(final BlockState state, final World w, final BlockPos pos, final Random r) { if (!AEConfig.instance().isEnableEffects()) { return; diff --git a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java index f576765fe..f1fdd5176 100644 --- a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java @@ -20,11 +20,11 @@ package appeng.decorative.solid; import java.util.Random; +import net.fabricmc.api.EnvType; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import appeng.client.render.effects.ParticleTypes; import appeng.core.AEConfig; @@ -37,7 +37,7 @@ public class QuartzLampBlock extends QuartzGlassBlock { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void animateTick(final BlockState state, final World w, final BlockPos pos, final Random r) { if (!AEConfig.instance().isEnableEffects()) { return; diff --git a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java index 2e519b318..094083e6b 100644 --- a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java +++ b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java @@ -24,9 +24,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.ToolType; import net.minecraftforge.event.entity.player.PlayerEvent; @@ -64,7 +64,7 @@ public class SkyStoneBlock extends AEBaseBlock { } @Override - public BlockState updatePostPlacement(BlockState stateIn, Direction facing, BlockState facingState, IWorld worldIn, + public BlockState updatePostPlacement(BlockState stateIn, Direction facing, BlockState facingState, WorldAccess worldIn, BlockPos currentPos, BlockPos facingPos) { if (worldIn instanceof ServerWorld) { WorldData.instance().compassData().service().updateArea(worldIn, new ChunkPos(currentPos), diff --git a/src/main/java/appeng/entity/AEBaseItemEntity.java b/src/main/java/appeng/entity/AEBaseItemEntity.java index 12a733448..ede4429bd 100644 --- a/src/main/java/appeng/entity/AEBaseItemEntity.java +++ b/src/main/java/appeng/entity/AEBaseItemEntity.java @@ -25,7 +25,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.network.IPacket; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; @@ -45,7 +45,7 @@ public abstract class AEBaseItemEntity extends ItemEntity { this.lifespan = stack.getEntityLifespan(world); } - protected List getCheckedEntitiesWithinAABBExcludingEntity(final AxisAlignedBB region) { + protected List getCheckedEntitiesWithinAABBExcludingEntity(final Box region) { return this.world.getEntitiesWithinAABBExcludingEntity(this, region); } diff --git a/src/main/java/appeng/entity/ChargedQuartzEntity.java b/src/main/java/appeng/entity/ChargedQuartzEntity.java index 3a4c73052..0b0301acd 100644 --- a/src/main/java/appeng/entity/ChargedQuartzEntity.java +++ b/src/main/java/appeng/entity/ChargedQuartzEntity.java @@ -27,7 +27,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -95,7 +95,7 @@ public final class ChargedQuartzEntity extends AEBaseItemEntity { final IMaterials materials = AEApi.instance().definitions().materials(); if (materials.certusQuartzCrystalCharged().isSameAs(item)) { - final AxisAlignedBB region = new AxisAlignedBB(this.getPosX() - 1, this.getPosY() - 1, this.getPosZ() - 1, + final Box region = new Box(this.getPosX() - 1, this.getPosY() - 1, this.getPosZ() - 1, this.getPosX() + 1, this.getPosY() + 1, this.getPosZ() + 1); final List l = this.getCheckedEntitiesWithinAABBExcludingEntity(region); diff --git a/src/main/java/appeng/entity/GrowingCrystalEntity.java b/src/main/java/appeng/entity/GrowingCrystalEntity.java index 72719cfbe..c7f6941d5 100644 --- a/src/main/java/appeng/entity/GrowingCrystalEntity.java +++ b/src/main/java/appeng/entity/GrowingCrystalEntity.java @@ -20,10 +20,10 @@ package appeng.entity; import net.minecraft.block.BlockState; import net.minecraft.block.Material; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.EntityType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -166,7 +166,7 @@ public final class GrowingCrystalEntity extends AEBaseItemEntity { } private boolean isAccelerated(final int x, final int y, final int z) { - final TileEntity te = this.world.getTileEntity(new BlockPos(x, y, z)); + final BlockEntity te = this.world.getTileEntity(new BlockPos(x, y, z)); return te instanceof ICrystalGrowthAccelerator && ((ICrystalGrowthAccelerator) te).isPowered(); } diff --git a/src/main/java/appeng/entity/SingularityEntity.java b/src/main/java/appeng/entity/SingularityEntity.java index c9f872356..78f088fa5 100644 --- a/src/main/java/appeng/entity/SingularityEntity.java +++ b/src/main/java/appeng/entity/SingularityEntity.java @@ -27,7 +27,7 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.DamageSource; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.world.World; import appeng.api.AEApi; @@ -74,7 +74,7 @@ public final class SingularityEntity extends AEBaseItemEntity { final IMaterials materials = AEApi.instance().definitions().materials(); if (materials.singularity().isSameAs(item)) { - final AxisAlignedBB region = new AxisAlignedBB(this.getPosX() - 4, this.getPosY() - 4, this.getPosZ() - 4, + final Box region = new Box(this.getPosX() - 4, this.getPosY() - 4, this.getPosZ() - 4, this.getPosX() + 4, this.getPosY() + 4, this.getPosZ() + 4); final List l = this.getCheckedEntitiesWithinAABBExcludingEntity(region); diff --git a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java index 1e9ebeacd..7baeee7ee 100644 --- a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java @@ -29,12 +29,12 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MoverType; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.TNTEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.particles.ParticleTypes; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.Explosion.Mode; @@ -122,7 +122,7 @@ public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAddit final Explosion ex = new Explosion(this.world, this, this.getPosX(), this.getPosY(), this.getPosZ(), 0.2f, false, Mode.BREAK); - final AxisAlignedBB area = new AxisAlignedBB(this.getPosX() - 1.5, this.getPosY() - 1.5f, this.getPosZ() - 1.5, + final Box area = new Box(this.getPosX() - 1.5, this.getPosY() - 1.5f, this.getPosZ() - 1.5, this.getPosX() + 1.5, this.getPosY() + 1.5, this.getPosZ() + 1.5); final List list = this.world.getEntitiesWithinAABBExcludingEntity(this, area); @@ -171,12 +171,12 @@ public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAddit } @Override - public void writeSpawnData(PacketBuffer buffer) { + public void writeSpawnData(PacketByteBuf buffer) { buffer.writeByte(this.getFuse()); } @Override - public void readSpawnData(PacketBuffer additionalData) { + public void readSpawnData(PacketByteBuf additionalData) { this.setFuse(additionalData.readByte()); } } diff --git a/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java index 83b994939..188f5005a 100644 --- a/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java @@ -18,22 +18,22 @@ package appeng.entity; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; -import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.entity.TNTMinecartRenderer; import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.util.Identifier; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class TinyTNTPrimedRenderer extends EntityRenderer { public TinyTNTPrimedRenderer(final EntityRendererManager manager) { @@ -43,7 +43,7 @@ public class TinyTNTPrimedRenderer extends EntityRenderer { @Override public void render(TinyTNTPrimedEntity tnt, float entityYaw, float partialTicks, MatrixStack mStack, - IRenderTypeBuffer buffers, int packedLight) { + VertexConsumerProvider buffers, int packedLight) { final BlockRendererDispatcher blockrendererdispatcher = Minecraft.getInstance().getBlockRendererDispatcher(); mStack.push(); mStack.translate(0, 0.25F, 0); @@ -78,7 +78,7 @@ public class TinyTNTPrimedRenderer extends EntityRenderer { } @Override - public ResourceLocation getEntityTexture(final TinyTNTPrimedEntity entity) { + public Identifier getEntityTexture(final TinyTNTPrimedEntity entity) { return AtlasTexture.LOCATION_BLOCKS_TEXTURE; } } diff --git a/src/main/java/appeng/facade/FacadeContainer.java b/src/main/java/appeng/facade/FacadeContainer.java index 3283de57b..edf8581ff 100644 --- a/src/main/java/appeng/facade/FacadeContainer.java +++ b/src/main/java/appeng/facade/FacadeContainer.java @@ -23,7 +23,7 @@ import java.util.Optional; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.AEApi; import appeng.api.parts.IFacadeContainer; @@ -98,7 +98,7 @@ public class FacadeContainer implements IFacadeContainer { } @Override - public boolean readFromStream(final PacketBuffer out) throws IOException { + public boolean readFromStream(final PacketByteBuf out) throws IOException { final int facadeSides = out.readByte(); boolean changed = false; @@ -148,7 +148,7 @@ public class FacadeContainer implements IFacadeContainer { } @Override - public void writeToStream(final PacketBuffer out) throws IOException { + public void writeToStream(final PacketByteBuf out) throws IOException { int facadeSides = 0; for (int x = 0; x < this.facades; x++) { if (this.getFacade(AEPartLocation.fromOrdinal(x)) != null) { diff --git a/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java b/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java index 27a6f4e8c..b1193cc74 100644 --- a/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java +++ b/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java @@ -23,7 +23,7 @@ import javax.annotation.Nullable; import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; @@ -49,7 +49,7 @@ public class FluidInterfaceBlock extends AEBaseTileBlock { public FluidFormationPlaneScreen(FluidFormationPlaneContainer container, PlayerInventory playerInventory, - ITextComponent title) { + Text title) { super(container, playerInventory, title); this.ySize = 251; } diff --git a/src/main/java/appeng/fluids/client/gui/FluidIOScreen.java b/src/main/java/appeng/fluids/client/gui/FluidIOScreen.java index 04e8f0003..57c5ae770 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidIOScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidIOScreen.java @@ -19,7 +19,7 @@ package appeng.fluids.client.gui; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.client.gui.implementations.UpgradeableScreen; import appeng.core.localization.GuiText; @@ -36,7 +36,7 @@ import appeng.fluids.util.IAEFluidTank; */ public class FluidIOScreen extends UpgradeableScreen { - public FluidIOScreen(FluidIOContainer container, PlayerInventory playerInventory, ITextComponent title) { + public FluidIOScreen(FluidIOContainer container, PlayerInventory playerInventory, Text title) { super(container, playerInventory, title); } diff --git a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java b/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java index c89be4b8d..c66b41294 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java @@ -19,7 +19,7 @@ package appeng.fluids.client.gui; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.client.gui.implementations.UpgradeableScreen; @@ -36,7 +36,7 @@ import appeng.fluids.util.IAEFluidTank; public class FluidInterfaceScreen extends UpgradeableScreen { public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory, - ITextComponent title) { + Text title) { super(container, playerInventory, title); this.ySize = 231; } diff --git a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java index c3625fd3a..682aea3d9 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java @@ -4,7 +4,7 @@ package appeng.fluids.client.gui; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; @@ -22,7 +22,7 @@ public class FluidLevelEmitterScreen extends UpgradeableScreen storageFilter; public FluidStorageBusScreen(FluidStorageBusContainer container, PlayerInventory playerInventory, - ITextComponent title) { + Text title) { super(container, playerInventory, title); this.ySize = 251; } diff --git a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java index 2535eb054..164df544d 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java @@ -30,7 +30,7 @@ import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ClickType; import net.minecraft.inventory.container.Slot; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.config.Settings; @@ -81,7 +81,7 @@ public class FluidTerminalScreen extends AEBaseMEScreen private SettingToggleButton sortDirBox; public FluidTerminalScreen(FluidTerminalContainer container, PlayerInventory playerInventory, - ITextComponent title) { + Text title) { super(container, playerInventory, title); this.xSize = 185; this.ySize = 222; diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java index ce842fdee..dbc4da9e2 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java @@ -13,7 +13,7 @@ import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.FluidStack; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -68,7 +68,7 @@ public class FluidSlotWidget extends CustomSlotWidget { if (clickStack.isEmpty() || mouseButton == 1) { this.setFluidStack(null); } else if (mouseButton == 0) { - final LazyOptional fluidOpt = FluidUtil.getFluidContained(clickStack); + final LazyOptional fluidOpt = FluidUtil.getFluidContained(clickStack); fluidOpt.ifPresent(fluid -> { this.setFluidStack(AEFluidStack.fromFluidStack(fluid)); }); diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java index 80a97b4d1..1fa89c66c 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java @@ -20,13 +20,13 @@ package appeng.fluids.client.gui.widgets; import com.mojang.blaze3d.systems.RenderSystem; +import net.fabricmc.api.EnvType; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.Widget; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.fluid.Fluid; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import net.minecraftforge.fluids.FluidAttributes; import appeng.api.storage.data.IAEFluidStack; @@ -34,7 +34,7 @@ import appeng.api.util.AEColor; import appeng.client.gui.widgets.ITooltip; import appeng.fluids.util.IAEFluidTank; -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class FluidTankWidget extends Widget implements ITooltip { private final IAEFluidTank tank; private final int slot; diff --git a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java b/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java index 0204b1267..4266f1135 100644 --- a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java +++ b/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java @@ -4,12 +4,12 @@ package appeng.fluids.container; import java.util.Collections; import java.util.Map; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.IContainerListener; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import appeng.api.config.Upgrades; @@ -39,7 +39,7 @@ public abstract class FluidConfigurableContainer extends UpgradeableContainer im @Override protected ItemStack transferStackToContainer(ItemStack input) { - LazyOptional fsOpt = FluidUtil.getFluidContained(input); + LazyOptional fsOpt = FluidUtil.getFluidContained(input); if (fsOpt.isPresent()) { final IAEFluidTank t = this.getFluidConfigInventory(); final IAEFluidStack stack = AEFluidStack.fromFluidStack(fsOpt.orElse(null)); diff --git a/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java b/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java index efe5bdfba..370c3daee 100644 --- a/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java +++ b/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java @@ -1,11 +1,11 @@ package appeng.fluids.container; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.SecurityPermissions; import appeng.api.config.Upgrades; @@ -23,7 +23,7 @@ public class FluidFormationPlaneContainer extends FluidConfigurableContainer { private static final ContainerHelper helper = new ContainerHelper<>( FluidFormationPlaneContainer::new, FluidFormationPlanePart.class, SecurityPermissions.BUILD); - public static FluidFormationPlaneContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidFormationPlaneContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -50,7 +50,7 @@ public class FluidFormationPlaneContainer extends FluidConfigurableContainer { @Override protected void setupConfig() { - final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); + final ItemTransferable upgrades = this.getUpgradeable().getInventoryByName("upgrades"); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, diff --git a/src/main/java/appeng/fluids/container/FluidIOContainer.java b/src/main/java/appeng/fluids/container/FluidIOContainer.java index fa0c345ad..51d3d8346 100644 --- a/src/main/java/appeng/fluids/container/FluidIOContainer.java +++ b/src/main/java/appeng/fluids/container/FluidIOContainer.java @@ -21,7 +21,7 @@ package appeng.fluids.container; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; @@ -41,7 +41,7 @@ public class FluidIOContainer extends FluidConfigurableContainer { private static final ContainerHelper helper = new ContainerHelper<>( FluidIOContainer::new, SharedFluidBusPart.class, SecurityPermissions.BUILD); - public static FluidIOContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidIOContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java b/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java index 19fa46dd2..d1a96bdc7 100644 --- a/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java +++ b/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java @@ -25,7 +25,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.IContainerListener; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.config.SecurityPermissions; import appeng.api.storage.data.IAEFluidStack; @@ -45,7 +45,7 @@ public class FluidInterfaceContainer extends FluidConfigurableContainer { private static final ContainerHelper helper = new ContainerHelper<>( FluidInterfaceContainer::new, IFluidInterfaceHost.class, SecurityPermissions.BUILD); - public static FluidInterfaceContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidInterfaceContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } diff --git a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java b/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java index 575da6ebd..6841ef16c 100644 --- a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java +++ b/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java @@ -4,9 +4,9 @@ import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.network.PacketByteBuf; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.api.config.RedstoneMode; import appeng.api.config.SecurityPermissions; @@ -24,7 +24,7 @@ public class FluidLevelEmitterContainer extends FluidConfigurableContainer { private static final ContainerHelper helper = new ContainerHelper<>( FluidLevelEmitterContainer::new, FluidLevelEmitterPart.class, SecurityPermissions.BUILD); - public static FluidLevelEmitterContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidLevelEmitterContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -34,7 +34,7 @@ public class FluidLevelEmitterContainer extends FluidConfigurableContainer { private final FluidLevelEmitterPart lvlEmitter; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private TextFieldWidget textField; @GuiSync(3) public long EmitterValue = -1; @@ -44,7 +44,7 @@ public class FluidLevelEmitterContainer extends FluidConfigurableContainer { this.lvlEmitter = te; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void setTextField(final TextFieldWidget level) { this.textField = level; this.textField.setText(String.valueOf(this.EmitterValue)); diff --git a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java index 605b2704f..ce9849cea 100644 --- a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java +++ b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java @@ -23,8 +23,8 @@ import java.util.Iterator; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.network.PacketByteBuf; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.AEApi; import appeng.api.config.AccessRestriction; @@ -58,7 +58,7 @@ public class FluidStorageBusContainer extends FluidConfigurableContainer { private static final ContainerHelper helper = new ContainerHelper<>( FluidStorageBusContainer::new, FluidStorageBusPart.class); - public static FluidStorageBusContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidStorageBusContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -86,7 +86,7 @@ public class FluidStorageBusContainer extends FluidConfigurableContainer { @Override protected void setupConfig() { - final IItemHandler upgrades = this.getUpgradeable().getInventoryByName("upgrades"); + final ItemTransferable upgrades = this.getUpgradeable().getInventoryByName("upgrades"); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getPlayerInventory())).setNotDraggable()); this.addSlot((new RestrictedInputSlot(RestrictedInputSlot.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, diff --git a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java index d4eebaed4..d8393a660 100644 --- a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java +++ b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java @@ -23,15 +23,15 @@ import java.nio.BufferOverflowException; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.IContainerListener; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; import net.minecraftforge.fluids.capability.IFluidHandlerItem; @@ -90,7 +90,7 @@ public class FluidTerminalContainer extends AEBaseContainer private static final ContainerHelper helper = new ContainerHelper<>( FluidTerminalContainer::new, ITerminalHost.class, SecurityPermissions.BUILD); - public static FluidTerminalContainer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { + public static FluidTerminalContainer fromNetwork(int windowId, PlayerInventory inv, PacketByteBuf buf) { return helper.fromNetwork(windowId, inv, buf); } @@ -365,7 +365,7 @@ public class FluidTerminalContainer extends AEBaseContainer this.updateHeld(player); } else if (action == InventoryAction.EMPTY_ITEM) { // See how much we can drain from the item - final FluidStack extract = fh.drain(Integer.MAX_VALUE, FluidAction.SIMULATE); + final FluidVolume extract = fh.drain(Integer.MAX_VALUE, FluidAction.SIMULATE); if (extract.isEmpty() || extract.getAmount() < 1) { return; } @@ -376,7 +376,7 @@ public class FluidTerminalContainer extends AEBaseContainer if (notStorable != null && notStorable.getStackSize() > 0) { final int toStore = (int) (extract.getAmount() - notStorable.getStackSize()); - final FluidStack storable = fh.drain(toStore, FluidAction.SIMULATE); + final FluidVolume storable = fh.drain(toStore, FluidAction.SIMULATE); if (storable.isEmpty() || storable.getAmount() == 0) { return; @@ -386,7 +386,7 @@ public class FluidTerminalContainer extends AEBaseContainer } // Actually drain - final FluidStack drained = fh.drain(extract, FluidAction.EXECUTE); + final FluidVolume drained = fh.drain(extract, FluidAction.EXECUTE); extract.setAmount(drained.getAmount()); final IAEFluidStack notInserted = Platform.poweredInsert(this.getPowerSource(), this.monitor, diff --git a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java index e458c7819..dfdc90f22 100644 --- a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java +++ b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java @@ -20,15 +20,15 @@ package appeng.fluids.helper; import java.util.Optional; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.FluidStack; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -176,7 +176,7 @@ public class DualityFluidInterface } } - final TileEntity te = this.iHost.getTileEntity(); + final BlockEntity te = this.iHost.getTileEntity(); if (te != null && te.getWorld() != null) { Platform.notifyBlocksOfNeighbors(te.getWorld(), te.getPos()); } @@ -334,7 +334,7 @@ public class DualityFluidInterface toStore.setStackSize(-toStore.getStackSize()); // make sure strange things didn't happen... - final FluidStack canExtract = this.tanks.drain(slot, toStore.getFluidStack(), false); + final FluidVolume canExtract = this.tanks.drain(slot, toStore.getFluidStack(), false); if (canExtract.isEmpty() || canExtract.getAmount() != toStore.getStackSize()) { changed = true; } else { @@ -344,7 +344,7 @@ public class DualityFluidInterface if (toStore.getStackSize() > 0) { // extract items! changed = true; - final FluidStack removed = this.tanks.drain(slot, toStore.getFluidStack(), true); + final FluidVolume removed = this.tanks.drain(slot, toStore.getFluidStack(), true); if (removed.isEmpty() || toStore.getStackSize() != removed.getAmount()) { throw new IllegalStateException("bad attempt at managing tanks. ( drain )"); } @@ -491,7 +491,7 @@ public class DualityFluidInterface } @Override - public IItemHandler getInventoryByName(String name) { + public ItemTransferable getInventoryByName(String name) { return null; } @@ -501,8 +501,8 @@ public class DualityFluidInterface } @Override - public TileEntity getTile() { - return (TileEntity) (this.iHost instanceof TileEntity ? this.iHost : null); + public BlockEntity getTile() { + return (BlockEntity) (this.iHost instanceof BlockEntity ? this.iHost : null); } @Override diff --git a/src/main/java/appeng/fluids/helper/FluidCellConfig.java b/src/main/java/appeng/fluids/helper/FluidCellConfig.java index 3a6b97d94..3586e518d 100644 --- a/src/main/java/appeng/fluids/helper/FluidCellConfig.java +++ b/src/main/java/appeng/fluids/helper/FluidCellConfig.java @@ -20,10 +20,10 @@ package appeng.fluids.helper; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import appeng.api.AEApi; @@ -46,12 +46,12 @@ public class FluidCellConfig extends CellConfig { if (stack.isEmpty() || stack.getItem() instanceof FluidDummyItem) { super.insertItem(slot, stack, simulate); } - LazyOptional fluidOpt = FluidUtil.getFluidContained(stack); + LazyOptional fluidOpt = FluidUtil.getFluidContained(stack); if (!fluidOpt.isPresent() || !AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) { return stack; } - FluidStack fluid = fluidOpt.orElse(null); + FluidVolume fluid = fluidOpt.orElse(null); fluid.setAmount(FluidAttributes.BUCKET_VOLUME); ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).get(); @@ -65,12 +65,12 @@ public class FluidCellConfig extends CellConfig { if (stack.isEmpty() || stack.getItem() instanceof FluidDummyItem) { super.setStackInSlot(slot, stack); } - LazyOptional fluidOpt = FluidUtil.getFluidContained(stack); + LazyOptional fluidOpt = FluidUtil.getFluidContained(stack); if (!fluidOpt.isPresent() || !AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) { return; } - FluidStack fluid = fluidOpt.orElse(null); + FluidVolume fluid = fluidOpt.orElse(null); fluid.setAmount(FluidAttributes.BUCKET_VOLUME); ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).get(); @@ -84,12 +84,12 @@ public class FluidCellConfig extends CellConfig { if (stack.isEmpty() || stack.getItem() instanceof FluidDummyItem) { super.isItemValid(slot, stack); } - LazyOptional fluidOpt = FluidUtil.getFluidContained(stack); + LazyOptional fluidOpt = FluidUtil.getFluidContained(stack); if (!fluidOpt.isPresent() || !AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) { return false; } - FluidStack fluid = fluidOpt.orElse(null); + FluidVolume fluid = fluidOpt.orElse(null); fluid.setAmount(FluidAttributes.BUCKET_VOLUME); ItemStack is = AEApi.instance().definitions().items().dummyFluidItem().maybeStack(1).get(); diff --git a/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java b/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java index 2b11cfce3..df09f3869 100644 --- a/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java +++ b/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java @@ -20,7 +20,7 @@ package appeng.fluids.helper; import java.util.EnumSet; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.Direction; import appeng.api.implementations.IUpgradeableHost; @@ -32,7 +32,7 @@ public interface IFluidInterfaceHost extends IActionHost, IGridProxyable, IUpgra EnumSet getTargets(); - TileEntity getTileEntity(); + BlockEntity getTileEntity(); void saveChanges(); } diff --git a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java index 52f4de6a8..561a9255a 100644 --- a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java +++ b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java @@ -20,7 +20,7 @@ package appeng.fluids.items; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.AEApi; import appeng.api.storage.IStorageChannel; @@ -88,7 +88,7 @@ public final class BasicFluidStorageCell extends AbstractStorageCell fhOpt = LazyOptional.empty(); if (te != null) { fhOpt = te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, diff --git a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java b/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java index d5c48f3f0..54dbd25b8 100644 --- a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java +++ b/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java @@ -7,22 +7,22 @@ import java.util.List; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.templates.FluidTank; @@ -110,7 +110,7 @@ public class FluidFormationPlanePart extends AbstractFormationPlanePart, IBaseMo @Override public IAEFluidStack injectItems(IAEFluidStack input, Actionable type, IActionSource src) { - FluidStack fluidStack = input.getFluidStack(); + FluidVolume fluidStack = input.getFluidStack(); // Insert int wasFillled = this.fluidHandler.fill(fluidStack, type.getFluidAction()); @@ -92,10 +92,10 @@ public class FluidHandlerAdapter implements IMEInventory, IBaseMo @Override public IAEFluidStack extractItems(IAEFluidStack request, Actionable mode, IActionSource src) { - FluidStack requestedFluidStack = request.getFluidStack(); + FluidVolume requestedFluidStack = request.getFluidStack(); // Drain the fluid from the tank - FluidStack gathered = this.fluidHandler.drain(requestedFluidStack, mode.getFluidAction()); + FluidVolume gathered = this.fluidHandler.drain(requestedFluidStack, mode.getFluidAction()); if (gathered.isEmpty()) { // If nothing was pulled from the tank, return null return null; @@ -181,7 +181,7 @@ public class FluidHandlerAdapter implements IMEInventory, IBaseMo for (int slot = 0; slot < slots; slot++) { // Save the old stuff final IAEFluidStack oldAEFS = this.cachedAeStacks[slot]; - final FluidStack newFS = fluidHandler.getFluidInTank(slot); + final FluidVolume newFS = fluidHandler.getFluidInTank(slot); this.handlePossibleSlotChanges(slot, oldAEFS, newFS, changes); } @@ -208,7 +208,7 @@ public class FluidHandlerAdapter implements IMEInventory, IBaseMo return out; } - private void handlePossibleSlotChanges(int slot, IAEFluidStack oldAeFS, FluidStack newFS, + private void handlePossibleSlotChanges(int slot, IAEFluidStack oldAeFS, FluidVolume newFS, List changes) { if (oldAeFS != null && oldAeFS.getFluidStack().isFluidEqual(newFS)) { this.handleStackSizeChanged(slot, oldAeFS, newFS, changes); @@ -217,7 +217,7 @@ public class FluidHandlerAdapter implements IMEInventory, IBaseMo } } - private void handleStackSizeChanged(int slot, IAEFluidStack oldAeFS, FluidStack newFS, + private void handleStackSizeChanged(int slot, IAEFluidStack oldAeFS, FluidVolume newFS, List changes) { // Still the same fluid, but amount might have changed final long diff = newFS.getAmount() - oldAeFS.getStackSize(); @@ -234,7 +234,7 @@ public class FluidHandlerAdapter implements IMEInventory, IBaseMo } } - private void handleFluidChanged(int slot, IAEFluidStack oldAeFS, FluidStack newFS, + private void handleFluidChanged(int slot, IAEFluidStack oldAeFS, FluidVolume newFS, List changes) { // Completely different fluid this.cachedAeStacks[slot] = AEFluidStack.fromFluidStack(newFS); diff --git a/src/main/java/appeng/fluids/parts/FluidImportBusPart.java b/src/main/java/appeng/fluids/parts/FluidImportBusPart.java index d3271db41..f6e137d82 100644 --- a/src/main/java/appeng/fluids/parts/FluidImportBusPart.java +++ b/src/main/java/appeng/fluids/parts/FluidImportBusPart.java @@ -20,11 +20,11 @@ package appeng.fluids.parts; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; @@ -56,16 +56,16 @@ import appeng.parts.PartModel; * @since rv6 30/04/2018 */ public class FluidImportBusPart extends SharedFluidBusPart { - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/fluid_import_bus_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/fluid_import_bus_base"); @PartModels public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/fluid_import_bus_off")); + new Identifier(AppEng.MOD_ID, "part/fluid_import_bus_off")); @PartModels public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/fluid_import_bus_on")); + new Identifier(AppEng.MOD_ID, "part/fluid_import_bus_on")); @PartModels public static final IPartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/fluid_import_bus_has_channel")); + new Identifier(AppEng.MOD_ID, "part/fluid_import_bus_has_channel")); private final IActionSource source; @@ -95,7 +95,7 @@ public class FluidImportBusPart extends SharedFluidBusPart { return TickRateModulation.IDLE; } - final TileEntity te = this.getConnectedTE(); + final BlockEntity te = this.getConnectedTE(); LazyOptional fhOpt = LazyOptional.empty(); if (te != null) { te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite()); @@ -106,7 +106,7 @@ public class FluidImportBusPart extends SharedFluidBusPart { final IMEMonitor inv = this.getProxy().getStorage().getInventory(this.getChannel()); if (fh != null) { - final FluidStack fluidStack = fh.drain(this.calculateAmountToSend(), FluidAction.SIMULATE); + final FluidVolume fluidStack = fh.drain(this.calculateAmountToSend(), FluidAction.SIMULATE); if (this.filterEnabled() && !this.isInFilter(fluidStack)) { return TickRateModulation.SLOWER; @@ -142,7 +142,7 @@ public class FluidImportBusPart extends SharedFluidBusPart { return this.getProxy().isActive(); } - private boolean isInFilter(FluidStack fluid) { + private boolean isInFilter(FluidVolume fluid) { for (int i = 0; i < this.getConfig().getSlots(); i++) { final IAEFluidStack stack = this.getConfig().getFluidInSlot(i); if (stack != null && stack.equals(fluid)) { diff --git a/src/main/java/appeng/fluids/parts/FluidInterfacePart.java b/src/main/java/appeng/fluids/parts/FluidInterfacePart.java index 739a22003..0e78c5cfd 100644 --- a/src/main/java/appeng/fluids/parts/FluidInterfacePart.java +++ b/src/main/java/appeng/fluids/parts/FluidInterfacePart.java @@ -24,14 +24,14 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.AEApi; import appeng.api.config.Upgrades; @@ -65,19 +65,19 @@ import appeng.util.Platform; public class FluidInterfacePart extends BasicStatePart implements IGridTickable, IStorageMonitorable, IFluidInterfaceHost, IPriorityHost { - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/fluid_interface_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/fluid_interface_base"); @PartModels public static final PartModel MODELS_OFF = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/fluid_interface_off")); + new Identifier(AppEng.MOD_ID, "part/fluid_interface_off")); @PartModels public static final PartModel MODELS_ON = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/fluid_interface_on")); + new Identifier(AppEng.MOD_ID, "part/fluid_interface_on")); @PartModels public static final PartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/fluid_interface_has_channel")); + new Identifier(AppEng.MOD_ID, "part/fluid_interface_has_channel")); private final DualityFluidInterface duality = new DualityFluidInterface(this.getProxy(), this); @@ -159,7 +159,7 @@ public class FluidInterfacePart extends BasicStatePart } @Override - public TileEntity getTileEntity() { + public BlockEntity getTileEntity() { return super.getHost().getTile(); } @@ -200,7 +200,7 @@ public class FluidInterfacePart extends BasicStatePart } @Override - public IItemHandler getInventoryByName(String name) { + public ItemTransferable getInventoryByName(String name) { return this.duality.getInventoryByName(name); } diff --git a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java b/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java index c931849e2..188a25a44 100644 --- a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java +++ b/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java @@ -3,13 +3,13 @@ package appeng.fluids.parts; import java.util.Random; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.particles.RedstoneParticleData; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -53,19 +53,19 @@ import appeng.util.Platform; public class FluidLevelEmitterPart extends UpgradeablePart implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver { @PartModels - public static final ResourceLocation MODEL_BASE_OFF = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_BASE_OFF = new Identifier(AppEng.MOD_ID, "part/level_emitter_base_off"); @PartModels - public static final ResourceLocation MODEL_BASE_ON = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_BASE_ON = new Identifier(AppEng.MOD_ID, "part/level_emitter_base_on"); @PartModels - public static final ResourceLocation MODEL_STATUS_OFF = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_off"); @PartModels - public static final ResourceLocation MODEL_STATUS_ON = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_on"); @PartModels - public static final ResourceLocation MODEL_STATUS_HAS_CHANNEL = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_has_channel"); public static final PartModel MODEL_OFF_OFF = new PartModel(MODEL_BASE_OFF, MODEL_STATUS_OFF); @@ -181,7 +181,7 @@ public class FluidLevelEmitterPart extends UpgradeablePart final boolean isOn = this.isLevelEmitterOn(); if (this.prevState != isOn) { this.getHost().markForUpdate(); - final TileEntity te = this.getHost().getTile(); + final BlockEntity te = this.getHost().getTile(); this.prevState = isOn; Platform.notifyBlocksOfNeighbors(te.getWorld(), te.getPos()); Platform.notifyBlocksOfNeighbors(te.getWorld(), te.getPos().offset(this.getSide().getFacing())); diff --git a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java index 45cfaf5c8..3e7e37767 100644 --- a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java +++ b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java @@ -24,14 +24,14 @@ import java.util.Objects; import javax.annotation.Nonnull; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.Vec3d; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -91,17 +91,17 @@ import appeng.util.prioritylist.PrecisePriorityList; */ public class FluidStorageBusPart extends SharedStorageBusPart implements IMEMonitorHandlerReceiver, IAEFluidInventory { - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/fluid_storage_bus_base"); @PartModels public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/fluid_storage_bus_off")); + new Identifier(AppEng.MOD_ID, "part/fluid_storage_bus_off")); @PartModels public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/fluid_storage_bus_on")); + new Identifier(AppEng.MOD_ID, "part/fluid_storage_bus_on")); @PartModels public static final IPartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/fluid_storage_bus_has_channel")); + new Identifier(AppEng.MOD_ID, "part/fluid_storage_bus_has_channel")); private final IActionSource source; private final AEFluidInventory config = new AEFluidInventory(this, 63); @@ -119,7 +119,7 @@ public class FluidStorageBusPart extends SharedStorageBusPart this.source = new MachineSource(this); } - private IMEInventory getInventoryWrapper(TileEntity target) { + private IMEInventory getInventoryWrapper(BlockEntity target) { Direction targetSide = this.getSide().getFacing().getOpposite(); // Prioritize a handler to directly link to another ME network IStorageMonitorableAccessor accessor = target @@ -265,8 +265,8 @@ public class FluidStorageBusPart extends SharedStorageBusPart final boolean wasSleeping = this.monitor == null; this.cached = true; - final TileEntity self = this.getHost().getTile(); - final TileEntity target = self.getWorld().getTileEntity(self.getPos().offset(this.getSide().getFacing())); + final BlockEntity self = this.getHost().getTile(); + final BlockEntity target = self.getWorld().getTileEntity(self.getPos().offset(this.getSide().getFacing())); final int newHandlerHash = this.createHandlerHash(target); if (newHandlerHash != 0 && newHandlerHash == this.handlerHash) { @@ -342,7 +342,7 @@ public class FluidStorageBusPart extends SharedStorageBusPart return this.handler; } - private void checkInterfaceVsStorageBus(final TileEntity target, final AEPartLocation side) { + private void checkInterfaceVsStorageBus(final BlockEntity target, final AEPartLocation side) { IInterfaceHost achievement = null; if (target instanceof IInterfaceHost) { @@ -377,7 +377,7 @@ public class FluidStorageBusPart extends SharedStorageBusPart return super.getCellArray(channel); } - private int createHandlerHash(TileEntity target) { + private int createHandlerHash(BlockEntity target) { if (target == null) { return 0; } diff --git a/src/main/java/appeng/fluids/parts/FluidTerminalPart.java b/src/main/java/appeng/fluids/parts/FluidTerminalPart.java index eafd19439..7a08360af 100644 --- a/src/main/java/appeng/fluids/parts/FluidTerminalPart.java +++ b/src/main/java/appeng/fluids/parts/FluidTerminalPart.java @@ -21,7 +21,7 @@ package appeng.fluids.parts; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AppEng; @@ -38,9 +38,9 @@ import appeng.parts.reporting.AbstractTerminalPart; public class FluidTerminalPart extends AbstractTerminalPart { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/fluid_terminal_off"); + public static final Identifier MODEL_OFF = new Identifier(AppEng.MOD_ID, "part/fluid_terminal_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/fluid_terminal_on"); + public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/fluid_terminal_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); diff --git a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java b/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java index 48d0f0b28..11be8364a 100644 --- a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java +++ b/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java @@ -18,10 +18,10 @@ package appeng.fluids.parts; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; @@ -105,12 +105,12 @@ public abstract class SharedFluidBusPart extends UpgradeablePart implements IGri bch.addBox(4, 4, 14, 12, 12, 16); } - protected TileEntity getConnectedTE() { - TileEntity self = this.getHost().getTile(); + protected BlockEntity getConnectedTE() { + BlockEntity self = this.getHost().getTile(); return this.getTileEntity(self, self.getPos().offset(this.getSide().getFacing())); } - private TileEntity getTileEntity(final TileEntity self, final BlockPos pos) { + private BlockEntity getTileEntity(final BlockEntity self, final BlockPos pos) { final World w = self.getWorld(); if (w.getChunkProvider().isChunkLoaded(new ChunkPos(pos))) { diff --git a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java b/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java index 0e1a6b25b..d84c4f203 100644 --- a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java +++ b/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java @@ -18,9 +18,9 @@ package appeng.fluids.registries; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import appeng.api.AEApi; import appeng.api.implementations.tiles.IChestOrDrive; @@ -45,6 +45,6 @@ public class BasicFluidCellGuiHandler implements ICellGuiHandler { public void openChestGui(final PlayerEntity player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final IStorageChannel chan) { ContainerOpener.openContainer(FluidTerminalContainer.TYPE, player, - ContainerLocator.forTileEntitySide((TileEntity) chest, chest.getUp())); + ContainerLocator.forTileEntitySide((BlockEntity) chest, chest.getUp())); } } diff --git a/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java b/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java index 3dcf2c28e..d711a7353 100644 --- a/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java +++ b/src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java @@ -22,15 +22,15 @@ import java.util.EnumSet; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.Upgrades; @@ -55,7 +55,7 @@ public class FluidInterfaceTileEntity extends AENetworkTileEntity implements IGridTickable, IFluidInterfaceHost, IPriorityHost { private final DualityFluidInterface duality = new DualityFluidInterface(this.getProxy(), this); - public FluidInterfaceTileEntity(TileEntityType tileEntityTypeIn) { + public FluidInterfaceTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -85,7 +85,7 @@ public class FluidInterfaceTileEntity extends AENetworkTileEntity } @Override - public TileEntity getTileEntity() { + public BlockEntity getTileEntity() { return this; } @@ -152,7 +152,7 @@ public class FluidInterfaceTileEntity extends AENetworkTileEntity } @Override - public IItemHandler getInventoryByName(String name) { + public ItemTransferable getInventoryByName(String name) { return this.duality.getInventoryByName(name); } diff --git a/src/main/java/appeng/fluids/util/AEFluidInventory.java b/src/main/java/appeng/fluids/util/AEFluidInventory.java index 5fa9fb6b4..4ef3831e3 100644 --- a/src/main/java/appeng/fluids/util/AEFluidInventory.java +++ b/src/main/java/appeng/fluids/util/AEFluidInventory.java @@ -5,8 +5,8 @@ import java.util.Objects; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraft.nbt.CompoundTag; -import net.minecraftforge.fluids.FluidStack; import appeng.api.storage.data.IAEFluidStack; import appeng.core.AELog; @@ -74,11 +74,11 @@ public class AEFluidInventory implements IAEFluidTank { @Nonnull @Override - public FluidStack getFluidInTank(int tank) { + public FluidVolume getFluidInTank(int tank) { if (tank < 0 || tank >= fluids.length) { - return FluidStack.EMPTY; + return FluidVolume.EMPTY; } - return fluids[tank] == null ? FluidStack.EMPTY : fluids[tank].getFluidStack(); + return fluids[tank] == null ? FluidVolume.EMPTY : fluids[tank].getFluidStack(); } @Override @@ -87,11 +87,11 @@ public class AEFluidInventory implements IAEFluidTank { } @Override - public boolean isFluidValid(int tank, @Nonnull FluidStack stack) { - return stack != FluidStack.EMPTY; + public boolean isFluidValid(int tank, @Nonnull FluidVolume stack) { + return stack != FluidVolume.EMPTY; } - public int fill(final int slot, final FluidStack resource, final boolean doFill) { + public int fill(final int slot, final FluidVolume resource, final boolean doFill) { if (resource.isEmpty() || resource.getAmount() <= 0) { return 0; } @@ -123,7 +123,7 @@ public class AEFluidInventory implements IAEFluidTank { } @Override - public int fill(FluidStack resource, FluidAction action) { + public int fill(FluidVolume resource, FluidAction action) { if (resource.isEmpty() || resource.getAmount() <= 0) { return 0; } @@ -160,16 +160,16 @@ public class AEFluidInventory implements IAEFluidTank { } @Override - public FluidStack drain(final FluidStack fluid, final FluidAction action) { + public FluidVolume drain(final FluidVolume fluid, final FluidAction action) { if (fluid.isEmpty() || fluid.getAmount() <= 0) { - return FluidStack.EMPTY; + return FluidVolume.EMPTY; } - final FluidStack resource = fluid.copy(); + final FluidVolume resource = fluid.copy(); - FluidStack totalDrained = FluidStack.EMPTY; + FluidVolume totalDrained = FluidVolume.EMPTY; for (int slot = 0; slot < this.getSlots(); ++slot) { - FluidStack drain = this.drain(slot, resource, action == FluidAction.EXECUTE); + FluidVolume drain = this.drain(slot, resource, action == FluidAction.EXECUTE); if (drain != null) { if (totalDrained.isEmpty()) { totalDrained = drain; @@ -187,12 +187,12 @@ public class AEFluidInventory implements IAEFluidTank { } @Override - public FluidStack drain(final int maxDrain, final FluidAction action) { + public FluidVolume drain(final int maxDrain, final FluidAction action) { if (maxDrain == 0) { - return FluidStack.EMPTY; + return FluidVolume.EMPTY; } - FluidStack totalDrained = FluidStack.EMPTY; + FluidVolume totalDrained = FluidVolume.EMPTY; int toDrain = maxDrain; for (int slot = 0; slot < this.getSlots(); ++slot) { @@ -202,9 +202,9 @@ public class AEFluidInventory implements IAEFluidTank { toDrain -= totalDrained.getAmount(); } } else { - FluidStack copy = totalDrained.copy(); + FluidVolume copy = totalDrained.copy(); copy.setAmount(toDrain); - FluidStack drain = this.drain(slot, copy, action == FluidAction.EXECUTE); + FluidVolume drain = this.drain(slot, copy, action == FluidAction.EXECUTE); if (drain != null) { totalDrained.setAmount(totalDrained.getAmount() + drain.getAmount()); toDrain -= drain.getAmount(); @@ -218,7 +218,7 @@ public class AEFluidInventory implements IAEFluidTank { return totalDrained; } - private int indexOfFluid(FluidStack resource) { + private int indexOfFluid(FluidVolume resource) { for (int slot = 0; slot < fluids.length; slot++) { if (fluids[slot] != null && fluids[slot].getFluidStack().isFluidEqual(resource)) { return slot; @@ -236,7 +236,7 @@ public class AEFluidInventory implements IAEFluidTank { return -1; } - public FluidStack drain(final int slot, final FluidStack resource, final boolean doDrain) { + public FluidVolume drain(final int slot, final FluidVolume resource, final boolean doDrain) { final IAEFluidStack fluid = this.fluids[slot]; if (resource.isEmpty() || fluid == null || !fluid.getFluidStack().equals(resource)) { return null; @@ -244,7 +244,7 @@ public class AEFluidInventory implements IAEFluidTank { return this.drain(slot, resource.getAmount(), doDrain); } - public FluidStack drain(final int slot, final int maxDrain, boolean doDrain) { + public FluidVolume drain(final int slot, final int maxDrain, boolean doDrain) { final IAEFluidStack fluid = this.fluids[slot]; if (fluid == null || maxDrain <= 0) { return null; @@ -255,7 +255,7 @@ public class AEFluidInventory implements IAEFluidTank { drained = (int) fluid.getStackSize(); } - FluidStack stack = new FluidStack(fluid.getFluid(), drained); + FluidVolume stack = new FluidVolume(fluid.getFluid(), drained); if (doDrain) { fluid.setStackSize(fluid.getStackSize() - drained); if (fluid.getStackSize() <= 0) { diff --git a/src/main/java/appeng/fluids/util/AEFluidStack.java b/src/main/java/appeng/fluids/util/AEFluidStack.java index c71110fd2..38abd25dd 100644 --- a/src/main/java/appeng/fluids/util/AEFluidStack.java +++ b/src/main/java/appeng/fluids/util/AEFluidStack.java @@ -21,17 +21,16 @@ package appeng.fluids.util; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import com.google.common.base.Preconditions; -import net.minecraft.fluid.EmptyFluid; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ResourceLocation; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.util.Identifier; import net.minecraftforge.common.util.Constants; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.registries.ForgeRegistries; import appeng.api.AEApi; @@ -77,7 +76,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu this.tagCompound = tag; } - public static AEFluidStack fromFluidStack(final FluidStack input) { + public static AEFluidStack fromFluidStack(final FluidVolume input) { if (input.isEmpty()) { return null; } @@ -96,7 +95,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu } public static IAEFluidStack fromNBT(final CompoundTag data) { - ResourceLocation fluidId = new ResourceLocation(data.getString(NBT_FLUID_ID)); + Identifier fluidId = new Identifier(data.getString(NBT_FLUID_ID)); Fluid fluid = ForgeRegistries.FLUIDS.getValue(fluidId); if (fluid == null || fluid == Fluids.EMPTY) { return null; @@ -196,8 +195,8 @@ public final class AEFluidStack extends AEStack implements IAEFlu if (other instanceof AEFluidStack) { final AEFluidStack is = (AEFluidStack) other; return is.fluid == this.fluid && Platform.itemComparisons().isNbtTagEqual(this.tagCompound, is.tagCompound); - } else if (other instanceof FluidStack) { - final FluidStack is = (FluidStack) other; + } else if (other instanceof FluidVolume) { + final FluidVolume is = (FluidVolume) other; return is.getFluid() == this.fluid && Platform.itemComparisons().isNbtTagEqual(this.tagCompound, is.getTag()); } @@ -215,9 +214,9 @@ public final class AEFluidStack extends AEStack implements IAEFlu } @Override - public FluidStack getFluidStack() { + public FluidVolume getFluidStack() { final int amount = (int) Math.min(Integer.MAX_VALUE, this.getStackSize()); - final FluidStack is = new FluidStack(this.fluid, amount, this.tagCompound); + final FluidVolume is = new FluidVolume(this.fluid, amount, this.tagCompound); return is; } @@ -238,9 +237,9 @@ public final class AEFluidStack extends AEStack implements IAEFlu return ItemStack.EMPTY; } - public static IAEFluidStack fromPacket(final PacketBuffer buffer) { + public static IAEFluidStack fromPacket(final PacketByteBuf buffer) { final boolean isCraftable = buffer.readBoolean(); - final FluidStack fluidStack = buffer.readFluidStack(); + final FluidVolume fluidStack = buffer.readFluidStack(); final long stackSize = buffer.readVarLong(); final long countRequestable = buffer.readVarLong(); @@ -257,7 +256,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu } @Override - public void writeToPacket(final PacketBuffer buffer) { + public void writeToPacket(final PacketByteBuf buffer) { buffer.writeBoolean(this.isCraftable()); buffer.writeFluidStack(this.getFluidStack()); buffer.writeVarLong(this.getStackSize()); diff --git a/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java b/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java index aafba126f..27331bdda 100644 --- a/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java +++ b/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java @@ -17,7 +17,7 @@ import net.minecraft.data.DirectoryCache; import net.minecraft.data.IDataProvider; import net.minecraft.data.loot.BlockLootTables; import net.minecraft.enchantment.Enchantments; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.world.storage.loot.ConstantRange; import net.minecraft.world.storage.loot.ItemLootEntry; import net.minecraft.world.storage.loot.LootEntry; @@ -62,7 +62,7 @@ public class BlockDropProvider extends BlockLootTables implements IAE2DataProvid @Override public void act(@Nonnull DirectoryCache cache) throws IOException { - for (Map.Entry entry : ForgeRegistries.BLOCKS.getEntries()) { + for (Map.Entry entry : ForgeRegistries.BLOCKS.getEntries()) { LootTable.Builder builder; if (entry.getKey().getNamespace().equals(AppEng.MOD_ID)) { builder = overrides.getOrDefault(entry.getValue(), this::defaultBuilder).apply(entry.getValue()); @@ -80,7 +80,7 @@ public class BlockDropProvider extends BlockLootTables implements IAE2DataProvid return LootTable.builder().addLootPool(pool); } - private Path getPath(Path root, ResourceLocation id) { + private Path getPath(Path root, Identifier id) { return root.resolve("data/" + id.getNamespace() + "/loot_tables/blocks/" + id.getPath() + ".json"); } diff --git a/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java b/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java index 1077b6311..d6f70d76a 100644 --- a/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java +++ b/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java @@ -11,7 +11,7 @@ import net.minecraft.data.RecipeProvider; import net.minecraft.data.ShapedRecipeBuilder; import net.minecraft.data.SingleItemRecipeBuilder; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.common.crafting.ConditionalRecipe; import appeng.api.definitions.IBlockDefinition; @@ -47,11 +47,11 @@ public class SlabStairRecipes extends RecipeProvider implements IAE2DataProvider ShapedRecipeBuilder.shapedRecipe(slabs.block(), 6).patternLine("###").key('#', inputBlock) .addCriterion(criterionName(block), hasItem(inputBlock)) - .build(consumer, new ResourceLocation(AppEng.MOD_ID, "shaped/slabs/" + block.identifier())); + .build(consumer, new Identifier(AppEng.MOD_ID, "shaped/slabs/" + block.identifier())); SingleItemRecipeBuilder.stonecuttingRecipe(Ingredient.fromItems(inputBlock), outputBlock, 2) .addCriterion(criterionName(block), hasItem(inputBlock)) - .build(consumer, new ResourceLocation(AppEng.MOD_ID, "block_cutter/slabs/" + slabs.identifier())); + .build(consumer, new Identifier(AppEng.MOD_ID, "block_cutter/slabs/" + slabs.identifier())); } private void stairRecipe(Consumer consumer, IBlockDefinition block, IBlockDefinition stairs) { @@ -60,11 +60,11 @@ public class SlabStairRecipes extends RecipeProvider implements IAE2DataProvider ShapedRecipeBuilder.shapedRecipe(outputBlock, 4).patternLine("# ").patternLine("## ").patternLine("###") .key('#', inputBlock).addCriterion(criterionName(block), hasItem(inputBlock)) - .build(consumer, new ResourceLocation(AppEng.MOD_ID, "shaped/stairs/" + block.identifier())); + .build(consumer, new Identifier(AppEng.MOD_ID, "shaped/stairs/" + block.identifier())); SingleItemRecipeBuilder.stonecuttingRecipe(Ingredient.fromItems(inputBlock), outputBlock) .addCriterion(criterionName(block), hasItem(inputBlock)) - .build(consumer, new ResourceLocation(AppEng.MOD_ID, "block_cutter/stairs/" + stairs.identifier())); + .build(consumer, new Identifier(AppEng.MOD_ID, "block_cutter/stairs/" + stairs.identifier())); } diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 5846708d3..e791b1d7f 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -28,29 +28,29 @@ import java.util.Optional; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.item.ItemTransferable; import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.TranslatableText; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.RangedWrapper; import appeng.api.AEApi; @@ -169,8 +169,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { if (this.isWorking == slot) { return; } @@ -401,7 +401,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } } - final TileEntity te = this.iHost.getTileEntity(); + final BlockEntity te = this.iHost.getTileEntity(); if (te != null && te.getWorld() != null) { Platform.notifyBlocksOfNeighbors(te.getWorld(), te.getPos()); } @@ -445,11 +445,11 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn // return after.stackSize != stack.stackSize; } - public IItemHandler getConfig() { + public ItemTransferable getConfig() { return this.config; } - public IItemHandler getPatterns() { + public ItemTransferable getPatterns() { return this.patterns; } @@ -475,7 +475,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn return new DimensionalCoord(this.iHost.getTileEntity()); } - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.storage; } @@ -505,7 +505,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn return; } - final TileEntity tile = this.iHost.getTileEntity(); + final BlockEntity tile = this.iHost.getTileEntity(); final World w = tile.getWorld(); final Iterator i = this.waitingToSend.iterator(); @@ -513,7 +513,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn ItemStack whatToSend = i.next(); for (final Direction s : possibleDirections) { - final TileEntity te = w.getTileEntity(tile.getPos().offset(s)); + final BlockEntity te = w.getTileEntity(tile.getPos().offset(s)); if (te == null) { continue; } @@ -657,8 +657,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } @Override - public TileEntity getTile() { - return (TileEntity) (this.iHost instanceof TileEntity ? this.iHost : null); + public BlockEntity getTile() { + return (BlockEntity) (this.iHost instanceof BlockEntity ? this.iHost : null); } @Override @@ -685,7 +685,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("storage")) { return this.storage; } @@ -705,7 +705,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn return null; } - public IItemHandler getStorage() { + public ItemTransferable getStorage() { return this.storage; } @@ -751,12 +751,12 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn return false; } - final TileEntity tile = this.iHost.getTileEntity(); + final BlockEntity tile = this.iHost.getTileEntity(); final World w = tile.getWorld(); final EnumSet possibleDirections = this.iHost.getTargets(); for (final Direction s : possibleDirections) { - final TileEntity te = w.getTileEntity(tile.getPos().offset(s)); + final BlockEntity te = w.getTileEntity(tile.getPos().offset(s)); if (te instanceof IInterfaceHost) { try { if (((IInterfaceHost) te).getInterfaceDuality().sameGrid(this.gridProxy.getGrid())) { @@ -812,13 +812,13 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn if (this.isBlocking()) { final EnumSet possibleDirections = this.iHost.getTargets(); - final TileEntity tile = this.iHost.getTileEntity(); + final BlockEntity tile = this.iHost.getTileEntity(); final World w = tile.getWorld(); boolean allAreBusy = true; for (final Direction s : possibleDirections) { - final TileEntity te = w.getTileEntity(tile.getPos().offset(s)); + final BlockEntity te = w.getTileEntity(tile.getPos().offset(s)); final InventoryAdaptor ad = InventoryAdaptor.getAdaptor(te, s.getOpposite()); if (ad != null) { @@ -937,8 +937,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn this.craftingTracker.jobStateChange(link); } - public ITextComponent getTermName() { - final TileEntity hostTile = this.iHost.getTileEntity(); + public Text getTermName() { + final BlockEntity hostTile = this.iHost.getTileEntity(); final World hostWorld = hostTile.getWorld(); if (((ICustomNameObject) this.iHost).hasCustomInventoryName()) { @@ -948,7 +948,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn final EnumSet possibleDirections = this.iHost.getTargets(); for (final Direction direction : possibleDirections) { final BlockPos targ = hostTile.getPos().offset(direction); - final TileEntity directedTile = hostWorld.getTileEntity(targ); + final BlockEntity directedTile = hostWorld.getTileEntity(targ); if (directedTile == null) { continue; @@ -995,12 +995,12 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } if (what.getItem() != Items.AIR) { - return new TranslationTextComponent(what.getTranslationKey()); + return new TranslatableText(what.getTranslationKey()); } final Item item = Item.getItemFromBlock(directedBlock); if (item == Items.AIR) { - return new TranslationTextComponent(directedBlock.getTranslationKey()); + return new TranslatableText(directedBlock.getTranslationKey()); } } } @@ -1009,7 +1009,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } public long getSortValue() { - final TileEntity te = this.iHost.getTileEntity(); + final BlockEntity te = this.iHost.getTileEntity(); return (te.getPos().getZ() << 24) ^ (te.getPos().getX() << 8) ^ te.getPos().getY(); } diff --git a/src/main/java/appeng/helpers/IContainerCraftingPacket.java b/src/main/java/appeng/helpers/IContainerCraftingPacket.java index da43192cb..175670d5c 100644 --- a/src/main/java/appeng/helpers/IContainerCraftingPacket.java +++ b/src/main/java/appeng/helpers/IContainerCraftingPacket.java @@ -18,8 +18,8 @@ package appeng.helpers; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import appeng.api.networking.IGridNode; import appeng.api.networking.security.IActionSource; @@ -36,7 +36,7 @@ public interface IContainerCraftingPacket { * * @return the inventory of the part/tile by name. */ - IItemHandler getInventoryByName(String string); + ItemTransferable getInventoryByName(String string); /** * @return who are we? diff --git a/src/main/java/appeng/helpers/ICustomNameObject.java b/src/main/java/appeng/helpers/ICustomNameObject.java index e6cbd0b14..4dc522586 100644 --- a/src/main/java/appeng/helpers/ICustomNameObject.java +++ b/src/main/java/appeng/helpers/ICustomNameObject.java @@ -18,11 +18,11 @@ package appeng.helpers; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; public interface ICustomNameObject { - ITextComponent getCustomInventoryName(); + Text getCustomInventoryName(); boolean hasCustomInventoryName(); } diff --git a/src/main/java/appeng/helpers/IInterfaceHost.java b/src/main/java/appeng/helpers/IInterfaceHost.java index 78beeab6c..23d3ae3a2 100644 --- a/src/main/java/appeng/helpers/IInterfaceHost.java +++ b/src/main/java/appeng/helpers/IInterfaceHost.java @@ -20,7 +20,7 @@ package appeng.helpers; import java.util.EnumSet; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.Direction; import appeng.api.implementations.IUpgradeableHost; @@ -33,7 +33,7 @@ public interface IInterfaceHost extends ICraftingProvider, IUpgradeableHost, ICr EnumSet getTargets(); - TileEntity getTileEntity(); + BlockEntity getTileEntity(); void saveChanges(); } diff --git a/src/main/java/appeng/helpers/InvalidPatternHelper.java b/src/main/java/appeng/helpers/InvalidPatternHelper.java index bb755518d..792ac1884 100644 --- a/src/main/java/appeng/helpers/InvalidPatternHelper.java +++ b/src/main/java/appeng/helpers/InvalidPatternHelper.java @@ -24,7 +24,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; @@ -103,7 +103,7 @@ public class InvalidPatternHelper { return !this.stack.isEmpty(); } - public ITextComponent getName() { + public Text getName() { return this.isValid() ? Platform.getItemDisplayName(this.stack) : new StringTextComponent(this.id + '@' + this.getDamage()); } @@ -124,8 +124,8 @@ public class InvalidPatternHelper { return this.stack; } - public ITextComponent getFormattedToolTip() { - ITextComponent result = new StringTextComponent(this.getCount() + " ").appendSibling(this.getName()); + public Text getFormattedToolTip() { + Text result = new StringTextComponent(this.getCount() + " ").appendSibling(this.getName()); if (!this.isValid()) { result.applyTextStyle(TextFormatting.RED); diff --git a/src/main/java/appeng/helpers/Splotch.java b/src/main/java/appeng/helpers/Splotch.java index cae780edf..2e9c9a7ef 100644 --- a/src/main/java/appeng/helpers/Splotch.java +++ b/src/main/java/appeng/helpers/Splotch.java @@ -18,7 +18,7 @@ package appeng.helpers; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; @@ -60,7 +60,7 @@ public class Splotch { this.side = side; } - public Splotch(final PacketBuffer data) { + public Splotch(final PacketByteBuf data) { this.pos = data.readByte(); final int val = data.readByte(); @@ -70,7 +70,7 @@ public class Splotch { this.lumen = ((val >> 7) & 0x01) > 0; } - public void writeToStream(final PacketBuffer stream) { + public void writeToStream(final PacketByteBuf stream) { stream.writeByte(this.pos); final int val = this.getSide().ordinal() | (this.getColor().ordinal() << 3) | (this.isLumen() ? 0x80 : 0x00); stream.writeByte(val); diff --git a/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java b/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java index 4c60f11fc..cde22c060 100644 --- a/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java +++ b/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java @@ -27,7 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; public final class BlockToolDispenseItemBehavior extends DefaultDispenseItemBehavior { diff --git a/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java b/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java index ed733300d..076087021 100644 --- a/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java +++ b/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java @@ -26,7 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import appeng.api.util.AEPartLocation; import appeng.items.tools.powered.MatterCannonItem; diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index ec26d0e7b..930a65de5 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -34,7 +34,7 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.World; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.TickEvent.Phase; @@ -61,7 +61,7 @@ public class TickHandler { public static final TickHandler INSTANCE = new TickHandler(); private final Queue> serverQueue = new ArrayDeque<>(); private final Multimap craftingJobs = LinkedListMultimap.create(); - private final WeakHashMap>> callQueue = new WeakHashMap<>(); + private final WeakHashMap>> callQueue = new WeakHashMap<>(); private final HandlerRep server = new HandlerRep(); private final HandlerRep client = new HandlerRep(); private final HashMap cliPlayerColors = new HashMap<>(); @@ -75,7 +75,7 @@ public class TickHandler { return this.cliPlayerColors; } - public void addCallable(final IWorld w, final IWorldCallable c) { + public void addCallable(final WorldAccess w, final IWorldCallable c) { if (w == null) { this.serverQueue.add(c); } else { diff --git a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java index 68007ad7c..dc115a2f6 100644 --- a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java +++ b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java @@ -28,7 +28,7 @@ import com.google.common.base.Splitter; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.fml.client.gui.HoverChecker; import mezz.jei.api.constants.VanillaTypes; @@ -51,7 +51,7 @@ import appeng.tile.misc.CondenserTileEntity; class CondenserCategory implements IRecipeCategory { - public static final ResourceLocation UID = new ResourceLocation(AppEng.MOD_ID, "condenser"); + public static final Identifier UID = new Identifier(AppEng.MOD_ID, "condenser"); private final String localizedName; @@ -73,10 +73,10 @@ class CondenserCategory implements IRecipeCategory { this.localizedName = I18n.format("gui.appliedenergistics2.Condenser"); this.icon = guiHelper.createDrawableIngredient(Api.INSTANCE.definitions().blocks().condenser().stack(1)); - ResourceLocation location = new ResourceLocation(AppEng.MOD_ID, "textures/guis/condenser.png"); + Identifier location = new Identifier(AppEng.MOD_ID, "textures/guis/condenser.png"); this.background = guiHelper.createDrawable(location, 50, 25, 94, 48); - ResourceLocation statesLocation = new ResourceLocation(AppEng.MOD_ID, "textures/guis/states.png"); + Identifier statesLocation = new Identifier(AppEng.MOD_ID, "textures/guis/states.png"); this.iconTrash = guiHelper.drawableBuilder(statesLocation, 241, 81, 14, 14).addPadding(28, 0, 2, 0).build(); this.iconButton = guiHelper.drawableBuilder(statesLocation, 240, 240, 16, 16).addPadding(28, 0, 78, 0).build(); @@ -106,7 +106,7 @@ class CondenserCategory implements IRecipeCategory { } @Override - public ResourceLocation getUid() { + public Identifier getUid() { return CondenserCategory.UID; } diff --git a/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java b/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java index a776cbe5e..247831119 100644 --- a/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java @@ -24,8 +24,8 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapedRecipe; +import net.minecraft.util.Identifier; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import mezz.jei.api.constants.VanillaRecipeCategoryUid; import mezz.jei.api.recipe.IFocus; @@ -51,7 +51,7 @@ class FacadeRegistryPlugin implements IRecipeManagerPlugin { } @Override - public List getRecipeCategoryUids(IFocus focus) { + public List getRecipeCategoryUids(IFocus focus) { if (focus.getMode() == IFocus.Mode.OUTPUT && focus.getValue() instanceof ItemStack) { // Looking up how a certain facade is crafted ItemStack itemStack = (ItemStack) focus.getValue(); @@ -101,7 +101,7 @@ class FacadeRegistryPlugin implements IRecipeManagerPlugin { private ShapedRecipe make(ItemStack textureItem, ItemStack cableAnchor, ItemStack result) { // This id should only be used within JEI and not really matter - ResourceLocation id = new ResourceLocation(AppEng.MOD_ID, + Identifier id = new Identifier(AppEng.MOD_ID, "facade/" + textureItem.getItem().getRegistryName().toString().replace(':', '/')); NonNullList ingredients = NonNullList.withSize(9, Ingredient.EMPTY); diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java index 88de2fc01..6bd7e1731 100644 --- a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java @@ -24,7 +24,7 @@ import java.util.List; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; @@ -41,7 +41,7 @@ import appeng.recipes.handlers.GrinderRecipe; class GrinderRecipeCategory implements IRecipeCategory { - public static final ResourceLocation UID = new ResourceLocation(AppEng.MOD_ID, "grinder"); + public static final Identifier UID = new Identifier(AppEng.MOD_ID, "grinder"); private final String localizedName; @@ -52,14 +52,14 @@ class GrinderRecipeCategory implements IRecipeCategory { public GrinderRecipeCategory(IGuiHelper guiHelper) { this.localizedName = I18n.format("block.appliedenergistics2.grindstone"); - ResourceLocation location = new ResourceLocation(AppEng.MOD_ID, "textures/guis/grinder.png"); + Identifier location = new Identifier(AppEng.MOD_ID, "textures/guis/grinder.png"); this.background = guiHelper.createDrawable(location, 11, 16, 154, 70); this.icon = guiHelper.createDrawableIngredient(Api.INSTANCE.definitions().blocks().grindstone().stack(1)); } @Override - public ResourceLocation getUid() { + public Identifier getUid() { return GrinderRecipeCategory.UID; } diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java index 0d9b1d408..2c55e6e1a 100644 --- a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java @@ -19,7 +19,7 @@ package appeng.integration.modules.jei; import net.minecraft.client.resources.I18n; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; @@ -42,7 +42,7 @@ class InscriberRecipeCategory implements IRecipeCategory { private static final int SLOT_INPUT_BOTTOM = 2; private static final int SLOT_OUTPUT = 3; - static final ResourceLocation UID = new ResourceLocation(AppEng.MOD_ID, "appliedenergistics2.inscriber"); + static final Identifier UID = new Identifier(AppEng.MOD_ID, "appliedenergistics2.inscriber"); private final IDrawable background; @@ -53,7 +53,7 @@ class InscriberRecipeCategory implements IRecipeCategory { private final IDrawable icon; public InscriberRecipeCategory(IGuiHelper guiHelper) { - ResourceLocation location = new ResourceLocation(AppEng.MOD_ID, "textures/guis/inscriber.png"); + Identifier location = new Identifier(AppEng.MOD_ID, "textures/guis/inscriber.png"); this.background = guiHelper.createDrawable(location, 44, 15, 97, 64); this.localizedName = I18n.format("block.appliedenergistics2.inscriber"); @@ -66,7 +66,7 @@ class InscriberRecipeCategory implements IRecipeCategory { } @Override - public ResourceLocation getUid() { + public Identifier getUid() { return UID; } diff --git a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java index cd531bd2a..361da2cf0 100644 --- a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java @@ -26,7 +26,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.RecipeManager; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; @@ -53,10 +53,10 @@ import appeng.recipes.handlers.InscriberRecipe; @JeiPlugin public class JEIPlugin implements IModPlugin { - private static final ResourceLocation ID = new ResourceLocation(AppEng.MOD_ID, "core"); + private static final Identifier ID = new Identifier(AppEng.MOD_ID, "core"); @Override - public ResourceLocation getPluginUid() { + public Identifier getPluginUid() { return ID; } diff --git a/src/main/java/appeng/integration/modules/theoneprobe/PartInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/PartInfoProvider.java index cb0c8a6c0..e76c78b39 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/PartInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/PartInfoProvider.java @@ -24,8 +24,8 @@ import java.util.Optional; import com.google.common.collect.Lists; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import mcjty.theoneprobe.api.IProbeHitData; @@ -64,7 +64,7 @@ public final class PartInfoProvider implements IProbeInfoProvider { @Override public void addProbeInfo(ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, BlockState blockState, IProbeHitData data) { - final TileEntity te = world.getTileEntity(data.getPos()); + final BlockEntity te = world.getTileEntity(data.getPos()); final Optional maybePart = this.accessor.getMaybePart(te, data); if (maybePart.isPresent()) { diff --git a/src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeText.java b/src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeText.java index d68e12753..278406ebd 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeText.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeText.java @@ -20,7 +20,7 @@ package appeng.integration.modules.theoneprobe; import java.util.Locale; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.TranslatableText; public enum TheOneProbeText { CRAFTING, DEVICE_ONLINE, DEVICE_OFFLINE, DEVICE_MISSING_CHANNEL, P2P_UNLINKED, P2P_INPUT_ONE_OUTPUT, @@ -36,8 +36,8 @@ public enum TheOneProbeText { return getTranslationComponent(args).getFormattedText(); } - public TranslationTextComponent getTranslationComponent(Object... args) { - return new TranslationTextComponent(this.getUnlocalized(), args); + public TranslatableText getTranslationComponent(Object... args) { + return new TranslatableText(this.getUnlocalized(), args); } public String getUnlocalized() { diff --git a/src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java index 3085fe7b2..ddd8010e2 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java @@ -24,7 +24,7 @@ import com.google.common.collect.Lists; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.World; import mcjty.theoneprobe.api.IProbeHitData; @@ -60,7 +60,7 @@ public final class TileInfoProvider implements IProbeInfoProvider { @Override public void addProbeInfo(ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, BlockState blockState, IProbeHitData data) { - final TileEntity tile = world.getTileEntity(data.getPos()); + final BlockEntity tile = world.getTileEntity(data.getPos()); if (tile instanceof AEBaseTileEntity) { final AEBaseTileEntity aeBaseTile = (AEBaseTileEntity) tile; diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/PartAccessor.java b/src/main/java/appeng/integration/modules/theoneprobe/part/PartAccessor.java index c717940fd..4c358dc58 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/part/PartAccessor.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/part/PartAccessor.java @@ -20,7 +20,7 @@ package appeng.integration.modules.theoneprobe.part; import java.util.Optional; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -32,7 +32,7 @@ import appeng.api.parts.SelectedPart; public final class PartAccessor { - public Optional getMaybePart(final TileEntity te, final IProbeHitData data) { + public Optional getMaybePart(final BlockEntity te, final IProbeHitData data) { if (te instanceof IPartHost) { BlockPos pos = data.getPos(); final Vec3d position = data.getHitVec().add(-pos.getX(), -pos.getY(), -pos.getZ()); diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java b/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java index 316fcf017..8e8904096 100644 --- a/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java +++ b/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java @@ -22,7 +22,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import mcjty.theoneprobe.api.ElementAlignment; import mcjty.theoneprobe.api.IProbeHitData; @@ -39,7 +39,7 @@ public class ChargerInfoProvider implements ITileProbInfoProvider { World world, BlockState blockState, IProbeHitData data) { if (tile instanceof ChargerTileEntity) { final ChargerTileEntity charger = (ChargerTileEntity) tile; - final IItemHandler chargerInventory = charger.getInternalInventory(); + final ItemTransferable chargerInventory = charger.getInternalInventory(); final ItemStack chargingItem = chargerInventory.getStackInSlot(0); if (!chargingItem.isEmpty()) { diff --git a/src/main/java/appeng/items/contents/NetworkToolViewer.java b/src/main/java/appeng/items/contents/NetworkToolViewer.java index f66ef1658..d1c3d55f2 100644 --- a/src/main/java/appeng/items/contents/NetworkToolViewer.java +++ b/src/main/java/appeng/items/contents/NetworkToolViewer.java @@ -18,8 +18,8 @@ package appeng.items.contents; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import appeng.api.implementations.guiobjects.INetworkTool; import appeng.api.implementations.items.IUpgradeModule; @@ -52,8 +52,8 @@ public class NetworkToolViewer implements INetworkTool, IAEAppEngInventory { } @Override - public void onChangeInventory(IItemHandler inv, int slot, InvOperation mc, ItemStack removedStack, - ItemStack newStack) { + public void onChangeInventory(ItemTransferable inv, int slot, InvOperation mc, ItemStack removedStack, + ItemStack newStack) { } @Override @@ -68,23 +68,23 @@ public class NetworkToolViewer implements INetworkTool, IAEAppEngInventory { private static class NetworkToolInventoryFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return true; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { return stack.getItem() instanceof IUpgradeModule && ((IUpgradeModule) stack.getItem()).getType(stack) != null; } } - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.inv; } @Override - public IItemHandler getInventory() { + public ItemTransferable getInventory() { return this.inv; } } diff --git a/src/main/java/appeng/items/materials/MaterialItem.java b/src/main/java/appeng/items/materials/MaterialItem.java index e31b07efd..3cdb72192 100644 --- a/src/main/java/appeng/items/materials/MaterialItem.java +++ b/src/main/java/appeng/items/materials/MaterialItem.java @@ -32,16 +32,16 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.TranslatableText; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.IItemHandler; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.config.Upgrades; import appeng.api.implementations.IUpgradeableHost; @@ -71,9 +71,9 @@ public final class MaterialItem extends AEBaseItem implements IStorageComponent, this.materialType = materialType; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override - public void addInformation(final ItemStack stack, final World world, final List lines, + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { super.addInformation(stack, world, lines, advancedTooltips); @@ -86,9 +86,9 @@ public final class MaterialItem extends AEBaseItem implements IStorageComponent, final Upgrades u = this.getType(stack); if (u != null) { - final List textList = new ArrayList<>(); + final List textList = new ArrayList<>(); for (final Entry j : u.getSupported().entrySet()) { - ITextComponent name = null; + Text name = null; final int limit = j.getValue(); @@ -96,7 +96,7 @@ public final class MaterialItem extends AEBaseItem implements IStorageComponent, final IItemGroup ig = (IItemGroup) j.getKey().getItem(); final String str = ig.getUnlocalizedGroupName(u.getSupported().keySet(), j.getKey()); if (str != null) { - name = new TranslationTextComponent(str).appendText(limit > 1 ? " (" + limit + ')' : ""); + name = new TranslatableText(str).appendText(limit > 1 ? " (" + limit + ')' : ""); } } @@ -142,8 +142,8 @@ public final class MaterialItem extends AEBaseItem implements IStorageComponent, PlayerEntity player = context.getPlayer(); Hand hand = context.getHand(); if (player.isCrouching()) { - final TileEntity te = context.getWorld().getTileEntity(context.getPos()); - IItemHandler upgrades = null; + final BlockEntity te = context.getWorld().getTileEntity(context.getPos()); + ItemTransferable upgrades = null; if (te instanceof IPartHost) { final SelectedPart sp = ((IPartHost) te).selectPart(context.getHitVec()); @@ -229,7 +229,7 @@ public final class MaterialItem extends AEBaseItem implements IStorageComponent, return false; } - private static class SlightlyBetterSort implements Comparator { + private static class SlightlyBetterSort implements Comparator { private final Pattern pattern; public SlightlyBetterSort(final Pattern pattern) { @@ -237,7 +237,7 @@ public final class MaterialItem extends AEBaseItem implements IStorageComponent, } @Override - public int compare(final ITextComponent o1, final ITextComponent o2) { + public int compare(final Text o1, final Text o2) { try { final Matcher a = this.pattern.matcher(o1.getString()); final Matcher b = this.pattern.matcher(o2.getString()); diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java index f9b6c5fb9..8624c2cf4 100644 --- a/src/main/java/appeng/items/materials/MaterialType.java +++ b/src/main/java/appeng/items/materials/MaterialType.java @@ -24,7 +24,7 @@ import java.util.Set; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.features.AEFeature; import appeng.core.AppEng; @@ -120,7 +120,7 @@ public enum MaterialType { FLUID_64K_CELL_COMPONENT("64k_fluid_cell_component", EnumSet.of(AEFeature.STORAGE_CELLS)); private final Set features; - private final ResourceLocation registryName; + private final Identifier registryName; private Item itemInstance; // stack! private MaterialStackSrc stackSrc; @@ -130,7 +130,7 @@ public enum MaterialType { MaterialType(String id, final Set features) { this.features = features; - this.registryName = new ResourceLocation(AppEng.MOD_ID, id); + this.registryName = new Identifier(AppEng.MOD_ID, id); } MaterialType(String id, final Set features, final Class c) { @@ -198,7 +198,7 @@ public enum MaterialType { return registryName.getPath(); } - public ResourceLocation getRegistryName() { + public Identifier getRegistryName() { return this.registryName; } diff --git a/src/main/java/appeng/items/misc/CrystalSeedItem.java b/src/main/java/appeng/items/misc/CrystalSeedItem.java index e3ddc99a5..d47c3a6c4 100644 --- a/src/main/java/appeng/items/misc/CrystalSeedItem.java +++ b/src/main/java/appeng/items/misc/CrystalSeedItem.java @@ -24,6 +24,8 @@ import javax.annotation.Nullable; import com.google.common.base.Preconditions; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.client.util.ITooltipFlag; @@ -32,14 +34,12 @@ import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.IItemProvider; +import net.minecraft.util.Identifier; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.implementations.items.IGrowableCrystal; import appeng.core.localization.ButtonToolTips; @@ -71,7 +71,7 @@ public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal { super(properties); this.grownItem = Preconditions.checkNotNull(grownItem); // Expose the growth of the seed to the model system - addPropertyOverride(new ResourceLocation("appliedenergistics2:growth"), + addPropertyOverride(new Identifier("appliedenergistics2:growth"), (is, w, p) -> getGrowthTicks(is) / (float) GROWTH_TICKS_REQUIRED); } @@ -103,8 +103,8 @@ public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal { } @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(final ItemStack stack, final World world, final List lines, + @Environment(EnvType.CLIENT) + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { lines.add(ButtonToolTips.DoesntDespawn.getTranslationKey()); lines.add(getGrowthTooltipItem(stack)); @@ -112,7 +112,7 @@ public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal { super.addInformation(stack, world, lines, advancedTooltips); } - public ITextComponent getGrowthTooltipItem(ItemStack stack) { + public Text getGrowthTooltipItem(ItemStack stack) { final int progress = getGrowthTicks(stack); return new StringTextComponent(Math.round(100 * progress / (float) GROWTH_TICKS_REQUIRED) + "%"); } diff --git a/src/main/java/appeng/items/misc/EncodedPatternItem.java b/src/main/java/appeng/items/misc/EncodedPatternItem.java index a7ffab199..9e7b60040 100644 --- a/src/main/java/appeng/items/misc/EncodedPatternItem.java +++ b/src/main/java/appeng/items/misc/EncodedPatternItem.java @@ -30,12 +30,12 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.api.AEApi; import appeng.api.implementations.ICraftingPatternItem; @@ -92,8 +92,8 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt } @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(final ItemStack stack, final World world, final List lines, + @Environment(EnvType.CLIENT) + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { final ICraftingPatternDetails details = this.getPatternForItem(stack, world); @@ -106,11 +106,11 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt InvalidPatternHelper invalid = new InvalidPatternHelper(stack); - final ITextComponent label = (invalid.isCraftable() ? GuiText.Crafts.textComponent() + final Text label = (invalid.isCraftable() ? GuiText.Crafts.textComponent() : GuiText.Creates.textComponent()).appendText(": "); - final ITextComponent and = new StringTextComponent(" ").appendSibling(GuiText.And.textComponent()) + final Text and = new StringTextComponent(" ").appendSibling(GuiText.And.textComponent()) .appendText(" "); - final ITextComponent with = GuiText.With.textComponent().appendText(": "); + final Text with = GuiText.With.textComponent().appendText(": "); boolean first = true; for (final InvalidPatternHelper.PatternIngredient output : invalid.getOutputs()) { @@ -125,8 +125,8 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt } if (invalid.isCraftable()) { - final ITextComponent substitutionLabel = GuiText.Substitute.textComponent().appendText(" "); - final ITextComponent canSubstitute = invalid.canSubstitute() ? GuiText.Yes.textComponent() + final Text substitutionLabel = GuiText.Substitute.textComponent().appendText(" "); + final Text canSubstitute = invalid.canSubstitute() ? GuiText.Yes.textComponent() : GuiText.No.textComponent(); lines.add(substitutionLabel.appendSibling(canSubstitute)); @@ -145,11 +145,11 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt final IAEItemStack[] in = details.getCondensedInputs(); final IAEItemStack[] out = details.getCondensedOutputs(); - final ITextComponent label = (isCrafting ? GuiText.Crafts.textComponent() : GuiText.Creates.textComponent()) + final Text label = (isCrafting ? GuiText.Crafts.textComponent() : GuiText.Creates.textComponent()) .appendText(": "); - final ITextComponent and = new StringTextComponent(" ").appendSibling(GuiText.And.textComponent()) + final Text and = new StringTextComponent(" ").appendSibling(GuiText.And.textComponent()) .appendText(" "); - final ITextComponent with = GuiText.With.textComponent().appendText(": "); + final Text with = GuiText.With.textComponent().appendText(": "); boolean first = true; for (final IAEItemStack anOut : out) { @@ -174,8 +174,8 @@ public class EncodedPatternItem extends AEBaseItem implements ICraftingPatternIt } if (isCrafting) { - final ITextComponent substitutionLabel = GuiText.Substitute.textComponent().appendText(" "); - final ITextComponent canSubstitute = substitute ? GuiText.Yes.textComponent() : GuiText.No.textComponent(); + final Text substitutionLabel = GuiText.Substitute.textComponent().appendText(" "); + final Text canSubstitute = substitute ? GuiText.Yes.textComponent() : GuiText.No.textComponent(); lines.add(substitutionLabel.appendSibling(canSubstitute)); } diff --git a/src/main/java/appeng/items/parts/FacadeItem.java b/src/main/java/appeng/items/parts/FacadeItem.java index 0c7399358..e70707895 100644 --- a/src/main/java/appeng/items/parts/FacadeItem.java +++ b/src/main/java/appeng/items/parts/FacadeItem.java @@ -29,11 +29,11 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.tags.BlockTags; import net.minecraft.tags.Tag; import net.minecraft.util.ActionResult; +import net.minecraft.util.Identifier; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.EmptyBlockReader; import net.minecraftforge.registries.ForgeRegistries; @@ -53,7 +53,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte /** * Block tag used to explicitly whitelist blocks for use in facades. */ - private static final ResourceLocation TAG_WHITELISTED = new ResourceLocation(AppEng.MOD_ID, "whitelisted/facades"); + private static final Identifier TAG_WHITELISTED = new Identifier(AppEng.MOD_ID, "whitelisted/facades"); private static final String NBT_ITEM_ID = "item"; @@ -68,7 +68,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte } @Override - public ITextComponent getDisplayName(ItemStack is) { + public Text getDisplayName(ItemStack is) { try { final ItemStack in = this.getTextureItem(is); if (!in.isEmpty()) { @@ -142,7 +142,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte return ItemStack.EMPTY; } - ResourceLocation itemId = new ResourceLocation(nbt.getString(NBT_ITEM_ID)); + Identifier itemId = new Identifier(nbt.getString(NBT_ITEM_ID)); Item baseItem = ForgeRegistries.ITEMS.getValue(itemId); if (baseItem == null) { diff --git a/src/main/java/appeng/items/parts/PartItemRendering.java b/src/main/java/appeng/items/parts/PartItemRendering.java index 15e29e0f3..3ac4c54de 100644 --- a/src/main/java/appeng/items/parts/PartItemRendering.java +++ b/src/main/java/appeng/items/parts/PartItemRendering.java @@ -18,8 +18,8 @@ package appeng.items.parts; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.api.util.AEColor; import appeng.bootstrap.IItemRendering; @@ -39,7 +39,7 @@ public class PartItemRendering extends ItemRenderingCustomizer { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IItemRendering rendering) { rendering.color(new StaticItemColor(color)); } diff --git a/src/main/java/appeng/items/parts/PartModelsHelper.java b/src/main/java/appeng/items/parts/PartModelsHelper.java index 81532144d..b0fe356ab 100644 --- a/src/main/java/appeng/items/parts/PartModelsHelper.java +++ b/src/main/java/appeng/items/parts/PartModelsHelper.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AELog; @@ -20,8 +20,8 @@ import appeng.core.AELog; */ class PartModelsHelper { - static List createModels(Class clazz) { - List locations = new ArrayList<>(); + static List createModels(Class clazz) { + List locations = new ArrayList<>(); // Check all static fields for used models Field[] fields = clazz.getDeclaredFields(); @@ -70,7 +70,7 @@ class PartModelsHelper { // Make sure we can handle the return type Class returnType = method.getReturnType(); - if (!ResourceLocation.class.isAssignableFrom(returnType) + if (!Identifier.class.isAssignableFrom(returnType) && !Collection.class.isAssignableFrom(returnType)) { AELog.error( "The @PartModels annotation can only be used on static methods that return a ResourceLocation or Collection of " @@ -97,13 +97,13 @@ class PartModelsHelper { return locations; } - private static void convertAndAddLocation(Object source, Object value, List locations) { + private static void convertAndAddLocation(Object source, Object value, List locations) { if (value == null) { return; } - if (value instanceof ResourceLocation) { - locations.add((ResourceLocation) value); + if (value instanceof Identifier) { + locations.add((Identifier) value); } else if (value instanceof IPartModel) { locations.addAll(((IPartModel) value).getModels()); } else if (value instanceof Collection) { diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index 12ca93c3e..157e585e8 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -23,7 +23,7 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.Set; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.features.AEFeature; import appeng.api.parts.IPart; @@ -208,7 +208,7 @@ public enum PartType { private final Set features; private final Set integrations; - private final Set models; + private final Set models; PartType(final Set features, final Set integrations, final Class c) { this.features = Collections.unmodifiableSet(features); @@ -233,7 +233,7 @@ public enum PartType { return this.integrations; } - public Set getModels() { + public Set getModels() { return this.models; } diff --git a/src/main/java/appeng/items/storage/AbstractStorageCell.java b/src/main/java/appeng/items/storage/AbstractStorageCell.java index bdc032251..9d79d6ca1 100644 --- a/src/main/java/appeng/items/storage/AbstractStorageCell.java +++ b/src/main/java/appeng/items/storage/AbstractStorageCell.java @@ -21,6 +21,8 @@ package appeng.items.storage; import java.util.List; import java.util.Set; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.fabricmc.api.EnvType; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -29,11 +31,9 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.IItemHandler; +import net.fabricmc.api.Environment; import appeng.api.AEApi; import appeng.api.config.FuzzyMode; @@ -71,9 +71,9 @@ public abstract class AbstractStorageCell> extends AEBaseI this.component = whichCell; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override - public void addInformation(final ItemStack stack, final World world, final List lines, + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { AEApi.instance().client().addCellInformation( AEApi.instance().registries().cell().getCellInventory(stack, null, this.getChannel()), lines); @@ -115,12 +115,12 @@ public abstract class AbstractStorageCell> extends AEBaseI } @Override - public IItemHandler getUpgradesInventory(final ItemStack is) { + public ItemTransferable getUpgradesInventory(final ItemStack is) { return new CellUpgrades(is, 2); } @Override - public IItemHandler getConfigInventory(final ItemStack is) { + public ItemTransferable getConfigInventory(final ItemStack is) { return new CellConfig(is); } @@ -167,7 +167,7 @@ public abstract class AbstractStorageCell> extends AEBaseI } // drop upgrades - final IItemHandler upgradesInventory = this.getUpgradesInventory(stack); + final ItemTransferable upgradesInventory = this.getUpgradesInventory(stack); for (int upgradeIndex = 0; upgradeIndex < upgradesInventory.getSlots(); upgradeIndex++) { final ItemStack upgradeStack = upgradesInventory.getStackInSlot(upgradeIndex); final ItemStack leftStack = ia.addItems(upgradeStack); diff --git a/src/main/java/appeng/items/storage/CreativeStorageCellItem.java b/src/main/java/appeng/items/storage/CreativeStorageCellItem.java index c14d74bad..6f1378cf9 100644 --- a/src/main/java/appeng/items/storage/CreativeStorageCellItem.java +++ b/src/main/java/appeng/items/storage/CreativeStorageCellItem.java @@ -20,13 +20,13 @@ package appeng.items.storage; import java.util.List; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.FuzzyMode; @@ -49,12 +49,12 @@ public class CreativeStorageCellItem extends AEBaseItem implements ICellWorkbenc } @Override - public IItemHandler getUpgradesInventory(final ItemStack is) { + public ItemTransferable getUpgradesInventory(final ItemStack is) { return null; } @Override - public IItemHandler getConfigInventory(final ItemStack is) { + public ItemTransferable getConfigInventory(final ItemStack is) { return new CellConfig(is); } @@ -68,9 +68,9 @@ public class CreativeStorageCellItem extends AEBaseItem implements ICellWorkbenc } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override - public void addInformation(final ItemStack stack, final World world, final List lines, + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { final IMEInventoryHandler inventory = AEApi.instance().registries().cell().getCellInventory(stack, null, AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); diff --git a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java index 17be0a5ab..00cf5e9db 100644 --- a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java +++ b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java @@ -20,18 +20,18 @@ package appeng.items.storage; import java.util.List; +import net.fabricmc.api.EnvType; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import appeng.api.implementations.TransitionResult; import appeng.api.implementations.items.ISpatialStorageCell; @@ -53,9 +53,9 @@ public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorag this.maxRegion = spatialScale; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override - public void addInformation(final ItemStack stack, final World world, final List lines, + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { final DimensionType dimType = this.getStoredDimension(stack); if (dimType == null) { @@ -87,7 +87,7 @@ public class SpatialStorageCellItem extends AEBaseItem implements ISpatialStorag final CompoundTag c = is.getTag(); if (c != null && c.contains(TAG_DIMENSION_ID)) { try { - ResourceLocation dimTypeId = new ResourceLocation(c.getString(TAG_DIMENSION_ID)); + Identifier dimTypeId = new Identifier(c.getString(TAG_DIMENSION_ID)); return DimensionType.byName(dimTypeId); } catch (Exception e) { AELog.warn("Failed to retrieve storage cell dimension.", e); diff --git a/src/main/java/appeng/items/storage/ViewCellItem.java b/src/main/java/appeng/items/storage/ViewCellItem.java index 2439b87ca..aed3fa337 100644 --- a/src/main/java/appeng/items/storage/ViewCellItem.java +++ b/src/main/java/appeng/items/storage/ViewCellItem.java @@ -18,8 +18,8 @@ package appeng.items.storage; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.FuzzyMode; @@ -59,8 +59,8 @@ public class ViewCellItem extends AEBaseItem implements ICellWorkbenchItem { .getStorageChannel(IItemStorageChannel.class).createList(); final ICellWorkbenchItem vc = (ICellWorkbenchItem) currentViewCell.getItem(); - final IItemHandler upgrades = vc.getUpgradesInventory(currentViewCell); - final IItemHandler config = vc.getConfigInventory(currentViewCell); + final ItemTransferable upgrades = vc.getUpgradesInventory(currentViewCell); + final ItemTransferable config = vc.getConfigInventory(currentViewCell); final FuzzyMode fzMode = vc.getFuzzyMode(currentViewCell); boolean hasInverter = false; @@ -112,12 +112,12 @@ public class ViewCellItem extends AEBaseItem implements ICellWorkbenchItem { } @Override - public IItemHandler getUpgradesInventory(final ItemStack is) { + public ItemTransferable getUpgradesInventory(final ItemStack is) { return new CellUpgrades(is, 2); } @Override - public IItemHandler getConfigInventory(final ItemStack is) { + public ItemTransferable getConfigInventory(final ItemStack is) { return new CellConfig(is); } diff --git a/src/main/java/appeng/items/tools/BiometricCardItem.java b/src/main/java/appeng/items/tools/BiometricCardItem.java index c4d93558e..f79d1c6e4 100644 --- a/src/main/java/appeng/items/tools/BiometricCardItem.java +++ b/src/main/java/appeng/items/tools/BiometricCardItem.java @@ -29,13 +29,13 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NBTUtil; +import net.minecraft.text.TranslatableText; import net.minecraft.util.TypedActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.Text; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.api.config.SecurityPermissions; import appeng.api.features.IPlayerRegistry; @@ -75,7 +75,7 @@ public class BiometricCardItem extends AEBaseItem implements IBiometricCard { } @Override - public ITextComponent getDisplayName(final ItemStack is) { + public Text getDisplayName(final ItemStack is) { final GameProfile username = this.getProfile(is); return username != null ? super.getDisplayName(is).appendText(" - " + username.getName()) : super.getDisplayName(is); @@ -153,20 +153,20 @@ public class BiometricCardItem extends AEBaseItem implements IBiometricCard { } @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(final ItemStack stack, final World world, final List lines, + @Environment(EnvType.CLIENT) + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { final EnumSet perms = this.getPermissions(stack); if (perms.isEmpty()) { - lines.add(new TranslationTextComponent(GuiText.NoPermissions.getLocal())); + lines.add(new TranslatableText(GuiText.NoPermissions.getLocal())); } else { - ITextComponent msg = null; + Text msg = null; for (final SecurityPermissions sp : perms) { if (msg == null) { - msg = new TranslationTextComponent(sp.getTranslatedName()); + msg = new TranslatableText(sp.getTranslatedName()); } else { - msg = msg.appendText(", ").appendSibling(new TranslationTextComponent(sp.getTranslatedName())); + msg = msg.appendText(", ").appendSibling(new TranslatableText(sp.getTranslatedName())); } } lines.add(msg); diff --git a/src/main/java/appeng/items/tools/MemoryCardItem.java b/src/main/java/appeng/items/tools/MemoryCardItem.java index 89bafa491..d9300d23b 100644 --- a/src/main/java/appeng/items/tools/MemoryCardItem.java +++ b/src/main/java/appeng/items/tools/MemoryCardItem.java @@ -20,23 +20,23 @@ package appeng.items.tools; import java.util.List; +import net.fabricmc.api.EnvType; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.CompoundTag; +import net.minecraft.text.TranslatableText; import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; @@ -57,25 +57,25 @@ public class MemoryCardItem extends AEBaseItem implements IMemoryCard { } @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(final ItemStack stack, final World world, final List lines, + @Environment(EnvType.CLIENT) + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { String firstLineKey = this.getFirstValidTranslationKey(this.getSettingsName(stack) + ".name", this.getSettingsName(stack)); - lines.add(new TranslationTextComponent(firstLineKey)); + lines.add(new TranslatableText(firstLineKey)); final CompoundTag data = this.getData(stack); if (data.contains("tooltip")) { String tooltipKey = getFirstValidTranslationKey(data.getString("tooltip") + ".name", data.getString("tooltip")); - lines.add(new TranslationTextComponent(tooltipKey)); + lines.add(new TranslatableText(tooltipKey)); } if (data.contains("freq")) { final short freq = data.getShort("freq"); final String freqTooltip = TextFormatting.BOLD + Platform.p2p().toHexString(freq); - lines.add(new TranslationTextComponent("gui.tooltips.appliedenergistics2.P2PFrequency", freqTooltip)); + lines.add(new TranslatableText("gui.tooltips.appliedenergistics2.P2PFrequency", freqTooltip)); } } diff --git a/src/main/java/appeng/items/tools/NetworkToolItem.java b/src/main/java/appeng/items/tools/NetworkToolItem.java index bb0c8ddd9..7bda86905 100644 --- a/src/main/java/appeng/items/tools/NetworkToolItem.java +++ b/src/main/java/appeng/items/tools/NetworkToolItem.java @@ -20,10 +20,10 @@ package appeng.items.tools; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; @@ -31,7 +31,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.hit.HitResult; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; @@ -67,16 +67,16 @@ public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench { if (pos == null) { return new NetworkToolViewer(is, null); } - final TileEntity te = world.getTileEntity(pos); + final BlockEntity te = world.getTileEntity(pos); return new NetworkToolViewer(is, (IGridHost) (te instanceof IGridHost ? te : null)); } @Override public TypedActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { if (Platform.isClient()) { - final RayTraceResult mop = AppEng.proxy.getRTR(); + final HitResult mop = AppEng.proxy.getRTR(); - if (mop == null || mop.getType() == RayTraceResult.Type.MISS) { + if (mop == null || mop.getType() == HitResult.Type.MISS) { NetworkHandler.instance().sendToServer(new ClickPacket(hand)); } } @@ -88,7 +88,7 @@ public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench { public ActionResult onItemUseFirst(ItemStack stack, ItemUseContext context) { final BlockRayTraceResult mop = new BlockRayTraceResult(context.getHitVec(), context.getFace(), context.getPos(), context.isInside()); - final TileEntity te = context.getWorld().getTileEntity(context.getPos()); + final BlockEntity te = context.getWorld().getTileEntity(context.getPos()); if (te instanceof IPartHost) { final SelectedPart part = ((IPartHost) te).selectPart(mop.getHitVec()); @@ -129,7 +129,7 @@ public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench { final BlockState bs = w.getBlockState(pos); if (!p.isCrouching()) { - final TileEntity te = w.getTileEntity(pos); + final BlockEntity te = w.getTileEntity(pos); if (!(te instanceof IGridHost)) { if (bs.rotate(w, pos, Rotation.CLOCKWISE_90) != bs) { bs.neighborChanged(w, pos, Blocks.AIR, pos, false); @@ -144,7 +144,7 @@ public class NetworkToolItem extends AEBaseItem implements IGuiItem, IAEWrench { return true; } - final TileEntity te = w.getTileEntity(pos); + final BlockEntity te = w.getTileEntity(pos); if (te instanceof IGridHost) { ContainerOpener.openContainer(NetworkStatusContainer.TYPE, p, diff --git a/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java b/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java index 187b59a3f..d8fe8d0be 100644 --- a/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java +++ b/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java @@ -22,7 +22,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import appeng.api.config.Actionable; import appeng.core.AEConfig; @@ -43,7 +43,7 @@ public class ChargedStaffItem extends AEBasePoweredItem { this.extractAEPower(item, 300, Actionable.MODULATE); if (Platform.isServer()) { for (int x = 0; x < 2; x++) { - final AxisAlignedBB entityBoundingBox = target.getBoundingBox(); + final Box entityBoundingBox = target.getBoundingBox(); final float dx = (float) (Platform.getRandomFloat() * target.getWidth() + entityBoundingBox.minX); final float dy = (float) (Platform.getRandomFloat() * target.getHeight() + entityBoundingBox.minY); final float dz = (float) (Platform.getRandomFloat() * target.getWidth() + entityBoundingBox.minZ); diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java index 19b66aa76..f1baf6850 100644 --- a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java +++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java @@ -22,10 +22,13 @@ import java.util.*; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.item.ItemTransferable; import com.google.common.collect.ImmutableMap; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -36,18 +39,15 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.state.IProperty; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.text.TranslatableText; import net.minecraft.util.ActionResult; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.Text; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.server.world.ServerWorld; +import net.fabricmc.api.EnvType; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -82,29 +82,29 @@ import appeng.util.item.AEItemStack; public class ColorApplicatorItem extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem { - private static final Map TAG_TO_COLOR = ImmutableMap.builder() - .put(new ResourceLocation("forge:dyes/black"), AEColor.BLACK) - .put(new ResourceLocation("forge:dyes/blue"), AEColor.BLUE) - .put(new ResourceLocation("forge:dyes/brown"), AEColor.BROWN) - .put(new ResourceLocation("forge:dyes/cyan"), AEColor.CYAN) - .put(new ResourceLocation("forge:dyes/gray"), AEColor.GRAY) - .put(new ResourceLocation("forge:dyes/green"), AEColor.GREEN) - .put(new ResourceLocation("forge:dyes/light_blue"), AEColor.LIGHT_BLUE) - .put(new ResourceLocation("forge:dyes/light_gray"), AEColor.LIGHT_GRAY) - .put(new ResourceLocation("forge:dyes/lime"), AEColor.LIME) - .put(new ResourceLocation("forge:dyes/magenta"), AEColor.MAGENTA) - .put(new ResourceLocation("forge:dyes/orange"), AEColor.ORANGE) - .put(new ResourceLocation("forge:dyes/pink"), AEColor.PINK) - .put(new ResourceLocation("forge:dyes/purple"), AEColor.PURPLE) - .put(new ResourceLocation("forge:dyes/red"), AEColor.RED) - .put(new ResourceLocation("forge:dyes/white"), AEColor.WHITE) - .put(new ResourceLocation("forge:dyes/yellow"), AEColor.YELLOW).build(); + private static final Map TAG_TO_COLOR = ImmutableMap.builder() + .put(new Identifier("forge:dyes/black"), AEColor.BLACK) + .put(new Identifier("forge:dyes/blue"), AEColor.BLUE) + .put(new Identifier("forge:dyes/brown"), AEColor.BROWN) + .put(new Identifier("forge:dyes/cyan"), AEColor.CYAN) + .put(new Identifier("forge:dyes/gray"), AEColor.GRAY) + .put(new Identifier("forge:dyes/green"), AEColor.GREEN) + .put(new Identifier("forge:dyes/light_blue"), AEColor.LIGHT_BLUE) + .put(new Identifier("forge:dyes/light_gray"), AEColor.LIGHT_GRAY) + .put(new Identifier("forge:dyes/lime"), AEColor.LIME) + .put(new Identifier("forge:dyes/magenta"), AEColor.MAGENTA) + .put(new Identifier("forge:dyes/orange"), AEColor.ORANGE) + .put(new Identifier("forge:dyes/pink"), AEColor.PINK) + .put(new Identifier("forge:dyes/purple"), AEColor.PURPLE) + .put(new Identifier("forge:dyes/red"), AEColor.RED) + .put(new Identifier("forge:dyes/white"), AEColor.WHITE) + .put(new Identifier("forge:dyes/yellow"), AEColor.YELLOW).build(); private static final String TAG_COLOR = "color"; public ColorApplicatorItem(Item.Properties props) { super(AEConfig.instance().getColorApplicatorBattery(), props); - addPropertyOverride(new ResourceLocation(AppEng.MOD_ID, "colored"), (itemStack, world, entity) -> { + addPropertyOverride(new Identifier(AppEng.MOD_ID, "colored"), (itemStack, world, entity) -> { // If the stack has no color, don't use the colored model since the impact of // calling getColor for every quad is extremely high, if the stack tries to // re-search its @@ -148,7 +148,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem final double powerPerUse = 100; if (!paintBall.isEmpty() && paintBall.getItem() instanceof SnowballItem) { - final TileEntity te = w.getTileEntity(pos); + final BlockEntity te = w.getTileEntity(pos); // clean cables. if (te instanceof IColorableTile && p != null) { if (this.getAECurrentPower(is) > powerPerUse @@ -164,7 +164,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem // clean paint balls.. final Block testBlk = w.getBlockState(pos.offset(side)).getBlock(); - final TileEntity painted = w.getTileEntity(pos.offset(side)); + final BlockEntity painted = w.getTileEntity(pos.offset(side)); if (this.getAECurrentPower(is) > powerPerUse && testBlk instanceof PaintSplotchesBlock && painted instanceof PaintSplotchesTileEntity) { inv.extractItems(AEItemStack.fromItemStack(paintBall), Actionable.MODULATE, new BaseActionSource()); @@ -194,13 +194,13 @@ public class ColorApplicatorItem extends AEBasePoweredItem } @Override - public ITextComponent getDisplayName(final ItemStack is) { - ITextComponent extra = GuiText.Empty.textComponent(); + public Text getDisplayName(final ItemStack is) { + Text extra = GuiText.Empty.textComponent(); final AEColor selected = this.getActiveColor(is); if (selected != null && Platform.isClient()) { - extra = new TranslationTextComponent(selected.translationKey); + extra = new TranslatableText(selected.translationKey); } return super.getDisplayName(is).appendText(" - ").appendSibling(extra); @@ -223,7 +223,7 @@ public class ColorApplicatorItem extends AEBasePoweredItem final PaintBallItem ipb = (PaintBallItem) paintBall.getItem(); return ipb.getColor(); } else { - for (Map.Entry entry : TAG_TO_COLOR.entrySet()) { + for (Map.Entry entry : TAG_TO_COLOR.entrySet()) { Tag tag = ItemTags.getCollection().get(entry.getKey()); if (tag != null && paintBall.getItem().isIn(tag)) { return entry.getValue(); @@ -355,8 +355,8 @@ public class ColorApplicatorItem extends AEBasePoweredItem } @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(final ItemStack stack, final World world, final List lines, + @Environment(EnvType.CLIENT) + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { super.addInformation(stack, world, lines, advancedTooltips); @@ -420,12 +420,12 @@ public class ColorApplicatorItem extends AEBasePoweredItem } @Override - public IItemHandler getUpgradesInventory(final ItemStack is) { + public ItemTransferable getUpgradesInventory(final ItemStack is) { return new CellUpgrades(is, 2); } @Override - public IItemHandler getConfigInventory(final ItemStack is) { + public ItemTransferable getConfigInventory(final ItemStack is) { return new CellConfig(is); } diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java b/src/main/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java index b3d40dfef..e904f0b7d 100644 --- a/src/main/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java +++ b/src/main/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java @@ -1,8 +1,8 @@ package appeng.items.tools.powered; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.util.AEColor; import appeng.bootstrap.IItemRendering; @@ -11,7 +11,7 @@ import appeng.bootstrap.ItemRenderingCustomizer; public class ColorApplicatorItemRendering extends ItemRenderingCustomizer { @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void customize(IItemRendering rendering) { rendering.color(this::getColor); } diff --git a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java index fc68ddad3..e72b69815 100644 --- a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java +++ b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java @@ -39,9 +39,9 @@ import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.hit.HitResult; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import appeng.api.config.Actionable; import appeng.api.util.DimensionalCoord; @@ -203,9 +203,9 @@ public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockT // considered for onItemUse @Override public TypedActionResult onItemRightClick(final World w, final PlayerEntity p, final Hand hand) { - final RayTraceResult target = rayTrace(w, p, RayTraceContext.FluidMode.ANY); + final HitResult target = rayTrace(w, p, RayTraceContext.FluidMode.ANY); - if (target.getType() != RayTraceResult.Type.BLOCK) { + if (target.getType() != HitResult.Type.BLOCK) { return new TypedActionResult<>(ActionResult.FAIL, p.getHeldItem(hand)); } else { BlockPos pos = ((BlockRayTraceResult) target).getPos(); diff --git a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java index 76d093f2f..5ea587d50 100644 --- a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java +++ b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java @@ -22,7 +22,10 @@ import java.util.List; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.fabricmc.api.EnvType; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -31,25 +34,22 @@ import net.minecraft.entity.passive.SheepEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.EntityRayTraceResult; import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.IItemHandler; +import net.fabricmc.api.Environment; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -92,9 +92,9 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< super(AEConfig.instance().getMatterCannonBattery(), props); } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override - public void addInformation(final ItemStack stack, final World world, final List lines, + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { super.addInformation(stack, world, lines, advancedTooltips); @@ -176,7 +176,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< private void shootPaintBalls(final ItemStack type, final World w, final PlayerEntity p, final Vec3d Vec3d, final Vec3d Vec3d1, final Vec3d direction, final double d0, final double d1, final double d2) { - final AxisAlignedBB bb = new AxisAlignedBB(Math.min(Vec3d.x, Vec3d1.x), Math.min(Vec3d.y, Vec3d1.y), + final Box bb = new Box(Math.min(Vec3d.x, Vec3d1.x), Math.min(Vec3d.y, Vec3d1.y), Math.min(Vec3d.z, Vec3d1.z), Math.max(Vec3d.x, Vec3d1.x), Math.max(Vec3d.y, Vec3d1.y), Math.max(Vec3d.z, Vec3d1.z)).grow(16, 16, 16); @@ -197,7 +197,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< final float f1 = 0.3F; - final AxisAlignedBB boundingBox = entity1.getBoundingBox().grow(f1, f1, f1); + final Box boundingBox = entity1.getBoundingBox().grow(f1, f1, f1); final Vec3d intersection = boundingBox.rayTrace(Vec3d, Vec3d1).orElse(null); if (intersection != null) { @@ -215,26 +215,26 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< RayTraceContext rayTraceContext = new RayTraceContext(Vec3d, Vec3d1, RayTraceContext.BlockMode.COLLIDER, RayTraceContext.FluidMode.NONE, p); - RayTraceResult pos = w.rayTraceBlocks(rayTraceContext); + HitResult pos = w.rayTraceBlocks(rayTraceContext); final Vec3d vec = new Vec3d(d0, d1, d2); - if (entity != null && pos.getType() != RayTraceResult.Type.MISS + if (entity != null && pos.getType() != HitResult.Type.MISS && pos.getHitVec().squareDistanceTo(vec) > closest) { pos = new EntityRayTraceResult(entity, entityIntersection); - } else if (entity != null && pos.getType() == RayTraceResult.Type.MISS) { + } else if (entity != null && pos.getType() == HitResult.Type.MISS) { pos = new EntityRayTraceResult(entity, entityIntersection); } try { AppEng.proxy.sendToAllNearExcept(null, d0, d1, d2, 128, w, new MatterCannonPacket(d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, - (byte) (pos.getType() == RayTraceResult.Type.MISS ? 32 + (byte) (pos.getType() == HitResult.Type.MISS ? 32 : pos.getHitVec().squareDistanceTo(vec) + 1))); } catch (final Exception err) { AELog.debug(err); } - if (pos.getType() != RayTraceResult.Type.MISS && type != null && type.getItem() instanceof PaintBallItem) { + if (pos.getType() != HitResult.Type.MISS && type != null && type.getItem() instanceof PaintBallItem) { final PaintBallItem ipb = (PaintBallItem) type.getItem(); final AEColor col = ipb.getColor(); @@ -271,7 +271,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< }); } - final TileEntity te = w.getTileEntity(hitPos); + final BlockEntity te = w.getTileEntity(hitPos); if (te instanceof PaintSplotchesTileEntity) { final Vec3d hp = pos.getHitVec().subtract(hitPos.getX(), hitPos.getY(), hitPos.getZ()); ((PaintSplotchesTileEntity) te).addBlot(type, side.getOpposite(), hp); @@ -286,7 +286,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< while (penetration > 0 && hasDestroyed) { hasDestroyed = false; - final AxisAlignedBB bb = new AxisAlignedBB(Math.min(Vec3d.x, Vec3d1.x), Math.min(Vec3d.y, Vec3d1.y), + final Box bb = new Box(Math.min(Vec3d.x, Vec3d1.x), Math.min(Vec3d.y, Vec3d1.y), Math.min(Vec3d.z, Vec3d1.z), Math.max(Vec3d.x, Vec3d1.x), Math.max(Vec3d.y, Vec3d1.y), Math.max(Vec3d.z, Vec3d1.z)).grow(16, 16, 16); @@ -307,7 +307,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< final float f1 = 0.3F; - final AxisAlignedBB boundingBox = entity1.getBoundingBox().grow(f1, f1, f1); + final Box boundingBox = entity1.getBoundingBox().grow(f1, f1, f1); final Vec3d intersection = boundingBox.rayTrace(Vec3d, Vec3d1).orElse(null); if (intersection != null) { @@ -326,24 +326,24 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< RayTraceContext rayTraceContext = new RayTraceContext(Vec3d, Vec3d1, RayTraceContext.BlockMode.COLLIDER, RayTraceContext.FluidMode.NONE, p); final Vec3d vec = new Vec3d(d0, d1, d2); - RayTraceResult pos = w.rayTraceBlocks(rayTraceContext); - if (entity != null && pos.getType() != RayTraceResult.Type.MISS + HitResult pos = w.rayTraceBlocks(rayTraceContext); + if (entity != null && pos.getType() != HitResult.Type.MISS && pos.getHitVec().squareDistanceTo(vec) > closest) { pos = new EntityRayTraceResult(entity, entityIntersection); - } else if (entity != null && pos.getType() == RayTraceResult.Type.MISS) { + } else if (entity != null && pos.getType() == HitResult.Type.MISS) { pos = new EntityRayTraceResult(entity, entityIntersection); } try { AppEng.proxy.sendToAllNearExcept(null, d0, d1, d2, 128, w, new MatterCannonPacket(d0, d1, d2, (float) direction.x, (float) direction.y, - (float) direction.z, (byte) (pos.getType() == RayTraceResult.Type.MISS ? 32 + (float) direction.z, (byte) (pos.getType() == HitResult.Type.MISS ? 32 : pos.getHitVec().squareDistanceTo(vec) + 1))); } catch (final Exception err) { AELog.debug(err); } - if (pos.getType() != RayTraceResult.Type.MISS) { + if (pos.getType() != HitResult.Type.MISS) { final DamageSource dmgSrc = new EntityDamageSource("matter_cannon", p); if (pos instanceof EntityRayTraceResult) { @@ -398,12 +398,12 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell< } @Override - public IItemHandler getUpgradesInventory(final ItemStack is) { + public ItemTransferable getUpgradesInventory(final ItemStack is) { return new CellUpgrades(is, 4); } @Override - public IItemHandler getConfigInventory(final ItemStack is) { + public ItemTransferable getConfigInventory(final ItemStack is) { return new CellConfig(is); } diff --git a/src/main/java/appeng/items/tools/powered/PortableCellItem.java b/src/main/java/appeng/items/tools/powered/PortableCellItem.java index 35dcad66b..72230d3d2 100644 --- a/src/main/java/appeng/items/tools/powered/PortableCellItem.java +++ b/src/main/java/appeng/items/tools/powered/PortableCellItem.java @@ -29,11 +29,11 @@ import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.IItemHandler; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.AEApi; import appeng.api.config.FuzzyMode; @@ -67,8 +67,8 @@ public class PortableCellItem extends AEBasePoweredItem implements IStorageCell< } @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(final ItemStack stack, final World world, final List lines, + @Environment(EnvType.CLIENT) + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { super.addInformation(stack, world, lines, advancedTooltips); @@ -129,12 +129,12 @@ public class PortableCellItem extends AEBasePoweredItem implements IStorageCell< } @Override - public IItemHandler getUpgradesInventory(final ItemStack is) { + public ItemTransferable getUpgradesInventory(final ItemStack is) { return new CellUpgrades(is, 2); } @Override - public IItemHandler getConfigInventory(final ItemStack is) { + public ItemTransferable getConfigInventory(final ItemStack is) { return new CellConfig(is); } diff --git a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java index 197a033a7..1ed7cc66e 100644 --- a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java +++ b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java @@ -20,19 +20,19 @@ package appeng.items.tools.powered; import java.util.List; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.text.TranslatableText; import net.minecraft.util.TypedActionResult; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.Text; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -60,8 +60,8 @@ public class WirelessTerminalItem extends AEBasePoweredItem implements IWireless } @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(final ItemStack stack, final World world, final List lines, + @Environment(EnvType.CLIENT) + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { super.addInformation(stack, world, lines, advancedTooltips); @@ -77,7 +77,7 @@ public class WirelessTerminalItem extends AEBasePoweredItem implements IWireless } } } else { - lines.add(new TranslationTextComponent("AppEng.GuiITooltip.Unlinked")); + lines.add(new TranslatableText("AppEng.GuiITooltip.Unlinked")); } } diff --git a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java index 610e6083b..1cfefc8f5 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java @@ -22,16 +22,16 @@ import java.text.MessageFormat; import java.util.List; import java.util.function.DoubleSupplier; +import net.fabricmc.api.Environment; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.text.TranslatableText; import net.minecraft.util.NonNullList; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.Text; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import net.minecraftforge.common.capabilities.ICapabilityProvider; import appeng.api.config.AccessRestriction; @@ -53,9 +53,9 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow this.powerCapacity = powerCapacity; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Override - public void addInformation(final ItemStack stack, final World world, final List lines, + public void addInformation(final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips) { final CompoundTag tag = stack.getTag(); double internalCurrentPower = 0; @@ -69,7 +69,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow lines.add(GuiText.StoredEnergy.textComponent() .appendText(':' + MessageFormat.format(" {0,number,#} ", internalCurrentPower)) - .appendSibling(new TranslationTextComponent(PowerUnits.AE.unlocalizedName)) + .appendSibling(new TranslatableText(PowerUnits.AE.unlocalizedName)) .appendText(" - " + MessageFormat.format(" {0,number,#.##%} ", percent))); } diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 34a8eb7cf..0c90cb68e 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -27,10 +27,10 @@ import java.util.EnumSet; import java.util.List; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.World; import appeng.api.exceptions.FailedConnectionException; @@ -246,7 +246,7 @@ public class GridNode implements IGridNode, IPathItem { } @Override - public IWorld getWorld() { + public WorldAccess getWorld() { return this.gridProxy.getLocation().getWorld(); } @@ -423,10 +423,10 @@ public class GridNode implements IGridNode, IPathItem { } } - private IGridHost findGridHost(final IWorld world, final int x, final int y, final int z) { + private IGridHost findGridHost(final WorldAccess world, final int x, final int y, final int z) { final BlockPos pos = new BlockPos(x, y, z); if (world.isBlockLoaded(pos)) { - final TileEntity te = world.getTileEntity(pos); + final BlockEntity te = world.getTileEntity(pos); if (te instanceof IGridHost) { return (IGridHost) te; } diff --git a/src/main/java/appeng/me/cluster/MBCalculator.java b/src/main/java/appeng/me/cluster/MBCalculator.java index b9f01f095..c883896ef 100644 --- a/src/main/java/appeng/me/cluster/MBCalculator.java +++ b/src/main/java/appeng/me/cluster/MBCalculator.java @@ -18,7 +18,7 @@ package appeng.me.cluster; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -158,7 +158,7 @@ public abstract class MBCalculator { * * @return true if tile entity is valid for structure */ - public abstract boolean isValidTile(TileEntity te); + public abstract boolean isValidTile(BlockEntity te); private boolean verifyUnownedRegionInner(final World w, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, final AEPartLocation side) { @@ -194,7 +194,7 @@ public abstract class MBCalculator { for (int x = minX; x <= maxX; x++) { for (int y = minY; y <= maxY; y++) { for (int z = minZ; z <= maxZ; z++) { - final TileEntity te = w.getTileEntity(new BlockPos(x, y, z)); + final BlockEntity te = w.getTileEntity(new BlockPos(x, y, z)); if (this.isValidTile(te)) { return true; } diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java index 887f0a97d..8614e158a 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java @@ -20,7 +20,7 @@ package appeng.me.cluster.implementations; import java.util.Iterator; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -125,7 +125,7 @@ public class CraftingCPUCalculator extends MBCalculator { } @Override - public boolean isValidTile(final TileEntity te) { + public boolean isValidTile(final BlockEntity te) { return te instanceof CraftingTileEntity; } } diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index f72cbc8df..e511def8d 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -32,9 +32,9 @@ import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListNBT; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.fml.hooks.BasicEventHooks; import appeng.api.AEApi; @@ -92,7 +92,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { private final List status = new ArrayList<>(); private final HashMap, Object> listeners = new HashMap<>(); private ICraftingLink myLastLink; - private ITextComponent myName = null; + private Text myName = null; private boolean isDestroyed = false; /** * crafting job info @@ -834,7 +834,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } @Override - public ITextComponent getName() { + public Text getName() { return this.myName; } diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java index b3b50821a..f142428c2 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java @@ -18,7 +18,7 @@ package appeng.me.cluster.implementations; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; @@ -131,7 +131,7 @@ public class QuantumCalculator extends MBCalculator { } @Override - public boolean isValidTile(final TileEntity te) { + public boolean isValidTile(final BlockEntity te) { return te instanceof QuantumBridgeTileEntity; } diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 59ca9a572..9aa622ffd 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -20,7 +20,7 @@ package appeng.me.cluster.implementations; import java.util.Iterator; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; @@ -165,7 +165,7 @@ public class QuantumCluster implements ILocatable, IAECluster { final DimensionType id = theWorld.dimension.getType(); final World cur = theWorld.getServer().getWorld(id); - final TileEntity te = theWorld.getTileEntity(qc.center.getPos()); + final BlockEntity te = theWorld.getTileEntity(qc.center.getPos()); return te != qc.center || theWorld != cur; } } diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java index 3ebef2058..b593dbb55 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java @@ -18,7 +18,7 @@ package appeng.me.cluster.implementations; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -90,7 +90,7 @@ public class SpatialPylonCalculator extends MBCalculator { } @Override - public boolean isValidTile(final TileEntity te) { + public boolean isValidTile(final BlockEntity te) { return te instanceof SpatialPylonTileEntity; } } diff --git a/src/main/java/appeng/me/storage/AbstractCellInventory.java b/src/main/java/appeng/me/storage/AbstractCellInventory.java index da5e1b950..5dfb95692 100644 --- a/src/main/java/appeng/me/storage/AbstractCellInventory.java +++ b/src/main/java/appeng/me/storage/AbstractCellInventory.java @@ -18,9 +18,9 @@ package appeng.me.storage; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraftforge.items.IItemHandler; import appeng.api.config.FuzzyMode; import appeng.api.implementations.items.IStorageCell; @@ -212,12 +212,12 @@ public abstract class AbstractCellInventory> implements IC } @Override - public IItemHandler getConfigInventory() { + public ItemTransferable getConfigInventory() { return this.cellType.getConfigInventory(this.i); } @Override - public IItemHandler getUpgradesInventory() { + public ItemTransferable getUpgradesInventory() { return this.cellType.getUpgradesInventory(this.i); } diff --git a/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java b/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java index e953734b5..fb2eb1ad9 100644 --- a/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java +++ b/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java @@ -18,9 +18,9 @@ package appeng.me.storage; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraftforge.items.IItemHandler; import appeng.api.config.FuzzyMode; import appeng.api.config.IncludeExclude; @@ -49,8 +49,8 @@ public class BasicCellInventoryHandler> extends MEInventor if (ci != null) { final IItemList priorityList = channel.createList(); - final IItemHandler upgrades = ci.getUpgradesInventory(); - final IItemHandler config = ci.getConfigInventory(); + final ItemTransferable upgrades = ci.getUpgradesInventory(); + final ItemTransferable config = ci.getConfigInventory(); final FuzzyMode fzMode = ci.getFuzzyMode(); boolean hasInverter = false; diff --git a/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java b/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java index b578426da..42063662b 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java +++ b/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java @@ -26,8 +26,8 @@ import java.util.Map.Entry; import java.util.NavigableMap; import java.util.concurrent.ConcurrentSkipListMap; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; import appeng.api.AEApi; @@ -90,7 +90,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki @Override public IAEFluidStack extractItems(final IAEFluidStack request, final Actionable type, final IActionSource src) { - final FluidStack removed = this.handler.drain(request.getFluidStack(), type.getFluidAction()); + final FluidVolume removed = this.handler.drain(request.getFluidStack(), type.getFluidAction()); if (removed.isEmpty() || removed.getAmount() == 0) { return null; @@ -123,18 +123,18 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki final CachedFluidStack old = this.memory.get(tank); high = Math.max(high, tank); - FluidStack newIS = this.handler.getFluidInTank(tank); + FluidVolume newIS = this.handler.getFluidInTank(tank); if (!newIS.isEmpty() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY) { // We have to actually check if we could extract _anything_ if (this.handler.drain(1, IFluidHandler.FluidAction.SIMULATE).isEmpty()) { // Just to safeguard against tanks that prevent non-bucket-size extractions if (this.handler.drain(FluidAttributes.BUCKET_VOLUME, IFluidHandler.FluidAction.SIMULATE) .isEmpty()) { - newIS = FluidStack.EMPTY; + newIS = FluidVolume.EMPTY; } } } - final FluidStack oldIS = old == null ? FluidStack.EMPTY : old.fluidStack; + final FluidVolume oldIS = old == null ? FluidVolume.EMPTY : old.fluidStack; if (isDifferent(newIS, oldIS)) { final CachedFluidStack cis = new CachedFluidStack(newIS); @@ -199,7 +199,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki return changed ? TickRateModulation.URGENT : TickRateModulation.SLOWER; } - private static boolean isDifferent(FluidStack a, FluidStack b) { + private static boolean isDifferent(FluidVolume a, FluidVolume b) { if (a == b) { return false; } @@ -288,12 +288,12 @@ public class MEMonitorIFluidHandler implements IMEMonitor, ITicki private static class CachedFluidStack { - private final FluidStack fluidStack; + private final FluidVolume fluidStack; private final IAEFluidStack aeStack; - CachedFluidStack(final FluidStack is) { + CachedFluidStack(final FluidVolume is) { if (is.isEmpty()) { - this.fluidStack = FluidStack.EMPTY; + this.fluidStack = FluidVolume.EMPTY; this.aeStack = null; } else { this.fluidStack = is.copy(); diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index f312e6350..dad154ec7 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -27,6 +27,8 @@ import java.util.Random; import com.google.common.base.Preconditions; +import net.fabricmc.api.EnvType; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -34,18 +36,16 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.IItemHandler; +import net.fabricmc.api.Environment; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.AEApi; import appeng.api.config.Upgrades; @@ -80,7 +80,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, private final AENetworkProxy proxy; private final ItemStack is; - private TileEntity tile = null; + private BlockEntity tile = null; private IPartHost host = null; private AEPartLocation side = null; @@ -144,7 +144,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - public TileEntity getTile() { + public BlockEntity getTile() { return this.tile; } @@ -173,7 +173,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - public ITextComponent getCustomInventoryName() { + public Text getCustomInventoryName() { return this.getItemStack().getDisplayName(); } @@ -232,12 +232,12 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - public void writeToStream(final PacketBuffer data) throws IOException { + public void writeToStream(final PacketByteBuf data) throws IOException { } @Override - public boolean readFromStream(final PacketBuffer data) throws IOException { + public boolean readFromStream(final PacketByteBuf data) throws IOException { return false; } @@ -262,7 +262,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - public void setPartHostInfo(final AEPartLocation side, final IPartHost host, final TileEntity tile) { + public void setPartHostInfo(final AEPartLocation side, final IPartHost host, final BlockEntity tile) { this.setSide(side); this.tile = tile; this.host = host; @@ -274,7 +274,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void animateTick(final World world, final BlockPos pos, final Random r) { } @@ -305,7 +305,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { return null; } @@ -329,7 +329,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, pHost.setPriority(compound.getInt("priority")); } - final IItemHandler inv = this.getInventoryByName("config"); + final ItemTransferable inv = this.getInventoryByName("config"); if (inv instanceof AppEngInternalAEInventory) { final AppEngInternalAEInventory target = (AppEngInternalAEInventory) inv; final AppEngInternalAEInventory tmp = new AppEngInternalAEInventory(null, target.getSlots()); @@ -360,7 +360,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, output.putInt("priority", pHost.getPriority()); } - final IItemHandler inv = this.getInventoryByName("config"); + final ItemTransferable inv = this.getInventoryByName("config"); if (inv instanceof AppEngInternalAEInventory) { ((AppEngInternalAEInventory) inv).writeToNBT(output, "config"); } diff --git a/src/main/java/appeng/parts/BasicStatePart.java b/src/main/java/appeng/parts/BasicStatePart.java index 324ce93ee..2de52401f 100644 --- a/src/main/java/appeng/parts/BasicStatePart.java +++ b/src/main/java/appeng/parts/BasicStatePart.java @@ -21,7 +21,7 @@ package appeng.parts; import java.io.IOException; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import appeng.api.implementations.IPowerChannelState; import appeng.api.networking.GridFlags; @@ -53,7 +53,7 @@ public abstract class BasicStatePart extends AEBasePart implements IPowerChannel } @Override - public void writeToStream(final PacketBuffer data) throws IOException { + public void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); this.setClientFlags(0); @@ -80,7 +80,7 @@ public abstract class BasicStatePart extends AEBasePart implements IPowerChannel } @Override - public boolean readFromStream(final PacketBuffer data) throws IOException { + public boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean eh = super.readFromStream(data); final int old = this.getClientFlags(); diff --git a/src/main/java/appeng/parts/BusCollisionHelper.java b/src/main/java/appeng/parts/BusCollisionHelper.java index 9abfa0b27..9d7934220 100644 --- a/src/main/java/appeng/parts/BusCollisionHelper.java +++ b/src/main/java/appeng/parts/BusCollisionHelper.java @@ -20,15 +20,15 @@ package appeng.parts; import java.util.List; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.AxisAlignedBB; import appeng.api.parts.IPartCollisionHelper; import appeng.api.util.AEPartLocation; public class BusCollisionHelper implements IPartCollisionHelper { - private final List boxes; + private final List boxes; private final Direction x; private final Direction y; @@ -36,8 +36,8 @@ public class BusCollisionHelper implements IPartCollisionHelper { private final boolean isVisual; - public BusCollisionHelper(final List boxes, final Direction x, final Direction y, final Direction z, - final boolean visual) { + public BusCollisionHelper(final List boxes, final Direction x, final Direction y, final Direction z, + final boolean visual) { this.boxes = boxes; this.x = x; this.y = y; @@ -45,7 +45,7 @@ public class BusCollisionHelper implements IPartCollisionHelper { this.isVisual = visual; } - public BusCollisionHelper(final List boxes, final AEPartLocation s, final boolean visual) { + public BusCollisionHelper(final List boxes, final AEPartLocation s, final boolean visual) { this.boxes = boxes; this.isVisual = visual; @@ -128,7 +128,7 @@ public class BusCollisionHelper implements IPartCollisionHelper { maxY = Math.max(aY, bY); maxZ = Math.max(aZ, bZ); - this.boxes.add(new AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ)); + this.boxes.add(new Box(minX, minY, minZ, maxX, maxY, maxZ)); } @Override diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index c08dc219c..17a1478c9 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -24,17 +24,17 @@ import java.util.*; import javax.annotation.Nullable; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.shape.VoxelShape; @@ -318,7 +318,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } @Override - public TileEntity getTile() { + public BlockEntity getTile() { return this.tcb.getTile(); } @@ -346,11 +346,11 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I for (final AEPartLocation side : AEPartLocation.values()) { final IPart p = this.getPart(side); if (p != null) { - final List boxes = new ArrayList<>(); + final List boxes = new ArrayList<>(); final IPartCollisionHelper bch = new BusCollisionHelper(boxes, side, true); p.getBoxes(bch); - for (AxisAlignedBB bb : boxes) { + for (Box bb : boxes) { bb = bb.grow(0.002, 0.002, 0.002); if (bb.contains(pos)) { return new SelectedPart(p, side); @@ -364,11 +364,11 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I for (final AEPartLocation side : AEPartLocation.SIDE_LOCATIONS) { final IFacadePart p = fc.getFacade(side); if (p != null) { - final List boxes = new ArrayList<>(); + final List boxes = new ArrayList<>(); final IPartCollisionHelper bch = new BusCollisionHelper(boxes, side, true); p.getBoxes(bch, true); - for (AxisAlignedBB bb : boxes) { + for (Box bb : boxes) { bb = bb.grow(0.01, 0.01, 0.01); if (bb.contains(pos)) { return new SelectedPart(p, side); @@ -401,7 +401,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } if (!facades.isEmpty()) { - final TileEntity te = this.tcb.getTile(); + final BlockEntity te = this.tcb.getTile(); Platform.spawnDrops(te.getWorld(), te.getPos(), facades); } } @@ -458,7 +458,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } private void updateRedstone() { - final TileEntity te = this.getTile(); + final BlockEntity te = this.getTile(); this.hasRedstone = te.getWorld().getRedstonePowerFromNeighbors(te.getPos()) != 0 ? YesNo.YES : YesNo.NO; } @@ -501,7 +501,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I this.inWorld = true; IS_LOADING.set(true); - final TileEntity te = this.getTile(); + final BlockEntity te = this.getTile(); // start with the center, then install the side parts into the grid. for (int x = 6; x >= 0; x--) { @@ -723,7 +723,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return light; } - public void writeToStream(final PacketBuffer data) throws IOException { + public void writeToStream(final PacketByteBuf data) throws IOException { int sides = 0; for (int x = 0; x < 7; x++) { final IPart p = this.getPart(AEPartLocation.fromOrdinal(x)); @@ -748,7 +748,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I this.getFacadeContainer().writeToStream(data); } - public boolean readFromStream(final PacketBuffer data) throws IOException { + public boolean readFromStream(final PacketByteBuf data) throws IOException { final byte sides = data.readByte(); boolean updateBlock = false; @@ -946,7 +946,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I // outgoing connection // point would look too big for other cable types final BlockPos adjacentPos = this.getTile().getPos().offset(facing); - final TileEntity adjacentTe = this.getTile().getWorld().getTileEntity(adjacentPos); + final BlockEntity adjacentTe = this.getTile().getWorld().getTileEntity(adjacentPos); if (adjacentTe instanceof IGridHost) { final IGridHost gridHost = (IGridHost) adjacentTe; @@ -1068,7 +1068,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } private VoxelShape createShape(boolean forCollision, boolean forLivingEntity) { - final List boxes = new ArrayList<>(); + final List boxes = new ArrayList<>(); final IFacadeContainer fc = this.getFacadeContainer(); for (final AEPartLocation s : AEPartLocation.values()) { @@ -1090,7 +1090,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } VoxelShape shape = VoxelShapes.empty(); - for (final AxisAlignedBB bx : boxes) { + for (final Box bx : boxes) { shape = VoxelShapes.or(shape, VoxelShapes.create(bx)); } return shape; diff --git a/src/main/java/appeng/parts/ICableBusContainer.java b/src/main/java/appeng/parts/ICableBusContainer.java index 4eade0951..bbf1683f0 100644 --- a/src/main/java/appeng/parts/ICableBusContainer.java +++ b/src/main/java/appeng/parts/ICableBusContainer.java @@ -21,6 +21,7 @@ package appeng.parts; import java.util.EnumSet; import java.util.Random; +import net.fabricmc.api.EnvType; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -30,8 +31,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.Environment; import appeng.api.parts.SelectedPart; import appeng.api.util.AEColor; @@ -61,7 +61,7 @@ public interface ICableBusContainer { boolean isLadder(LivingEntity entity); - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) void animateTick(World world, BlockPos pos, Random r); int getLightValue(); diff --git a/src/main/java/appeng/parts/PartModel.java b/src/main/java/appeng/parts/PartModel.java index f9595b0f9..5ee4cee76 100644 --- a/src/main/java/appeng/parts/PartModel.java +++ b/src/main/java/appeng/parts/PartModel.java @@ -22,36 +22,36 @@ import java.util.List; import com.google.common.collect.ImmutableList; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; public class PartModel implements IPartModel { private final boolean isSolid; - private final List resources; + private final List resources; - public PartModel(ResourceLocation resource) { + public PartModel(Identifier resource) { this(true, resource); } - public PartModel(ResourceLocation... resources) { + public PartModel(Identifier... resources) { this(true, resources); } - public PartModel(boolean isSolid, ResourceLocation resource) { + public PartModel(boolean isSolid, Identifier resource) { this(isSolid, ImmutableList.of(resource)); } - public PartModel(boolean isSolid, ResourceLocation... resources) { + public PartModel(boolean isSolid, Identifier... resources) { this(isSolid, ImmutableList.copyOf(resources)); } - public PartModel(List resources) { + public PartModel(List resources) { this(true, resources); } - public PartModel(boolean isSolid, List resources) { + public PartModel(boolean isSolid, List resources) { this.isSolid = isSolid; this.resources = resources; } @@ -62,7 +62,7 @@ public class PartModel implements IPartModel { } @Override - public List getModels() { + public List getModels() { return this.resources; } diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 76e98a7f0..f29d981ce 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -32,7 +32,7 @@ import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.DirectionalPlaceContext; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; @@ -40,7 +40,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -91,7 +91,7 @@ public class PartPlacement { return ActionResult.FAIL; } - final TileEntity tile = world.getTileEntity(pos); + final BlockEntity tile = world.getTileEntity(pos); IPartHost host = null; if (tile instanceof IPartHost) { @@ -100,7 +100,7 @@ public class PartPlacement { if (host != null) { if (!world.isRemote) { - if (mop.getType() == RayTraceResult.Type.BLOCK) { + if (mop.getType() == HitResult.Type.BLOCK) { final List is = new ArrayList<>(); final SelectedPart sp = selectPart(player, host, mop.getHitVec().add(-mop.getPos().getX(), -mop.getPos().getY(), -mop.getPos().getZ())); @@ -136,7 +136,7 @@ public class PartPlacement { return ActionResult.FAIL; } - TileEntity tile = world.getTileEntity(pos); + BlockEntity tile = world.getTileEntity(pos); IPartHost host = null; if (tile instanceof IPartHost) { @@ -181,7 +181,7 @@ public class PartPlacement { if (held.isEmpty()) { if (host != null && player.isCrouching() && world.isAirBlock(pos)) { - if (mop.getType() == RayTraceResult.Type.BLOCK) { + if (mop.getType() == HitResult.Type.BLOCK) { Vec3d hitVec = mop.getHitVec().add(-mop.getPos().getX(), -mop.getPos().getY(), -mop.getPos().getZ()); final SelectedPart sPart = selectPart(player, host, hitVec); @@ -284,7 +284,7 @@ public class PartPlacement { } if (!world.isRemote) { - if (mop.getType() != RayTraceResult.Type.MISS) { + if (mop.getType() != HitResult.Type.MISS) { final SelectedPart sp = selectPart(player, host, mop.getHitVec().add(-mop.getPos().getX(), -mop.getPos().getY(), -mop.getPos().getZ())); @@ -363,7 +363,7 @@ public class PartPlacement { if (event instanceof PlayerInteractEvent.RightClickEmpty && event.getPlayer().world.isRemote) { // re-check to see if this event was already channeled, cause these two events // are really stupid... - final RayTraceResult mop = Platform.rayTrace(event.getPlayer(), true, false); + final HitResult mop = Platform.rayTrace(event.getPlayer(), true, false); final Minecraft mc = Minecraft.getInstance(); final float f = 1.0F; @@ -374,7 +374,7 @@ public class PartPlacement { BlockRayTraceResult brtr = (BlockRayTraceResult) mop; final World w = event.getEntity().world; - final TileEntity te = w.getTileEntity(brtr.getPos()); + final BlockEntity te = w.getTileEntity(brtr.getPos()); if (te instanceof IPartHost && this.wasCanceled) { event.setCanceled(true); } diff --git a/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java b/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java index 92481971d..c59363458 100644 --- a/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java +++ b/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java @@ -3,7 +3,7 @@ package appeng.parts.automation; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; @@ -71,7 +71,7 @@ public abstract class AbstractFormationPlanePart> extends final IPartHost host = this.getHost(); if (host != null) { - final TileEntity te = host.getTile(); + final BlockEntity te = host.getTile(); final BlockPos pos = te.getPos(); @@ -137,7 +137,7 @@ public abstract class AbstractFormationPlanePart> extends final IPartHost host = this.getHost(); if (host != null) { - final TileEntity te = host.getTile(); + final BlockEntity te = host.getTile(); final BlockPos pos = te.getPos(); @@ -166,7 +166,7 @@ public abstract class AbstractFormationPlanePart> extends @Override public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { if (pos.offset(this.getSide().getFacing()).equals(neighbor)) { - final TileEntity te = this.getHost().getTile(); + final BlockEntity te = this.getHost().getTile(); final AEPartLocation side = this.getSide(); final BlockPos tePos = te.getPos().offset(side.getFacing()); @@ -180,7 +180,7 @@ public abstract class AbstractFormationPlanePart> extends return 1; } - protected boolean isTransitionPlane(final TileEntity blockTileEntity, final AEPartLocation side) { + protected boolean isTransitionPlane(final BlockEntity blockTileEntity, final AEPartLocation side) { if (blockTileEntity instanceof IPartHost) { final IPart p = ((IPartHost) blockTileEntity).getPart(side); return p != null && this.getClass() == p.getClass(); diff --git a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java index a24583cdf..a3be72325 100644 --- a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java +++ b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java @@ -26,6 +26,7 @@ import javax.annotation.Nonnull; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.Item; @@ -34,14 +35,13 @@ import net.minecraft.item.Items; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.common.ToolType; import net.minecraftforge.common.util.FakePlayerFactory; @@ -82,7 +82,7 @@ import appeng.util.item.AEItemStack; public class AnnihilationPlanePart extends BasicStatePart implements IGridTickable, IWorldCallable { - public static final ResourceLocation TAG_BLACKLIST = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier TAG_BLACKLIST = new Identifier(AppEng.MOD_ID, "blacklisted/annihilation_plane"); private static final PlaneModels MODELS = new PlaneModels("part/annihilation_plane", "part/annihilation_plane_on"); @@ -115,7 +115,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab final IPartHost host = this.getHost(); if (host != null) { - final TileEntity te = host.getTile(); + final BlockEntity te = host.getTile(); final BlockPos pos = te.getPos(); @@ -187,7 +187,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab final IPartHost host = this.getHost(); if (host != null) { - final TileEntity te = host.getTile(); + final BlockEntity te = host.getTile(); final BlockPos pos = te.getPos(); @@ -362,7 +362,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab return changed; } - protected boolean isAnnihilationPlane(final TileEntity blockTileEntity, final AEPartLocation side) { + protected boolean isAnnihilationPlane(final BlockEntity blockTileEntity, final AEPartLocation side) { if (blockTileEntity instanceof IPartHost) { final IPart p = ((IPartHost) blockTileEntity).getPart(side); return p != null && p.getClass() == this.getClass(); @@ -387,7 +387,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab private TickRateModulation breakBlock(final boolean modulate) { if (this.isAccepting && this.getProxy().isActive()) { try { - final TileEntity te = this.getTile(); + final BlockEntity te = this.getTile(); final ServerWorld w = (ServerWorld) te.getWorld(); final BlockPos pos = te.getPos().offset(this.getSide().getFacing()); @@ -502,7 +502,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab } } - TileEntity te = w.getTileEntity(pos); + BlockEntity te = w.getTileEntity(pos); return Block.getDrops(state, w, pos, te, fakePlayer, harvestTool); } @@ -564,7 +564,7 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab // This handles items that do not spawn via loot-tables but rather normal block // breaking // i.e. our cable-buses do this (bad practice, really) - final AxisAlignedBB box = new AxisAlignedBB(pos).grow(0.2); + final Box box = new Box(pos).grow(0.2); for (final Object ei : w.getEntitiesWithinAABB(ItemEntity.class, box)) { if (ei instanceof ItemEntity) { final ItemEntity entityItem = (ItemEntity) ei; diff --git a/src/main/java/appeng/parts/automation/ExportBusPart.java b/src/main/java/appeng/parts/automation/ExportBusPart.java index 1d737ad43..0c7ec8302 100644 --- a/src/main/java/appeng/parts/automation/ExportBusPart.java +++ b/src/main/java/appeng/parts/automation/ExportBusPart.java @@ -25,7 +25,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; import appeng.api.AEApi; @@ -70,19 +70,19 @@ import appeng.util.item.AEItemStack; public class ExportBusPart extends SharedItemBusPart implements ICraftingRequester { - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/export_bus_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/export_bus_base"); @PartModels public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/export_bus_off")); + new Identifier(AppEng.MOD_ID, "part/export_bus_off")); @PartModels public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/export_bus_on")); + new Identifier(AppEng.MOD_ID, "part/export_bus_on")); @PartModels public static final IPartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/export_bus_has_channel")); + new Identifier(AppEng.MOD_ID, "part/export_bus_has_channel")); private final MultiCraftingTracker craftingTracker = new MultiCraftingTracker(this, 9); private final IActionSource mySrc; diff --git a/src/main/java/appeng/parts/automation/FormationPlanePart.java b/src/main/java/appeng/parts/automation/FormationPlanePart.java index 78d9858f3..d7f061714 100644 --- a/src/main/java/appeng/parts/automation/FormationPlanePart.java +++ b/src/main/java/appeng/parts/automation/FormationPlanePart.java @@ -25,6 +25,7 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; @@ -38,19 +39,18 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.item.WallOrFloorItem; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.common.IPlantable; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.AEApi; import appeng.api.config.AccessRestriction; @@ -140,8 +140,8 @@ public class FormationPlanePart extends AbstractFormationPlanePart } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { super.onChangeInventory(inv, slot, mc, removedStack, newStack); if (inv == this.Config) { @@ -163,7 +163,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("config")) { return this.Config; } @@ -215,7 +215,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart long maxStorage = Math.min(input.getStackSize(), is.getMaxStackSize()); boolean worked = false; - final TileEntity te = this.getHost().getTile(); + final BlockEntity te = this.getHost().getTile(); final World w = te.getWorld(); final AEPartLocation side = this.getSide(); @@ -358,7 +358,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart } private int countEntitesAround(World world, BlockPos pos) { - final AxisAlignedBB t = new AxisAlignedBB(pos).grow(8); + final Box t = new Box(pos).grow(8); final List list = world.getEntitiesWithinAABB(Entity.class, t); return list.size(); diff --git a/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java b/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java index cb187f5e0..f20305bde 100644 --- a/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java +++ b/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java @@ -25,12 +25,12 @@ import javax.annotation.Nonnull; import com.google.common.collect.ImmutableMap; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.client.model.data.IModelData; import appeng.api.parts.IPart; @@ -56,7 +56,7 @@ public class IdentityAnnihilationPlanePart extends AnnihilationPlanePart { } @Override - protected boolean isAnnihilationPlane(final TileEntity blockTileEntity, final AEPartLocation side) { + protected boolean isAnnihilationPlane(final BlockEntity blockTileEntity, final AEPartLocation side) { if (blockTileEntity instanceof IPartHost) { final IPart p = ((IPartHost) blockTileEntity).getPart(side); return p != null && p.getClass() == this.getClass(); diff --git a/src/main/java/appeng/parts/automation/ImportBusPart.java b/src/main/java/appeng/parts/automation/ImportBusPart.java index 680974dfc..21e3f8ea3 100644 --- a/src/main/java/appeng/parts/automation/ImportBusPart.java +++ b/src/main/java/appeng/parts/automation/ImportBusPart.java @@ -22,7 +22,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; import appeng.api.AEApi; @@ -60,16 +60,16 @@ import appeng.util.item.AEItemStack; public class ImportBusPart extends SharedItemBusPart implements IInventoryDestination { - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/import_bus_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/import_bus_base"); @PartModels public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/import_bus_off")); + new Identifier(AppEng.MOD_ID, "part/import_bus_off")); @PartModels public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/import_bus_on")); + new Identifier(AppEng.MOD_ID, "part/import_bus_on")); @PartModels public static final IPartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/import_bus_has_channel")); + new Identifier(AppEng.MOD_ID, "part/import_bus_has_channel")); private final IActionSource source; private int itemsToSend; // used in tickingRequest diff --git a/src/main/java/appeng/parts/automation/LevelEmitterPart.java b/src/main/java/appeng/parts/automation/LevelEmitterPart.java index b56725e37..8d9e66304 100644 --- a/src/main/java/appeng/parts/automation/LevelEmitterPart.java +++ b/src/main/java/appeng/parts/automation/LevelEmitterPart.java @@ -21,18 +21,18 @@ package appeng.parts.automation; import java.util.Collection; import java.util.Random; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.particles.RedstoneParticleData; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.FuzzyMode; @@ -86,19 +86,19 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH ICraftingWatcherHost, IMEMonitorHandlerReceiver, ICraftingProvider { @PartModels - public static final ResourceLocation MODEL_BASE_OFF = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_BASE_OFF = new Identifier(AppEng.MOD_ID, "part/level_emitter_base_off"); @PartModels - public static final ResourceLocation MODEL_BASE_ON = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_BASE_ON = new Identifier(AppEng.MOD_ID, "part/level_emitter_base_on"); @PartModels - public static final ResourceLocation MODEL_STATUS_OFF = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_off"); @PartModels - public static final ResourceLocation MODEL_STATUS_ON = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_on"); @PartModels - public static final ResourceLocation MODEL_STATUS_HAS_CHANNEL = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/level_emitter_status_has_channel"); public static final PartModel MODEL_OFF_OFF = new PartModel(MODEL_BASE_OFF, MODEL_STATUS_OFF); @@ -156,7 +156,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH final boolean isOn = this.isLevelEmitterOn(); if (this.prevState != isOn) { this.getHost().markForUpdate(); - final TileEntity te = this.getHost().getTile(); + final BlockEntity te = this.getHost().getTile(); this.prevState = isOn; Platform.notifyBlocksOfNeighbors(te.getWorld(), te.getPos()); Platform.notifyBlocksOfNeighbors(te.getWorld(), te.getPos().offset(this.getSide().getFacing())); @@ -417,8 +417,8 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { if (inv == this.config) { this.configureWatchers(); } @@ -455,7 +455,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("config")) { return this.config; } diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/main/java/appeng/parts/automation/PlaneBakedModel.java index ab35ca25f..573795036 100644 --- a/src/main/java/appeng/parts/automation/PlaneBakedModel.java +++ b/src/main/java/appeng/parts/automation/PlaneBakedModel.java @@ -30,8 +30,8 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.IDynamicBakedModel; diff --git a/src/main/java/appeng/parts/automation/PlaneModel.java b/src/main/java/appeng/parts/automation/PlaneModel.java index 71cd67332..ee277a3c7 100644 --- a/src/main/java/appeng/parts/automation/PlaneModel.java +++ b/src/main/java/appeng/parts/automation/PlaneModel.java @@ -25,15 +25,15 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.IModelTransform; +import net.minecraft.client.render.model.IUnbakedModel; +import net.minecraft.client.render.model.ItemOverrideList; +import net.minecraft.client.render.model.Material; +import net.minecraft.client.render.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -46,7 +46,7 @@ public class PlaneModel implements IModelGeometry { private final Material sidesTexture; private final Material backTexture; - public PlaneModel(ResourceLocation frontTexture, ResourceLocation sidesTexture, ResourceLocation backTexture) { + public PlaneModel(Identifier frontTexture, Identifier sidesTexture, Identifier backTexture) { this.frontTexture = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, frontTexture); this.sidesTexture = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, sidesTexture); this.backTexture = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, backTexture); @@ -55,7 +55,7 @@ public class PlaneModel implements IModelGeometry { @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { + ItemOverrideList overrides, Identifier modelLocation) { TextureAtlasSprite frontSprite = spriteGetter.apply(this.frontTexture); TextureAtlasSprite sidesSprite = spriteGetter.apply(this.sidesTexture); TextureAtlasSprite backSprite = spriteGetter.apply(this.backTexture); @@ -65,7 +65,7 @@ public class PlaneModel implements IModelGeometry { @Override public Collection getTextures(IModelConfiguration owner, - Function modelGetter, Set> missingTextureErrors) { + Function modelGetter, Set> missingTextureErrors) { return Arrays.asList(frontTexture, sidesTexture, backTexture); } diff --git a/src/main/java/appeng/parts/automation/PlaneModelLoader.java b/src/main/java/appeng/parts/automation/PlaneModelLoader.java index 41ff98302..be737f498 100644 --- a/src/main/java/appeng/parts/automation/PlaneModelLoader.java +++ b/src/main/java/appeng/parts/automation/PlaneModelLoader.java @@ -4,7 +4,7 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import net.minecraft.resources.IResourceManager; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.IModelLoader; public class PlaneModelLoader implements IModelLoader { @@ -21,8 +21,8 @@ public class PlaneModelLoader implements IModelLoader { String sidesTexture = modelContents.get("sides").getAsString(); String backTexture = modelContents.get("back").getAsString(); - return new PlaneModel(new ResourceLocation(frontTexture), new ResourceLocation(sidesTexture), - new ResourceLocation(backTexture)); + return new PlaneModel(new Identifier(frontTexture), new Identifier(sidesTexture), + new Identifier(backTexture)); } } diff --git a/src/main/java/appeng/parts/automation/PlaneModels.java b/src/main/java/appeng/parts/automation/PlaneModels.java index ccf9c9ad3..a9e7f8f71 100644 --- a/src/main/java/appeng/parts/automation/PlaneModels.java +++ b/src/main/java/appeng/parts/automation/PlaneModels.java @@ -22,7 +22,7 @@ import java.util.List; import com.google.common.collect.ImmutableList; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AppEng; @@ -34,11 +34,11 @@ import appeng.parts.PartModel; */ public class PlaneModels { - public static final ResourceLocation MODEL_CHASSIS_OFF = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_CHASSIS_OFF = new Identifier(AppEng.MOD_ID, "part/transition_plane_off"); - public static final ResourceLocation MODEL_CHASSIS_ON = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_CHASSIS_ON = new Identifier(AppEng.MOD_ID, "part/transition_plane_on"); - public static final ResourceLocation MODEL_CHASSIS_HAS_CHANNEL = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_CHASSIS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/transition_plane_has_channel"); private final IPartModel modelOff; @@ -48,8 +48,8 @@ public class PlaneModels { private final IPartModel modelHasChannel; public PlaneModels(String planeOffLocation, String planeOnLocation) { - ResourceLocation planeOff = new ResourceLocation(AppEng.MOD_ID, planeOffLocation); - ResourceLocation planeOn = new ResourceLocation(AppEng.MOD_ID, planeOnLocation); + Identifier planeOff = new Identifier(AppEng.MOD_ID, planeOffLocation); + Identifier planeOn = new Identifier(AppEng.MOD_ID, planeOnLocation); this.modelOff = new PartModel(MODEL_CHASSIS_OFF, planeOff); this.modelOn = new PartModel(MODEL_CHASSIS_ON, planeOff); diff --git a/src/main/java/appeng/parts/automation/SharedItemBusPart.java b/src/main/java/appeng/parts/automation/SharedItemBusPart.java index 043803c6c..ca0799e29 100644 --- a/src/main/java/appeng/parts/automation/SharedItemBusPart.java +++ b/src/main/java/appeng/parts/automation/SharedItemBusPart.java @@ -18,13 +18,13 @@ package appeng.parts.automation; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.config.RedstoneMode; import appeng.api.config.Upgrades; @@ -61,7 +61,7 @@ public abstract class SharedItemBusPart extends UpgradeablePart implements IGrid } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("config")) { return this.getConfig(); } @@ -81,13 +81,13 @@ public abstract class SharedItemBusPart extends UpgradeablePart implements IGrid } protected InventoryAdaptor getHandler() { - final TileEntity self = this.getHost().getTile(); - final TileEntity target = this.getTileEntity(self, self.getPos().offset(this.getSide().getFacing())); + final BlockEntity self = this.getHost().getTile(); + final BlockEntity target = this.getTileEntity(self, self.getPos().offset(this.getSide().getFacing())); return InventoryAdaptor.getAdaptor(target, this.getSide().getFacing().getOpposite()); } - private TileEntity getTileEntity(final TileEntity self, final BlockPos pos) { + private BlockEntity getTileEntity(final BlockEntity self, final BlockPos pos) { final World w = self.getWorld(); if (w.getChunkProvider().isChunkLoaded(new ChunkPos(pos))) { @@ -125,7 +125,7 @@ public abstract class SharedItemBusPart extends UpgradeablePart implements IGrid * @return true, if the the bus should do its work. */ protected boolean canDoBusWork() { - final TileEntity self = this.getHost().getTile(); + final BlockEntity self = this.getHost().getTile(); final BlockPos selfPos = self.getPos().offset(this.getSide().getFacing()); final World world = self.getWorld(); diff --git a/src/main/java/appeng/parts/automation/UpgradeInventory.java b/src/main/java/appeng/parts/automation/UpgradeInventory.java index 07a859181..98a7400dc 100644 --- a/src/main/java/appeng/parts/automation/UpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/UpgradeInventory.java @@ -18,11 +18,11 @@ package appeng.parts.automation; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; -import net.minecraftforge.items.IItemHandler; import appeng.api.config.Upgrades; import appeng.api.implementations.items.IUpgradeModule; @@ -136,8 +136,8 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { this.cached = false; if (this.parent != null && Platform.isServer()) { this.parent.onChangeInventory(inv, slot, mc, removedStack, newStack); @@ -147,12 +147,12 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement private class UpgradeInvFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return true; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack itemstack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack itemstack) { if (itemstack.isEmpty()) { return false; } diff --git a/src/main/java/appeng/parts/automation/UpgradeablePart.java b/src/main/java/appeng/parts/automation/UpgradeablePart.java index b17b1841d..7ab16f85c 100644 --- a/src/main/java/appeng/parts/automation/UpgradeablePart.java +++ b/src/main/java/appeng/parts/automation/UpgradeablePart.java @@ -21,7 +21,7 @@ package appeng.parts.automation; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; @@ -53,8 +53,8 @@ public abstract class UpgradeablePart extends BasicStatePart implements IAEAppEn } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { if (inv == this.upgrades) { this.upgradesChanged(); } @@ -134,7 +134,7 @@ public abstract class UpgradeablePart extends BasicStatePart implements IAEAppEn } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("upgrades")) { return this.upgrades; } diff --git a/src/main/java/appeng/parts/misc/CableAnchorPart.java b/src/main/java/appeng/parts/misc/CableAnchorPart.java index 5b614b4d7..2a7c14701 100644 --- a/src/main/java/appeng/parts/misc/CableAnchorPart.java +++ b/src/main/java/appeng/parts/misc/CableAnchorPart.java @@ -27,10 +27,10 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.BlockView; @@ -53,11 +53,11 @@ public class CableAnchorPart implements IPart { @PartModels public static final PartModel DEFAULT_MODELS = new PartModel(false, - new ResourceLocation(AppEng.MOD_ID, "part/cable_anchor")); + new Identifier(AppEng.MOD_ID, "part/cable_anchor")); @PartModels public static final PartModel FACADE_MODELS = new PartModel(false, - new ResourceLocation(AppEng.MOD_ID, "part/cable_anchor_short")); + new Identifier(AppEng.MOD_ID, "part/cable_anchor_short")); private ItemStack is = ItemStack.EMPTY; private IPartHost host = null; @@ -132,12 +132,12 @@ public class CableAnchorPart implements IPart { } @Override - public void writeToStream(final PacketBuffer data) throws IOException { + public void writeToStream(final PacketByteBuf data) throws IOException { } @Override - public boolean readFromStream(final PacketBuffer data) throws IOException { + public boolean readFromStream(final PacketByteBuf data) throws IOException { return false; } @@ -167,7 +167,7 @@ public class CableAnchorPart implements IPart { } @Override - public void setPartHostInfo(final AEPartLocation side, final IPartHost host, final TileEntity tile) { + public void setPartHostInfo(final AEPartLocation side, final IPartHost host, final BlockEntity tile) { this.host = host; this.mySide = side; } diff --git a/src/main/java/appeng/parts/misc/InterfacePart.java b/src/main/java/appeng/parts/misc/InterfacePart.java index 4a506dccb..5ae4ac91c 100644 --- a/src/main/java/appeng/parts/misc/InterfacePart.java +++ b/src/main/java/appeng/parts/misc/InterfacePart.java @@ -21,6 +21,7 @@ package appeng.parts.misc; import java.util.EnumSet; import java.util.List; +import alexiil.mc.lib.attributes.item.ItemTransferable; import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.PlayerEntity; @@ -28,14 +29,13 @@ import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -78,19 +78,19 @@ import appeng.util.inv.InvOperation; public class InterfacePart extends BasicStatePart implements IGridTickable, IStorageMonitorable, IInventoryDestination, IInterfaceHost, IAEAppEngInventory, IPriorityHost { - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/interface_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/interface_base"); @PartModels public static final PartModel MODELS_OFF = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/interface_off")); + new Identifier(AppEng.MOD_ID, "part/interface_off")); @PartModels public static final PartModel MODELS_ON = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/interface_on")); + new Identifier(AppEng.MOD_ID, "part/interface_on")); @PartModels public static final PartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/interface_has_channel")); + new Identifier(AppEng.MOD_ID, "part/interface_has_channel")); private final DualityInterface duality = new DualityInterface(this.getProxy(), this); @@ -159,7 +159,7 @@ public class InterfacePart extends BasicStatePart implements IGridTickable, ISto } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { return this.duality.getInventoryByName(name); } @@ -192,8 +192,8 @@ public class InterfacePart extends BasicStatePart implements IGridTickable, ISto } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { this.duality.onChangeInventory(inv, slot, mc, removedStack, newStack); } @@ -208,7 +208,7 @@ public class InterfacePart extends BasicStatePart implements IGridTickable, ISto } @Override - public TileEntity getTileEntity() { + public BlockEntity getTileEntity() { return super.getHost().getTile(); } diff --git a/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java b/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java index 0c15301c4..ba678ed21 100644 --- a/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java +++ b/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java @@ -19,7 +19,7 @@ package appeng.parts.misc; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AppEng; @@ -29,7 +29,7 @@ import appeng.parts.PartModel; public class InvertedToggleBusPart extends ToggleBusPart { @PartModels - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/inverted_toggle_bus_base"); public static final PartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_STATUS_OFF); diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java index ea53d52f5..00c61147d 100644 --- a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java +++ b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java @@ -25,8 +25,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -52,11 +52,11 @@ import appeng.util.item.AEItemStack; class ItemHandlerAdapter implements IMEInventory, IBaseMonitor, ITickingMonitor { private final Map, Object> listeners = new HashMap<>(); private IActionSource mySource; - private final IItemHandler itemHandler; + private final ItemTransferable itemHandler; private final IGridProxyable proxyable; private final InventoryCache cache; - ItemHandlerAdapter(IItemHandler itemHandler, IGridProxyable proxy) { + ItemHandlerAdapter(ItemTransferable itemHandler, IGridProxyable proxy) { this.itemHandler = itemHandler; this.proxyable = proxy; this.cache = new InventoryCache(this.itemHandler); @@ -220,9 +220,9 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor, IPriorityHost { - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/storage_bus_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/storage_bus_base"); @PartModels public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/storage_bus_off")); + new Identifier(AppEng.MOD_ID, "part/storage_bus_off")); @PartModels public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/storage_bus_on")); + new Identifier(AppEng.MOD_ID, "part/storage_bus_on")); @PartModels public static final IPartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, - new ResourceLocation(AppEng.MOD_ID, "part/storage_bus_has_channel")); + new Identifier(AppEng.MOD_ID, "part/storage_bus_has_channel")); private final IActionSource mySrc; private final AppEngInternalAEInventory Config = new AppEngInternalAEInventory(this, 63); @@ -167,8 +167,8 @@ public class StorageBusPart extends UpgradeablePart } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { super.onChangeInventory(inv, slot, mc, removedStack, newStack); if (inv == this.Config) { @@ -197,7 +197,7 @@ public class StorageBusPart extends UpgradeablePart } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("config")) { return this.Config; } @@ -257,7 +257,7 @@ public class StorageBusPart extends UpgradeablePart @Override public void onNeighborChanged(BlockView w, BlockPos pos, BlockPos neighbor) { if (pos.offset(this.getSide().getFacing()).equals(neighbor)) { - final TileEntity te = w.getTileEntity(neighbor); + final BlockEntity te = w.getTileEntity(neighbor); // In case the TE was destroyed, we have to do a full reset immediately. if (te == null) { @@ -329,7 +329,7 @@ public class StorageBusPart extends UpgradeablePart } } - private IMEInventory getInventoryWrapper(TileEntity target) { + private IMEInventory getInventoryWrapper(BlockEntity target) { Direction targetSide = this.getSide().getFacing().getOpposite(); @@ -355,7 +355,7 @@ public class StorageBusPart extends UpgradeablePart } // Check via cap for IItemHandler - final LazyOptional handlerExtOpt = target + final LazyOptional handlerExtOpt = target .getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide); if (handlerExtOpt.isPresent()) { return new ItemHandlerAdapter(handlerExtOpt.orElse(null), this); @@ -366,7 +366,7 @@ public class StorageBusPart extends UpgradeablePart } // TODO, LazyOptionals are cacheable this might need changing? - private int createHandlerHash(TileEntity target) { + private int createHandlerHash(BlockEntity target) { if (target == null) { return 0; } @@ -380,11 +380,11 @@ public class StorageBusPart extends UpgradeablePart return Objects.hash(target, accessorOpt.orElse(null)); } - final LazyOptional itemHandlerOpt = target + final LazyOptional itemHandlerOpt = target .getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide); if (itemHandlerOpt.isPresent()) { - IItemHandler itemHandler = itemHandlerOpt.orElse(null); + ItemTransferable itemHandler = itemHandlerOpt.orElse(null); return Objects.hash(target, itemHandler, itemHandler.getSlots()); } @@ -399,8 +399,8 @@ public class StorageBusPart extends UpgradeablePart final boolean wasSleeping = this.monitor == null; this.cached = true; - final TileEntity self = this.getHost().getTile(); - final TileEntity target = self.getWorld().getTileEntity(self.getPos().offset(this.getSide().getFacing())); + final BlockEntity self = this.getHost().getTile(); + final BlockEntity target = self.getWorld().getTileEntity(self.getPos().offset(this.getSide().getFacing())); final int newHandlerHash = this.createHandlerHash(target); if (newHandlerHash != 0 && newHandlerHash == this.handlerHash) { @@ -482,7 +482,7 @@ public class StorageBusPart extends UpgradeablePart return this.handler; } - private void checkInterfaceVsStorageBus(final TileEntity target, final AEPartLocation side) { + private void checkInterfaceVsStorageBus(final BlockEntity target, final AEPartLocation side) { IInterfaceHost achievement = null; if (target instanceof IInterfaceHost) { diff --git a/src/main/java/appeng/parts/misc/ToggleBusPart.java b/src/main/java/appeng/parts/misc/ToggleBusPart.java index 8f9cb6fe6..8d3f7a16f 100644 --- a/src/main/java/appeng/parts/misc/ToggleBusPart.java +++ b/src/main/java/appeng/parts/misc/ToggleBusPart.java @@ -23,9 +23,9 @@ import java.util.EnumSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; @@ -49,15 +49,15 @@ import appeng.parts.PartModel; public class ToggleBusPart extends BasicStatePart { @PartModels - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/toggle_bus_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/toggle_bus_base"); @PartModels - public static final ResourceLocation MODEL_STATUS_OFF = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, "part/toggle_bus_status_off"); @PartModels - public static final ResourceLocation MODEL_STATUS_ON = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, "part/toggle_bus_status_on"); @PartModels - public static final ResourceLocation MODEL_STATUS_HAS_CHANNEL = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/toggle_bus_status_has_channel"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_STATUS_OFF); @@ -140,7 +140,7 @@ public class ToggleBusPart extends BasicStatePart { } @Override - public void setPartHostInfo(final AEPartLocation side, final IPartHost host, final TileEntity tile) { + public void setPartHostInfo(final AEPartLocation side, final IPartHost host, final BlockEntity tile) { super.setPartHostInfo(side, host, tile); this.outerProxy.setValidSides(EnumSet.of(side.getFacing())); } diff --git a/src/main/java/appeng/parts/networking/CablePart.java b/src/main/java/appeng/parts/networking/CablePart.java index 3c43b8ff1..4234b13b2 100644 --- a/src/main/java/appeng/parts/networking/CablePart.java +++ b/src/main/java/appeng/parts/networking/CablePart.java @@ -24,7 +24,7 @@ import java.util.EnumSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import appeng.api.AEApi; @@ -238,7 +238,7 @@ public class CablePart extends AEBasePart implements ICablePart { } @Override - public void writeToStream(final PacketBuffer data) throws IOException { + public void writeToStream(final PacketByteBuf data) throws IOException { int flags = 0; boolean[] writeSide = new boolean[Direction.values().length]; int[] channelsPerSide = new int[Direction.values().length]; @@ -288,7 +288,7 @@ public class CablePart extends AEBasePart implements ICablePart { } @Override - public boolean readFromStream(final PacketBuffer data) throws IOException { + public boolean readFromStream(final PacketByteBuf data) throws IOException { int cs = data.readByte(); final EnumSet myC = this.getConnections().clone(); final boolean wasPowered = this.powered; diff --git a/src/main/java/appeng/parts/networking/DenseCablePart.java b/src/main/java/appeng/parts/networking/DenseCablePart.java index a198b1c5f..4a88f1972 100644 --- a/src/main/java/appeng/parts/networking/DenseCablePart.java +++ b/src/main/java/appeng/parts/networking/DenseCablePart.java @@ -18,8 +18,8 @@ package appeng.parts.networking; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import appeng.api.networking.GridFlags; import appeng.api.networking.IGridHost; @@ -114,7 +114,7 @@ public abstract class DenseCablePart extends CablePart { } private boolean isDense(final AEPartLocation of) { - final TileEntity te = this.getTile().getWorld().getTileEntity(this.getTile().getPos().offset(of.getFacing())); + final BlockEntity te = this.getTile().getWorld().getTileEntity(this.getTile().getPos().offset(of.getFacing())); if (te instanceof IGridHost) { final AECableType t = ((IGridHost) te).getCableConnectionType(of.getOpposite()); diff --git a/src/main/java/appeng/parts/networking/QuartzFiberPart.java b/src/main/java/appeng/parts/networking/QuartzFiberPart.java index 4f9d869cc..30c2b13b1 100644 --- a/src/main/java/appeng/parts/networking/QuartzFiberPart.java +++ b/src/main/java/appeng/parts/networking/QuartzFiberPart.java @@ -25,9 +25,9 @@ import java.util.EnumSet; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.config.Actionable; import appeng.api.networking.GridFlags; @@ -49,7 +49,7 @@ import appeng.parts.PartModel; public class QuartzFiberPart extends AEBasePart implements IEnergyGridProvider { @PartModels - private static final IPartModel MODELS = new PartModel(new ResourceLocation(AppEng.MOD_ID, "part/quartz_fiber")); + private static final IPartModel MODELS = new PartModel(new Identifier(AppEng.MOD_ID, "part/quartz_fiber")); private final AENetworkProxy outerProxy = new AENetworkProxy(this, "outer", this.getProxy().getMachineRepresentation(), true); @@ -97,7 +97,7 @@ public class QuartzFiberPart extends AEBasePart implements IEnergyGridProvider { } @Override - public void setPartHostInfo(final AEPartLocation side, final IPartHost host, final TileEntity tile) { + public void setPartHostInfo(final AEPartLocation side, final IPartHost host, final BlockEntity tile) { super.setPartHostInfo(side, host, tile); this.outerProxy.setValidSides(EnumSet.of(side.getFacing())); } diff --git a/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java index aedf5b8b3..a65640cad 100644 --- a/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java @@ -23,8 +23,8 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.energy.IEnergyStorage; @@ -63,8 +63,8 @@ public class FEP2PTunnelPart extends P2PTunnelPart { private IEnergyStorage getAttachedEnergyStorage() { LazyOptional energyStorageOpt = LazyOptional.empty(); if (this.isActive()) { - final TileEntity self = this.getTile(); - final TileEntity te = self.getWorld().getTileEntity(self.getPos().offset(this.getSide().getFacing())); + final BlockEntity self = this.getTile(); + final BlockEntity te = self.getWorld().getTileEntity(self.getPos().offset(this.getSide().getFacing())); if (te != null) { energyStorageOpt = te.getCapability(Capabilities.FORGE_ENERGY, diff --git a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java index 1cff034b1..6f2e35011 100644 --- a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java @@ -26,14 +26,14 @@ import java.util.List; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; @@ -102,8 +102,8 @@ public class FluidP2PTunnelPart extends P2PTunnelPart implem @Override @Nonnull - public FluidStack getFluidInTank(int tank) { - return FluidStack.EMPTY; + public FluidVolume getFluidInTank(int tank) { + return FluidVolume.EMPTY; } @Override @@ -112,12 +112,12 @@ public class FluidP2PTunnelPart extends P2PTunnelPart implem } @Override - public boolean isFluidValid(int tank, @Nonnull FluidStack stack) { + public boolean isFluidValid(int tank, @Nonnull FluidVolume stack) { return false; } @Override - public int fill(FluidStack resource, FluidAction action) { + public int fill(FluidVolume resource, FluidAction action) { final Deque stack = this.getDepth(); @@ -174,7 +174,7 @@ public class FluidP2PTunnelPart extends P2PTunnelPart implem while (i.hasNext() && available > 0) { final FluidP2PTunnelPart l = i.next(); - final FluidStack insert = resource.copy(); + final FluidVolume insert = resource.copy(); insert.setAmount((int) Math.ceil(insert.getAmount() * ((double) l.tmpUsed / (double) requestTotal))); if (insert.getAmount() > available) { insert.setAmount(available); @@ -200,14 +200,14 @@ public class FluidP2PTunnelPart extends P2PTunnelPart implem @Override @Nonnull - public FluidStack drain(FluidStack resource, FluidAction action) { - return FluidStack.EMPTY; + public FluidVolume drain(FluidVolume resource, FluidAction action) { + return FluidVolume.EMPTY; } @Override @Nonnull - public FluidStack drain(int maxDrain, FluidAction action) { - return FluidStack.EMPTY; + public FluidVolume drain(int maxDrain, FluidAction action) { + return FluidVolume.EMPTY; } private Deque getDepth() { @@ -247,7 +247,7 @@ public class FluidP2PTunnelPart extends P2PTunnelPart implem return this.cachedTank; } - final TileEntity te = this.getTile().getWorld() + final BlockEntity te = this.getTile().getWorld() .getTileEntity(this.getTile().getPos().offset(this.getSide().getFacing())); if (te != null && te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, diff --git a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java index 8d8525b93..c69bafc4a 100644 --- a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java @@ -23,15 +23,15 @@ import java.util.List; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; import appeng.api.networking.IGridNode; @@ -50,7 +50,7 @@ import appeng.me.cache.helpers.TunnelCollection; import appeng.util.Platform; import appeng.util.inv.WrapperChainedItemHandler; -public class ItemP2PTunnelPart extends P2PTunnelPart implements IItemHandler, IGridTickable { +public class ItemP2PTunnelPart extends P2PTunnelPart implements ItemTransferable, IGridTickable { private static final float POWER_DRAIN = 2.0f; private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_items"); private boolean partVisited = false; @@ -62,7 +62,7 @@ public class ItemP2PTunnelPart extends P2PTunnelPart implemen private int oldSize = 0; private boolean requested; - private IItemHandler cachedInv; + private ItemTransferable cachedInv; public ItemP2PTunnelPart(final ItemStack is) { super(is); @@ -77,14 +77,14 @@ public class ItemP2PTunnelPart extends P2PTunnelPart implemen } } - private IItemHandler getDestination() { + private ItemTransferable getDestination() { this.requested = true; if (this.cachedInv != null) { return this.cachedInv; } - final List outs = new ArrayList(); + final List outs = new ArrayList(); final TunnelCollection itemTunnels; try { @@ -94,7 +94,7 @@ public class ItemP2PTunnelPart extends P2PTunnelPart implemen } for (final ItemP2PTunnelPart t : itemTunnels) { - final IItemHandler inv = t.getOutputInv(); + final ItemTransferable inv = t.getOutputInv(); if (inv != null && inv != this) { if (Platform.getRandomInt() % 2 == 0) { outs.add(inv); @@ -104,16 +104,16 @@ public class ItemP2PTunnelPart extends P2PTunnelPart implemen } } - return this.cachedInv = new WrapperChainedItemHandler(outs.toArray(new IItemHandler[outs.size()])); + return this.cachedInv = new WrapperChainedItemHandler(outs.toArray(new ItemTransferable[outs.size()])); } - private IItemHandler getOutputInv() { - IItemHandler ret = null; + private ItemTransferable getOutputInv() { + ItemTransferable ret = null; if (!this.partVisited) { this.partVisited = true; if (this.getProxy().isActive()) { final Direction facing = this.getSide().getFacing(); - final TileEntity te = this.getTile().getWorld().getTileEntity(this.getTile().getPos().offset(facing)); + final BlockEntity te = this.getTile().getWorld().getTileEntity(this.getTile().getPos().offset(facing)); if (te != null) { ret = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite()) diff --git a/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java index 74235abcf..3e14165a8 100644 --- a/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java @@ -23,8 +23,8 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; @@ -69,14 +69,14 @@ public class LightP2PTunnelPart extends P2PTunnelPart implem } @Override - public void writeToStream(final PacketBuffer data) throws IOException { + public void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeInt(this.isOutput() ? this.lastValue : 0); data.writeInt(this.opacity); } @Override - public boolean readFromStream(final PacketBuffer data) throws IOException { + public boolean readFromStream(final PacketByteBuf data) throws IOException { super.readFromStream(data); final int oldValue = this.lastValue; final int oldOpacity = this.opacity; @@ -93,7 +93,7 @@ public class LightP2PTunnelPart extends P2PTunnelPart implem return false; } - final TileEntity te = this.getTile(); + final BlockEntity te = this.getTile(); final World w = te.getWorld(); final int newLevel = w.getLight(te.getPos().offset(this.getSide().getFacing())); @@ -138,7 +138,7 @@ public class LightP2PTunnelPart extends P2PTunnelPart implem private int blockLight(final int emit) { if (this.opacity < 0) { - final TileEntity te = this.getTile(); + final BlockEntity te = this.getTile(); this.opacity = 255 - te.getWorld().getLight(te.getPos().offset(this.getSide().getFacing())); } diff --git a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java index f6672e33d..ac526a1a6 100644 --- a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java @@ -26,7 +26,7 @@ import java.util.List; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; import appeng.api.AEApi; @@ -109,7 +109,7 @@ public class MEP2PTunnelPart extends P2PTunnelPart implements I } @Override - public void setPartHostInfo(final AEPartLocation side, final IPartHost host, final TileEntity tile) { + public void setPartHostInfo(final AEPartLocation side, final IPartHost host, final BlockEntity tile) { super.setPartHostInfo(side, host, tile); this.outerProxy.setValidSides(EnumSet.of(side.getFacing())); } @@ -196,8 +196,8 @@ public class MEP2PTunnelPart extends P2PTunnelPart implements I connections.getConnections().put(me.getGridNode(), new TunnelConnection(me, AEApi.instance() .grid().createGridConnection(this.outerProxy.getNode(), me.outerProxy.getNode()))); } catch (final FailedConnectionException e) { - final TileEntity start = this.getTile(); - final TileEntity end = me.getTile(); + final BlockEntity start = this.getTile(); + final BlockEntity end = me.getTile(); AELog.debug(e); diff --git a/src/main/java/appeng/parts/p2p/P2PModels.java b/src/main/java/appeng/parts/p2p/P2PModels.java index 362920d5e..9ee196e89 100644 --- a/src/main/java/appeng/parts/p2p/P2PModels.java +++ b/src/main/java/appeng/parts/p2p/P2PModels.java @@ -21,7 +21,7 @@ package appeng.parts.p2p; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AppEng; @@ -32,13 +32,13 @@ import appeng.parts.PartModel; */ class P2PModels { - public static final ResourceLocation MODEL_STATUS_OFF = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, "part/p2p/p2p_tunnel_status_off"); - public static final ResourceLocation MODEL_STATUS_ON = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, "part/p2p/p2p_tunnel_status_on"); - public static final ResourceLocation MODEL_STATUS_HAS_CHANNEL = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_STATUS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/p2p/p2p_tunnel_status_has_channel"); - public static final ResourceLocation MODEL_FREQUENCY = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_FREQUENCY = new Identifier(AppEng.MOD_ID, "part/p2p/p2p_tunnel_frequency"); private final IPartModel modelsOff; @@ -46,7 +46,7 @@ class P2PModels { private final IPartModel modelsHasChannel; public P2PModels(String frontModelPath) { - ResourceLocation frontModel = new ResourceLocation(AppEng.MOD_ID, frontModelPath); + Identifier frontModel = new Identifier(AppEng.MOD_ID, frontModelPath); this.modelsOff = new PartModel(MODEL_STATUS_OFF, MODEL_FREQUENCY, frontModel); this.modelsOn = new PartModel(MODEL_STATUS_ON, MODEL_FREQUENCY, frontModel); diff --git a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java index 6df6618da..a642cc4c2 100644 --- a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java @@ -26,7 +26,7 @@ import java.util.Optional; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; import net.minecraftforge.client.model.data.IModelData; @@ -133,7 +133,7 @@ public abstract class P2PTunnelPart extends BasicStateP } @Override - public boolean readFromStream(PacketBuffer data) throws IOException { + public boolean readFromStream(PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final short oldf = this.freq; this.freq = data.readShort(); @@ -141,7 +141,7 @@ public abstract class P2PTunnelPart extends BasicStateP } @Override - public void writeToStream(PacketBuffer data) throws IOException { + public void writeToStream(PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeShort(this.getFrequency()); } diff --git a/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java b/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java index 2f529c606..ceb6aaf22 100644 --- a/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java @@ -19,7 +19,7 @@ package appeng.parts.reporting; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.core.AppEng; import appeng.items.parts.PartModels; @@ -40,17 +40,17 @@ public abstract class AbstractDisplayPart extends AbstractReportingPart { // The base chassis of all display parts @PartModels - protected static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/display_base"); + protected static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/display_base"); // Models that contain the status indicator light @PartModels - protected static final ResourceLocation MODEL_STATUS_OFF = new ResourceLocation(AppEng.MOD_ID, + protected static final Identifier MODEL_STATUS_OFF = new Identifier(AppEng.MOD_ID, "part/display_status_off"); @PartModels - protected static final ResourceLocation MODEL_STATUS_ON = new ResourceLocation(AppEng.MOD_ID, + protected static final Identifier MODEL_STATUS_ON = new Identifier(AppEng.MOD_ID, "part/display_status_on"); @PartModels - protected static final ResourceLocation MODEL_STATUS_HAS_CHANNEL = new ResourceLocation(AppEng.MOD_ID, + protected static final Identifier MODEL_STATUS_HAS_CHANNEL = new Identifier(AppEng.MOD_ID, "part/display_status_has_channel"); public AbstractDisplayPart(final ItemStack is) { diff --git a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java index 2dd07ff59..3f8e02a26 100644 --- a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java @@ -20,19 +20,19 @@ package appeng.parts.reporting; import java.io.IOException; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.Vec3d; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import appeng.api.AEApi; import appeng.api.implementations.parts.IStorageMonitorPart; @@ -106,7 +106,7 @@ public abstract class AbstractMonitorPart extends AbstractDisplayPart } @Override - public void writeToStream(final PacketBuffer data) throws IOException { + public void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeBoolean(this.isLocked); @@ -117,7 +117,7 @@ public abstract class AbstractMonitorPart extends AbstractDisplayPart } @Override - public boolean readFromStream(final PacketBuffer data) throws IOException { + public boolean readFromStream(final PacketByteBuf data) throws IOException { boolean needRedraw = super.readFromStream(data); final boolean isLocked = data.readBoolean(); @@ -218,8 +218,8 @@ public abstract class AbstractMonitorPart extends AbstractDisplayPart } @Override - @OnlyIn(Dist.CLIENT) - public void renderDynamic(float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffers, + @Environment(EnvType.CLIENT) + public void renderDynamic(float partialTicks, MatrixStack matrixStack, VertexConsumerProvider buffers, int combinedLightIn, int combinedOverlayIn) { if ((this.getClientFlags() & (PanelPart.POWERED_FLAG | PanelPart.CHANNEL_FLAG)) != (PanelPart.POWERED_FLAG @@ -290,7 +290,7 @@ public abstract class AbstractMonitorPart extends AbstractDisplayPart } @Override - public boolean showNetworkInfo(final RayTraceResult where) { + public boolean showNetworkInfo(final HitResult where) { return false; } diff --git a/src/main/java/appeng/parts/reporting/AbstractPanelPart.java b/src/main/java/appeng/parts/reporting/AbstractPanelPart.java index 4c73fe5e7..4b322dd2e 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPanelPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractPanelPart.java @@ -19,7 +19,7 @@ package appeng.parts.reporting; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.util.AEColor; import appeng.core.AppEng; @@ -39,7 +39,7 @@ import appeng.items.parts.PartModels; public abstract class AbstractPanelPart extends AbstractReportingPart { @PartModels - public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/monitor_base"); + public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "part/monitor_base"); public AbstractPanelPart(final ItemStack is) { super(is, false); diff --git a/src/main/java/appeng/parts/reporting/AbstractReportingPart.java b/src/main/java/appeng/parts/reporting/AbstractReportingPart.java index 63eaa5752..94358530c 100644 --- a/src/main/java/appeng/parts/reporting/AbstractReportingPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractReportingPart.java @@ -23,8 +23,8 @@ import java.io.IOException; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -125,7 +125,7 @@ public abstract class AbstractReportingPart extends AEBasePart implements IMonit } @Override - public void writeToStream(final PacketBuffer data) throws IOException { + public void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); this.clientFlags = this.getSpin() & 3; @@ -150,7 +150,7 @@ public abstract class AbstractReportingPart extends AEBasePart implements IMonit } @Override - public boolean readFromStream(final PacketBuffer data) throws IOException { + public boolean readFromStream(final PacketByteBuf data) throws IOException { super.readFromStream(data); final int oldFlags = this.getClientFlags(); final int oldOpacity = this.opacity; @@ -172,7 +172,7 @@ public abstract class AbstractReportingPart extends AEBasePart implements IMonit @Override public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) { - final TileEntity te = this.getTile(); + final BlockEntity te = this.getTile(); if (Platform.isWrench(player, player.inventory.getCurrentItem(), te.getPos())) { if (Platform.isServer()) { @@ -219,7 +219,7 @@ public abstract class AbstractReportingPart extends AEBasePart implements IMonit private final int blockLight(final int emit) { if (this.opacity < 0) { - final TileEntity te = this.getTile(); + final BlockEntity te = this.getTile(); World world = te.getWorld(); BlockPos pos = te.getPos().offset(this.getSide().getFacing()); this.opacity = 255 - world.getBlockState(pos).getOpacity(world, pos); diff --git a/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java b/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java index d2dbcb253..46dfe34e0 100644 --- a/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java @@ -20,13 +20,13 @@ package appeng.parts.reporting; import java.util.List; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; -import net.minecraftforge.items.IItemHandler; import appeng.api.config.Settings; import appeng.api.config.SortDir; @@ -133,13 +133,13 @@ public abstract class AbstractTerminalPart extends AbstractDisplayPart } @Override - public IItemHandler getViewCellStorage() { + public ItemTransferable getViewCellStorage() { return this.viewCell; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { this.getHost().markForSave(); } } diff --git a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java index 5c6c6ff1a..38f6617ef 100644 --- a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java @@ -21,13 +21,13 @@ package appeng.parts.reporting; import java.util.Collections; import java.util.List; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraftforge.items.wrapper.PlayerMainInvWrapper; import appeng.api.AEApi; @@ -49,14 +49,14 @@ import appeng.util.item.AEItemStack; public class ConversionMonitorPart extends AbstractMonitorPart { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/conversion_monitor_off"); + public static final Identifier MODEL_OFF = new Identifier(AppEng.MOD_ID, "part/conversion_monitor_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/conversion_monitor_on"); + public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/conversion_monitor_on"); @PartModels - public static final ResourceLocation MODEL_LOCKED_OFF = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_LOCKED_OFF = new Identifier(AppEng.MOD_ID, "part/conversion_monitor_locked_off"); @PartModels - public static final ResourceLocation MODEL_LOCKED_ON = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_LOCKED_ON = new Identifier(AppEng.MOD_ID, "part/conversion_monitor_locked_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF); @@ -157,7 +157,7 @@ public class ConversionMonitorPart extends AbstractMonitorPart { if (allItems) { if (this.getDisplayed() != null) { final IAEItemStack input = this.getDisplayed().copy(); - IItemHandler inv = new PlayerMainInvWrapper(player.inventory); + ItemTransferable inv = new PlayerMainInvWrapper(player.inventory); for (int x = 0; x < inv.getSlots(); x++) { final ItemStack targetStack = inv.getStackInSlot(x); @@ -205,7 +205,7 @@ public class ConversionMonitorPart extends AbstractMonitorPart { final InventoryAdaptor adaptor = InventoryAdaptor.getAdaptor(player); newItems = adaptor.addItems(newItems); if (!newItems.isEmpty()) { - final TileEntity te = this.getTile(); + final BlockEntity te = this.getTile(); final List list = Collections.singletonList(newItems); Platform.spawnDrops(player.world, te.getPos().offset(this.getSide().getFacing()), list); } diff --git a/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java b/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java index cfbd8f9d6..42c45ac3d 100644 --- a/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java @@ -20,12 +20,12 @@ package appeng.parts.reporting; import java.util.List; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.util.Identifier; import appeng.api.config.SecurityPermissions; import appeng.api.parts.IPartModel; @@ -41,9 +41,9 @@ import appeng.util.Platform; public class CraftingTerminalPart extends AbstractTerminalPart { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/crafting_terminal_off"); + public static final Identifier MODEL_OFF = new Identifier(AppEng.MOD_ID, "part/crafting_terminal_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/crafting_terminal_on"); + public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/crafting_terminal_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); @@ -88,7 +88,7 @@ public class CraftingTerminalPart extends AbstractTerminalPart { } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("crafting")) { return this.craftingGrid; } diff --git a/src/main/java/appeng/parts/reporting/DarkPanelPart.java b/src/main/java/appeng/parts/reporting/DarkPanelPart.java index 2569a8301..435cb9569 100644 --- a/src/main/java/appeng/parts/reporting/DarkPanelPart.java +++ b/src/main/java/appeng/parts/reporting/DarkPanelPart.java @@ -19,7 +19,7 @@ package appeng.parts.reporting; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AppEng; @@ -30,9 +30,9 @@ import appeng.parts.PartModel; public class DarkPanelPart extends AbstractPanelPart { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/monitor_dark_off"); + public static final Identifier MODEL_OFF = new Identifier(AppEng.MOD_ID, "part/monitor_dark_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/monitor_dark_on"); + public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/monitor_dark_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON); diff --git a/src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java b/src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java index 3625cd0cf..b368fe17f 100644 --- a/src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java @@ -21,7 +21,7 @@ package appeng.parts.reporting; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; import appeng.api.parts.IPartModel; @@ -36,9 +36,9 @@ import appeng.util.Platform; public class InterfaceTerminalPart extends AbstractDisplayPart { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/interface_terminal_off"); + public static final Identifier MODEL_OFF = new Identifier(AppEng.MOD_ID, "part/interface_terminal_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/interface_terminal_on"); + public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/interface_terminal_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); diff --git a/src/main/java/appeng/parts/reporting/PanelPart.java b/src/main/java/appeng/parts/reporting/PanelPart.java index 49b44c824..92f00977d 100644 --- a/src/main/java/appeng/parts/reporting/PanelPart.java +++ b/src/main/java/appeng/parts/reporting/PanelPart.java @@ -19,7 +19,7 @@ package appeng.parts.reporting; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AppEng; @@ -30,9 +30,9 @@ import appeng.parts.PartModel; public class PanelPart extends AbstractPanelPart { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/monitor_bright_off"); + public static final Identifier MODEL_OFF = new Identifier(AppEng.MOD_ID, "part/monitor_bright_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/monitor_bright_on"); + public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/monitor_bright_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON); diff --git a/src/main/java/appeng/parts/reporting/PatternTerminalPart.java b/src/main/java/appeng/parts/reporting/PatternTerminalPart.java index 2ca0401c8..bd56719c8 100644 --- a/src/main/java/appeng/parts/reporting/PatternTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/PatternTerminalPart.java @@ -24,8 +24,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.util.Identifier; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.config.SecurityPermissions; import appeng.api.implementations.ICraftingPatternItem; @@ -45,9 +45,9 @@ import appeng.util.inv.InvOperation; public class PatternTerminalPart extends AbstractTerminalPart { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/pattern_terminal_off"); + public static final Identifier MODEL_OFF = new Identifier(AppEng.MOD_ID, "part/pattern_terminal_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/pattern_terminal_on"); + public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/pattern_terminal_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); @@ -103,8 +103,8 @@ public class PatternTerminalPart extends AbstractTerminalPart { } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { if (inv == this.pattern && slot == 1) { final ItemStack is = this.pattern.getStackInSlot(1); if (!is.isEmpty() && is.getItem() instanceof ICraftingPatternItem) { @@ -162,7 +162,7 @@ public class PatternTerminalPart extends AbstractTerminalPart { } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("crafting")) { return this.crafting; } diff --git a/src/main/java/appeng/parts/reporting/SemiDarkPanelPart.java b/src/main/java/appeng/parts/reporting/SemiDarkPanelPart.java index 4862a5fbd..524324994 100644 --- a/src/main/java/appeng/parts/reporting/SemiDarkPanelPart.java +++ b/src/main/java/appeng/parts/reporting/SemiDarkPanelPart.java @@ -19,7 +19,7 @@ package appeng.parts.reporting; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AppEng; @@ -29,9 +29,9 @@ import appeng.parts.PartModel; public class SemiDarkPanelPart extends AbstractPanelPart { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/monitor_medium_off"); + public static final Identifier MODEL_OFF = new Identifier(AppEng.MOD_ID, "part/monitor_medium_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/monitor_medium_on"); + public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/monitor_medium_on"); public static final PartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON); diff --git a/src/main/java/appeng/parts/reporting/StorageMonitorPart.java b/src/main/java/appeng/parts/reporting/StorageMonitorPart.java index 4f27c984a..c5d082b55 100644 --- a/src/main/java/appeng/parts/reporting/StorageMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/StorageMonitorPart.java @@ -19,7 +19,7 @@ package appeng.parts.reporting; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AppEng; @@ -36,14 +36,14 @@ import appeng.parts.PartModel; public class StorageMonitorPart extends AbstractMonitorPart { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/storage_monitor_off"); + public static final Identifier MODEL_OFF = new Identifier(AppEng.MOD_ID, "part/storage_monitor_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/storage_monitor_on"); + public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/storage_monitor_on"); @PartModels - public static final ResourceLocation MODEL_LOCKED_OFF = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_LOCKED_OFF = new Identifier(AppEng.MOD_ID, "part/storage_monitor_locked_off"); @PartModels - public static final ResourceLocation MODEL_LOCKED_ON = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier MODEL_LOCKED_ON = new Identifier(AppEng.MOD_ID, "part/storage_monitor_locked_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF); diff --git a/src/main/java/appeng/parts/reporting/TerminalPart.java b/src/main/java/appeng/parts/reporting/TerminalPart.java index 901b7fd04..1a70dbd1d 100644 --- a/src/main/java/appeng/parts/reporting/TerminalPart.java +++ b/src/main/java/appeng/parts/reporting/TerminalPart.java @@ -19,7 +19,7 @@ package appeng.parts.reporting; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import appeng.api.parts.IPartModel; import appeng.core.AppEng; @@ -29,9 +29,9 @@ import appeng.parts.PartModel; public class TerminalPart extends AbstractTerminalPart { @PartModels - public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/terminal_off"); + public static final Identifier MODEL_OFF = new Identifier(AppEng.MOD_ID, "part/terminal_off"); @PartModels - public static final ResourceLocation MODEL_ON = new ResourceLocation(AppEng.MOD_ID, "part/terminal_on"); + public static final Identifier MODEL_ON = new Identifier(AppEng.MOD_ID, "part/terminal_on"); public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF); public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON); diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index 34996f9e6..d08af9ad8 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.SpecialRecipe; import net.minecraft.item.crafting.SpecialRecipeSerializer; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.world.World; import appeng.api.AEApi; @@ -50,7 +50,7 @@ public final class DisassembleRecipe extends SpecialRecipe { DisassembleRecipe::new); static { - SERIALIZER.setRegistryName(new ResourceLocation(AppEng.MOD_ID, "disassemble")); + SERIALIZER.setRegistryName(new Identifier(AppEng.MOD_ID, "disassemble")); } private static final ItemStack MISMATCHED_STACK = ItemStack.EMPTY; @@ -58,7 +58,7 @@ public final class DisassembleRecipe extends SpecialRecipe { private final Map cellMappings; private final Map nonCellMappings; - public DisassembleRecipe(ResourceLocation id) { + public DisassembleRecipe(Identifier id) { super(id); final IDefinitions definitions = AEApi.instance().definitions(); diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index f3bdef4b7..c161ce811 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -26,7 +26,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.SpecialRecipe; import net.minecraft.item.crafting.SpecialRecipeSerializer; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.world.World; import appeng.api.AEApi; @@ -41,7 +41,7 @@ public final class FacadeRecipe extends SpecialRecipe { private final IComparableDefinition anchor; private final FacadeItem facade; - public FacadeRecipe(ResourceLocation id, FacadeItem facade) { + public FacadeRecipe(Identifier id, FacadeItem facade) { super(id); this.facade = facade; final IDefinitions definitions = AEApi.instance().definitions(); @@ -90,7 +90,7 @@ public final class FacadeRecipe extends SpecialRecipe { public static IRecipeSerializer getSerializer(FacadeItem facade) { if (SERIALIZER == null) { SERIALIZER = new SpecialRecipeSerializer<>(id -> new FacadeRecipe(id, facade)); - SERIALIZER.setRegistryName(new ResourceLocation(AppEng.MOD_ID, "facade")); + SERIALIZER.setRegistryName(new Identifier(AppEng.MOD_ID, "facade")); } return SERIALIZER; } diff --git a/src/main/java/appeng/recipes/handlers/GrinderRecipe.java b/src/main/java/appeng/recipes/handlers/GrinderRecipe.java index dcbfa8ce5..4db2c837a 100644 --- a/src/main/java/appeng/recipes/handlers/GrinderRecipe.java +++ b/src/main/java/appeng/recipes/handlers/GrinderRecipe.java @@ -10,15 +10,15 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.Identifier; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class GrinderRecipe implements IRecipe { public static IRecipeType TYPE; - private final ResourceLocation id; + private final Identifier id; private final String group; private final Ingredient ingredient; private final int ingredientCount; @@ -26,8 +26,8 @@ public class GrinderRecipe implements IRecipe { private final List optionalResults; private final int turns; - public GrinderRecipe(ResourceLocation id, String group, Ingredient ingredient, int ingredientCount, - ItemStack result, int turns, List optionalResults) { + public GrinderRecipe(Identifier id, String group, Ingredient ingredient, int ingredientCount, + ItemStack result, int turns, List optionalResults) { this.id = id; this.group = group; this.ingredient = ingredient; @@ -64,7 +64,7 @@ public class GrinderRecipe implements IRecipe { } @Override - public ResourceLocation getId() { + public Identifier getId() { return id; } diff --git a/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java index 6b8af2a9e..2fcfa2aa2 100644 --- a/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java +++ b/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java @@ -14,9 +14,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapedRecipe; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.util.Identifier; import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.registries.ForgeRegistryEntry; import appeng.core.AEConfig; @@ -35,7 +35,7 @@ public class GrinderRecipeSerializer extends ForgeRegistryEntry { public static IRecipeType TYPE; - private final ResourceLocation id; + private final Identifier id; private final String group; private final Ingredient middleInput; @@ -25,8 +25,8 @@ public class InscriberRecipe implements IRecipe { private final ItemStack output; private final InscriberProcessType processType; - public InscriberRecipe(ResourceLocation id, String group, Ingredient middleInput, ItemStack output, - Ingredient topOptional, Ingredient bottomOptional, InscriberProcessType processType) { + public InscriberRecipe(Identifier id, String group, Ingredient middleInput, ItemStack output, + Ingredient topOptional, Ingredient bottomOptional, InscriberProcessType processType) { this.id = id; this.group = group; this.middleInput = middleInput; @@ -57,7 +57,7 @@ public class InscriberRecipe implements IRecipe { } @Override - public ResourceLocation getId() { + public Identifier getId() { return id; } diff --git a/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java index aa6529597..def67a1a8 100644 --- a/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java +++ b/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java @@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapedRecipe; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.util.Identifier; import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.registries.ForgeRegistryEntry; import appeng.api.features.InscriberProcessType; @@ -42,7 +42,7 @@ public class InscriberRecipeSerializer extends ForgeRegistryEntry tile, final AEBaseBlock blk) { + public void bindTileEntitySpecialRenderer(final Class tile, final AEBaseBlock blk) { throw new UnsupportedOperationException("This is a server..."); } @@ -102,7 +102,7 @@ public class ServerHelper extends CommonHelper { } @Override - public RayTraceResult getRTR() { + public HitResult getRTR() { return null; } diff --git a/src/main/java/appeng/server/subcommands/ChunkLogger.java b/src/main/java/appeng/server/subcommands/ChunkLogger.java index d811245ab..b6545b9ea 100644 --- a/src/main/java/appeng/server/subcommands/ChunkLogger.java +++ b/src/main/java/appeng/server/subcommands/ChunkLogger.java @@ -22,7 +22,7 @@ import com.mojang.brigadier.context.CommandContext; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.TranslatableText; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -72,10 +72,10 @@ public class ChunkLogger implements ISubCommand { if (this.enabled) { MinecraftForge.EVENT_BUS.register(this); - sender.sendFeedback(new TranslationTextComponent("commands.ae2.ChunkLoggerOn"), true); + sender.sendFeedback(new TranslatableText("commands.ae2.ChunkLoggerOn"), true); } else { MinecraftForge.EVENT_BUS.unregister(this); - sender.sendFeedback(new TranslationTextComponent("commands.ae2.ChunkLoggerOff"), true); + sender.sendFeedback(new TranslatableText("commands.ae2.ChunkLoggerOff"), true); } } } diff --git a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java index 019581e6b..4971c063b 100644 --- a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java +++ b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java @@ -35,7 +35,7 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.event.ClickEvent; @@ -46,7 +46,7 @@ import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.Heightmap; import net.minecraft.world.gen.feature.structure.StructureStart; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.fml.server.ServerLifecycleHooks; import appeng.server.ISubCommand; @@ -157,7 +157,7 @@ public class TestMeteoritesCommand implements ISubCommand { } } - ITextComponent restOfLine; + Text restOfLine; if (settings.getFallout() == null) { restOfLine = new StringTextComponent( String.format(Locale.ROOT, ", radius=%.2f [%s]", settings.getMeteoriteRadius(), state)); @@ -167,11 +167,11 @@ public class TestMeteoritesCommand implements ISubCommand { settings.getFallout().name().toLowerCase())); } - ITextComponent msg = new StringTextComponent(" #" + (i + 1) + " "); + Text msg = new StringTextComponent(" #" + (i + 1) + " "); msg.appendSibling(getClickablePosition(world, settings, pos)).appendSibling(restOfLine); // Add a tooltip - ITextComponent tooltip = new StringTextComponent(settings.toString() + "\nBiome: ") + Text tooltip = new StringTextComponent(settings.toString() + "\nBiome: ") .appendSibling(world.getBiome(pos).getDisplayName()); msg.applyTextStyle(style -> style.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, tooltip))); @@ -180,7 +180,7 @@ public class TestMeteoritesCommand implements ISubCommand { } // Add a clickable link to teleport the user to the Meteorite - private static ITextComponent getClickablePosition(ServerWorld world, PlacedMeteoriteSettings settings, + private static Text getClickablePosition(ServerWorld world, PlacedMeteoriteSettings settings, BlockPos pos) { BlockPos tpPos = pos.up((int) Math.ceil(settings.getMeteoriteRadius())); int surfaceY = world.getHeight(Heightmap.Type.WORLD_SURFACE, tpPos).getY(); diff --git a/src/main/java/appeng/server/subcommands/TestOreGenCommand.java b/src/main/java/appeng/server/subcommands/TestOreGenCommand.java index dad0d927e..b234ad2ca 100644 --- a/src/main/java/appeng/server/subcommands/TestOreGenCommand.java +++ b/src/main/java/appeng/server/subcommands/TestOreGenCommand.java @@ -38,7 +38,7 @@ import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.IChunk; import net.minecraft.world.dimension.DimensionType; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import appeng.core.Api; import appeng.server.ISubCommand; diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index c246abf6b..de316a41f 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -32,10 +32,10 @@ import net.minecraft.block.Block; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.chunk.IChunk; import net.minecraft.world.dimension.DimensionType; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -91,7 +91,7 @@ public final class CompassService { } } - public void updateArea(final IWorld w, ChunkPos chunkPos) { + public void updateArea(final WorldAccess w, ChunkPos chunkPos) { this.updateArea(w, chunkPos, CHUNK_SIZE); this.updateArea(w, chunkPos, CHUNK_SIZE + 32); this.updateArea(w, chunkPos, CHUNK_SIZE + 64); @@ -103,7 +103,7 @@ public final class CompassService { this.updateArea(w, chunkPos, CHUNK_SIZE + 224); } - public Future updateArea(final IWorld w, ChunkPos chunkPos, int y) { + public Future updateArea(final WorldAccess w, ChunkPos chunkPos, int y) { this.jobSize++; final int cx = chunkPos.x; diff --git a/src/main/java/appeng/services/compass/CompassReader.java b/src/main/java/appeng/services/compass/CompassReader.java index c9b5ca7f4..1699d35ac 100644 --- a/src/main/java/appeng/services/compass/CompassReader.java +++ b/src/main/java/appeng/services/compass/CompassReader.java @@ -23,7 +23,7 @@ import java.util.Map; import com.google.common.base.Preconditions; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; public final class CompassReader { private final Map regions = new HashMap<>(100); diff --git a/src/main/java/appeng/services/compass/CompassRegion.java b/src/main/java/appeng/services/compass/CompassRegion.java index 8438c43b1..2759e6d6e 100644 --- a/src/main/java/appeng/services/compass/CompassRegion.java +++ b/src/main/java/appeng/services/compass/CompassRegion.java @@ -21,7 +21,7 @@ package appeng.services.compass; import com.google.common.base.Preconditions; import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraft.world.storage.WorldSavedData; final class CompassRegion { diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 6d13e86c7..7b29b2b4e 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -25,9 +25,9 @@ import java.util.Map.Entry; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.network.play.server.SChunkDataPacket; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.EmptyBlockReader; import net.minecraft.world.ITickList; @@ -45,7 +45,6 @@ import appeng.api.util.AEPartLocation; import appeng.api.util.WorldCoord; import appeng.core.AELog; import appeng.core.worlddata.WorldData; -import appeng.util.Platform; public class CachedPlane { private final int x_size; @@ -58,7 +57,7 @@ public class CachedPlane { private final int y_size; private final Chunk[][] myChunks; private final Column[][] myColumns; - private final List tiles = new ArrayList<>(); + private final List tiles = new ArrayList<>(); private final List> ticks = new ArrayList<>(); private final World world; private final IMovableRegistry reg = AEApi.instance().registries().movable(); @@ -121,10 +120,10 @@ public class CachedPlane { final Chunk c = w.getChunk(minCX + cx, minCZ + cz); this.myChunks[cx][cz] = c; - final List> rawTiles = new ArrayList<>(c.getTileEntityMap().entrySet()); - for (final Entry tx : rawTiles) { + final List> rawTiles = new ArrayList<>(c.getTileEntityMap().entrySet()); + for (final Entry tx : rawTiles) { final BlockPos cp = tx.getKey(); - final TileEntity te = tx.getValue(); + final BlockEntity te = tx.getValue(); final BlockPos tePOS = te.getPos(); if (tePOS.getX() >= minX && tePOS.getX() <= maxX && tePOS.getY() >= minY && tePOS.getY() <= maxY @@ -167,7 +166,7 @@ public class CachedPlane { } } - for (final TileEntity te : this.tiles) { + for (final BlockEntity te : this.tiles) { try { this.getWorld().loadedTileEntityList.remove(te); if (te instanceof ITickableTileEntity) { @@ -179,7 +178,7 @@ public class CachedPlane { } } - private IMovableHandler getHandler(final TileEntity te) { + private IMovableHandler getHandler(final BlockEntity te) { final IMovableRegistry mr = AEApi.instance().registries().movable(); return mr.getHandler(te); } @@ -221,13 +220,13 @@ public class CachedPlane { long duration = endTime - startTime; AELog.info("Block Copy Time: " + duration); - for (final TileEntity te : this.tiles) { + for (final BlockEntity te : this.tiles) { final BlockPos tePOS = te.getPos(); dst.addTile(tePOS.getX() - this.x_offset, tePOS.getY() - this.y_offset, tePOS.getZ() - this.z_offset, te, this, mr); } - for (final TileEntity te : dst.tiles) { + for (final BlockEntity te : dst.tiles) { final BlockPos tePOS = te.getPos(); this.addTile(tePOS.getX() - dst.x_offset, tePOS.getY() - dst.y_offset, tePOS.getZ() - dst.z_offset, te, dst, mr); @@ -268,7 +267,7 @@ public class CachedPlane { entry.priority); } - private void addTile(final int x, final int y, final int z, final TileEntity te, + private void addTile(final int x, final int y, final int z, final BlockEntity te, final CachedPlane alternateDestination, final IMovableRegistry mr) { try { final Column c = this.myColumns[x][z]; diff --git a/src/main/java/appeng/spatial/DefaultSpatialHandler.java b/src/main/java/appeng/spatial/DefaultSpatialHandler.java index 49b90f815..195ac3e7b 100644 --- a/src/main/java/appeng/spatial/DefaultSpatialHandler.java +++ b/src/main/java/appeng/spatial/DefaultSpatialHandler.java @@ -19,7 +19,7 @@ package appeng.spatial; import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -36,12 +36,12 @@ public class DefaultSpatialHandler implements IMovableHandler { * @return true */ @Override - public boolean canHandle(final Class myClass, final TileEntity tile) { + public boolean canHandle(final Class myClass, final BlockEntity tile) { return true; } @Override - public void moveTile(final TileEntity te, final World w, final BlockPos newPosition) { + public void moveTile(final BlockEntity te, final World w, final BlockPos newPosition) { te.setWorldAndPos(w, newPosition); final Chunk c = w.getChunkAt(newPosition); diff --git a/src/main/java/appeng/spatial/SpatialDimensionExtraData.java b/src/main/java/appeng/spatial/SpatialDimensionExtraData.java index 5912c87f2..388be4850 100644 --- a/src/main/java/appeng/spatial/SpatialDimensionExtraData.java +++ b/src/main/java/appeng/spatial/SpatialDimensionExtraData.java @@ -4,7 +4,7 @@ import javax.annotation.Nullable; import io.netty.buffer.Unpooled; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.BlockPos; import appeng.core.AELog; @@ -13,7 +13,7 @@ import appeng.core.AELog; * Helps with encoding and decoding the extra data we attach to the spatial * {@link net.minecraft.world.dimension.DimensionType} as "extra data". Keep in * mind this data will also be sent to the client unless - * {@link net.minecraftforge.common.ModDimension#write(PacketBuffer, boolean)} + * {@link net.minecraftforge.common.ModDimension#write(PacketByteBuf, boolean)} * is overridden. */ public final class SpatialDimensionExtraData { @@ -32,8 +32,8 @@ public final class SpatialDimensionExtraData { this.size = size; } - public PacketBuffer write() { - PacketBuffer buf = new PacketBuffer(Unpooled.buffer()); + public PacketByteBuf write() { + PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer()); buf.writeByte(CURRENT_FORMAT); buf.writeBlockPos(size); buf.capacity(buf.writerIndex()); // This cuts the backing buffer to the required size @@ -45,7 +45,7 @@ public final class SpatialDimensionExtraData { } @Nullable - public static SpatialDimensionExtraData read(@Nullable PacketBuffer buf) { + public static SpatialDimensionExtraData read(@Nullable PacketByteBuf buf) { if (buf == null) { return null; } diff --git a/src/main/java/appeng/spatial/SpatialDimensionManager.java b/src/main/java/appeng/spatial/SpatialDimensionManager.java index 7d92e0801..429c27c18 100644 --- a/src/main/java/appeng/spatial/SpatialDimensionManager.java +++ b/src/main/java/appeng/spatial/SpatialDimensionManager.java @@ -23,13 +23,13 @@ import java.util.Locale; import javax.annotation.Nullable; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.world.dimension.DimensionType; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fml.server.ServerLifecycleHooks; @@ -54,10 +54,10 @@ public final class SpatialDimensionManager implements ISpatialDimension { @Override public DimensionType createNewCellDimension(BlockPos size) { - ResourceLocation dimKey = findFreeDimensionId(); + Identifier dimKey = findFreeDimensionId(); AELog.info("Allocating storage cell dimension '%s'", dimKey); - PacketBuffer extraData = new SpatialDimensionExtraData(size).write(); + PacketByteBuf extraData = new SpatialDimensionExtraData(size).write(); return DimensionManager.registerDimension(dimKey, StorageCellModDimension.INSTANCE, extraData, true); } @@ -66,10 +66,10 @@ public final class SpatialDimensionManager implements ISpatialDimension { * Tries finding the next free storage cell dimension ID based on the currently * registered storage cell dimensions. */ - private ResourceLocation findFreeDimensionId() { + private Identifier findFreeDimensionId() { int maxId = 0; for (DimensionType dimensionType : DimensionType.getAll()) { - ResourceLocation regName = dimensionType.getRegistryName(); + Identifier regName = dimensionType.getRegistryName(); if (regName == null || !AppEng.MOD_ID.equals(regName.getNamespace())) { continue; } @@ -89,7 +89,7 @@ public final class SpatialDimensionManager implements ISpatialDimension { ++maxId; - return new ResourceLocation(AppEng.MOD_ID, DIM_ID_PREFIX + maxId); + return new Identifier(AppEng.MOD_ID, DIM_ID_PREFIX + maxId); } @Override @@ -126,9 +126,9 @@ public final class SpatialDimensionManager implements ISpatialDimension { } @Override - public void addCellDimensionTooltip(DimensionType cellDim, List lines) { + public void addCellDimensionTooltip(DimensionType cellDim, List lines) { // Check if the cell dimension type is even registered - ResourceLocation registryName = cellDim.getRegistryName(); + Identifier registryName = cellDim.getRegistryName(); if (registryName == null || !AppEng.MOD_ID.equals(registryName.getNamespace())) { return; } diff --git a/src/main/java/appeng/spatial/StorageCellBiome.java b/src/main/java/appeng/spatial/StorageCellBiome.java index dee00faf2..0bcc3eede 100644 --- a/src/main/java/appeng/spatial/StorageCellBiome.java +++ b/src/main/java/appeng/spatial/StorageCellBiome.java @@ -20,15 +20,15 @@ package appeng.spatial; import net.minecraft.util.SharedSeedRandom; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.IWorldReader; import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; public class StorageCellBiome extends Biome { @@ -46,7 +46,7 @@ public class StorageCellBiome extends Biome { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public int getSkyColor() { return 0x111111; } @@ -68,7 +68,7 @@ public class StorageCellBiome extends Biome { @Override public void decorate(GenerationStage.Decoration stage, ChunkGenerator chunkGenerator, - IWorld worldIn, long seed, SharedSeedRandom random, BlockPos pos) { + WorldAccess worldIn, long seed, SharedSeedRandom random, BlockPos pos) { // Nothing should ever generate here... } } diff --git a/src/main/java/appeng/spatial/StorageCellDimension.java b/src/main/java/appeng/spatial/StorageCellDimension.java index 135ef247c..f74b2ba7a 100644 --- a/src/main/java/appeng/spatial/StorageCellDimension.java +++ b/src/main/java/appeng/spatial/StorageCellDimension.java @@ -20,16 +20,15 @@ package appeng.spatial; import javax.annotation.Nullable; +import net.fabricmc.api.Environment; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.dimension.Dimension; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import net.minecraftforge.client.IRenderHandler; import appeng.client.render.SpatialSkyRender; @@ -62,7 +61,7 @@ public class StorageCellDimension extends Dimension { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public float[] calcSunriseSunsetColors(final float celestialAngle, final float partialTicks) { return null; } @@ -78,7 +77,7 @@ public class StorageCellDimension extends Dimension { } @Override - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public boolean isSkyColored() { return true; } diff --git a/src/main/java/appeng/spatial/StorageCellModDimension.java b/src/main/java/appeng/spatial/StorageCellModDimension.java index 6307f50b6..3b49a2a14 100644 --- a/src/main/java/appeng/spatial/StorageCellModDimension.java +++ b/src/main/java/appeng/spatial/StorageCellModDimension.java @@ -21,7 +21,7 @@ package appeng.spatial; import java.util.function.BiFunction; import net.minecraft.world.World; -import net.minecraft.world.dimension.Dimension; +import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.common.ModDimension; diff --git a/src/main/java/appeng/spatial/StorageChunkGenerator.java b/src/main/java/appeng/spatial/StorageChunkGenerator.java index 045945440..aa697c456 100644 --- a/src/main/java/appeng/spatial/StorageChunkGenerator.java +++ b/src/main/java/appeng/spatial/StorageChunkGenerator.java @@ -20,7 +20,7 @@ package appeng.spatial; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.World; import net.minecraft.world.biome.provider.BiomeProvider; import net.minecraft.world.biome.provider.SingleBiomeProvider; @@ -80,7 +80,7 @@ public class StorageChunkGenerator extends ChunkGenerator { } @Override - public void makeBase(IWorld worldIn, IChunk chunkIn) { + public void makeBase(WorldAccess worldIn, IChunk chunkIn) { } @Override diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 8cec8478a..4dbcd635c 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -27,18 +27,17 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkStatus; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.server.world.ServerWorld; import net.minecraftforge.common.util.ITeleporter; import appeng.api.AEApi; import appeng.api.util.WorldCoord; import appeng.core.AppEng; -import appeng.util.Platform; public class StorageHelper { @@ -144,10 +143,10 @@ public class StorageHelper { dstY + scaleY + 1, dstZ + scaleZ + 1, new WrapInMatrixFrame(matrixFrameBlock.getDefaultState(), dstWorld))); - final AxisAlignedBB srcBox = new AxisAlignedBB(srcX, srcY, srcZ, srcX + scaleX + 1, srcY + scaleY + 1, + final Box srcBox = new Box(srcX, srcY, srcZ, srcX + scaleX + 1, srcY + scaleY + 1, srcZ + scaleZ + 1); - final AxisAlignedBB dstBox = new AxisAlignedBB(dstX, dstY, dstZ, dstX + scaleX + 1, dstY + scaleY + 1, + final Box dstBox = new Box(dstX, dstY, dstZ, dstX + scaleX + 1, dstY + scaleY + 1, dstZ + scaleZ + 1); final CachedPlane cDst = new CachedPlane(dstWorld, dstX, dstY, dstZ, dstX + scaleX, dstY + scaleY, @@ -228,8 +227,8 @@ public class StorageHelper { private final double y; private final double z; - TelDestination(final World dimension, final AxisAlignedBB srcBox, final double x, final double y, - final double z, final int tileX, final int tileY, final int tileZ) { + TelDestination(final World dimension, final Box srcBox, final double x, final double y, + final double z, final int tileX, final int tileY, final int tileZ) { this.dim = dimension; this.x = Math.min(srcBox.maxX - 0.5, Math.max(srcBox.minX + 0.5, x + tileX)); this.y = Math.min(srcBox.maxY - 0.5, Math.max(srcBox.minY + 0.5, y + tileY)); diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java index 71705f8ac..6c721612d 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java @@ -19,12 +19,12 @@ package appeng.thirdparty.codechicken.lib.model; import net.minecraft.client.renderer.Vector3f; -import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.render.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.MathHelper; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.IVertexProducer; @@ -165,7 +165,7 @@ public class Quad implements IVertexProducer, ISmartVertexConsumer { * * @param bb The box. */ - public void clamp(AxisAlignedBB bb) { + public void clamp(Box bb) { for (Vertex vertex : this.vertices) { float[] vec = vertex.vec; vec[0] = (float) MathHelper.clamp(vec[0], bb.minX, bb.maxX); diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java index 23c06180d..c99270547 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java @@ -18,7 +18,7 @@ package appeng.thirdparty.codechicken.lib.model.pipeline.transformers; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import appeng.thirdparty.codechicken.lib.model.Quad.Vertex; @@ -36,18 +36,18 @@ public class QuadClamper extends QuadTransformer { public static IPipelineElementFactory FACTORY = QuadClamper::new; - private AxisAlignedBB clampBounds; + private Box clampBounds; QuadClamper() { super(); } - public QuadClamper(IVertexConsumer parent, AxisAlignedBB bounds) { + public QuadClamper(IVertexConsumer parent, Box bounds) { super(parent); this.clampBounds = bounds; } - public void setClampBounds(AxisAlignedBB bounds) { + public void setClampBounds(Box bounds) { this.clampBounds = bounds; } diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java index be63e844b..b86cb11b4 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java @@ -23,7 +23,7 @@ import static net.minecraft.util.math.Direction.AxisDirection.POSITIVE; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction.AxisDirection; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3i; import appeng.thirdparty.codechicken.lib.model.Quad.Vertex; @@ -61,7 +61,7 @@ public class QuadCornerKicker extends QuadTransformer { private int mySide; private int facadeMask; - private AxisAlignedBB box; + private Box box; private double thickness; QuadCornerKicker() { @@ -93,7 +93,7 @@ public class QuadCornerKicker extends QuadTransformer { * * @param box The BoundingBox. */ - public void setBox(AxisAlignedBB box) { + public void setBox(Box box) { this.box = box; } @@ -175,15 +175,15 @@ public class QuadCornerKicker extends QuadTransformer { return values()[sideMask[sideA] | sideMask[sideB] | sideMask[sideC]]; } - public float pX(AxisAlignedBB box) { + public float pX(Box box) { return (float) (this.xAxis == NEGATIVE ? box.minX : box.maxX); } - public float pY(AxisAlignedBB box) { + public float pY(Box box) { return (float) (this.yAxis == NEGATIVE ? box.minY : box.maxY); } - public float pZ(AxisAlignedBB box) { + public float pZ(Box box) { return (float) (this.zAxis == NEGATIVE ? box.minZ : box.maxZ); } } diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java index 090fd65a6..4390c5d31 100644 --- a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java +++ b/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java @@ -21,7 +21,7 @@ package appeng.thirdparty.codechicken.lib.model.pipeline.transformers; import static net.minecraft.util.math.Direction.AxisDirection.POSITIVE; import net.minecraft.util.math.Direction.AxisDirection; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Box; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import appeng.thirdparty.codechicken.lib.model.Quad.Vertex; @@ -38,14 +38,14 @@ public class QuadFaceStripper extends QuadTransformer { public static final IPipelineElementFactory FACTORY = QuadFaceStripper::new; - private AxisAlignedBB bounds; + private Box bounds; private int mask; QuadFaceStripper() { super(); } - public QuadFaceStripper(IVertexConsumer parent, AxisAlignedBB bounds, int mask) { + public QuadFaceStripper(IVertexConsumer parent, Box bounds, int mask) { super(parent); this.bounds = bounds; this.mask = mask; @@ -57,7 +57,7 @@ public class QuadFaceStripper extends QuadTransformer { * * @param bounds The bounds. */ - public void setBounds(AxisAlignedBB bounds) { + public void setBounds(Box bounds) { this.bounds = bounds; } diff --git a/src/main/java/appeng/tile/AEBaseInvTileEntity.java b/src/main/java/appeng/tile/AEBaseInvTileEntity.java index debb8dd93..c8772efb5 100644 --- a/src/main/java/appeng/tile/AEBaseInvTileEntity.java +++ b/src/main/java/appeng/tile/AEBaseInvTileEntity.java @@ -22,16 +22,16 @@ import java.util.List; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; import appeng.util.helpers.ItemHandlerUtil; @@ -40,14 +40,14 @@ import appeng.util.inv.InvOperation; public abstract class AEBaseInvTileEntity extends AEBaseTileEntity implements IAEAppEngInventory { - public AEBaseInvTileEntity(TileEntityType tileEntityTypeIn) { + public AEBaseInvTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @Override public void read(final CompoundTag data) { super.read(data); - final IItemHandler inv = this.getInternalInventory(); + final ItemTransferable inv = this.getInternalInventory(); if (inv != EmptyHandler.INSTANCE) { final CompoundTag opt = data.getCompound("inv"); for (int x = 0; x < inv.getSlots(); x++) { @@ -57,12 +57,13 @@ public abstract class AEBaseInvTileEntity extends AEBaseTileEntity implements IA } } - public abstract @Nonnull IItemHandler getInternalInventory(); + public abstract @Nonnull + ItemTransferable getInternalInventory(); @Override public CompoundTag write(final CompoundTag data) { super.write(data); - final IItemHandler inv = this.getInternalInventory(); + final ItemTransferable inv = this.getInternalInventory(); if (inv != EmptyHandler.INSTANCE) { final CompoundTag opt = new CompoundTag(); for (int x = 0; x < inv.getSlots(); x++) { @@ -80,7 +81,7 @@ public abstract class AEBaseInvTileEntity extends AEBaseTileEntity implements IA @Override public void getDrops(final World w, final BlockPos pos, final List drops) { - final IItemHandler inv = this.getInternalInventory(); + final ItemTransferable inv = this.getInternalInventory(); for (int l = 0; l < inv.getSlots(); l++) { final ItemStack is = inv.getStackInSlot(l); @@ -91,10 +92,11 @@ public abstract class AEBaseInvTileEntity extends AEBaseTileEntity implements IA } @Override - public abstract void onChangeInventory(IItemHandler inv, int slot, InvOperation mc, ItemStack removed, - ItemStack added); + public abstract void onChangeInventory(ItemTransferable inv, int slot, InvOperation mc, ItemStack removed, + ItemStack added); - protected @Nonnull IItemHandler getItemHandlerForSide(@Nonnull Direction side) { + protected @Nonnull + ItemTransferable getItemHandlerForSide(@Nonnull Direction side) { return this.getInternalInventory(); } diff --git a/src/main/java/appeng/tile/AEBaseTileEntity.java b/src/main/java/appeng/tile/AEBaseTileEntity.java index 8e6e594f2..bb3275a73 100644 --- a/src/main/java/appeng/tile/AEBaseTileEntity.java +++ b/src/main/java/appeng/tile/AEBaseTileEntity.java @@ -30,21 +30,21 @@ import javax.annotation.Nullable; import io.netty.buffer.Unpooled; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.NetworkManager; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.network.play.server.SUpdateTileEntityPacket; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.implementations.tiles.ISegmentedInventory; import appeng.api.util.ICommonTile; @@ -62,10 +62,10 @@ import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.util.Platform; import appeng.util.SettingsFrom; -public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommonTile, ICustomNameObject { +public class AEBaseTileEntity extends BlockEntity implements IOrientable, ICommonTile, ICustomNameObject { private static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal<>(); - private static final Map, IStackSrc> ITEM_STACKS = new HashMap<>(); + private static final Map, IStackSrc> ITEM_STACKS = new HashMap<>(); private int renderFragment = 0; @Nullable private String customName; @@ -73,11 +73,11 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon private Direction up = Direction.UP; private boolean markDirtyQueued = false; - public AEBaseTileEntity(TileEntityType tileEntityTypeIn) { + public AEBaseTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } - public static void registerTileItem(final Class c, final IStackSrc wat) { + public static void registerTileItem(final Class c, final IStackSrc wat) { ITEM_STACKS.put(c, wat); } @@ -91,7 +91,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon } @Nonnull - public TileEntity getTile() { + public BlockEntity getTile() { return this; } @@ -162,7 +162,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon private CompoundTag writeUpdateData() { final CompoundTag data = new CompoundTag(); - final PacketBuffer stream = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf stream = new PacketByteBuf(Unpooled.buffer()); try { this.writeToStream(stream); @@ -178,7 +178,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon return data; } - private boolean readUpdateData(PacketBuffer stream) { + private boolean readUpdateData(PacketByteBuf stream) { boolean output = false; try { @@ -221,14 +221,14 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon */ @Override public void handleUpdateTag(CompoundTag tag) { - final PacketBuffer stream = new PacketBuffer(Unpooled.copiedBuffer(tag.getByteArray("X"))); + final PacketByteBuf stream = new PacketByteBuf(Unpooled.copiedBuffer(tag.getByteArray("X"))); if (this.readUpdateData(stream)) { this.markForUpdate(); } } - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { if (this.canBeRotated()) { final Direction old_Forward = this.forward; final Direction old_Up = this.up; @@ -242,7 +242,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon return false; } - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { if (this.canBeRotated()) { final byte orientation = (byte) ((this.up.ordinal() << 3) | this.forward.ordinal()); data.writeByte(orientation); @@ -334,7 +334,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon } if (this instanceof ISegmentedInventory) { - final IItemHandler inv = ((ISegmentedInventory) this).getInventoryByName("config"); + final ItemTransferable inv = ((ISegmentedInventory) this).getInventoryByName("config"); if (inv instanceof AppEngInternalAEInventory) { final AppEngInternalAEInventory target = (AppEngInternalAEInventory) inv; final AppEngInternalAEInventory tmp = new AppEngInternalAEInventory(null, target.getSlots()); @@ -392,7 +392,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon } if (this instanceof ISegmentedInventory) { - final IItemHandler inv = ((ISegmentedInventory) this).getInventoryByName("config"); + final ItemTransferable inv = ((ISegmentedInventory) this).getInventoryByName("config"); if (inv instanceof AppEngInternalAEInventory) { ((AppEngInternalAEInventory) inv).writeToNBT(output, "config"); } @@ -402,7 +402,7 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon } @Override - public ITextComponent getCustomInventoryName() { + public Text getCustomInventoryName() { return new StringTextComponent( this.hasCustomInventoryName() ? this.customName : this.getClass().getSimpleName()); } diff --git a/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java index a5aec4368..fcdf8310f 100644 --- a/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java @@ -23,14 +23,14 @@ import java.util.Optional; import javax.annotation.Nonnull; +import net.fabricmc.api.Environment; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.fabricmc.api.EnvType; import net.minecraftforge.client.model.data.IModelData; import appeng.api.AEApi; @@ -41,21 +41,21 @@ import appeng.util.item.AEItemStack; public class CraftingMonitorTileEntity extends CraftingTileEntity implements IColorableTile { - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private Integer dspList; - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) private boolean updateList; private IAEItemStack dspPlay; private AEColor paintedColor = AEColor.TRANSPARENT; - public CraftingMonitorTileEntity(TileEntityType tileEntityTypeIn) { + public CraftingMonitorTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final AEColor oldPaintedColor = this.paintedColor; this.paintedColor = AEColor.values()[data.readByte()]; @@ -73,7 +73,7 @@ public class CraftingMonitorTileEntity extends CraftingTileEntity implements ICo } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeByte(this.paintedColor.ordinal()); diff --git a/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java index 937f822b9..2600bfee6 100644 --- a/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java @@ -20,8 +20,8 @@ package appeng.tile.crafting; import java.util.Optional; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityType; import appeng.api.AEApi; import appeng.api.definitions.IBlocks; @@ -30,7 +30,7 @@ import appeng.block.crafting.AbstractCraftingUnitBlock; public class CraftingStorageTileEntity extends CraftingTileEntity { private static final int KILO_SCALAR = 1024; - public CraftingStorageTileEntity(TileEntityType tileEntityTypeIn) { + public CraftingStorageTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java index f50fb808b..00e27d1b7 100644 --- a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java @@ -27,10 +27,10 @@ import java.util.Optional; import javax.annotation.Nonnull; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; @@ -68,7 +68,7 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB private boolean isCoreBlock = false; private CraftingCPUCluster cluster; - public CraftingTileEntity(TileEntityType tileEntityTypeIn) { + public CraftingTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setFlags(GridFlags.MULTIBLOCK, GridFlags.REQUIRE_CHANNEL); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); @@ -258,7 +258,7 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB if (h == this) { places.add(new WorldCoord(this)); } else { - final TileEntity te = (TileEntity) h; + final BlockEntity te = (BlockEntity) h; for (final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS) { final WorldCoord wc = new WorldCoord(te); diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java index 9701b542a..56834511d 100644 --- a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java +++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java @@ -20,18 +20,19 @@ package appeng.tile.crafting; import java.util.Random; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.fabricmc.api.EnvType; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.util.math.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderState; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.render.model.IBakedModel; +import net.minecraft.client.render.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; @@ -39,9 +40,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.util.Identifier; +import net.fabricmc.api.Environment; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; @@ -52,10 +52,10 @@ import appeng.core.AppEng; * Renders the item currently being crafted by the molecular assembler, as well * as the light strip when it's powered. */ -@OnlyIn(Dist.CLIENT) +@Environment(EnvType.CLIENT) public class MolecularAssemblerRenderer extends TileEntityRenderer { - public static final ResourceLocation LIGHTS_MODEL = new ResourceLocation(AppEng.MOD_ID, + public static final Identifier LIGHTS_MODEL = new Identifier(AppEng.MOD_ID, "block/molecular_assembler_lights"); private static final RenderType MC_161917_RENDERTYPE_FIX = createRenderType(); @@ -68,7 +68,7 @@ public class MolecularAssemblerRenderer extends TileEntityRenderer tileEntityTypeIn) { + public MolecularAssemblerTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); final ITileDefinition assembler = AEApi.instance().definitions().blocks().molecularAssembler(); @@ -187,7 +187,7 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final boolean oldPower = this.isPowered; this.isPowered = data.readBoolean(); @@ -195,7 +195,7 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeBoolean(this.isPowered); } @@ -289,7 +289,7 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("upgrades")) { return this.upgrades; } @@ -307,18 +307,18 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.internalInv; } @Override - protected IItemHandler getItemHandlerForSide(Direction side) { + protected ItemTransferable getItemHandlerForSide(Direction side) { return this.gridInvExt; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { if (inv == this.gridInv || inv == this.patternInv) { this.recalculatePlan(); } @@ -488,7 +488,7 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity return output; } - final TileEntity te = this.getWorld().getTileEntity(this.pos.offset(d)); + final BlockEntity te = this.getWorld().getTileEntity(this.pos.offset(d)); if (te == null) { return output; @@ -542,12 +542,12 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity return this.isPowered; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public void setAnimationStatus(@Nullable AssemblerAnimationStatus status) { this.animationStatus = status; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) @Nullable public AssemblerAnimationStatus getAnimationStatus() { return this.animationStatus; @@ -560,12 +560,12 @@ public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity } @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return slot == 9; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { if (slot >= 9) { return false; } diff --git a/src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java b/src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java index c5441fcaf..4d51b85c1 100644 --- a/src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java +++ b/src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java @@ -18,8 +18,8 @@ package appeng.tile.grid; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntityType; import appeng.api.networking.IGridNode; import appeng.api.networking.security.IActionHost; @@ -32,7 +32,7 @@ public abstract class AENetworkInvTileEntity extends AEBaseInvTileEntity impleme private final AENetworkProxy gridProxy = new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true); - public AENetworkInvTileEntity(TileEntityType tileEntityTypeIn) { + public AENetworkInvTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java b/src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java index 4ddfd3297..ee7ff1230 100644 --- a/src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java +++ b/src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java @@ -19,7 +19,7 @@ package appeng.tile.grid; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import appeng.api.networking.IGridNode; import appeng.api.networking.security.IActionHost; @@ -34,7 +34,7 @@ public abstract class AENetworkPowerTileEntity extends AEBasePoweredTileEntity i private final AENetworkProxy gridProxy = new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true); - public AENetworkPowerTileEntity(TileEntityType tileEntityTypeIn) { + public AENetworkPowerTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/grid/AENetworkTileEntity.java b/src/main/java/appeng/tile/grid/AENetworkTileEntity.java index ae06b56d2..371c91578 100644 --- a/src/main/java/appeng/tile/grid/AENetworkTileEntity.java +++ b/src/main/java/appeng/tile/grid/AENetworkTileEntity.java @@ -18,8 +18,8 @@ package appeng.tile.grid; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntityType; import appeng.api.networking.IGridNode; import appeng.api.networking.security.IActionHost; @@ -34,7 +34,7 @@ public class AENetworkTileEntity extends AEBaseTileEntity implements IActionHost private final AENetworkProxy gridProxy = this.createProxy(); - public AENetworkTileEntity(TileEntityType tileEntityTypeIn) { + public AENetworkTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/grindstone/CrankTileEntity.java b/src/main/java/appeng/tile/grindstone/CrankTileEntity.java index 5f0372b8c..138a5a15a 100644 --- a/src/main/java/appeng/tile/grindstone/CrankTileEntity.java +++ b/src/main/java/appeng/tile/grindstone/CrankTileEntity.java @@ -21,10 +21,10 @@ package appeng.tile.grindstone; import java.io.IOException; import net.minecraft.block.BlockState; -import net.minecraft.network.PacketBuffer; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.network.PacketByteBuf; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.Direction; import appeng.api.implementations.tiles.ICrankable; @@ -41,7 +41,7 @@ public class CrankTileEntity extends AEBaseTileEntity implements ITickableTileEn private int hits = 0; private int rotation = 0; - public CrankTileEntity(TileEntityType tileEntityTypeIn) { + public CrankTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -68,7 +68,7 @@ public class CrankTileEntity extends AEBaseTileEntity implements ITickableTileEn } final Direction grinder = this.getUp().getOpposite(); - final TileEntity te = this.world.getTileEntity(this.pos.offset(grinder)); + final BlockEntity te = this.world.getTileEntity(this.pos.offset(grinder)); if (te instanceof ICrankable) { return (ICrankable) te; } @@ -76,14 +76,14 @@ public class CrankTileEntity extends AEBaseTileEntity implements ITickableTileEn } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); this.rotation = data.readInt(); return c; } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeInt(this.rotation); } diff --git a/src/main/java/appeng/tile/grindstone/GrinderTileEntity.java b/src/main/java/appeng/tile/grindstone/GrinderTileEntity.java index 45ca57cd7..5395da3fa 100644 --- a/src/main/java/appeng/tile/grindstone/GrinderTileEntity.java +++ b/src/main/java/appeng/tile/grindstone/GrinderTileEntity.java @@ -21,11 +21,11 @@ package appeng.tile.grindstone; import java.util.ArrayList; import java.util.List; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.RangedWrapper; import appeng.api.implementations.tiles.ICrankable; @@ -45,10 +45,10 @@ public class GrinderTileEntity extends AEBaseInvTileEntity implements ICrankable private static final int SLOT_PROCESSING = 6; private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 7); - private final IItemHandler invExt = new WrapperFilteredItemHandler(this.inv, new GrinderFilter()); + private final ItemTransferable invExt = new WrapperFilteredItemHandler(this.inv, new GrinderFilter()); private int points; - public GrinderTileEntity(TileEntityType tileEntityTypeIn) { + public GrinderTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -60,18 +60,18 @@ public class GrinderTileEntity extends AEBaseInvTileEntity implements ICrankable } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.inv; } @Override - protected IItemHandler getItemHandlerForSide(Direction side) { + protected ItemTransferable getItemHandlerForSide(Direction side) { return this.invExt; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { } @@ -162,12 +162,12 @@ public class GrinderTileEntity extends AEBaseInvTileEntity implements ICrankable private class GrinderFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slotIndex, int amount) { + public boolean allowExtract(ItemTransferable inv, int slotIndex, int amount) { return slotIndex >= 3 && slotIndex <= 5; } @Override - public boolean allowInsert(IItemHandler inv, int slotIndex, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slotIndex, ItemStack stack) { if (!GrinderRecipes.isValidIngredient(world, stack)) { return false; } diff --git a/src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java b/src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java index 81dc6b4fb..20fa0e703 100644 --- a/src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java +++ b/src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java @@ -20,12 +20,12 @@ package appeng.tile.misc; import java.util.List; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import appeng.api.config.CopyMode; import appeng.api.config.Settings; @@ -49,17 +49,17 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 63); private final ConfigManager manager = new ConfigManager(this); - private IItemHandler cacheUpgrades = null; - private IItemHandler cacheConfig = null; + private ItemTransferable cacheUpgrades = null; + private ItemTransferable cacheConfig = null; private boolean locked = false; - public CellWorkbenchTileEntity(TileEntityType tileEntityTypeIn) { + public CellWorkbenchTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.manager.registerSetting(Settings.COPY_MODE, CopyMode.CLEAR_ON_REMOVE); this.cell.setEnableClientEvents(true); } - public IItemHandler getCellUpgradeInventory() { + public ItemTransferable getCellUpgradeInventory() { if (this.cacheUpgrades == null) { final ICellWorkbenchItem cell = this.getCell(); if (cell == null) { @@ -71,7 +71,7 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity return null; } - final IItemHandler inv = cell.getUpgradesInventory(is); + final ItemTransferable inv = cell.getUpgradesInventory(is); if (inv == null) { return null; } @@ -111,7 +111,7 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("config")) { return this.config; } @@ -129,15 +129,15 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { if (inv == this.cell && !this.locked) { this.locked = true; this.cacheUpgrades = null; this.cacheConfig = null; - final IItemHandler configInventory = this.getCellConfigInventory(); + final ItemTransferable configInventory = this.getCellConfigInventory(); if (configInventory != null) { boolean cellHasConfig = false; for (int x = 0; x < configInventory.getSlots(); x++) { @@ -165,7 +165,7 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity this.locked = false; } else if (inv == this.config && !this.locked) { this.locked = true; - final IItemHandler c = this.getCellConfigInventory(); + final ItemTransferable c = this.getCellConfigInventory(); if (c != null) { ItemHandlerUtil.copy(this.config, c, false); // copy items back. The ConfigInventory may changed the items on insert @@ -175,7 +175,7 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity } } - private IItemHandler getCellConfigInventory() { + private ItemTransferable getCellConfigInventory() { if (this.cacheConfig == null) { final ICellWorkbenchItem cell = this.getCell(); if (cell == null) { @@ -187,7 +187,7 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity return null; } - final IItemHandler inv = cell.getConfigInventory(is); + final ItemTransferable inv = cell.getConfigInventory(is); if (inv == null) { return null; } diff --git a/src/main/java/appeng/tile/misc/ChargerTileEntity.java b/src/main/java/appeng/tile/misc/ChargerTileEntity.java index 08faf482e..abc55c2aa 100644 --- a/src/main/java/appeng/tile/misc/ChargerTileEntity.java +++ b/src/main/java/appeng/tile/misc/ChargerTileEntity.java @@ -23,12 +23,12 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -62,7 +62,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 1, 1, new ChargerInvFilter()); - public ChargerTileEntity(TileEntityType tileEntityTypeIn) { + public ChargerTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); this.getProxy().setFlags(); @@ -76,7 +76,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); try { final IAEItemStack item = AEItemStack.fromPacket(data); @@ -89,7 +89,7 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); final AEItemStack is = AEItemStack.fromItemStack(this.inv.getStackInSlot(0)); if (is != null) { @@ -132,13 +132,13 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.inv; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { try { this.getProxy().getTick().wakeDevice(this.getProxy().getNode()); } catch (final GridAccessException e) { @@ -253,14 +253,14 @@ public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICran private class ChargerInvFilter implements IAEItemFilter { @Override - public boolean allowInsert(IItemHandler inv, final int i, final ItemStack itemstack) { + public boolean allowInsert(ItemTransferable inv, final int i, final ItemStack itemstack) { final IItemDefinition cert = AEApi.instance().definitions().materials().certusQuartzCrystal(); return Platform.isChargeable(itemstack) || cert.isSameAs(itemstack); } @Override - public boolean allowExtract(IItemHandler inv, final int slotIndex, int amount) { + public boolean allowExtract(ItemTransferable inv, final int slotIndex, int amount) { ItemStack extractedItem = inv.getStackInSlot(slotIndex); if (Platform.isChargeable(extractedItem)) { diff --git a/src/main/java/appeng/tile/misc/CondenserTileEntity.java b/src/main/java/appeng/tile/misc/CondenserTileEntity.java index 246502c2c..51e2cd720 100644 --- a/src/main/java/appeng/tile/misc/CondenserTileEntity.java +++ b/src/main/java/appeng/tile/misc/CondenserTileEntity.java @@ -21,19 +21,19 @@ package appeng.tile.misc; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.CondenserOutput; @@ -69,18 +69,18 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM private final AppEngInternalInventory outputSlot = new AppEngInternalInventory(this, 1); private final AppEngInternalInventory storageSlot = new AppEngInternalInventory(this, 1); - private final IItemHandler inputSlot = new CondenseItemHandler(); + private final ItemTransferable inputSlot = new CondenseItemHandler(); private final IFluidHandler fluidHandler = new FluidHandler(); private final MEHandler meHandler = new MEHandler(); - private final IItemHandler externalInv = new WrapperChainedItemHandler(this.inputSlot, + private final ItemTransferable externalInv = new WrapperChainedItemHandler(this.inputSlot, new WrapperFilteredItemHandler(this.outputSlot, AEItemFilters.EXTRACT_ONLY)); - private final IItemHandler combinedInv = new WrapperChainedItemHandler(this.inputSlot, this.outputSlot, + private final ItemTransferable combinedInv = new WrapperChainedItemHandler(this.inputSlot, this.outputSlot, this.storageSlot); private double storedPower = 0; - public CondenserTileEntity(TileEntityType tileEntityTypeIn) { + public CondenserTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.cm.registerSetting(Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH); } @@ -142,7 +142,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM this.outputSlot.insertItem(0, output, false); } - IItemHandler getOutputSlot() { + ItemTransferable getOutputSlot() { return this.outputSlot; } @@ -167,13 +167,13 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.combinedInv; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { if (inv == this.outputSlot) { this.meHandler.outputChanged(added, removed); } @@ -210,7 +210,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM return super.getCapability(capability, facing); } - private class CondenseItemHandler implements IItemHandler { + private class CondenseItemHandler implements ItemTransferable { @Override public int getSlots() { @@ -259,8 +259,8 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM @Nonnull @Override - public FluidStack getFluid() { - return FluidStack.EMPTY; + public FluidVolume getFluid() { + return FluidVolume.EMPTY; } @Override @@ -274,12 +274,12 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM } @Override - public boolean isFluidValid(FluidStack stack) { + public boolean isFluidValid(FluidVolume stack) { return !stack.isEmpty(); } @Override - public int fill(FluidStack resource, FluidAction action) { + public int fill(FluidVolume resource, FluidAction action) { if (action == FluidAction.EXECUTE) { final IStorageChannel chan = AEApi.instance().storage() .getStorageChannel(IFluidStorageChannel.class); @@ -292,14 +292,14 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM @Nonnull @Override - public FluidStack drain(int maxDrain, FluidAction action) { - return FluidStack.EMPTY; + public FluidVolume drain(int maxDrain, FluidAction action) { + return FluidVolume.EMPTY; } @Nonnull @Override - public FluidStack drain(FluidStack resource, FluidAction action) { - return FluidStack.EMPTY; + public FluidVolume drain(FluidVolume resource, FluidAction action) { + return FluidVolume.EMPTY; } @Override @@ -309,8 +309,8 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM @Nonnull @Override - public FluidStack getFluidInTank(int tank) { - return FluidStack.EMPTY; + public FluidVolume getFluidInTank(int tank) { + return FluidVolume.EMPTY; } @Override @@ -319,7 +319,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM } @Override - public boolean isFluidValid(int tank, @Nonnull FluidStack stack) { + public boolean isFluidValid(int tank, @Nonnull FluidVolume stack) { return tank == 0 && isFluidValid(stack); } } diff --git a/src/main/java/appeng/tile/misc/InscriberRecipes.java b/src/main/java/appeng/tile/misc/InscriberRecipes.java index 2e3e00a2c..21d95a0f2 100644 --- a/src/main/java/appeng/tile/misc/InscriberRecipes.java +++ b/src/main/java/appeng/tile/misc/InscriberRecipes.java @@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; @@ -29,7 +29,7 @@ import appeng.recipes.handlers.InscriberRecipe; */ public final class InscriberRecipes { - public static final ResourceLocation NAMEPLATE_RECIPE_ID = new ResourceLocation(AppEng.MOD_ID, "nameplate"); + public static final Identifier NAMEPLATE_RECIPE_ID = new Identifier(AppEng.MOD_ID, "nameplate"); private InscriberRecipes() { } diff --git a/src/main/java/appeng/tile/misc/InscriberTileEntity.java b/src/main/java/appeng/tile/misc/InscriberTileEntity.java index bccbec6a7..017e0c070 100644 --- a/src/main/java/appeng/tile/misc/InscriberTileEntity.java +++ b/src/main/java/appeng/tile/misc/InscriberTileEntity.java @@ -25,14 +25,14 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import appeng.api.AEApi; @@ -89,16 +89,16 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity private final AppEngInternalInventory bottomItemHandler = new AppEngInternalInventory(this, 1, 1); private final AppEngInternalInventory sideItemHandler = new AppEngInternalInventory(this, 2, 1); - private final IItemHandler topItemHandlerExtern; - private final IItemHandler bottomItemHandlerExtern; - private final IItemHandler sideItemHandlerExtern; + private final ItemTransferable topItemHandlerExtern; + private final ItemTransferable bottomItemHandlerExtern; + private final ItemTransferable sideItemHandlerExtern; private InscriberRecipe cachedTask = null; private final IItemHandlerModifiable inv = new WrapperChainedItemHandler(this.topItemHandler, this.bottomItemHandler, this.sideItemHandler); - public InscriberTileEntity(TileEntityType tileEntityTypeIn) { + public InscriberTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); @@ -142,7 +142,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final int slot = data.readByte(); @@ -167,7 +167,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); int slot = this.isSmash() ? 64 : 0; @@ -206,13 +206,13 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.inv; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { try { if (slot == 0) { this.setProcessingTime(0); @@ -341,7 +341,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("inv")) { return this.getInternalInventory(); } @@ -354,7 +354,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity } @Override - protected IItemHandler getItemHandlerForSide(@Nonnull Direction facing) { + protected ItemTransferable getItemHandlerForSide(@Nonnull Direction facing) { if (facing == this.getUp()) { return this.topItemHandlerExtern; } else if (facing == this.getUp().getOpposite()) { @@ -410,7 +410,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity */ private class ItemHandlerFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { if (InscriberTileEntity.this.isSmash()) { return false; } @@ -420,7 +420,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { // output slot if (slot == 1) { return false; diff --git a/src/main/java/appeng/tile/misc/InterfaceTileEntity.java b/src/main/java/appeng/tile/misc/InterfaceTileEntity.java index b3df88a0c..79ceffc2f 100644 --- a/src/main/java/appeng/tile/misc/InterfaceTileEntity.java +++ b/src/main/java/appeng/tile/misc/InterfaceTileEntity.java @@ -30,15 +30,15 @@ import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -75,7 +75,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity // Indicates that this interface has no specific direction set private boolean omniDirectional = true; - public InterfaceTileEntity(TileEntityType tileEntityTypeIn) { + public InterfaceTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -166,7 +166,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); boolean oldOmniDirectional = this.omniDirectional; this.omniDirectional = data.readBoolean(); @@ -174,7 +174,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeBoolean(this.omniDirectional); } @@ -195,7 +195,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { return this.duality.getInventoryByName(name); } @@ -210,13 +210,13 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.duality.getInternalInventory(); } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { this.duality.onChangeInventory(inv, slot, mc, removed, added); } @@ -234,7 +234,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity } @Override - public TileEntity getTileEntity() { + public BlockEntity getTileEntity() { return this; } diff --git a/src/main/java/appeng/tile/misc/LightDetectorTileEntity.java b/src/main/java/appeng/tile/misc/LightDetectorTileEntity.java index 4dc3fa2a7..30f26d5f3 100644 --- a/src/main/java/appeng/tile/misc/LightDetectorTileEntity.java +++ b/src/main/java/appeng/tile/misc/LightDetectorTileEntity.java @@ -19,7 +19,7 @@ package appeng.tile.misc; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import appeng.tile.AEBaseTileEntity; import appeng.util.Platform; @@ -29,7 +29,7 @@ public class LightDetectorTileEntity extends AEBaseTileEntity implements ITickab private int lastCheck = 30; private int lastLight = 0; - public LightDetectorTileEntity(TileEntityType tileEntityTypeIn) { + public LightDetectorTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java b/src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java index 0c3fca774..30f1b94a7 100644 --- a/src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java +++ b/src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java @@ -32,8 +32,8 @@ import io.netty.buffer.Unpooled; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -57,7 +57,7 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity { private int isLit = 0; private List dots = null; - public PaintSplotchesTileEntity(TileEntityType tileEntityTypeIn) { + public PaintSplotchesTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -69,7 +69,7 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity { @Override public CompoundTag write(final CompoundTag data) { super.write(data); - final PacketBuffer myDat = new PacketBuffer(Unpooled.buffer()); + final PacketByteBuf myDat = new PacketByteBuf(Unpooled.buffer()); this.writeBuffer(myDat); if (myDat.hasArray()) { data.putByteArray("dots", myDat.array()); @@ -77,7 +77,7 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity { return data; } - private void writeBuffer(final PacketBuffer out) { + private void writeBuffer(final PacketByteBuf out) { if (this.dots == null) { out.writeByte(0); return; @@ -94,11 +94,11 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity { public void read(final CompoundTag data) { super.read(data); if (data.contains("dots")) { - this.readBuffer(new PacketBuffer(Unpooled.copiedBuffer(data.getByteArray("dots")))); + this.readBuffer(new PacketByteBuf(Unpooled.copiedBuffer(data.getByteArray("dots")))); } } - private void readBuffer(final PacketBuffer in) { + private void readBuffer(final PacketByteBuf in) { final byte howMany = in.readByte(); if (howMany == 0) { @@ -133,13 +133,13 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity { } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); this.writeBuffer(data); } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { super.readFromStream(data); this.readBuffer(data); return true; diff --git a/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java b/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java index 8fdb8b119..fa05404f6 100644 --- a/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java +++ b/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java @@ -21,8 +21,8 @@ package appeng.tile.misc; import java.io.IOException; import java.util.EnumSet; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import appeng.api.implementations.IPowerChannelState; @@ -40,7 +40,7 @@ public class QuartzGrowthAcceleratorTileEntity extends AENetworkTileEntity private boolean hasPower = false; - public QuartzGrowthAcceleratorTileEntity(TileEntityType tileEntityTypeIn) { + public QuartzGrowthAcceleratorTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); this.getProxy().setFlags(); @@ -58,7 +58,7 @@ public class QuartzGrowthAcceleratorTileEntity extends AENetworkTileEntity } @Override - public boolean readFromStream(final PacketBuffer data) throws IOException { + public boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final boolean hadPower = this.isPowered(); this.setPowered(data.readBoolean()); @@ -66,7 +66,7 @@ public class QuartzGrowthAcceleratorTileEntity extends AENetworkTileEntity } @Override - public void writeToStream(final PacketBuffer data) throws IOException { + public void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); try { data.writeBoolean(this.getProxy().getEnergy().isNetworkPowered()); diff --git a/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java b/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java index fd83e9bd8..d5a3ed0ec 100644 --- a/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java +++ b/src/main/java/appeng/tile/misc/SecurityStationTileEntity.java @@ -23,18 +23,18 @@ import java.util.EnumSet; import java.util.List; import java.util.Map; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.INBT; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; @@ -92,7 +92,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT private AEColor paintedColor = AEColor.TRANSPARENT; private boolean isActive = false; - public SecurityStationTileEntity(TileEntityType tileEntityTypeIn) { + public SecurityStationTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); this.getProxy().setIdlePowerUsage(2.0); @@ -109,8 +109,8 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removedStack, final ItemStack newStack) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { } @@ -130,7 +130,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final boolean wasActive = this.isActive; this.isActive = data.readBoolean(); @@ -142,7 +142,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeBoolean(this.getProxy().isActive()); data.writeByte(this.paintedColor.ordinal()); diff --git a/src/main/java/appeng/tile/misc/SkyCompassTileEntity.java b/src/main/java/appeng/tile/misc/SkyCompassTileEntity.java index bc9445f34..fd53f2ea0 100644 --- a/src/main/java/appeng/tile/misc/SkyCompassTileEntity.java +++ b/src/main/java/appeng/tile/misc/SkyCompassTileEntity.java @@ -18,13 +18,13 @@ package appeng.tile.misc; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import appeng.tile.AEBaseTileEntity; public class SkyCompassTileEntity extends AEBaseTileEntity { - public SkyCompassTileEntity(TileEntityType tileEntityTypeIn) { + public SkyCompassTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } diff --git a/src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java b/src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java index 91800e5a9..73b52c58a 100644 --- a/src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java +++ b/src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java @@ -22,14 +22,14 @@ import java.io.IOException; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.items.IItemHandler; import appeng.api.config.Actionable; import appeng.api.networking.IGridNode; @@ -55,7 +55,7 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement public static final int MAX_BURN_SPEED = 200; public static final double DILATION_SCALING = 25.0; // x4 ~ 40 AE/t at max private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 1); - private final IItemHandler invExt = new WrapperFilteredItemHandler(this.inv, new FuelSlotFilter()); + private final ItemTransferable invExt = new WrapperFilteredItemHandler(this.inv, new FuelSlotFilter()); private int burnSpeed = 100; private double burnTime = 0; @@ -64,7 +64,7 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement // client side.. public boolean isOn; - public VibrationChamberTileEntity(TileEntityType tileEntityTypeIn) { + public VibrationChamberTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setIdlePowerUsage(0); this.getProxy().setFlags(); @@ -76,7 +76,7 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final boolean wasOn = this.isOn; @@ -86,7 +86,7 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeBoolean(this.getBurnTime() > 0); } @@ -109,18 +109,18 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement } @Override - protected IItemHandler getItemHandlerForSide(@Nonnull Direction facing) { + protected ItemTransferable getItemHandlerForSide(@Nonnull Direction facing) { return this.invExt; } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.inv; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { if (this.getBurnTime() <= 0) { if (this.canEatFuel()) { try { @@ -269,12 +269,12 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement private class FuelSlotFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return ForgeHooks.getBurnTime(inv.getStackInSlot(slot)) == 0; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { return ForgeHooks.getBurnTime(stack) != 0; } } diff --git a/src/main/java/appeng/tile/networking/CableBusTESR.java b/src/main/java/appeng/tile/networking/CableBusTESR.java index c870357cb..e46b9cf3c 100644 --- a/src/main/java/appeng/tile/networking/CableBusTESR.java +++ b/src/main/java/appeng/tile/networking/CableBusTESR.java @@ -18,9 +18,9 @@ package appeng.tile.networking; -import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.math.Direction; @@ -34,7 +34,7 @@ public class CableBusTESR extends TileEntityRenderer { } @Override - public void render(CableBusTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, + public void render(CableBusTileEntity te, float partialTicks, MatrixStack ms, VertexConsumerProvider buffers, int combinedLightIn, int combinedOverlayIn) { if (!te.getCableBus().isRequiresDynamicRender()) { return; diff --git a/src/main/java/appeng/tile/networking/CableBusTileEntity.java b/src/main/java/appeng/tile/networking/CableBusTileEntity.java index dbeb3f333..ed7170927 100644 --- a/src/main/java/appeng/tile/networking/CableBusTileEntity.java +++ b/src/main/java/appeng/tile/networking/CableBusTileEntity.java @@ -25,11 +25,11 @@ import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; @@ -63,7 +63,7 @@ public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile private int oldLV = -1; // on re-calculate light when it changes - public CableBusTileEntity(TileEntityType tileEntityTypeIn) { + public CableBusTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); } @@ -81,7 +81,7 @@ public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); boolean ret = this.getCableBus().readFromStream(data); @@ -97,7 +97,7 @@ public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); this.getCableBus().writeToStream(data); } diff --git a/src/main/java/appeng/tile/networking/ControllerTileEntity.java b/src/main/java/appeng/tile/networking/ControllerTileEntity.java index db484e90a..5c89648dc 100644 --- a/src/main/java/appeng/tile/networking/ControllerTileEntity.java +++ b/src/main/java/appeng/tile/networking/ControllerTileEntity.java @@ -21,11 +21,11 @@ package appeng.tile.networking; import java.util.EnumSet; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraftforge.items.wrapper.EmptyHandler; import appeng.api.config.Actionable; @@ -48,7 +48,7 @@ import appeng.util.inv.InvOperation; public class ControllerTileEntity extends AENetworkPowerTileEntity { private boolean isValid = false; - public ControllerTileEntity(TileEntityType tileEntityTypeIn) { + public ControllerTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.setInternalMaxPower(8000); this.setInternalPublicPowerStorage(true); @@ -168,13 +168,13 @@ public class ControllerTileEntity extends AENetworkPowerTileEntity { } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return EmptyHandler.INSTANCE; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { } /** diff --git a/src/main/java/appeng/tile/networking/CreativeEnergyCellTileEntity.java b/src/main/java/appeng/tile/networking/CreativeEnergyCellTileEntity.java index 4d37ecdae..08d88cc7e 100644 --- a/src/main/java/appeng/tile/networking/CreativeEnergyCellTileEntity.java +++ b/src/main/java/appeng/tile/networking/CreativeEnergyCellTileEntity.java @@ -18,7 +18,7 @@ package appeng.tile.networking; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; @@ -30,7 +30,7 @@ import appeng.tile.grid.AENetworkTileEntity; public class CreativeEnergyCellTileEntity extends AENetworkTileEntity implements IAEPowerStorage { - public CreativeEnergyCellTileEntity(TileEntityType tileEntityTypeIn) { + public CreativeEnergyCellTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setIdlePowerUsage(0); } diff --git a/src/main/java/appeng/tile/networking/DenseEnergyCellTileEntity.java b/src/main/java/appeng/tile/networking/DenseEnergyCellTileEntity.java index d935ecf67..3bcc049c4 100644 --- a/src/main/java/appeng/tile/networking/DenseEnergyCellTileEntity.java +++ b/src/main/java/appeng/tile/networking/DenseEnergyCellTileEntity.java @@ -18,11 +18,11 @@ package appeng.tile.networking; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; public class DenseEnergyCellTileEntity extends EnergyCellTileEntity { - public DenseEnergyCellTileEntity(TileEntityType tileEntityTypeIn) { + public DenseEnergyCellTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.setInternalMaxPower(200000 * 8); } diff --git a/src/main/java/appeng/tile/networking/EnergyAcceptorTileEntity.java b/src/main/java/appeng/tile/networking/EnergyAcceptorTileEntity.java index 32e25d0f9..06d75e16c 100644 --- a/src/main/java/appeng/tile/networking/EnergyAcceptorTileEntity.java +++ b/src/main/java/appeng/tile/networking/EnergyAcceptorTileEntity.java @@ -18,9 +18,9 @@ package appeng.tile.networking; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraftforge.items.wrapper.EmptyHandler; import appeng.api.config.Actionable; @@ -33,7 +33,7 @@ import appeng.util.inv.InvOperation; public class EnergyAcceptorTileEntity extends AENetworkPowerTileEntity { - public EnergyAcceptorTileEntity(TileEntityType tileEntityTypeIn) { + public EnergyAcceptorTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setIdlePowerUsage(0.0); this.setInternalMaxPower(0); @@ -68,13 +68,13 @@ public class EnergyAcceptorTileEntity extends AENetworkPowerTileEntity { } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return EmptyHandler.INSTANCE; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { } } diff --git a/src/main/java/appeng/tile/networking/EnergyCellTileEntity.java b/src/main/java/appeng/tile/networking/EnergyCellTileEntity.java index 09fb37f7d..2e7bf12cf 100644 --- a/src/main/java/appeng/tile/networking/EnergyCellTileEntity.java +++ b/src/main/java/appeng/tile/networking/EnergyCellTileEntity.java @@ -18,8 +18,8 @@ package appeng.tile.networking; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntityType; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; @@ -41,7 +41,7 @@ public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowe private byte currentMeta = -1; - public EnergyCellTileEntity(TileEntityType tileEntityTypeIn) { + public EnergyCellTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setIdlePowerUsage(0); } diff --git a/src/main/java/appeng/tile/networking/WirelessTileEntity.java b/src/main/java/appeng/tile/networking/WirelessTileEntity.java index fb6d44b1e..81c2951da 100644 --- a/src/main/java/appeng/tile/networking/WirelessTileEntity.java +++ b/src/main/java/appeng/tile/networking/WirelessTileEntity.java @@ -21,11 +21,11 @@ package appeng.tile.networking; import java.io.IOException; import java.util.EnumSet; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.implementations.IPowerChannelState; @@ -54,7 +54,7 @@ public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirel private int clientFlags = 0; - public WirelessTileEntity(TileEntityType tileEntityTypeIn) { + public WirelessTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.inv.setFilter(new AEItemDefinitionFilter(AEApi.instance().definitions().materials().wirelessBooster())); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); @@ -78,7 +78,7 @@ public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirel } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final int old = this.getClientFlags(); this.setClientFlags(data.readByte()); @@ -87,7 +87,7 @@ public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirel } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); this.setClientFlags(0); @@ -117,13 +117,13 @@ public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirel } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.inv; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { // :P } diff --git a/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java b/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java index 0c4eaba75..ae5e8eacb 100644 --- a/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java +++ b/src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java @@ -26,7 +26,7 @@ import javax.annotation.Nonnull; import com.google.common.collect.ImmutableSet; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; @@ -59,7 +59,7 @@ public abstract class AEBasePoweredTileEntity extends AEBaseInvTileEntity // IC2 private IC2PowerSink ic2Sink; - public AEBasePoweredTileEntity(TileEntityType tileEntityTypeIn) { + public AEBasePoweredTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.forgeEnergyAdapter = new ForgeEnergyAdapter(this); this.forgeEnergyAdapterOptional = LazyOptional.of(() -> forgeEnergyAdapter); diff --git a/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java b/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java index c76d75865..0a44c2642 100644 --- a/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java +++ b/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java @@ -24,18 +24,18 @@ import java.util.Optional; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.client.model.data.ModelProperty; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; import appeng.api.AEApi; @@ -70,7 +70,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I private QuantumCluster cluster; private boolean updateStatus = false; - public QuantumBridgeTileEntity(TileEntityType tileEntityTypeIn) { + public QuantumBridgeTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); this.getProxy().setFlags(GridFlags.DENSE_CAPACITY); @@ -89,7 +89,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); int out = this.constructed; @@ -105,7 +105,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final int oldValue = this.constructed; this.constructed = data.readByte(); @@ -113,20 +113,20 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.internalInventory; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { if (this.cluster != null) { this.cluster.updateStatus(true); } } @Override - protected IItemHandler getItemHandlerForSide(Direction side) { + protected ItemTransferable getItemHandlerForSide(Direction side) { if (this.isCenter()) { return this.internalInventory; } @@ -229,7 +229,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I final EnumSet set = EnumSet.noneOf(Direction.class); for (final Direction d : Direction.values()) { - final TileEntity te = this.world.getTileEntity(this.pos.offset(d)); + final BlockEntity te = this.world.getTileEntity(this.pos.offset(d)); if (te instanceof QuantumBridgeTileEntity) { set.add(d); } diff --git a/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java b/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java index 72f31716c..67713a9b2 100644 --- a/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java +++ b/src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java @@ -20,12 +20,12 @@ package appeng.tile.spatial; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -54,10 +54,10 @@ import appeng.util.inv.filter.IAEItemFilter; public class SpatialIOPortTileEntity extends AENetworkInvTileEntity implements IWorldCallable { private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 2); - private final IItemHandler invExt = new WrapperFilteredItemHandler(this.inv, new SpatialIOFilter()); + private final ItemTransferable invExt = new WrapperFilteredItemHandler(this.inv, new SpatialIOFilter()); private YesNo lastRedstoneState = YesNo.UNDECIDED; - public SpatialIOPortTileEntity(TileEntityType tileEntityTypeIn) { + public SpatialIOPortTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); } @@ -159,29 +159,30 @@ public class SpatialIOPortTileEntity extends AENetworkInvTileEntity implements I } @Override - protected @Nonnull IItemHandler getItemHandlerForSide(@Nonnull Direction side) { + protected @Nonnull + ItemTransferable getItemHandlerForSide(@Nonnull Direction side) { return this.invExt; } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.inv; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { } private class SpatialIOFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return slot == 1; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { return (slot == 0 && SpatialIOPortTileEntity.this.isSpatialCell(stack)); } diff --git a/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java b/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java index c319bb1f4..7fd39d234 100644 --- a/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java +++ b/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java @@ -23,8 +23,8 @@ import java.util.EnumSet; import javax.annotation.Nonnull; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelDataMap; @@ -66,7 +66,7 @@ public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMu private SpatialPylonCluster cluster; private boolean didHaveLight = false; - public SpatialPylonTileEntity(TileEntityType tileEntityTypeIn) { + public SpatialPylonTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL, GridFlags.MULTIBLOCK); this.getProxy().setIdlePowerUsage(0.5); @@ -194,7 +194,7 @@ public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMu } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final int old = this.displayBits; this.displayBits = data.readByte(); @@ -202,7 +202,7 @@ public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMu } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeByte(this.displayBits); } diff --git a/src/main/java/appeng/tile/storage/ChestTileEntity.java b/src/main/java/appeng/tile/storage/ChestTileEntity.java index 06e8e11ac..5935d5173 100644 --- a/src/main/java/appeng/tile/storage/ChestTileEntity.java +++ b/src/main/java/appeng/tile/storage/ChestTileEntity.java @@ -25,23 +25,23 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.AccessRestriction; @@ -112,7 +112,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity implements IMEChest, ITerminalHost, IPriorityHost, IConfigManagerHost, IColorableTile, ITickableTileEntity { private final AppEngInternalInventory inputInventory = new AppEngInternalInventory(this, 1); private final AppEngInternalInventory cellInventory = new AppEngInternalInventory(this, 1); - private final IItemHandler internalInventory = new WrapperChainedItemHandler(this.inputInventory, + private final ItemTransferable internalInventory = new WrapperChainedItemHandler(this.inputInventory, this.cellInventory); private final IActionSource mySrc = new MachineSource(this); @@ -127,7 +127,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity private Accessor accessor; private IFluidHandler fluidHandler; - public ChestTileEntity(TileEntityType tileEntityTypeIn) { + public ChestTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.setInternalMaxPower(PowerMultiplier.CONFIG.multiply(40)); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); @@ -345,7 +345,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); if (this.world.getGameTime() - this.lastStateChange > 8) { @@ -369,7 +369,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final int oldState = this.state; @@ -424,13 +424,13 @@ public class ChestTileEntity extends AENetworkPowerTileEntity } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.internalInventory; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { if (inv == this.cellInventory) { this.cellHandler = null; this.isCached = false; // recalculate the storage cell. @@ -455,7 +455,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity } @Override - protected IItemHandler getItemHandlerForSide(@Nonnull Direction side) { + protected ItemTransferable getItemHandlerForSide(@Nonnull Direction side) { if (side == this.getForward()) { return this.cellInventory; } else { @@ -712,8 +712,8 @@ public class ChestTileEntity extends AENetworkPowerTileEntity @Nonnull @Override - public FluidStack getFluid() { - return FluidStack.EMPTY; + public FluidVolume getFluid() { + return FluidVolume.EMPTY; } @Override @@ -727,7 +727,7 @@ public class ChestTileEntity extends AENetworkPowerTileEntity } @Override - public boolean isFluidValid(FluidStack stack) { + public boolean isFluidValid(FluidVolume stack) { return canAcceptLiquids(); } @@ -738,8 +738,8 @@ public class ChestTileEntity extends AENetworkPowerTileEntity @Nonnull @Override - public FluidStack getFluidInTank(int tank) { - return FluidStack.EMPTY; + public FluidVolume getFluidInTank(int tank) { + return FluidVolume.EMPTY; } @Override @@ -748,12 +748,12 @@ public class ChestTileEntity extends AENetworkPowerTileEntity } @Override - public boolean isFluidValid(int tank, @Nonnull FluidStack stack) { + public boolean isFluidValid(int tank, @Nonnull FluidVolume stack) { return tank == 0; } @Override - public int fill(FluidStack resource, FluidAction action) { + public int fill(FluidVolume resource, FluidAction action) { ChestTileEntity.this.updateHandler(); if (canAcceptLiquids()) { final IAEFluidStack results = Platform.poweredInsert(ChestTileEntity.this, @@ -771,25 +771,25 @@ public class ChestTileEntity extends AENetworkPowerTileEntity @Nonnull @Override - public FluidStack drain(FluidStack resource, FluidAction action) { - return FluidStack.EMPTY; + public FluidVolume drain(FluidVolume resource, FluidAction action) { + return FluidVolume.EMPTY; } @Nonnull @Override - public FluidStack drain(int maxDrain, FluidAction action) { - return FluidStack.EMPTY; + public FluidVolume drain(int maxDrain, FluidAction action) { + return FluidVolume.EMPTY; } } private class InputInventoryFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return false; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { if (ChestTileEntity.this.isPowered()) { ChestTileEntity.this.updateHandler(); return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler @@ -802,12 +802,12 @@ public class ChestTileEntity extends AENetworkPowerTileEntity private static class CellInventoryFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return true; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { return AEApi.instance().registries().cell().getHandler(stack) != null; } diff --git a/src/main/java/appeng/tile/storage/DriveTileEntity.java b/src/main/java/appeng/tile/storage/DriveTileEntity.java index 707309d3c..1740fcbc3 100644 --- a/src/main/java/appeng/tile/storage/DriveTileEntity.java +++ b/src/main/java/appeng/tile/storage/DriveTileEntity.java @@ -29,15 +29,15 @@ import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.item.ItemTransferable; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.ResourceLocation; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.util.Identifier; import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.registries.ForgeRegistries; import appeng.api.AEApi; @@ -103,7 +103,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD */ private int state = 0; - public DriveTileEntity(TileEntityType tileEntityTypeIn) { + public DriveTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.mySrc = new MachineSource(this); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); @@ -112,7 +112,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); int newState = 0; @@ -127,13 +127,13 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD writeCellItemIds(data); } - private void writeCellItemIds(PacketBuffer data) { - List cellItemIds = new ArrayList<>(getCellCount()); + private void writeCellItemIds(PacketByteBuf data) { + List cellItemIds = new ArrayList<>(getCellCount()); byte[] bm = new byte[getCellCount()]; for (int x = 0; x < this.getCellCount(); x++) { Item item = getCellItem(x); if (item != null && item.getRegistryName() != null) { - ResourceLocation itemId = item.getRegistryName(); + Identifier itemId = item.getRegistryName(); int idx = cellItemIds.indexOf(itemId); if (idx == -1) { cellItemIds.add(itemId); @@ -146,7 +146,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD // Write out the list of unique cell item ids data.writeByte(cellItemIds.size()); - for (ResourceLocation itemId : cellItemIds) { + for (Identifier itemId : cellItemIds) { data.writeResourceLocation(itemId); } // Then the lookup table for each slot @@ -156,7 +156,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { boolean c = super.readFromStream(data); final int oldState = this.state; this.state = data.readInt(); @@ -166,7 +166,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD return (this.state & BIT_STATE_MASK) != (oldState & BIT_STATE_MASK) || c; } - private boolean readCellItemIDs(final PacketBuffer data) { + private boolean readCellItemIDs(final PacketByteBuf data) { int uniqueStrCount = data.readByte(); String[] uniqueStrs = new String[uniqueStrCount]; for (int i = 0; i < uniqueStrCount; i++) { @@ -182,7 +182,7 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD if (idx > 0) { --idx; String itemId = uniqueStrs[idx]; - item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemId)); + item = ForgeRegistries.ITEMS.getValue(new Identifier(itemId)); } if (cellItems[i] != item) { changed = true; @@ -303,13 +303,13 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.inv; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { if (this.isCached) { this.isCached = false; // recalculate the storage cell. this.updateState(); @@ -421,12 +421,12 @@ public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrD private class CellValidInventoryFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return true; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { return !stack.isEmpty() && AEApi.instance().registries().cell().isCellHandled(stack); } diff --git a/src/main/java/appeng/tile/storage/IOPortTileEntity.java b/src/main/java/appeng/tile/storage/IOPortTileEntity.java index 0a5a2858f..04c33fd58 100644 --- a/src/main/java/appeng/tile/storage/IOPortTileEntity.java +++ b/src/main/java/appeng/tile/storage/IOPortTileEntity.java @@ -22,14 +22,14 @@ import java.util.IdentityHashMap; import java.util.List; import java.util.Map; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -83,11 +83,11 @@ public class IOPortTileEntity extends AENetworkInvTileEntity private final AppEngInternalInventory inputCells = new AppEngInternalInventory(this, NUMBER_OF_CELL_SLOTS); private final AppEngInternalInventory outputCells = new AppEngInternalInventory(this, NUMBER_OF_CELL_SLOTS); - private final IItemHandler combinedInventory = new WrapperChainedItemHandler(this.inputCells, this.outputCells); + private final ItemTransferable combinedInventory = new WrapperChainedItemHandler(this.inputCells, this.outputCells); - private final IItemHandler inputCellsExt = new WrapperFilteredItemHandler(this.inputCells, + private final ItemTransferable inputCellsExt = new WrapperFilteredItemHandler(this.inputCells, AEItemFilters.INSERT_ONLY); - private final IItemHandler outputCellsExt = new WrapperFilteredItemHandler(this.outputCells, + private final ItemTransferable outputCellsExt = new WrapperFilteredItemHandler(this.outputCells, AEItemFilters.EXTRACT_ONLY); private final UpgradeInventory upgrades; @@ -96,7 +96,7 @@ public class IOPortTileEntity extends AENetworkInvTileEntity private ItemStack currentCell; private Map, IMEInventory> cachedInventories; - public IOPortTileEntity(TileEntityType tileEntityTypeIn) { + public IOPortTileEntity(BlockEntityType tileEntityTypeIn) { super(tileEntityTypeIn); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL); this.manager = new ConfigManager(this); @@ -185,7 +185,7 @@ public class IOPortTileEntity extends AENetworkInvTileEntity } @Override - public IItemHandler getInventoryByName(final String name) { + public ItemTransferable getInventoryByName(final String name) { if (name.equals("upgrades")) { return this.upgrades; } @@ -211,20 +211,20 @@ public class IOPortTileEntity extends AENetworkInvTileEntity } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.combinedInventory; } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { if (this.inputCells == inv) { this.updateTask(); } } @Override - protected IItemHandler getItemHandlerForSide(final Direction facing) { + protected ItemTransferable getItemHandlerForSide(final Direction facing) { if (facing == this.getUp() || facing == this.getUp().getOpposite()) { return this.inputCellsExt; } else { diff --git a/src/main/java/appeng/tile/storage/SkyChestTileEntity.java b/src/main/java/appeng/tile/storage/SkyChestTileEntity.java index dd397ddfe..8002ef70f 100644 --- a/src/main/java/appeng/tile/storage/SkyChestTileEntity.java +++ b/src/main/java/appeng/tile/storage/SkyChestTileEntity.java @@ -23,14 +23,14 @@ import java.io.IOException; import net.minecraft.block.Block; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; +import net.minecraft.network.PacketByteBuf; import net.minecraft.tileentity.IChestLid; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.MathHelper; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.block.storage.SkyChestBlock; import appeng.tile.AEBaseInvTileEntity; @@ -48,18 +48,18 @@ public class SkyChestTileEntity extends AEBaseInvTileEntity implements ITickable private float lidAngle; private float prevLidAngle; - public SkyChestTileEntity(TileEntityType type) { + public SkyChestTileEntity(BlockEntityType type) { super(type); } @Override - protected void writeToStream(final PacketBuffer data) throws IOException { + protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); data.writeBoolean(this.getPlayerOpen() > 0); } @Override - protected boolean readFromStream(final PacketBuffer data) throws IOException { + protected boolean readFromStream(final PacketByteBuf data) throws IOException { final boolean c = super.readFromStream(data); final int wasOpen = this.getPlayerOpen(); this.setPlayerOpen(data.readBoolean() ? 1 : 0); @@ -77,7 +77,7 @@ public class SkyChestTileEntity extends AEBaseInvTileEntity implements ITickable } @Override - public IItemHandler getInternalInventory() { + public ItemTransferable getInternalInventory() { return this.inv; } @@ -139,8 +139,8 @@ public class SkyChestTileEntity extends AEBaseInvTileEntity implements ITickable } @Override - public void onChangeInventory(final IItemHandler inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { + public void onChangeInventory(final ItemTransferable inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { } diff --git a/src/main/java/appeng/util/InventoryAdaptor.java b/src/main/java/appeng/util/InventoryAdaptor.java index cb90f634f..0b5ff1110 100644 --- a/src/main/java/appeng/util/InventoryAdaptor.java +++ b/src/main/java/appeng/util/InventoryAdaptor.java @@ -20,11 +20,11 @@ package appeng.util; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.Direction; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.config.FuzzyMode; import appeng.util.inv.AdaptorItemHandler; @@ -39,9 +39,9 @@ import appeng.util.inv.ItemSlot; * import/export buses. */ public abstract class InventoryAdaptor implements Iterable { - public static InventoryAdaptor getAdaptor(final TileEntity te, final Direction d) { + public static InventoryAdaptor getAdaptor(final BlockEntity te, final Direction d) { if (te != null) { - LazyOptional cap = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d); + LazyOptional cap = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d); // Attempt getting an IItemHandler for the given side via caps if (cap.isPresent()) { diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 1f4955e00..79cb3d926 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -32,9 +32,10 @@ import javax.annotation.Nullable; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; @@ -45,26 +46,21 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.*; +import net.minecraft.util.math.Box; import net.minecraft.util.math.EntityRayTraceResult; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.hit.HitResult; +import net.minecraft.text.Text; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.text.TranslatableText; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.server.world.ServerWorld; +import net.fabricmc.api.EnvType; import net.minecraftforge.common.util.FakePlayerFactory; -import net.minecraftforge.fluids.FluidStack; +import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.thread.SidedThreadGroups; import net.minecraftforge.fml.loading.FMLEnvironment; @@ -255,7 +251,7 @@ public class Platform { final ISecurityGrid sg = g.getCache(ISecurityGrid.class); if (!sg.hasPermission(player, requiredPermission)) { - player.sendMessage(new TranslationTextComponent("appliedenergistics2.permission_denied") + player.sendMessage(new TranslatableText("appliedenergistics2.permission_denied") .applyTextStyle(TextFormatting.RED)); // FIXME trace logging? return false; @@ -277,7 +273,7 @@ public class Platform { ServerWorld serverWorld = (ServerWorld) w; final BlockState state = w.getBlockState(pos); - final TileEntity tileEntity = w.getTileEntity(pos); + final BlockEntity tileEntity = w.getTileEntity(pos); List out = Block.getDrops(state, serverWorld, pos, tileEntity); @@ -316,8 +312,8 @@ public class Platform { return Math.abs(RANDOM_GENERATOR.nextInt()); } - @OnlyIn(Dist.CLIENT) - public static List getTooltip(final Object o) { + @Environment(EnvType.CLIENT) + public static List getTooltip(final Object o) { if (o == null) { return Collections.emptyList(); } @@ -356,7 +352,7 @@ public class Platform { return "** Null"; } - final ResourceLocation n = ForgeRegistries.FLUIDS.getKey(fs.getFluidStack().getFluid()); + final Identifier n = ForgeRegistries.FLUIDS.getKey(fs.getFluidStack().getFluid()); return n == null ? "** Null" : n.getNamespace(); } @@ -365,14 +361,14 @@ public class Platform { + ModList.get().getModContainerById(modId).map(mc -> mc.getModInfo().getDisplayName()).orElse(null); } - public static ITextComponent getItemDisplayName(final Object o) { + public static Text getItemDisplayName(final Object o) { if (o == null) { return new StringTextComponent("** Null"); } ItemStack itemStack = ItemStack.EMPTY; if (o instanceof AEItemStack) { - final ITextComponent n = ((AEItemStack) o).getDisplayName(); + final Text n = ((AEItemStack) o).getDisplayName(); return n == null ? new StringTextComponent("** Null") : n; } else if (o instanceof ItemStack) { itemStack = (ItemStack) o; @@ -384,28 +380,28 @@ public class Platform { return itemStack.getDisplayName(); } catch (final Exception errA) { try { - return new TranslationTextComponent(itemStack.getTranslationKey()); + return new TranslatableText(itemStack.getTranslationKey()); } catch (final Exception errB) { return new StringTextComponent("** Exception"); } } } - public static ITextComponent getFluidDisplayName(Object o) { + public static Text getFluidDisplayName(Object o) { if (o == null) { return new StringTextComponent("** Null"); } - FluidStack fluidStack = null; + FluidVolume fluidStack = null; if (o instanceof AEFluidStack) { fluidStack = ((AEFluidStack) o).getFluidStack(); - } else if (o instanceof FluidStack) { - fluidStack = (FluidStack) o; + } else if (o instanceof FluidVolume) { + fluidStack = (FluidVolume) o; } else { return new StringTextComponent("**Invalid Object"); } - ITextComponent n = fluidStack.getDisplayName(); + Text n = fluidStack.getDisplayName(); if (n == null) { - n = new TranslationTextComponent(fluidStack.getTranslationKey()); + n = new TranslatableText(fluidStack.getTranslationKey()); } return n; } @@ -694,7 +690,7 @@ public class Platform { return new LookDirection(from, to); } - public static RayTraceResult rayTrace(final PlayerEntity p, final boolean hitBlocks, final boolean hitEntities) { + public static HitResult rayTrace(final PlayerEntity p, final boolean hitBlocks, final boolean hitEntities) { final World w = p.getEntityWorld(); final float f = 1.0F; @@ -714,7 +710,7 @@ public class Platform { final Vec3d vec31 = vec3.add(f7 * d3, f6 * d3, f8 * d3); - final AxisAlignedBB bb = new AxisAlignedBB(Math.min(vec3.x, vec31.x), Math.min(vec3.y, vec31.y), + final Box bb = new Box(Math.min(vec3.x, vec31.x), Math.min(vec3.y, vec31.y), Math.min(vec3.z, vec31.z), Math.max(vec3.x, vec31.x), Math.max(vec3.y, vec31.y), Math.max(vec3.z, vec31.z)).grow(16, 16, 16); @@ -732,7 +728,7 @@ public class Platform { f1 = 0.3F; // FIXME: Three different bounding boxes available, should double-check - final AxisAlignedBB boundingBox = entity1.getBoundingBox().grow(f1, f1, f1); + final Box boundingBox = entity1.getBoundingBox().grow(f1, f1, f1); final Vec3d rtResult = boundingBox.rayTrace(vec3, vec31).orElse(null); if (rtResult != null) { @@ -747,7 +743,7 @@ public class Platform { } } - RayTraceResult pos = null; + HitResult pos = null; Vec3d vec = null; if (hitBlocks) { @@ -984,7 +980,7 @@ public class Platform { return gs.hasPermission(playerID, SecurityPermissions.BUILD); } - public static void configurePlayer(final PlayerEntity player, final AEPartLocation side, final TileEntity tile) { + public static void configurePlayer(final PlayerEntity player, final AEPartLocation side, final BlockEntity tile) { float pitch = 0.0f; float yaw = 0.0f; // player.yOffset = 1.8f; diff --git a/src/main/java/appeng/util/helpers/ItemHandlerUtil.java b/src/main/java/appeng/util/helpers/ItemHandlerUtil.java index dc8396972..67c0fac47 100644 --- a/src/main/java/appeng/util/helpers/ItemHandlerUtil.java +++ b/src/main/java/appeng/util/helpers/ItemHandlerUtil.java @@ -18,16 +18,16 @@ package appeng.util.helpers; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; public class ItemHandlerUtil { private ItemHandlerUtil() { } - public static void setStackInSlot(final IItemHandler inv, final int slot, final ItemStack stack) { + public static void setStackInSlot(final ItemTransferable inv, final int slot, final ItemStack stack) { if (inv instanceof IItemHandlerModifiable) { ((IItemHandlerModifiable) inv).setStackInSlot(slot, stack); } else { @@ -36,13 +36,13 @@ public class ItemHandlerUtil { } } - public static void clear(final IItemHandler inv) { + public static void clear(final ItemTransferable inv) { for (int x = 0; x < inv.getSlots(); x++) { setStackInSlot(inv, x, ItemStack.EMPTY); } } - public static boolean isEmpty(final IItemHandler inv) { + public static boolean isEmpty(final ItemTransferable inv) { for (int x = 0; x < inv.getSlots(); x++) { if (!inv.getStackInSlot(x).isEmpty()) { return false; @@ -51,13 +51,13 @@ public class ItemHandlerUtil { return true; } - public static void copy(final IItemHandler from, final IItemHandler to, boolean deepCopy) { + public static void copy(final ItemTransferable from, final ItemTransferable to, boolean deepCopy) { for (int i = 0; i < Math.min(from.getSlots(), to.getSlots()); ++i) { setStackInSlot(to, i, deepCopy ? from.getStackInSlot(i).copy() : from.getStackInSlot(i)); } } - public static void copy(final CraftingInventory from, final IItemHandler to, boolean deepCopy) { + public static void copy(final CraftingInventory from, final ItemTransferable to, boolean deepCopy) { for (int i = 0; i < Math.min(from.getSizeInventory(), to.getSlots()); ++i) { setStackInSlot(to, i, deepCopy ? from.getStackInSlot(i).copy() : from.getStackInSlot(i)); } diff --git a/src/main/java/appeng/util/inv/AdaptorItemHandler.java b/src/main/java/appeng/util/inv/AdaptorItemHandler.java index 56ca52565..23bc87317 100644 --- a/src/main/java/appeng/util/inv/AdaptorItemHandler.java +++ b/src/main/java/appeng/util/inv/AdaptorItemHandler.java @@ -21,16 +21,16 @@ package appeng.util.inv; import java.util.Iterator; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.api.config.FuzzyMode; import appeng.util.InventoryAdaptor; import appeng.util.Platform; public class AdaptorItemHandler extends InventoryAdaptor { - protected final IItemHandler itemHandler; + protected final ItemTransferable itemHandler; - public AdaptorItemHandler(IItemHandler itemHandler) { + public AdaptorItemHandler(ItemTransferable itemHandler) { this.itemHandler = itemHandler; } diff --git a/src/main/java/appeng/util/inv/IAEAppEngInventory.java b/src/main/java/appeng/util/inv/IAEAppEngInventory.java index d8c6f6300..b90dfe095 100644 --- a/src/main/java/appeng/util/inv/IAEAppEngInventory.java +++ b/src/main/java/appeng/util/inv/IAEAppEngInventory.java @@ -18,11 +18,11 @@ package appeng.util.inv; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; public interface IAEAppEngInventory { void saveChanges(); - void onChangeInventory(IItemHandler inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack); + void onChangeInventory(ItemTransferable inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack); } diff --git a/src/main/java/appeng/util/inv/ItemHandlerIterator.java b/src/main/java/appeng/util/inv/ItemHandlerIterator.java index 2c1df841e..e73293174 100644 --- a/src/main/java/appeng/util/inv/ItemHandlerIterator.java +++ b/src/main/java/appeng/util/inv/ItemHandlerIterator.java @@ -21,17 +21,17 @@ package appeng.util.inv; import java.util.Iterator; import java.util.NoSuchElementException; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; class ItemHandlerIterator implements Iterator { - private final IItemHandler itemHandler; + private final ItemTransferable itemHandler; private final ItemSlot itemSlot = new ItemSlot(); private int slot = 0; - ItemHandlerIterator(IItemHandler itemHandler) { + ItemHandlerIterator(ItemTransferable itemHandler) { this.itemHandler = itemHandler; } diff --git a/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java b/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java index d8be97baf..004ae6b84 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java @@ -22,23 +22,23 @@ import java.util.ArrayList; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.EmptyHandler; import appeng.util.helpers.ItemHandlerUtil; public class WrapperChainedItemHandler implements IItemHandlerModifiable { - private IItemHandler[] itemHandler; // the handlers + private ItemTransferable[] itemHandler; // the handlers private int[] baseIndex; // index-offsets of the different handlers private int slotCount; // number of total slots - public WrapperChainedItemHandler(IItemHandler... itemHandler) { + public WrapperChainedItemHandler(ItemTransferable... itemHandler) { this.setItemHandlers(itemHandler); } - private void setItemHandlers(IItemHandler[] handlers) { + private void setItemHandlers(ItemTransferable[] handlers) { this.itemHandler = handlers; this.baseIndex = new int[this.itemHandler.length]; int index = 0; @@ -63,7 +63,7 @@ public class WrapperChainedItemHandler implements IItemHandlerModifiable { return -1; } - private IItemHandler getHandlerFromIndex(int index) { + private ItemTransferable getHandlerFromIndex(int index) { if (index < 0 || index >= this.itemHandler.length) { return EmptyHandler.INSTANCE; } @@ -79,12 +79,12 @@ public class WrapperChainedItemHandler implements IItemHandlerModifiable { public void cycleOrder() { if (this.itemHandler.length > 1) { - ArrayList newOrder = new ArrayList<>(); + ArrayList newOrder = new ArrayList<>(); newOrder.add(this.itemHandler[this.itemHandler.length - 1]); for (int i = 0; i < this.itemHandler.length - 1; ++i) { newOrder.add(this.itemHandler[i]); } - this.setItemHandlers(newOrder.toArray(new IItemHandler[this.itemHandler.length])); + this.setItemHandlers(newOrder.toArray(new ItemTransferable[this.itemHandler.length])); } } @@ -97,7 +97,7 @@ public class WrapperChainedItemHandler implements IItemHandlerModifiable { @Nonnull public ItemStack getStackInSlot(final int slot) { int index = this.getIndexForSlot(slot); - IItemHandler handler = this.getHandlerFromIndex(index); + ItemTransferable handler = this.getHandlerFromIndex(index); int targetSlot = this.getSlotFromIndex(slot, index); return handler.getStackInSlot(targetSlot); } @@ -106,7 +106,7 @@ public class WrapperChainedItemHandler implements IItemHandlerModifiable { @Nonnull public ItemStack insertItem(final int slot, @Nonnull ItemStack stack, boolean simulate) { int index = this.getIndexForSlot(slot); - IItemHandler handler = this.getHandlerFromIndex(index); + ItemTransferable handler = this.getHandlerFromIndex(index); int targetSlot = this.getSlotFromIndex(slot, index); return handler.insertItem(targetSlot, stack, simulate); } @@ -115,7 +115,7 @@ public class WrapperChainedItemHandler implements IItemHandlerModifiable { @Nonnull public ItemStack extractItem(int slot, int amount, boolean simulate) { int index = this.getIndexForSlot(slot); - IItemHandler handler = this.getHandlerFromIndex(index); + ItemTransferable handler = this.getHandlerFromIndex(index); int targetSlot = this.getSlotFromIndex(slot, index); return handler.extractItem(targetSlot, amount, simulate); } @@ -123,7 +123,7 @@ public class WrapperChainedItemHandler implements IItemHandlerModifiable { @Override public int getSlotLimit(int slot) { int index = this.getIndexForSlot(slot); - IItemHandler handler = this.getHandlerFromIndex(index); + ItemTransferable handler = this.getHandlerFromIndex(index); int localSlot = this.getSlotFromIndex(slot, index); return handler.getSlotLimit(localSlot); } @@ -131,7 +131,7 @@ public class WrapperChainedItemHandler implements IItemHandlerModifiable { @Override public void setStackInSlot(int slot, ItemStack stack) { int index = this.getIndexForSlot(slot); - IItemHandler handler = this.getHandlerFromIndex(index); + ItemTransferable handler = this.getHandlerFromIndex(index); int targetSlot = this.getSlotFromIndex(slot, index); ItemHandlerUtil.setStackInSlot(handler, targetSlot, stack); } @@ -139,7 +139,7 @@ public class WrapperChainedItemHandler implements IItemHandlerModifiable { @Override public boolean isItemValid(int slot, ItemStack stack) { int index = this.getIndexForSlot(slot); - IItemHandler handler = this.getHandlerFromIndex(index); + ItemTransferable handler = this.getHandlerFromIndex(index); int targetSlot = this.getSlotFromIndex(slot, index); return handler.isItemValid(targetSlot, stack); } diff --git a/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java b/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java index 071b09f20..129528bb2 100644 --- a/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java @@ -21,17 +21,17 @@ package appeng.util.inv; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraftforge.items.IItemHandlerModifiable; import appeng.util.helpers.ItemHandlerUtil; import appeng.util.inv.filter.IAEItemFilter; public class WrapperFilteredItemHandler implements IItemHandlerModifiable { - private final IItemHandler handler; + private final ItemTransferable handler; private final IAEItemFilter filter; - public WrapperFilteredItemHandler(@Nonnull IItemHandler handler, @Nonnull IAEItemFilter filter) { + public WrapperFilteredItemHandler(@Nonnull ItemTransferable handler, @Nonnull IAEItemFilter filter) { this.handler = handler; this.filter = filter; } diff --git a/src/main/java/appeng/util/inv/WrapperInvItemHandler.java b/src/main/java/appeng/util/inv/WrapperInvItemHandler.java index 01356e8b1..ff304b28c 100644 --- a/src/main/java/appeng/util/inv/WrapperInvItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperInvItemHandler.java @@ -21,14 +21,14 @@ package appeng.util.inv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import appeng.util.helpers.ItemHandlerUtil; public class WrapperInvItemHandler implements IInventory { - private final IItemHandler inv; + private final ItemTransferable inv; - public WrapperInvItemHandler(final IItemHandler inv) { + public WrapperInvItemHandler(final ItemTransferable inv) { this.inv = inv; } diff --git a/src/main/java/appeng/util/inv/WrapperRangeItemHandler.java b/src/main/java/appeng/util/inv/WrapperRangeItemHandler.java index 042b79dd7..555fcaac3 100644 --- a/src/main/java/appeng/util/inv/WrapperRangeItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperRangeItemHandler.java @@ -20,18 +20,18 @@ package appeng.util.inv; import javax.annotation.Nonnull; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import appeng.util.helpers.ItemHandlerUtil; public class WrapperRangeItemHandler implements IItemHandlerModifiable { - private final IItemHandler compose; + private final ItemTransferable compose; private final int minSlot; private final int maxSlot; - public WrapperRangeItemHandler(IItemHandler compose, int minSlot, int maxSlotExclusive) { + public WrapperRangeItemHandler(ItemTransferable compose, int minSlot, int maxSlotExclusive) { this.compose = compose; this.minSlot = minSlot; this.maxSlot = maxSlotExclusive; diff --git a/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java b/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java index d25f15808..5c9a525a8 100644 --- a/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java @@ -21,15 +21,15 @@ package appeng.util.inv; import java.util.function.Supplier; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraftforge.items.IItemHandlerModifiable; import appeng.util.helpers.ItemHandlerUtil; public class WrapperSupplierItemHandler implements IItemHandlerModifiable { - private final Supplier sourceHandler; + private final Supplier sourceHandler; - public WrapperSupplierItemHandler(Supplier source) { + public WrapperSupplierItemHandler(Supplier source) { this.sourceHandler = source; } diff --git a/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java b/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java index e29d0daf7..274e7934b 100644 --- a/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java +++ b/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java @@ -18,8 +18,8 @@ package appeng.util.inv.filter; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; import appeng.api.definitions.IItemDefinition; @@ -31,12 +31,12 @@ public class AEItemDefinitionFilter implements IAEItemFilter { } @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return true; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { return this.definition.isSameAs(stack); } diff --git a/src/main/java/appeng/util/inv/filter/AEItemFilters.java b/src/main/java/appeng/util/inv/filter/AEItemFilters.java index cc104208f..9888324ee 100644 --- a/src/main/java/appeng/util/inv/filter/AEItemFilters.java +++ b/src/main/java/appeng/util/inv/filter/AEItemFilters.java @@ -18,8 +18,8 @@ package appeng.util.inv.filter; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; public class AEItemFilters { public static final IAEItemFilter INSERT_ONLY = new InsertOnlyFilter(); @@ -30,24 +30,24 @@ public class AEItemFilters { private static class InsertOnlyFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return false; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { return true; } } private static class ExtractOnlyFilter implements IAEItemFilter { @Override - public boolean allowExtract(IItemHandler inv, int slot, int amount) { + public boolean allowExtract(ItemTransferable inv, int slot, int amount) { return true; } @Override - public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) { + public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) { return false; } } diff --git a/src/main/java/appeng/util/inv/filter/IAEItemFilter.java b/src/main/java/appeng/util/inv/filter/IAEItemFilter.java index 1017c5085..cd30ddb9a 100644 --- a/src/main/java/appeng/util/inv/filter/IAEItemFilter.java +++ b/src/main/java/appeng/util/inv/filter/IAEItemFilter.java @@ -18,11 +18,11 @@ package appeng.util.inv.filter; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; public interface IAEItemFilter { - boolean allowExtract(IItemHandler inv, int slot, int amount); + boolean allowExtract(ItemTransferable inv, int slot, int amount); - boolean allowInsert(IItemHandler inv, int slot, ItemStack stack); + boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack); } diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index f7a7e13ee..f30b97ef3 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -24,13 +24,13 @@ import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.fabricmc.api.Environment; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.text.Text; +import net.fabricmc.api.EnvType; import net.minecraftforge.items.ItemHandlerHelper; import appeng.api.AEApi; @@ -48,10 +48,10 @@ public final class AEItemStack extends AEStack implements IAEItemS private final AESharedItemStack sharedStack; - @OnlyIn(Dist.CLIENT) - private ITextComponent displayName; - @OnlyIn(Dist.CLIENT) - private List tooltip; + @Environment(EnvType.CLIENT) + private Text displayName; + @Environment(EnvType.CLIENT) + private List tooltip; private AEItemStack(final AEItemStack is) { this.setStackSize(is.getStackSize()); @@ -104,7 +104,7 @@ public final class AEItemStack extends AEStack implements IAEItemS i.putBoolean(NBT_CRAFTABLE, this.isCraftable()); } - public static AEItemStack fromPacket(final PacketBuffer buffer) { + public static AEItemStack fromPacket(final PacketByteBuf buffer) { final boolean isCraftable = buffer.readBoolean(); final long stackSize = buffer.readVarLong(); final long countRequestable = buffer.readVarLong(); @@ -121,7 +121,7 @@ public final class AEItemStack extends AEStack implements IAEItemS } @Override - public void writeToPacket(final PacketBuffer buffer) { + public void writeToPacket(final PacketByteBuf buffer) { buffer.writeBoolean(this.isCraftable()); buffer.writeVarLong(this.getStackSize()); buffer.writeVarLong(this.getCountRequestable()); @@ -226,23 +226,23 @@ public final class AEItemStack extends AEStack implements IAEItemS return this.getStackSize() + "x" + this.getDefinition().getItem().getRegistryName(); } - @OnlyIn(Dist.CLIENT) - public List getToolTip() { + @Environment(EnvType.CLIENT) + public List getToolTip() { if (this.tooltip == null) { this.tooltip = Platform.getTooltip(this.asItemStackRepresentation()); } return this.tooltip; } - @OnlyIn(Dist.CLIENT) - public ITextComponent getDisplayName() { + @Environment(EnvType.CLIENT) + public Text getDisplayName() { if (this.displayName == null) { this.displayName = Platform.getItemDisplayName(this.asItemStackRepresentation()); } return this.displayName; } - @OnlyIn(Dist.CLIENT) + @Environment(EnvType.CLIENT) public String getModID() { return this.getDefinition().getItem().getRegistryName().getNamespace(); } diff --git a/src/main/java/appeng/util/iterators/InvIterator.java b/src/main/java/appeng/util/iterators/InvIterator.java index 7ec0b841b..b7c7f4e00 100644 --- a/src/main/java/appeng/util/iterators/InvIterator.java +++ b/src/main/java/appeng/util/iterators/InvIterator.java @@ -20,16 +20,16 @@ package appeng.util.iterators; import java.util.Iterator; +import alexiil.mc.lib.attributes.item.ItemTransferable; import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; public final class InvIterator implements Iterator { - private final IItemHandler inventory; + private final ItemTransferable inventory; private final int size; private int counter = 0; - public InvIterator(final IItemHandler inventory) { + public InvIterator(final ItemTransferable inventory) { this.inventory = inventory; this.size = this.inventory.getSlots(); } diff --git a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java index bfc27b3a7..8510b64a2 100644 --- a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java +++ b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java @@ -7,7 +7,7 @@ import com.mojang.datafixers.Dynamic; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.chunk.IChunk; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.GenerationSettings; @@ -35,7 +35,7 @@ public class ChargedQuartzOreFeature extends Feature { } @Override - public boolean place(IWorld worldIn, ChunkGenerator generator, Random rand, + public boolean place(WorldAccess worldIn, ChunkGenerator generator, Random rand, BlockPos pos, ChargedQuartzOreConfig config) { ChunkPos chunkPos = new ChunkPos(pos); diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java index 8e7d796fc..beb38463b 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java @@ -21,10 +21,10 @@ package appeng.worldgen.meteorite; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; public class MeteoriteBlockPutter { - public boolean put(final IWorld w, BlockPos pos, final BlockState blk) { + public boolean put(final WorldAccess w, BlockPos pos, final BlockState blk) { final BlockState original = w.getBlockState(pos); if (original.getBlock() == Blocks.BEDROCK || original == blk) { diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java index 98b702162..536f665f6 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java @@ -24,16 +24,16 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MutableBoundingBox; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; @@ -57,7 +57,7 @@ public final class MeteoritePlacer { private final BlockState skyStone; private final Item skyStoneItem; private final MeteoriteBlockPutter putter = new MeteoriteBlockPutter(); - private final IWorld world; + private final WorldAccess world; private final Fallout type; private final BlockPos pos; private final int x; @@ -73,7 +73,7 @@ public final class MeteoritePlacer { private final boolean craterLake; private final MutableBoundingBox boundingBox; - public MeteoritePlacer(IWorld world, PlacedMeteoriteSettings settings, MutableBoundingBox boundingBox) { + public MeteoritePlacer(WorldAccess world, PlacedMeteoriteSettings settings, MutableBoundingBox boundingBox) { this.boundingBox = boundingBox; this.world = world; this.pos = settings.getPos(); @@ -187,7 +187,7 @@ public final class MeteoritePlacer { } for (final Object o : world.getEntitiesWithinAABB(ItemEntity.class, - new AxisAlignedBB(minX(x - 30), y - 5, minZ(z - 30), maxX(x + 30), y + 30, maxZ(z + 30)))) { + new Box(minX(x - 30), y - 5, minZ(z - 30), maxX(x + 30), y + 30, maxZ(z + 30)))) { final Entity e = (Entity) o; e.remove(); } @@ -204,7 +204,7 @@ public final class MeteoritePlacer { if (AEConfig.instance().isFeatureEnabled(AEFeature.SPAWN_PRESSES_IN_METEORITES)) { this.putter.put(world, pos, this.skyChestDefinition.block().getDefaultState()); - final TileEntity te = world.getTileEntity(pos); // FIXME: this is also probably a band-aid for another issue + final BlockEntity te = world.getTileEntity(pos); // FIXME: this is also probably a band-aid for another issue final InventoryAdaptor ap = InventoryAdaptor.getAdaptor(te, Direction.UP); if (ap != null && !ap.containsItems()) // FIXME: band-aid for meteorites being generated multiple times { @@ -413,7 +413,7 @@ public final class MeteoritePlacer { } } - private Fallout getFallout(IWorld w, BlockPos pos, FalloutMode mode) { + private Fallout getFallout(WorldAccess w, BlockPos pos, FalloutMode mode) { switch (mode) { case SAND: return new FalloutSand(w, pos, this.putter, this.skyStone); diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java index 97ff5f09e..a7c54cbf6 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java @@ -10,8 +10,8 @@ import net.minecraft.nbt.INBT; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.IWorld; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.world.WorldAccess; +import net.minecraft.server.world.ServerWorld; import net.minecraft.world.storage.WorldSavedData; import net.minecraftforge.fml.server.ServerLifecycleHooks; @@ -135,7 +135,7 @@ public final class MeteoriteSpawnData { return ll; } - public synchronized static MeteoriteSpawnData get(IWorld world) { + public synchronized static MeteoriteSpawnData get(WorldAccess world) { ServerWorld serverWorld; if (world instanceof ServerWorld) { serverWorld = (ServerWorld) world; diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java index c00ffacd2..11ce74f8e 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java @@ -23,7 +23,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MutableBoundingBox; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.feature.structure.IStructurePieceType; import net.minecraft.world.gen.feature.structure.StructurePiece; @@ -85,7 +85,7 @@ public class MeteoriteStructurePiece extends StructurePiece { } @Override - public boolean create(IWorld world, ChunkGenerator chunkGeneratorIn, Random rand, MutableBoundingBox bounds, + public boolean create(WorldAccess world, ChunkGenerator chunkGeneratorIn, Random rand, MutableBoundingBox bounds, ChunkPos chunkPos) { MeteoritePlacer placer = new MeteoritePlacer(world, settings, bounds); placer.place(); diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java index df9d8259d..273d9e600 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java @@ -9,7 +9,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.tags.BlockTags; import net.minecraft.tags.Tag; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MutableBoundingBox; import net.minecraft.world.biome.Biome; @@ -26,9 +26,9 @@ import appeng.worldgen.meteorite.fallout.FalloutMode; public class MeteoriteStructureStart extends StructureStart { - private final Tag sandTag = BlockTags.getCollection().getOrCreate(new ResourceLocation("minecraft:sand")); + private final Tag sandTag = BlockTags.getCollection().getOrCreate(new Identifier("minecraft:sand")); private final Tag terracottaTag = BlockTags.getCollection() - .getOrCreate(new ResourceLocation("forge:terracotta")); + .getOrCreate(new Identifier("forge:terracotta")); public MeteoriteStructureStart(Structure p_i225815_1_, int p_i225815_2_, int p_i225815_3_, MutableBoundingBox p_i225815_4_, int p_i225815_5_, long p_i225815_6_) { diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/Fallout.java b/src/main/java/appeng/worldgen/meteorite/fallout/Fallout.java index 2d4eae515..5712b4d45 100644 --- a/src/main/java/appeng/worldgen/meteorite/fallout/Fallout.java +++ b/src/main/java/appeng/worldgen/meteorite/fallout/Fallout.java @@ -21,7 +21,7 @@ package appeng.worldgen.meteorite.fallout; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import appeng.worldgen.meteorite.MeteoriteBlockPutter; @@ -38,7 +38,7 @@ public class Fallout { return 0; } - public void getRandomFall(final IWorld w, BlockPos pos) { + public void getRandomFall(final WorldAccess w, BlockPos pos) { final double a = Math.random(); if (a > 0.9) { this.putter.put(w, pos, Blocks.STONE.getDefaultState()); @@ -51,7 +51,7 @@ public class Fallout { } } - public void getRandomInset(final IWorld w, BlockPos pos) { + public void getRandomInset(final WorldAccess w, BlockPos pos) { final double a = Math.random(); if (a > 0.9) { this.putter.put(w, pos, Blocks.COBBLESTONE.getDefaultState()); diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java index 5a4fe0843..5502d5323 100644 --- a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java +++ b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java @@ -21,7 +21,7 @@ package appeng.worldgen.meteorite.fallout; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import appeng.worldgen.meteorite.MeteoriteBlockPutter; @@ -33,14 +33,14 @@ public class FalloutCopy extends Fallout { private final BlockState block; private final MeteoriteBlockPutter putter; - public FalloutCopy(final IWorld w, BlockPos pos, final MeteoriteBlockPutter putter, final BlockState skyStone) { + public FalloutCopy(final WorldAccess w, BlockPos pos, final MeteoriteBlockPutter putter, final BlockState skyStone) { super(putter, skyStone); this.putter = putter; this.block = w.getBiome(pos).getSurfaceBuilderConfig().getTop(); } @Override - public void getRandomFall(final IWorld w, BlockPos pos) { + public void getRandomFall(final WorldAccess w, BlockPos pos) { final double a = Math.random(); if (a > SPECIFIED_BLOCK_THRESHOLD) { this.putter.put(w, pos, this.block); @@ -49,12 +49,12 @@ public class FalloutCopy extends Fallout { } } - public void getOther(final IWorld w, BlockPos pos, final double a) { + public void getOther(final WorldAccess w, BlockPos pos, final double a) { } @Override - public void getRandomInset(final IWorld w, BlockPos pos) { + public void getRandomInset(final WorldAccess w, BlockPos pos) { final double a = Math.random(); if (a > SPECIFIED_BLOCK_THRESHOLD) { this.putter.put(w, pos, this.block); diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java index e516c2c59..e5cbfc500 100644 --- a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java +++ b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java @@ -21,7 +21,7 @@ package appeng.worldgen.meteorite.fallout; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import appeng.worldgen.meteorite.MeteoriteBlockPutter; @@ -29,7 +29,7 @@ public class FalloutSand extends FalloutCopy { private static final double GLASS_THRESHOLD = 0.66; private final MeteoriteBlockPutter putter; - public FalloutSand(final IWorld w, BlockPos pos, final MeteoriteBlockPutter putter, final BlockState skyStone) { + public FalloutSand(final WorldAccess w, BlockPos pos, final MeteoriteBlockPutter putter, final BlockState skyStone) { super(w, pos, putter, skyStone); this.putter = putter; } @@ -40,7 +40,7 @@ public class FalloutSand extends FalloutCopy { } @Override - public void getOther(final IWorld w, BlockPos pos, final double a) { + public void getOther(final WorldAccess w, BlockPos pos, final double a) { if (a > GLASS_THRESHOLD) { this.putter.put(w, pos, Blocks.GLASS.getDefaultState()); } diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java index eac0861f1..390900602 100644 --- a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java +++ b/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java @@ -21,7 +21,7 @@ package appeng.worldgen.meteorite.fallout; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.WorldAccess; import appeng.worldgen.meteorite.MeteoriteBlockPutter; @@ -30,7 +30,7 @@ public class FalloutSnow extends FalloutCopy { private static final double ICE_THRESHOLD = 0.5; private final MeteoriteBlockPutter putter; - public FalloutSnow(final IWorld w, BlockPos pos, final MeteoriteBlockPutter putter, final BlockState skyStone) { + public FalloutSnow(final WorldAccess w, BlockPos pos, final MeteoriteBlockPutter putter, final BlockState skyStone) { super(w, pos, putter, skyStone); this.putter = putter; } @@ -41,7 +41,7 @@ public class FalloutSnow extends FalloutCopy { } @Override - public void getOther(final IWorld w, BlockPos pos, final double a) { + public void getOther(final WorldAccess w, BlockPos pos, final double a) { if (a > SNOW_THRESHOLD) { this.putter.put(w, pos, Blocks.SNOW.getDefaultState()); } else if (a > ICE_THRESHOLD) { diff --git a/src/test/java/appeng/core/worlddata/SpatialDimensionExtraDataTest.java b/src/test/java/appeng/core/worlddata/SpatialDimensionExtraDataTest.java index fe2e32241..09165b6db 100644 --- a/src/test/java/appeng/core/worlddata/SpatialDimensionExtraDataTest.java +++ b/src/test/java/appeng/core/worlddata/SpatialDimensionExtraDataTest.java @@ -2,11 +2,11 @@ package appeng.core.worlddata; import static org.junit.Assert.*; +import net.minecraft.network.PacketByteBuf; import org.junit.Test; import io.netty.buffer.Unpooled; -import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; import appeng.spatial.SpatialDimensionExtraData; @@ -18,16 +18,16 @@ public class SpatialDimensionExtraDataTest { */ @Test public void testCreatedBufferSize() { - PacketBuffer buffer = new SpatialDimensionExtraData(BlockPos.ZERO).write(); + PacketByteBuf buffer = new SpatialDimensionExtraData(BlockPos.ZERO).write(); assertEquals(1 + 8 + 8, buffer.array().length); } @Test public void testReadWriteSize() { BlockPos capacity = new BlockPos(1, 2, 3); - PacketBuffer buffer = new SpatialDimensionExtraData(capacity).write(); + PacketByteBuf buffer = new SpatialDimensionExtraData(capacity).write(); - PacketBuffer readBackBuf = new PacketBuffer(Unpooled.wrappedBuffer(buffer.array())); + PacketByteBuf readBackBuf = new PacketByteBuf(Unpooled.wrappedBuffer(buffer.array())); SpatialDimensionExtraData extraData = SpatialDimensionExtraData.read(readBackBuf); assertNotNull(extraData); assertEquals(capacity, extraData.getSize()); @@ -38,11 +38,11 @@ public class SpatialDimensionExtraDataTest { */ @Test public void testHandleInvalidFormatVersion() { - PacketBuffer buffer = new SpatialDimensionExtraData(BlockPos.ZERO).write(); + PacketByteBuf buffer = new SpatialDimensionExtraData(BlockPos.ZERO).write(); buffer.writerIndex(0); buffer.writeByte(5); - PacketBuffer readBackBuf = new PacketBuffer(Unpooled.wrappedBuffer(buffer.array())); + PacketByteBuf readBackBuf = new PacketByteBuf(Unpooled.wrappedBuffer(buffer.array())); assertNull(SpatialDimensionExtraData.read(readBackBuf)); }