Update to 1.18.2

- Closes #33

build.gradle

@@ -114,8 +114,8 @@ repositories {
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
-    implementation fg.deobf("curse.maven:create-328085:3706700")
-    implementation fg.deobf("curse.maven:flywheel-486392:3687357")
+    implementation fg.deobf("curse.maven:create-328085:3737418")
+    implementation fg.deobf("curse.maven:flywheel-486392:3737402")
     //implementation fg.deobf("curse.maven:immersive-engineering-231951:3377691")
     //implementation fg.deobf("curse.maven:create-alloyed-564792:3602444")
 

changelog.txt

@@ -1,2 +1,2 @@
-2.0.1-alpha:
-  - Update to Create 0.4f, Flywheel 0.6.1, and Forge 39.1.0
+2.0.2-alpha:
+  - Update to support Minecraft 1.18.2, Create 0.4.1, Flywheel 0.6.2, and Forge 40.0.0

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # mod version info
-mod_version = 2.0.1-alpha
-minecraft_version = 1.18.1
-forge_version = 39.1.0
+mod_version = 2.0.2-alpha
+minecraft_version = 1.18.2
+forge_version = 40.0.34
 
 # build dependency versions
 forgegradle_version = 5.1.+
 mixingradle_version = 0.7-SNAPSHOT
 cursegradle_version = 1.4.0
 librarian_version = 1.+
-parchment_mappings = 2022.02.13-1.18.1
+parchment_mappings = 2022.03.13-1.18.2
 
 # curseforge information
 projectId = 534610

src/main/java/com/teammoeg/steampowered/SPTags.java

@@ -18,9 +18,10 @@
 
 package com.teammoeg.steampowered;
 
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.tags.FluidTags;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 
 public class SPTags {
 
@@ -28,10 +29,10 @@ public class SPTags {
 
     }
 
-    public static final Tag.Named<Fluid> STEAM = forgeTag("steam");
+    public static final TagKey<Fluid> STEAM = forgeTag("steam");
 
-    private static Tag.Named<Fluid> forgeTag(String name) {
-        return FluidTags.bind("forge:" + name);
+    private static TagKey<Fluid> forgeTag(String name) {
+        return FluidTags.create(new ResourceLocation("forge", name));
     }
 
 }

src/main/java/com/teammoeg/steampowered/SteamPowered.java

@@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger;
 
 import com.simibubi.create.foundation.block.BlockStressValues;
 import com.simibubi.create.foundation.data.CreateRegistrate;
-import com.simibubi.create.repack.registrate.util.NonNullLazyValue;
+import com.simibubi.create.repack.registrate.util.nullness.NonNullSupplier;
 import com.teammoeg.steampowered.client.Particles;
 import com.teammoeg.steampowered.client.SteamPoweredClient;
 import com.teammoeg.steampowered.network.PacketHandler;
@@ -64,7 +64,7 @@ public class SteamPowered {
         }
     };
 
-    public static final NonNullLazyValue<CreateRegistrate> registrate = CreateRegistrate.lazy(MODID);
+    public static final NonNullSupplier<CreateRegistrate> registrate = CreateRegistrate.lazy(MODID);
 
     // Directly reference a log4j logger.
     private static final Logger LOGGER = LogManager.getLogger();

src/main/java/com/teammoeg/steampowered/content/engine/SteamEngineTileEntity.java

@@ -18,39 +18,35 @@
 
 package com.teammoeg.steampowered.content.engine;
 
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock;
 import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity;
 import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineBlock;
 import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineTileEntity;
 import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation;
 import com.teammoeg.steampowered.FluidRegistry;
-
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.Fluid;
+import com.teammoeg.steampowered.SPTags;
+import net.minecraft.ChatFormatting;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.tags.FluidTags;
-import net.minecraft.tags.Tag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.core.Direction;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.material.Fluid;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidHandler;
-import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
 import net.minecraftforge.fluids.capability.templates.FluidTank;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+
 public abstract class SteamEngineTileEntity extends EngineTileEntity implements IHaveGoggleInformation {
 
 	private FluidTank tank;
@@ -61,9 +57,8 @@ public abstract class SteamEngineTileEntity extends EngineTileEntity implements
 		super(type, pos, state);
 		this.refreshCapability();
 		this.tank = new FluidTank(this.getSteamStorage(), fluidStack -> {
-			Tag<Fluid> steamTag = FluidTags.getAllTags().getTag(new ResourceLocation("forge", "steam"));
-			if (steamTag != null)
-				return fluidStack.getFluid().is(steamTag);
+			if (SPTags.STEAM != null)
+				return fluidStack.getFluid().is(SPTags.STEAM);
 			else
 				return fluidStack.getFluid() == FluidRegistry.steam.get();
 		});

src/main/resources/META-INF/mods.toml

@@ -14,28 +14,28 @@ Expanding Create mod to the Steam Age
 [[dependencies.steampowered]]
     modId = "forge"
     mandatory = true
-    versionRange = "[39.1.0,)"
+    versionRange = "[40.0.0,)"
     ordering = "NONE"
     side = "BOTH"
 
 [[dependencies.steampowered]]
     modId = "minecraft"
     mandatory = true
-    versionRange = "[1.18.1,1.19)"
+    versionRange = "[1.18.2,1.19)"
     ordering = "NONE"
     side = "BOTH"
 
 [[dependencies.steampowered]]
     modId="create"
     mandatory=true
-    versionRange="[v0.4f,)"
+    versionRange="[v0.4.1,)"
     ordering="NONE"
     side="BOTH"
 
 [[dependencies.steampowered]]
     modId="flywheel"
     mandatory=true
-    versionRange="[1.18-0.6.1,)"
+    versionRange="[1.18-0.6.2,)"
     ordering="AFTER"
     side="CLIENT"