Merge pull request #916 from piotrenewicz/1.21.1-piotrenewicz

mrh0 · web-flow · commit d581e2c5eaea · 2025-04-11T10:08:34.000+02:00
Helping with port to 1.21.1
diff --git a/src/main/java/com/mrh0/createaddition/blocks/energy_meter/EnergyMeterBlock.java b/src/main/java/com/mrh0/createaddition/blocks/energy_meter/EnergyMeterBlock.java
@@ -36,6 +36,8 @@
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.ticks.TickPriority;
 
+import javax.annotation.Nullable;
+
 import java.util.Random;
 
 public class EnergyMeterBlock extends Block implements IBE<EnergyMeterTileEntity>, IWrenchable, ITransformableBlock {
@@ -203,14 +205,14 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
 	}
 	
 	@Override
-	public void playerWillDestroy(Level worldIn, BlockPos pos, BlockState state, Player player) {
-		super.playerWillDestroy(worldIn, pos, state, player);
+	public void playerDestroy(Level level, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool) {
+		super.playerDestroy(level, player, pos, state, blockEntity, tool);
 
-		if (worldIn.isClientSide()) return;
-		BlockEntity te = worldIn.getBlockEntity(pos);
+		if (level.isClientSide()) return;
+		BlockEntity te = level.getBlockEntity(pos);
 		if (te == null) return;
 		if (!(te instanceof IWireNode cte)) return;
-		cte.dropWires(worldIn, !player.isCreative());
+		cte.dropWires(level, !player.isCreative());
 	}
 	
 	@Override
diff --git a/src/main/java/com/mrh0/createaddition/blocks/redstone_relay/RedstoneRelayBlock.java b/src/main/java/com/mrh0/createaddition/blocks/redstone_relay/RedstoneRelayBlock.java
@@ -42,6 +42,8 @@
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraft.world.ticks.TickPriority;
 
+import javax.annotation.Nullable;
+
 public class RedstoneRelayBlock extends Block implements IBE<RedstoneRelayBlockEntity>, IWrenchable, TransformableBlock {
 
 	public static final BooleanProperty VERTICAL = BooleanProperty.create("vertical");
@@ -207,14 +209,14 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
 	}
 
 	@Override
-	public void playerWillDestroy(Level worldIn, BlockPos pos, BlockState state, Player player) {
-		super.playerWillDestroy(worldIn, pos, state, player);
+	public void playerDestroy(Level level, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool) {
+		super.playerDestroy(level, player, pos, state, blockEntity, tool);
 
-		if (worldIn.isClientSide()) return;
-		BlockEntity te = worldIn.getBlockEntity(pos);
+		if (level.isClientSide()) return;
+		BlockEntity te = level.getBlockEntity(pos);
 		if (te == null) return;
 		if (!(te instanceof IWireNode cte)) return;
-		cte.dropWires(worldIn, !player.isCreative());
+		cte.dropWires(level, !player.isCreative());
 	}
 
 	@Override
diff --git a/src/main/java/com/mrh0/createaddition/compat/forge/ForgeEnergyDisplaySource.java b/src/main/java/com/mrh0/createaddition/compat/forge/ForgeEnergyDisplaySource.java
@@ -13,11 +13,11 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
 import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.energy.IEnergyStorage;
+import net.neoforged.neoforge.energy.IEnergyStorage;
 
 public class ForgeEnergyDisplaySource extends PercentOrProgressBarDisplaySource {
 	public final static ForgeEnergyDisplaySource INSTANCE = new ForgeEnergyDisplaySource();
diff --git a/src/main/java/com/mrh0/createaddition/compat/jei/LiquidBurningCategory.java b/src/main/java/com/mrh0/createaddition/compat/jei/LiquidBurningCategory.java
@@ -11,7 +11,7 @@
 import com.simibubi.create.foundation.gui.AllGuiTextures;
 import com.simibubi.create.foundation.utility.CreateLang;
 
-import mezz.jei.api.forge.ForgeTypes;
+import mezz.jei.api.neoforge.NeoForgeTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
 import mezz.jei.api.recipe.IFocusGroup;
@@ -45,7 +45,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, LiquidBurningRecipe recipe,
 		/*builder
 			.addSlot(RecipeIngredientRole.INPUT, getBackground().getWidth() / 2 -16, 3)
 			.setBackground(getRenderedSlot(), -1, -1)
-			.addIngredients(ForgeTypes.FLUID_STACK, withImprovedVisibility(recipe.getFluidIngredient().getMatchingFluidStacks()))
+			.addIngredients(NeoForgeTypes.FLUID_STACK, withImprovedVisibility(recipe.getFluidIngredient().getMatchingFluidStacks()))
 			.addRichTooltipCallback(addStochasticTooltip(recipe.));*/
 	}
 
diff --git a/src/main/java/com/mrh0/createaddition/index/CADamageTypes.java b/src/main/java/com/mrh0/createaddition/index/CADamageTypes.java
@@ -4,6 +4,7 @@
 import com.simibubi.create.foundation.damageTypes.DamageTypeBuilder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.data.worldgen.BootstrapContext;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.damagesource.DamageScaling;
@@ -23,7 +24,7 @@ private static ResourceKey<DamageType> key(String name) {
             BARBED_WIRE_KEY = key("barbed_wire"),
             TESLA_COIL_KEY = key("tesla_coil");
 
-    public static void bootstrap(BootstapContext<DamageType> ctx) {
+    public static void bootstrap(BootstrapContext<DamageType> ctx) {
         new DamageTypeBuilder(BARBED_WIRE_KEY)
                 .exhaustion(0.0f)
                 .scaling(DamageScaling.ALWAYS)
diff --git a/src/main/java/com/mrh0/createaddition/index/CADisplaySources.java b/src/main/java/com/mrh0/createaddition/index/CADisplaySources.java
@@ -2,16 +2,17 @@
 
 import com.mrh0.createaddition.blocks.digital_adapter.DigitalAdapterDisplaySource;
 import com.mrh0.createaddition.blocks.modular_accumulator.ModularAccumulatorDisplaySource;
+import com.simibubi.create.api.behaviour.display.DisplaySource;
 import com.tterrag.registrate.util.entry.RegistryEntry;
 
 import static com.mrh0.createaddition.CreateAddition.REGISTRATE;
 
 public class CADisplaySources {
-    public static final RegistryEntry<ModularAccumulatorDisplaySource> MODULAR_ACCUMULATOR = REGISTRATE.displaySource("modular_accumulator", ModularAccumulatorDisplaySource::new)
+    public static final RegistryEntry<DisplaySource, ModularAccumulatorDisplaySource> MODULAR_ACCUMULATOR = REGISTRATE.displaySource("modular_accumulator", ModularAccumulatorDisplaySource::new)
             //.associate(CABlocks.MODULAR_ACCUMULATOR.get())
             .register();
 
-    public static final RegistryEntry<DigitalAdapterDisplaySource> DIGITAL_ADAPTER = REGISTRATE.displaySource("digital_adapter", DigitalAdapterDisplaySource::new)
+    public static final RegistryEntry<DisplaySource, DigitalAdapterDisplaySource> DIGITAL_ADAPTER = REGISTRATE.displaySource("digital_adapter", DigitalAdapterDisplaySource::new)
             //.associate(CABlocks.DIGITAL_ADAPTER.get())
             .register();
 
diff --git a/src/main/java/com/mrh0/createaddition/index/CAItems.java b/src/main/java/com/mrh0/createaddition/index/CAItems.java
@@ -1,6 +1,6 @@
 package com.mrh0.createaddition.index;
 
-import static com.simibubi.create.AllTags.forgeItemTag;
+import static com.simibubi.create.AllTags.commonItemTag;
 import static com.simibubi.create.AllTags.AllItemTags.PLATES;
 import com.mrh0.createaddition.CreateAddition;
 import com.mrh0.createaddition.item.ElectrumAmulet;
@@ -47,11 +47,11 @@ public class CAItems {
 
 	public static final ItemEntry<Item> ELECTRUM_SHEET =
 			CreateAddition.REGISTRATE.item("electrum_sheet", Item::new)
-					.tag(forgeItemTag("plates/electrum"), PLATES.tag)
+					.tag(commonItemTag("plates/electrum"), PLATES.tag)
 					.register();
 	public static final ItemEntry<Item> ZINC_SHEET =
 			CreateAddition.REGISTRATE.item("zinc_sheet", Item::new)
-					.tag(forgeItemTag("plates/zinc"), PLATES.tag)
+					.tag(commonItemTag("plates/zinc"), PLATES.tag)
 					.register();
 
 	public static final ItemEntry<Item> COPPER_WIRE =
diff --git a/src/main/java/com/mrh0/createaddition/item/DiamondGritSandpaper.java b/src/main/java/com/mrh0/createaddition/item/DiamondGritSandpaper.java
@@ -8,9 +8,9 @@
 import com.simibubi.create.foundation.item.render.SimpleCustomRenderer;
 
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.extensions.common.IClientItemExtensions;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
+import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions;
 
 
 public class DiamondGritSandpaper extends SandPaperItem {
diff --git a/src/main/java/com/mrh0/createaddition/rendering/WireNodeRenderer.java b/src/main/java/com/mrh0/createaddition/rendering/WireNodeRenderer.java
@@ -229,22 +229,22 @@ public static void wireVert(VertexConsumer vertBuilder, Matrix4f matrix, int lig
 			float c = 0.015f;
 
 			if (!sw) {
-				vertBuilder.vertex(matrix, fx -c, fy, fz + (p?-c:c)).color(cr, cg, cb, 255).uv2(light).endVertex();
+				vertBuilder.addVertex(matrix, fx -c, fy, fz + (p?-c:c)).setColor(cr, cg, cb, 255).setLight(light);
 			}
 
-			vertBuilder.vertex(matrix, fx + c, fy, fz + (p?c:-c)).color(cr, cg, cb, 255).uv2(light).endVertex();
+			vertBuilder.addVertex(matrix, fx + c, fy, fz + (p?c:-c)).setColor(cr, cg, cb, 255).setLight(light);
 			if (sw) {
-				vertBuilder.vertex(matrix, fx -c, fy, fz + (p?-c:c)).color(cr, cg, cb, 255).uv2(light).endVertex();
+				vertBuilder.addVertex(matrix, fx -c, fy, fz + (p?-c:c)).setColor(cr, cg, cb, 255).setLight(light);
 			}
 		}
 		else {
 			if (!sw) {
-				vertBuilder.vertex(matrix, fx + o1, fy + a - b, fz - o2).color(cr, cg, cb, 255).uv2(light).endVertex();
+				vertBuilder.addVertex(matrix, fx + o1, fy + a - b, fz - o2).setColor(cr, cg, cb, 255).setLight(light);
 			}
 
-			vertBuilder.vertex(matrix, fx - o1, fy + b, fz + o2).color(cr, cg, cb, 255).uv2(light).endVertex();
+			vertBuilder.addVertex(matrix, fx - o1, fy + b, fz + o2).setColor(cr, cg, cb, 255).setLight(light);
 			if (sw) {
-				vertBuilder.vertex(matrix, fx + o1, fy + a - b, fz - o2).color(cr, cg, cb, 255).uv2(light).endVertex();
+				vertBuilder.addVertex(matrix, fx + o1, fy + a - b, fz - o2).setColor(cr, cg, cb, 255).setLight(light);
 			}
 		}
 	}
diff --git a/src/main/java/com/mrh0/createaddition/sound/CASoundScapes.java b/src/main/java/com/mrh0/createaddition/sound/CASoundScapes.java
@@ -60,7 +60,7 @@ public enum PitchGroup {
 	public static void play(AmbienceGroup group, BlockPos pos, float pitch) {
 		if (!AllConfigs.client().enableAmbientSounds.get()) return;
 		// if (!Config.AUDIO_ENABLED.get()) return;
-		if(!CASounds.ELECTRIC_MOTOR_BUZZ.isPresent() || !CASounds.ELECTRIC_CHARGE.isPresent()) return;
+		if(!CASounds.ELECTRIC_MOTOR_BUZZ.isBound() || !CASounds.ELECTRIC_CHARGE.isBound()) return;
 
 		if (!outOfRange(pos)) addSound(group, pos, pitch);
 	}
diff --git a/src/main/java/com/mrh0/createaddition/trains/schedule/condition/EnergyThresholdCondition.java b/src/main/java/com/mrh0/createaddition/trains/schedule/condition/EnergyThresholdCondition.java
@@ -19,9 +19,9 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.energy.IEnergyStorage;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
+import net.neoforged.neoforge.energy.IEnergyStorage;
 
 public class EnergyThresholdCondition extends CargoThresholdCondition {
     @Override

Original file line number	Diff line number	Diff line change
`@@ -229,22 +229,22 @@ public static void wireVert(VertexConsumer vertBuilder, Matrix4f matrix, int lig`
`229`	`229`	`float c = 0.015f;`
`230`	`230`
`231`	`231`	`if (!sw) {`
`232`		`- vertBuilder.vertex(matrix, fx -c, fy, fz + (p?-c:c)).color(cr, cg, cb, 255).uv2(light).endVertex();`
	`232`	`+ vertBuilder.addVertex(matrix, fx -c, fy, fz + (p?-c:c)).setColor(cr, cg, cb, 255).setLight(light);`
`233`	`233`	`}`
`234`	`234`
`235`		`- vertBuilder.vertex(matrix, fx + c, fy, fz + (p?c:-c)).color(cr, cg, cb, 255).uv2(light).endVertex();`
	`235`	`+ vertBuilder.addVertex(matrix, fx + c, fy, fz + (p?c:-c)).setColor(cr, cg, cb, 255).setLight(light);`
`236`	`236`	`if (sw) {`
`237`		`- vertBuilder.vertex(matrix, fx -c, fy, fz + (p?-c:c)).color(cr, cg, cb, 255).uv2(light).endVertex();`
	`237`	`+ vertBuilder.addVertex(matrix, fx -c, fy, fz + (p?-c:c)).setColor(cr, cg, cb, 255).setLight(light);`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`	`else {`
`241`	`241`	`if (!sw) {`
`242`		`- vertBuilder.vertex(matrix, fx + o1, fy + a - b, fz - o2).color(cr, cg, cb, 255).uv2(light).endVertex();`
	`242`	`+ vertBuilder.addVertex(matrix, fx + o1, fy + a - b, fz - o2).setColor(cr, cg, cb, 255).setLight(light);`
`243`	`243`	`}`
`244`	`244`
`245`		`- vertBuilder.vertex(matrix, fx - o1, fy + b, fz + o2).color(cr, cg, cb, 255).uv2(light).endVertex();`
	`245`	`+ vertBuilder.addVertex(matrix, fx - o1, fy + b, fz + o2).setColor(cr, cg, cb, 255).setLight(light);`
`246`	`246`	`if (sw) {`
`247`		`- vertBuilder.vertex(matrix, fx + o1, fy + a - b, fz - o2).color(cr, cg, cb, 255).uv2(light).endVertex();`
	`247`	`+ vertBuilder.addVertex(matrix, fx + o1, fy + a - b, fz - o2).setColor(cr, cg, cb, 255).setLight(light);`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public enum PitchGroup {`
`60`	`60`	`public static void play(AmbienceGroup group, BlockPos pos, float pitch) {`
`61`	`61`	`if (!AllConfigs.client().enableAmbientSounds.get()) return;`
`62`	`62`	`// if (!Config.AUDIO_ENABLED.get()) return;`
`63`		`- if(!CASounds.ELECTRIC_MOTOR_BUZZ.isPresent() \|\| !CASounds.ELECTRIC_CHARGE.isPresent()) return;`
	`63`	`+ if(!CASounds.ELECTRIC_MOTOR_BUZZ.isBound() \|\| !CASounds.ELECTRIC_CHARGE.isBound()) return;`
`64`	`64`
`65`	`65`	`if (!outOfRange(pos)) addSound(group, pos, pitch);`
`66`	`66`	`}`