Update to 1.20.1

build.gradle

@@ -1,30 +1,15 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.minecraftforge.net' }
-        maven { url = 'https://maven.parchmentmc.org' }
-        maven { url = 'https://cursemaven.com' }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-        classpath 'org.parchmentmc:librarian:1.+'
-        classpath 'org.spongepowered:mixingradle:0.7.+'
-    }
-}
-
+// This is the new and fancy way to apply plugins :)
 plugins {
-    id "io.freefair.lombok" version "6.4.1"
+    id 'io.freefair.lombok' version '6.4.1'
+    id 'net.minecraftforge.gradle' version "${forge_gradle_version}"
+    id 'org.parchmentmc.librarian.forgegradle' version "${parchment_gradle_version}"
+
+    id 'eclipse'
+    id 'idea'
+    id 'maven-publish'
+    id 'org.spongepowered.mixin' version '0.7.+'
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.parchmentmc.librarian.forgegradle'
-// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
-apply plugin: 'eclipse'
-apply plugin: 'maven-publish'
-apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle'
-apply plugin: 'org.spongepowered.mixin'
-
-
 group = mod_group // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = mod_id
 version = "mc${mc_version}-v${mod_version}"
@@ -33,6 +18,9 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17) // Mojang ships Java
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
+    enableIdeaPrepareRuns = true
+    copyIdeResources = true
+
     // The mappings can be changed at any time, and must be in the following format.
     // Channel:   Version:
     // snapshot   YYYYMMDD   Snapshot are built nightly.
@@ -112,9 +100,9 @@ minecraft {
             property 'forge.logging.console.level', 'debug'
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-
-
-            forceExit = false
+//
+//
+//            forceExit = false
 
             args '--mod', "${project.mod_id}", '--all',
                     '--existing', file('src/main/resources').toString(),
@@ -158,28 +146,24 @@ dependencies {
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
     // compile against the JEI API but do not include it at runtime
-//    // at runtime, use the full JEI jar
-//
+
+    // at runtime, use the full JEI jar
 //    runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}")
 //    compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api")
-//    compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}:api")
-//    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")
-//
+
+    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")
+    compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}:api")
+
 //    runtimeOnly fg.deobf("com.teamcofh:cofh_core:1.16.5-1.4.2.9")
 //    runtimeOnly fg.deobf("com.teamcofh:thermal_foundation:1.16.5-1.4.3.10")
 //    runtimeOnly fg.deobf("com.teamcofh:thermal_expansion:1.16.5-1.4.2.4")
 
-    // spark
-    runtimeOnly fg.deobf("curse.maven:spark-361579:3875647")
+//    // spark
+//    runtimeOnly fg.deobf("curse.maven:spark-361579:3875647")
 
     // create
-    runtimeOnly fg.deobf("curse.maven:create-328085:4547147")
-    compileOnly fg.deobf("curse.maven:create-328085:4547147")
-
-//    compileOnly fg.deobf("com.jozufozu.flywheel:Flywheel-Forge:${rootProject.flywheel_version}")
-//    compileOnly fg.deobf("com.simibubi.create:Create:${rootProject.create_version}")
-//    runtimeOnly fg.deobf("com.jozufozu.flywheel:Flywheel-Forge:${rootProject.flywheel_version}")
-//    runtimeOnly fg.deobf("com.simibubi.create:Create:${rootProject.create_version}")
+    runtimeOnly fg.deobf("curse.maven:create-328085:${rootProject.create_version}")
+    compileOnly fg.deobf("curse.maven:create-328085:${rootProject.create_version}")
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..
@@ -203,26 +187,26 @@ jar.finalizedBy('reobfJar')
 // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
 //publish.dependsOn('reobfJar')
 
-processResources {
-    inputs.property "version", project.mod_version
-    filteringCharset "UTF-8"
-
-    // will replace ${} strings inside mods.toml
-    filesMatching("META-INF/mods.toml") {
-        expand  "mod_id":                   project.mod_id,
-                "mod_version":              project.mod_version,
-                "mod_icon_path":            project.mod_icon_path,
-                "mod_title":                project.mod_title,
-                "mod_description":          project.mod_description,
-                "mod_url":                  project.mod_url,
-                "mod_author":               project.mod_author,
-                "mod_license":              project.mod_license,
-                "mc_version_range":         project.mc_version_range,
-                "forge_version_range":      project.forge_version_range,
-                "patchouli_version_range":  project.patchouli_version_range
-    }
-    filesMatching("pack.mcmeta") {
-        expand "mod_id": project.mod_id
+tasks.named('processResources', ProcessResources).configure {
+    var replaceProperties = [
+            "mod_id":                   project.mod_id,
+            "mod_version":              project.mod_version,
+            "mod_icon_path":            project.mod_icon_path,
+            "mod_title":                project.mod_title,
+            "mod_description":          project.mod_description,
+            "mod_url":                  project.mod_url,
+            "mod_author":               project.mod_author,
+            "mod_license":              project.mod_license,
+            "mc_version_range":         project.mc_version_range,
+            "forge_version_range":      project.forge_version_range,
+            "patchouli_version_range":  project.patchouli_version_range,
+            "version":                  project.mod_version
+    ]
+
+    inputs.properties replaceProperties
+
+    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+        expand replaceProperties
     }
 }
 

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs  = -Xmx3G
 org.gradle.daemon   = false
 
 # Core properties
-mod_version         = 1.3.0
+mod_version         = 1.20.1.0
 mod_group           = dev.murad.littlelogistics
 mod_id              = littlelogistics
 mod_title           = Little Logistics
@@ -25,27 +25,30 @@ Acknowledgements:\n\
 For Entity Spring: https://github.com/jglrxavpok\n\
 For logo help: https://github.com/tenmyouji\n\
 For artwork: https://twitter.com/danfront2\n\
-\n\
+\n\ 
 
 mod_url             = https://littlelogistics.murad.dev
 mod_author          = Murad Akhundov and EDToaster
 mod_license         = LGPLv3
 mod_icon_path       = modbanner.png
 
-mc_version          = 1.19.2
-mc_version_range    = [1.19,1.20)
-forge_version       = 43.2.11
-forge_version_range = [41,)
+mc_version          = 1.20.1
+mc_version_range    = [1.20,1.21)
+forge_version       = 47.1.1
+forge_version_range = [47,)
+forge_gradle_version = [6.0.13, 6.2)
 
 # Mod dependencies
-jei_version         = 9.5.0.132
-patchouli_version   = 1.18.2-66
-patchouli_version_range = [1.18,)
+jei_version         = 15.2.0.27
+patchouli_version   = 1.20.1-81-FORGE
+patchouli_version_range = [1.20,)
 
 # Mod compat
-create_version          = mc1.18.2_v0.4.1+111
-flywheel_version        = 1.18-0.6.2.64
+create_version          = 4626108
 
 # Mapping versions (official, parchment)
-mappings_channel = official
-mappings_version = 1.19
+mappings_channel = parchment
+mappings_version = 2023.06.26-1.20.1
+
+# Only for parchment
+parchment_gradle_version = 1+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1 +1,19 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = 'Forge'
+            url = 'https://maven.minecraftforge.net'
+        }
+        maven {
+            name = 'Parchment'
+            url = 'https://maven.parchmentmc.org'
+        }
+        maven {
+            name = 'Sponge'
+            url = 'https://repo.spongepowered.org/repository/maven-public/'
+        }
+        gradlePluginPortal()
+    }
+}
+
 rootProject.name = mod_id

src/main/java/dev/murad/shipping/ShippingConfig.java

@@ -29,8 +29,6 @@ public static class Client {
         public static final ForgeConfigSpec.ConfigValue<Double> LOCO_SMOKE_MODIFIER;
         public static final ForgeConfigSpec.ConfigValue<Boolean> DISABLE_TUG_ROUTE_BEACONS;
 
-
-
         static {
             BUILDER.push("general");
             TUG_SMOKE_MODIFIER =

src/main/java/dev/murad/shipping/block/dock/AbstractDockBlock.java

@@ -4,7 +4,10 @@
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.EntityBlock;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 
@@ -13,8 +16,6 @@ public AbstractDockBlock(Properties p_i48440_1_) {
         super(p_i48440_1_);
     }
 
-
-
     @Deprecated
     public void neighborChanged(BlockState state, Level world, BlockPos p_220069_3_, Block p_220069_4_, BlockPos p_220069_5_, boolean p_220069_6_) {
         super.neighborChanged(state, world, p_220069_3_, p_220069_4_, p_220069_5_, p_220069_6_);

src/main/java/dev/murad/shipping/block/dock/TugDockBlock.java

@@ -10,6 +10,7 @@
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
@@ -19,6 +20,7 @@
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.phys.BlockHitResult;
+import net.minecraftforge.common.ToolAction;
 
 import javax.annotation.Nullable;
 

src/main/java/dev/murad/shipping/block/energy/VesselChargerTileEntity.java

@@ -16,8 +16,8 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
 
 import javax.annotation.Nonnull;
@@ -38,7 +38,7 @@ public VesselChargerTileEntity(BlockPos pos, BlockState state) {
     @Override
     @Nonnull
     public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
-        if (capability == CapabilityEnergy.ENERGY)
+        if (capability == ForgeCapabilities.ENERGY)
             return holder.cast();
         return super.getCapability(capability, facing);
     }
@@ -60,7 +60,7 @@ public static void serverTick(Level pLevel, BlockPos pPos, BlockState pState, Ve
 
     private boolean tryChargeEntity() {
         return IVesselLoader.getEntityCapability(getBlockPos().relative(getBlockState().getValue(VesselChargerBlock.FACING)),
-                CapabilityEnergy.ENERGY, level).map(iEnergyStorage -> {
+                ForgeCapabilities.ENERGY, level).map(iEnergyStorage -> {
                     int vesselCap = iEnergyStorage.receiveEnergy(MAX_TRANSFER, true);
                     int toTransfer = internalBattery.extractEnergy(vesselCap, false);
                     return iEnergyStorage.receiveEnergy(toTransfer, false) > 0;
@@ -83,7 +83,7 @@ public void saveAdditional(CompoundTag compound) {
 
     @Override
     public<T extends Entity & LinkableEntity<T>> boolean hold(T vehicle, Mode mode) {
-        return vehicle.getCapability(CapabilityEnergy.ENERGY).map(energyHandler -> {
+        return vehicle.getCapability(ForgeCapabilities.ENERGY).map(energyHandler -> {
             switch (mode) {
                 case EXPORT:
                     return (energyHandler.getEnergyStored() < energyHandler.getMaxEnergyStored() - 50) && internalBattery.getEnergyStored() > 50;

src/main/java/dev/murad/shipping/block/fluid/FluidHopperTileEntity.java

@@ -16,10 +16,10 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidType;
 import net.minecraftforge.fluids.FluidUtil;
-import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.templates.FluidTank;
 
@@ -58,7 +58,7 @@ public boolean use(Player player, InteractionHand hand){
     @Override
     @Nonnull
     public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
-        if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
+        if (capability == ForgeCapabilities.FLUID_HANDLER)
             return holder.cast();
         return super.getCapability(capability, facing);
     }
@@ -109,9 +109,9 @@ private void serverTickInternal() {
 
     private Optional<IFluidHandler> getExternalFluidHandler(BlockPos pos){
         return Optional.ofNullable(this.level.getBlockEntity(pos))
-                .map(tile -> tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY))
+                .map(tile -> tile.getCapability(ForgeCapabilities.FLUID_HANDLER))
                 .flatMap(LazyOptional::resolve)
-                .map(Optional::of).orElseGet(() -> IVesselLoader.getEntityCapability(pos, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.level));
+                .map(Optional::of).orElseGet(() -> IVesselLoader.getEntityCapability(pos, ForgeCapabilities.FLUID_HANDLER, this.level));
 
     }
 
@@ -130,7 +130,7 @@ private boolean tryExportFluid() {
 
     @Override
     public<T extends Entity & LinkableEntity<T>> boolean hold(T vehicle, Mode mode) {
-        return vehicle.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY).map(iFluidHandler -> {
+        return vehicle.getCapability(ForgeCapabilities.FLUID_HANDLER).map(iFluidHandler -> {
             switch (mode) {
                 case IMPORT:
                     return !FluidUtil.tryFluidTransfer(this.tank, iFluidHandler, 1, false).isEmpty();

src/main/java/dev/murad/shipping/block/fluid/render/FluidHopperTileEntityRenderer.java

@@ -1,14 +1,15 @@
 package dev.murad.shipping.block.fluid.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
 import dev.murad.shipping.block.fluid.FluidHopperBlock;
 import dev.murad.shipping.block.fluid.FluidHopperTileEntity;
 import dev.murad.shipping.util.FluidRenderUtil;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.core.Direction;
+import net.minecraft.world.phys.Vec3;
 
 public class FluidHopperTileEntityRenderer implements BlockEntityRenderer<FluidHopperTileEntity> {
     public FluidHopperTileEntityRenderer(BlockEntityRendererProvider.Context context) {
@@ -22,13 +23,13 @@ public void render(FluidHopperTileEntity fluidHopperTileEntity, float p_225616_2
         matrixStack.translate(0.5f, 0, 0.5f);
         switch (direction) {
             case NORTH:
-                matrixStack.mulPose(Vector3f.YP.rotationDegrees(Direction.SOUTH.toYRot()));
+                matrixStack.mulPose(Axis.YP.rotationDegrees(Direction.SOUTH.toYRot()));
                 break;
             case SOUTH:
-                matrixStack.mulPose(Vector3f.YP.rotationDegrees(Direction.NORTH.toYRot()));
+                matrixStack.mulPose(Axis.YP.rotationDegrees(Direction.NORTH.toYRot()));
                 break;
             default:
-                matrixStack.mulPose(Vector3f.YP.rotationDegrees(direction.toYRot()));
+                matrixStack.mulPose(Axis.YP.rotationDegrees(direction.toYRot()));
         }
         matrixStack.scale(1.45f, 1f, 1.2f);
         matrixStack.translate(-0.25f, 0, -0.15f);