Port to Minecraft 1.16

refinedmods · Jul 15, 2020 · b9e4b2f · b9e4b2f
1 parent 2830c87
commit b9e4b2f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Ranged Pumps Changelog
 
+### 0.8
+- Port to Minecraft 1.16 (raoulvdberge)
+
 ### 0.7.1
 - Port to Minecraft 1.15.2 (raoulvdberge)
 

diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
-# Ranged Pumps [![Build Status](https://ci.refinedmods.com/buildStatus/icon?job=rangedpumps-mc1.15)](https://ci.refinedmods.com/job/rangedpumps-mc1.15/) [![CurseForge](http://cf.way2muchnoise.eu/full_247496_downloads.svg)](http://minecraft.curseforge.com/projects/ranged-pumps)
+# Ranged Pumps [![Build Status](https://ci.refinedmods.com/buildStatus/icon?job=rangedpumps-mc1.16)](https://ci.refinedmods.com/job/rangedpumps-mc1.16/) [![CurseForge](http://cf.way2muchnoise.eu/full_247496_downloads.svg)](http://minecraft.curseforge.com/projects/ranged-pumps)
 
 Ranged Pumps is a simple mod that adds a pump that pumps liquids in a range.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '0.7.2'
+version = '0.8'
 def env = System.getenv()
 if (env.BUILD_NUMBER) {
     version = version + "+" + "${env.BUILD_NUMBER}"
@@ -24,7 +24,7 @@ archivesBaseName = 'rangedpumps'
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
 
 minecraft {
-    mappings channel: 'snapshot', version: '20200124-1.15.1'
+    mappings channel: 'snapshot', version: '20200707-1.16.1'
 
     runs {
         client {
@@ -78,7 +78,7 @@ processResources {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.15.2-31.0.14'
+    minecraft 'net.minecraftforge:forge:1.16.1-32.0.63'
 }
 
 jar {

diff --git a/src/main/java/com/refinedmods/rangedpumps/block/PumpBlock.java b/src/main/java/com/refinedmods/rangedpumps/block/PumpBlock.java
@@ -61,13 +61,13 @@ public ActionResultType onBlockActivated(BlockState state, World world, BlockPos
                 ITextComponent message = PumpState.getMessage(pump);
 
                 if (message != null) {
-                    player.sendMessage(message);
+                    player.sendMessage(message, player.getUniqueID());
                 }
 
                 if (pump.getTank().getFluidAmount() == 0) {
-                    player.sendMessage(new TranslationTextComponent("block." + RangedPumps.ID + ".pump.state_empty", energy.getEnergyStored(), energy.getMaxEnergyStored()));
+                    player.sendMessage(new TranslationTextComponent("block." + RangedPumps.ID + ".pump.state_empty", energy.getEnergyStored(), energy.getMaxEnergyStored()), player.getUniqueID());
                 } else {
-                    player.sendMessage(new TranslationTextComponent("block." + RangedPumps.ID + ".pump.state", pump.getTank().getFluidAmount(), pump.getTank().getFluid().getDisplayName(), energy.getEnergyStored(), energy.getMaxEnergyStored()));
+                    player.sendMessage(new TranslationTextComponent("block." + RangedPumps.ID + ".pump.state", pump.getTank().getFluidAmount(), pump.getTank().getFluid().getDisplayName(), energy.getEnergyStored(), energy.getMaxEnergyStored()), player.getUniqueID());
                 }
             }
         }

diff --git a/src/main/java/com/refinedmods/rangedpumps/tile/PumpTile.java b/src/main/java/com/refinedmods/rangedpumps/tile/PumpTile.java
@@ -263,8 +263,8 @@ public CompoundNBT write(CompoundNBT tag) {
     }
 
     @Override
-    public void read(CompoundNBT tag) {
-        super.read(tag);
+    public void read(BlockState blockState, CompoundNBT tag) {
+        super.read(blockState, tag);
 
         if (tag.contains("Energy")) {
             energy.receiveEnergy(tag.getInt("Energy"), false);

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[31,)"
+loaderVersion="[32,)"
 issueTrackerURL="https://github.com/refinedmods/rangedpumps"
 [[mods]]
 modId="rangedpumps"

diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "Ranged Pumps resources",
-    "pack_format": 4
+    "pack_format": 5
   }
 }