Ported to 1.19, refactor

Straight port to 1.19 feature-wise
Refactored the code; all classes which other mods should ever directly import are now in the 'api' package, rather than having them spread out everywhere.

Author: Da-Technomancer

build.gradle

@@ -87,9 +87,10 @@ dependencies {
 
 	//JEI
 	//Compile against APIs
-	compileOnly fg.deobf("mezz.jei:jei-$jei_mc_version:$jei_version:api")
+	compileOnly fg.deobf("mezz.jei:jei-$jei_mc_version-common-api:$jei_version")
+	compileOnly fg.deobf("mezz.jei:jei-$jei_mc_version-forge-api:$jei_version")
 	//Run with the full versions
-	runtimeOnly fg.deobf("mezz.jei:jei-$jei_mc_version:$jei_version")
+	runtimeOnly fg.deobf("mezz.jei:jei-$jei_mc_version-forge:$jei_version")
 	//Patchouli
 	compileOnly(fg.deobf("vazkii.patchouli:Patchouli:$patchouli_version"))
 	runtimeOnly(fg.deobf("vazkii.patchouli:Patchouli:$patchouli_version"))

gradle.properties

@@ -2,12 +2,12 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-mod_version=2.14.0
-mc_version=1.18.2
-fg_version=40.1.20
+mod_version=2.15.0
+mc_version=1.19
+fg_version=41.0.45
 mcp_channel=official
-mcp_version=1.18.2
-jei_mc_version=1.18.2
-jei_version=9.5.0.132
-patchouli_version=1.18.2-66
-cctweaked_version=1.100.5
+mcp_version=1.19
+jei_mc_version=1.19
+jei_version=11.0.0.206
+patchouli_version=1.19-73
+cctweaked_version=1.100.8

src/main/java/com/Da_Technomancer/essentials/ESConfig.java

@@ -1,39 +1,23 @@
 package com.Da_Technomancer.essentials;
 
+import com.Da_Technomancer.essentials.api.ConfigUtil;
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 import com.electronwill.nightconfig.core.io.WritingMode;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.Style;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.common.ToolAction;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.loading.FMLPaths;
 
-import javax.annotation.Nullable;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-
 public class ESConfig{
 
-	/**
-	 * A common style applied to "quip" lines in tooltips
-	 */
-	public static final Style TT_QUIP = Style.EMPTY.applyFormat(ChatFormatting.AQUA).withItalic(true);
-
 	public static ForgeConfigSpec.BooleanValue addWrench;
 
 	//	private static ForgeConfigSpec.ConfigValue<List<? extends String>> wrenchTypes;
 	public static ForgeConfigSpec.IntValue brazierRange;
 	public static ForgeConfigSpec.IntValue itemChuteRange;
 	public static ForgeConfigSpec.DoubleValue fertileSoilRate;
 	public static ForgeConfigSpec.IntValue maxRedstoneRange;
-	public static ForgeConfigSpec.EnumValue<NumberTypes> numberDisplay;
+	public static ForgeConfigSpec.EnumValue<ConfigUtil.NumberTypes> numberDisplay;
 	public static ForgeConfigSpec.IntValue wirelessRange;
 
 	private static ForgeConfigSpec clientSpec;
@@ -43,7 +27,7 @@ protected static void init(){
 		//Client config
 		ForgeConfigSpec.Builder clientBuilder = new ForgeConfigSpec.Builder();
 		addWrench = clientBuilder.worldRestart().comment("Should the Wrench show up in the creative menu?").define("creative_wrench", true);
-		numberDisplay = clientBuilder.comment("How should very large and small numbers be displayed?", "Options are: NORMAL, SCIENTIFIC, ENGINEERING, and HEX").defineEnum("num_display", NumberTypes.SCIENTIFIC);
+		numberDisplay = clientBuilder.comment("How should very large and small numbers be displayed?", "Options are: NORMAL, SCIENTIFIC, ENGINEERING, and HEX").defineEnum("num_display", ConfigUtil.NumberTypes.SCIENTIFIC);
 
 		clientSpec = clientBuilder.build();
 		ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, clientSpec);
@@ -71,75 +55,4 @@ protected static void load(){
 		serverSpec.setConfig(serverConfig);
 	}
 
-	private static final TagKey<Item> WRENCH = ItemTags.create(new ResourceLocation("forge:wrench"));
-	public static final ToolAction WRENCH_ACTION = ToolAction.get("wrench");//No single standard for wrench tool action name has emerged yet
-
-	/**
-	 * @param stack The stack to test
-	 * @return Whether this item is considered a wrench
-	 */
-	public static boolean isWrench(ItemStack stack){
-		//Essentials prefers wrenches defined via the forge:item/wrench.json, but will also check tool actions- which some mods use to define their wrench
-		return stack.is(WRENCH) || stack.canPerformAction(WRENCH_ACTION);
-	}
-
-	/**
-	 * Formats floating point values for display
-	 * @param value The value to format
-	 * @param format The format to conform the value to. Uses the value in the config if null.
-	 * @return The formatted string version, for display
-	 */
-	public static String formatFloat(float value, @Nullable NumberTypes format){
-		if(format == null){
-			format = numberDisplay.get();
-		}
-		switch(format){
-			case SCIENTIFIC:
-				float absValue = Math.abs(value);
-				if(absValue == 0){
-					return "0";
-				}
-				if(absValue < 1000 && absValue >= 0.0005F){
-					return trimTrail(Math.round(value * 1000F) / 1000F);
-				}
-
-				return scientific.format(value);
-			case ENGINEERING:
-				float absoValue = Math.abs(value);
-				if(absoValue == 0){
-					return "0";
-				}
-				if(absoValue < 1000 && absoValue >= 0.0005F){
-					return trimTrail(Math.round(value * 1000F) / 1000F);
-				}
-
-				return engineering.format(value);
-			case HEX:
-				//This option exists mainly for debugging. It shows the entire hex definition of the float value
-				return Float.toHexString(value);
-			case NORMAL:
-			default:
-				return Float.toString(value);
-		}
-	}
-
-	private static String trimTrail(float valFloat){
-		String val = Float.toString(valFloat);
-		//Removes the .0 java appends to string representations of integer-valued floats
-		while(val.contains(".") && (val.endsWith("0") || val.endsWith("."))){
-			val = val.substring(0, val.length() - 2);
-		}
-		return val;
-	}
-
-	private static final NumberFormat scientific = new DecimalFormat("0.###E0");
-	private static final NumberFormat engineering = new DecimalFormat("##0.###E0");
-
-	public enum NumberTypes{
-
-		NORMAL(),//Java default
-		SCIENTIFIC(),//Scientific notation when magnitude outside of 0.001-1000
-		ENGINEERING(),//Engineering notation when magnitude outside of 0.001-1000
-		HEX()//Display the raw float hexadecimal. This exists mainly for debugging. You want this? WHAT IS WRONG WITH YOU?
-	}
 }

src/main/java/com/Da_Technomancer/essentials/ESEventHandlerClient.java

@@ -1,16 +1,17 @@
 package com.Da_Technomancer.essentials;
 
-import com.Da_Technomancer.essentials.blocks.BlockUtil;
+import com.Da_Technomancer.essentials.api.BlockUtil;
+import com.Da_Technomancer.essentials.api.ConfigUtil;
+import com.Da_Technomancer.essentials.api.packets.ConfigureWrenchOnServer;
+import com.Da_Technomancer.essentials.api.packets.EssentialsPackets;
+import com.Da_Technomancer.essentials.api.redstone.IWireConnect;
 import com.Da_Technomancer.essentials.blocks.WitherCannon;
-import com.Da_Technomancer.essentials.blocks.redstone.AbstractTile;
+import com.Da_Technomancer.essentials.blocks.redstone.CircuitTileEntity;
 import com.Da_Technomancer.essentials.gui.*;
 import com.Da_Technomancer.essentials.gui.container.*;
 import com.Da_Technomancer.essentials.items.CircuitWrench;
 import com.Da_Technomancer.essentials.items.ESItems;
-import com.Da_Technomancer.essentials.packets.ConfigureWrenchOnServer;
-import com.Da_Technomancer.essentials.packets.EssentialsPackets;
 import com.Da_Technomancer.essentials.render.CannonSkullRenderer;
-import com.Da_Technomancer.essentials.tileentities.redstone.CircuitTileEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 import net.minecraft.client.Minecraft;
@@ -21,7 +22,7 @@
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.EntityRenderers;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.block.Block;
@@ -34,10 +35,11 @@
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.event.RenderLevelLastEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.network.IContainerFactory;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegisterEvent;
 
 import java.util.ArrayList;
 
@@ -48,28 +50,30 @@ public static class ESModEventsClient{
 
 		@SubscribeEvent
 		@SuppressWarnings("unused")
-		public static void registerContainers(RegistryEvent.Register<MenuType<?>> e){
-			registerCon(ItemShifterContainer::new, ItemShifterScreen::new, "item_shifter", e);
-			registerCon(FluidShifterContainer::new, FluidShifterScreen::new, "fluid_shifter", e);
-			registerCon(SlottedChestContainer::new, SlottedChestScreen::new, "slotted_chest", e);
-			registerCon(CircuitWrenchContainer::new, CircuitWrenchScreen::new, "circuit_wrench", e);
-			registerCon(ConstantCircuitContainer::new, ConstantCircuitScreen::new, "cons_circuit", e);
-			registerCon(TimerCircuitContainer::new, TimerCircuitScreen::new, "timer_circuit", e);
-			registerCon(AutoCrafterContainer::new, AutoCrafterScreen::new, "auto_crafter", e);
-			registerCon(DelayCircuitContainer::new, DelayCircuitScreen::new, "delay_circuit", e);
-			registerCon(PulseCircuitContainer::new, PulseCircuitScreen::new, "pulse_circuit", e);
+		public static void registerContainers(RegisterEvent e){
+			e.register(ForgeRegistries.Keys.CONTAINER_TYPES, helper -> {
+				registerCon(ItemShifterContainer::new, ItemShifterScreen::new, "item_shifter", helper);
+				registerCon(FluidShifterContainer::new, FluidShifterScreen::new, "fluid_shifter", helper);
+				registerCon(SlottedChestContainer::new, SlottedChestScreen::new, "slotted_chest", helper);
+				registerCon(CircuitWrenchContainer::new, CircuitWrenchScreen::new, "circuit_wrench", helper);
+				registerCon(ConstantCircuitContainer::new, ConstantCircuitScreen::new, "cons_circuit", helper);
+				registerCon(TimerCircuitContainer::new, TimerCircuitScreen::new, "timer_circuit", helper);
+				registerCon(AutoCrafterContainer::new, AutoCrafterScreen::new, "auto_crafter", helper);
+				registerCon(DelayCircuitContainer::new, DelayCircuitScreen::new, "delay_circuit", helper);
+				registerCon(PulseCircuitContainer::new, PulseCircuitScreen::new, "pulse_circuit", helper);
+			});
 		}
 
 		/**
 		 * Creates and registers both a container type and a screen factory. Not usable on the physical server due to screen factory.
 		 * @param cons Container factory
 		 * @param screenFactory The screen factory to be linked to the type
 		 * @param id The ID to use
-		 * @param reg Registery event
+		 * @param helper Registry helper
 		 * @param <T> Container subclass
 		 */
-		private static <T extends AbstractContainerMenu> void registerCon(IContainerFactory<T> cons, MenuScreens.ScreenConstructor<T, AbstractContainerScreen<T>> screenFactory, String id, RegistryEvent.Register<MenuType<?>> reg){
-			MenuType<T> contType = ESEventHandlerCommon.ESModEventsCommon.registerConType(cons, id, reg);
+		private static <T extends AbstractContainerMenu> void registerCon(IContainerFactory<T> cons, MenuScreens.ScreenConstructor<T, AbstractContainerScreen<T>> screenFactory, String id, RegisterEvent.RegisterHelper<MenuType<?>> helper){
+			MenuType<T> contType = ESEventHandlerCommon.ESModEventsCommon.registerConType(cons, id, helper);
 			MenuScreens.register(contType, screenFactory);
 		}
 
@@ -104,7 +108,7 @@ public static void renderRedsOutput(RenderLevelLastEvent e){
 					float output = ((CircuitTileEntity) te).getOutput();
 					float[] relPos = {te.getBlockPos().getX() + 0.5F, te.getBlockPos().getY() + 0.5F, te.getBlockPos().getZ() + 0.5F};
 					if(RANGE * RANGE > Minecraft.getInstance().getEntityRenderDispatcher().distanceToSqr(relPos[0], relPos[1], relPos[2])){
-						renderNameplate(e.getPoseStack(), buffer, relPos, ESConfig.formatFloat(output, null));
+						renderNameplate(e.getPoseStack(), buffer, relPos, ConfigUtil.formatFloat(output, null));
 					}
 				}
 			}
@@ -134,13 +138,13 @@ public static void pickBlockCircuitWrench(InputEvent.ClickInputEvent e){
 			if(hit.getType() == HitResult.Type.BLOCK){
 				BlockPos pos = ((BlockHitResult) hit).getBlockPos();
 				Block block = Minecraft.getInstance().level.getBlockState(pos).getBlock();
-				if(block instanceof AbstractTile){
+				if(block instanceof IWireConnect){
 					//Because we're on the client side, we need to send a packet to the server updating the wrench
 
 					int index = -1;
-					ArrayList<AbstractTile> modes = CircuitWrench.MODES;
+					ArrayList<IWireConnect> modes = CircuitWrench.MODES;
 					for(int i = 0; i < modes.size(); i++){
-						AbstractTile tile = modes.get(i);
+						IWireConnect tile = modes.get(i);
 						if(tile == block){
 							index = i;
 							break;
@@ -149,12 +153,12 @@ public static void pickBlockCircuitWrench(InputEvent.ClickInputEvent e){
 					if(index < 0){
 						//Didn't find this circuit
 						//Log an error and abort
-						Essentials.logger.warn("Attempted to select unregistered circuit: " + block.getRegistryName());
+						Essentials.logger.warn("Attempted to select unregistered circuit: " + ForgeRegistries.BLOCKS.getKey(block));
 						return;
 					}
 					e.setCanceled(true);
 					EssentialsPackets.channel.sendToServer(new ConfigureWrenchOnServer(index));
-					Minecraft.getInstance().player.sendMessage(new TranslatableComponent("tt.essentials.circuit_wrench_setting").setStyle(CircuitWrenchScreen.CIRCUIT_WRENCH_STYLE).append(new TranslatableComponent(CircuitWrench.MODES.get(index).getDescriptionId())), Minecraft.getInstance().player.getUUID());
+					Minecraft.getInstance().player.displayClientMessage(Component.translatable("tt.essentials.circuit_wrench_setting").setStyle(CircuitWrenchScreen.CIRCUIT_WRENCH_STYLE).append(Component.translatable(CircuitWrench.MODES.get(index).wireAsBlock().getDescriptionId())), true);
 				}
 			}
 		}