Merge branch 'team-abnormals:1.20.x' into 1.20.x

build.gradle

@@ -21,7 +21,7 @@ mixin {
 }
 
 version = "${project.minecraft}-${project.modVersion}"
-group = "com.minecraftabnormals"
+group = "com.teamabnormals"
 archivesBaseName = project.modId
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)

gradle.properties

@@ -10,7 +10,7 @@ modVersion=5.0.0
 
 minecraft=1.20.1
 forge=47.1.3
-blueprint=7.1.0-beta29
-boatload=5.0.1-beta1
-woodworks=3.0.1-beta3
+blueprint=7.1.0
+boatload=5.0.1
+woodworks=3.0.1
 jei=15.3.0.4

src/generated/resources/data/endergetic/loot_tables/blocks/poise_cluster.json

@@ -5,12 +5,7 @@
       "bonus_rolls": 0.0,
       "conditions": [
         {
-          "condition": "minecraft:match_tool",
-          "predicate": {
-            "items": [
-              "minecraft:shears"
-            ]
-          }
+          "condition": "minecraft:survives_explosion"
         }
       ],
       "entries": [

src/main/java/com/teamabnormals/endergetic/client/model/BoofBlockDispenserModel.java

@@ -17,7 +17,6 @@
  * Created using Tabula 7.0.0
  */
 public class BoofBlockDispenserModel {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "boof_block_dispensed"), "main");
 	public ModelPart base;
 
 	public BoofBlockDispenserModel(ModelPart root) {

src/main/java/com/teamabnormals/endergetic/client/model/BoofBlockModel.java

@@ -19,7 +19,6 @@
  * Created using Tabula 7.0.0
  */
 public class BoofBlockModel<T extends BoofBlockEntity> extends EntityModel<T> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "boof_block"), "main");
 	public ModelPart base;
 
 	public BoofBlockModel(ModelPart root) {

src/main/java/com/teamabnormals/endergetic/client/model/PoiseClusterModel.java

@@ -19,7 +19,6 @@
  * Created using Tabula 7.0.0
  */
 public class PoiseClusterModel<T extends PoiseClusterEntity> extends EntityModel<T> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "poise_cluster"), "main");
 	public ModelPart cube;
 
 	public PoiseClusterModel(ModelPart root) {

src/main/java/com/teamabnormals/endergetic/client/model/PuffBugModel.java

@@ -29,7 +29,6 @@
  * Created using Tabula 7.0.0
  */
 public class PuffBugModel<E extends PuffBug> extends EndimatorEntityModel<E> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "puff_bug"), "main");
 	public EndimatorModelPart Body;
 	public EndimatorModelPart Stinger;
 	public EndimatorModelPart Neck;

src/main/java/com/teamabnormals/endergetic/client/model/bolloom/BolloomBalloonModel.java

@@ -21,7 +21,6 @@
  * Created using Tabula 7.0.0
  */
 public class BolloomBalloonModel<T extends BolloomBalloon> extends EntityModel<T> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "bolloom_balloon"), "main");
 	public ModelPart balloon;
 	public ModelPart x_string;
 	public ModelPart z_string;

src/main/java/com/teamabnormals/endergetic/client/model/bolloom/BolloomBudModel.java

@@ -19,7 +19,6 @@
  * Created using Tabula 7.0.0
  */
 public class BolloomBudModel {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "bolloom_bud"), "main");
 	public ModelPart Center;
 	public ModelPart Pedal;
 	public ModelPart Pedal_1;

src/main/java/com/teamabnormals/endergetic/client/model/bolloom/BolloomFruitModel.java

@@ -21,7 +21,6 @@
  * Created using Tabula 7.0.0
  */
 public class BolloomFruitModel<T extends BolloomFruit> extends EntityModel<T> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "bolloom_fruit"), "main");
 	public ModelPart vine_x;
 	public ModelPart fruit;
 	public ModelPart vine_z;

src/main/java/com/teamabnormals/endergetic/client/model/bolloom/BolloomKnotModel.java

@@ -19,7 +19,6 @@
  * Created using Tabula 7.0.0
  */
 public class BolloomKnotModel<T extends BolloomKnot> extends EntityModel<T> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "bolloom_knot"), "main");
 	public ModelPart knot;
 
 	public BolloomKnotModel(ModelPart root) {

src/main/java/com/teamabnormals/endergetic/client/model/booflo/AdolescentBoofloModel.java

@@ -23,7 +23,6 @@
  * Created using Tabula 7.0.0
  */
 public class AdolescentBoofloModel<E extends BoofloAdolescent> extends EndimatorEntityModel<E> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "adolescent_booflo"), "main");
 	public ModelPart Head;
 	public ModelPart KneeLeft;
 	public ModelPart KneeRight;

src/main/java/com/teamabnormals/endergetic/client/model/booflo/BoofloBabyModel.java

@@ -20,7 +20,6 @@
  * Created using Tabula 7.0.0
  */
 public class BoofloBabyModel<E extends BoofloBaby> extends EntityModel<E> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "booflo_baby"), "main");
 	public ModelPart Head;
 	public ModelPart Jaw;
 	public ModelPart Tail;

src/main/java/com/teamabnormals/endergetic/client/model/booflo/BoofloModel.java

@@ -24,8 +24,6 @@
  */
 @OnlyIn(Dist.CLIENT)
 public class BoofloModel<E extends Booflo> extends EndimatorEntityModel<E> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "booflo"), "main");
-
 	public ModelPart Head;
 	public ModelPart Jaw;
 	public ModelPart KneeLeft;

src/main/java/com/teamabnormals/endergetic/client/model/corrock/CorrockCrownStandingModel.java

@@ -17,7 +17,6 @@
  * Created using Tabula 7.0.0
  */
 public class CorrockCrownStandingModel {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "corrock_crown_standing"), "main");
 	public ModelPart shape1;
 	public ModelPart shape1_1;
 

src/main/java/com/teamabnormals/endergetic/client/model/corrock/CorrockCrownWallModel.java

@@ -17,7 +17,6 @@
  * Created using Tabula 7.0.0
  */
 public class CorrockCrownWallModel {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "corrock_crown_wall"), "main");
 	public ModelPart shape1;
 	public ModelPart shape1_1;
 

src/main/java/com/teamabnormals/endergetic/client/model/eetle/BroodEetleModel.java

@@ -25,7 +25,6 @@
  * Created using Tabula 7.0.0
  */
 public class BroodEetleModel extends EndimatorEntityModel<BroodEetle> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "brood_eetle"), "main");
 	private static final float WING_SHOW_THRESHOLD = (float) Math.toRadians(15.0F);
 	public EndimatorModelPart body;
 	public EndimatorModelPart leftShell;

src/main/java/com/teamabnormals/endergetic/client/model/eetle/ChargerEetleModel.java

@@ -23,8 +23,6 @@
  * Created using Tabula 7.0.0
  */
 public class ChargerEetleModel extends EndimatorEntityModel<ChargerEetle> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "charger_eetle"), "main");
-
 	public ModelPart body;
 	public ModelPart frontLeftLeg;
 	public ModelPart frontRightLeg;

src/main/java/com/teamabnormals/endergetic/client/model/eetle/GliderEetleModel.java

@@ -23,7 +23,6 @@
  * Created using Tabula 7.0.0
  */
 public class GliderEetleModel extends EndimatorEntityModel<GliderEetle> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "glider_eetle"), "main");
 	private static final float WING_SHOW_THRESHOLD = (float) Math.toRadians(9.0F);
 	public ModelPart body;
 	public ModelPart rightElytron;

src/main/java/com/teamabnormals/endergetic/client/model/eetle/LeetleModel.java

@@ -23,7 +23,6 @@
  * Created using Tabula 7.0.0
  */
 public class LeetleModel<E extends AbstractEetle> extends EndimatorEntityModel<E> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "leetle"), "main");
 	public ModelPart body;
 	public ModelPart head;
 	public ModelPart body2;

src/main/java/com/teamabnormals/endergetic/client/model/eetle/eggs/LargeEetleEggModel.java

@@ -22,7 +22,6 @@
  * Created using Tabula 7.0.0
  */
 public class LargeEetleEggModel implements IEetleEggModel {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "large_eetle_egg"), "main");
 	public ModelPart smallEgg;
 	public ModelPart Egg;
 	public ModelPart GiantEgg;

src/main/java/com/teamabnormals/endergetic/client/model/eetle/eggs/MediumEetleEggModel.java

@@ -22,7 +22,6 @@
  * Created using Tabula 7.0.0
  */
 public class MediumEetleEggModel implements IEetleEggModel {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "medium_eetle_egg"), "main");
 	public ModelPart smallEgg1;
 	public ModelPart smallEgg2;
 	public ModelPart BigEgg;

src/main/java/com/teamabnormals/endergetic/client/model/eetle/eggs/SmallEetleEggModel.java

@@ -22,7 +22,6 @@
  * Created using Tabula 7.0.0
  */
 public class SmallEetleEggModel implements IEetleEggModel {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "small_eetle_egg"), "main");
 	public ModelPart egg;
 	public ModelPart otherEgg;
 	public ModelPart bigEgg;

src/main/java/com/teamabnormals/endergetic/client/model/purpoid/PurpModel.java

@@ -4,15 +4,11 @@
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.teamabnormals.blueprint.client.ClientInfo;
 import com.teamabnormals.endergetic.common.entity.purpoid.Purpoid;
-import com.teamabnormals.endergetic.core.EndergeticExpansion;
-import net.minecraft.client.model.geom.ModelLayerLocation;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
-import net.minecraft.resources.ResourceLocation;
 
 public class PurpModel extends PurpoidModel {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "purp"), "main");
 
 	public PurpModel(ModelPart root) {
 		super(root);

src/main/java/com/teamabnormals/endergetic/client/model/purpoid/PurpazoidModel.java

@@ -12,7 +12,6 @@
 import net.minecraft.resources.ResourceLocation;
 
 public class PurpazoidModel extends PurpoidModel {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "purpazoid"), "main");
 
 	public PurpazoidModel(ModelPart root) {
 		super(root);

src/main/java/com/teamabnormals/endergetic/client/model/purpoid/PurpoidGelModel.java

@@ -10,18 +10,12 @@
 import com.teamabnormals.endergetic.api.util.ModelUtil;
 import com.teamabnormals.endergetic.common.entity.purpoid.Purpoid;
 import com.teamabnormals.endergetic.common.entity.purpoid.PurpoidSize;
-import com.teamabnormals.endergetic.core.EndergeticExpansion;
-import net.minecraft.client.model.geom.ModelLayerLocation;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
 public class PurpoidGelModel extends EndimatorEntityModel<Purpoid> {
-	public static final ModelLayerLocation PURPOID_LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "purpoid_gel"), "main");
-	public static final ModelLayerLocation PURP_LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "purp_gel"), "main");
-	public static final ModelLayerLocation PURPAZOID_LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "purpazoid_gel"), "main");
 	public ModelPart gelLayer;
 	private float headScale;
 

src/main/java/com/teamabnormals/endergetic/client/model/purpoid/PurpoidModel.java

@@ -26,7 +26,6 @@
  * Created using Tabula 7.0.0
  */
 public class PurpoidModel extends EndimatorEntityModel<Purpoid> {
-	public static final ModelLayerLocation LOCATION = new ModelLayerLocation(new ResourceLocation(EndergeticExpansion.MOD_ID, "purpoid"), "main");
 	private static final ResourceLocation REST_ONTO_FLOWER_ENDIMATION = new ResourceLocation(EndergeticExpansion.MOD_ID, "purpoid/rest_onto_flower");
 	public ModelPart head;
 	public ModelPart rim1;

src/main/java/com/teamabnormals/endergetic/client/particle/ParticleTypeWithData.java

@@ -0,0 +1,22 @@
+package com.teamabnormals.endergetic.client.particle;
+
+import com.mojang.serialization.Codec;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.core.particles.ParticleType;
+
+import java.util.function.Function;
+
+public class ParticleTypeWithData<T extends ParticleOptions> extends ParticleType<T> {
+	private final Function<ParticleType<T>, Codec<T>> function;
+
+	@SuppressWarnings("deprecation")
+	public ParticleTypeWithData(ParticleOptions.Deserializer<T> deserializer, Function<ParticleType<T>, Codec<T>> function) {
+		super(false, deserializer);
+		this.function = function;
+	}
+
+	@Override
+	public Codec<T> codec() {
+		return this.function.apply(this);
+	}
+}

src/main/java/com/teamabnormals/endergetic/client/renderer/block/BolloomBudTileEntityRenderer.java

@@ -5,6 +5,7 @@
 import com.teamabnormals.endergetic.client.model.bolloom.BolloomBudModel;
 import com.teamabnormals.endergetic.common.block.entity.BolloomBudTileEntity;
 import com.teamabnormals.endergetic.core.EndergeticExpansion;
+import com.teamabnormals.endergetic.core.other.EEModelLayers;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
@@ -16,7 +17,7 @@ public class BolloomBudTileEntityRenderer implements BlockEntityRenderer<Bolloom
 	private BolloomBudModel budModel;
 
 	public BolloomBudTileEntityRenderer(BlockEntityRendererProvider.Context context) {
-		this.budModel = new BolloomBudModel(context.bakeLayer(BolloomBudModel.LOCATION));
+		this.budModel = new BolloomBudModel(context.bakeLayer(EEModelLayers.BOLLOOM_BUD));
 	}
 
 	@Override

src/main/java/com/teamabnormals/endergetic/client/renderer/block/CorrockCrownTileEntityRenderer.java

@@ -9,6 +9,7 @@
 import com.teamabnormals.endergetic.common.block.CorrockCrownStandingBlock;
 import com.teamabnormals.endergetic.common.block.entity.CorrockCrownTileEntity;
 import com.teamabnormals.endergetic.core.EndergeticExpansion;
+import com.teamabnormals.endergetic.core.other.EEModelLayers;
 import com.teamabnormals.endergetic.core.registry.EEBlocks;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
@@ -29,8 +30,8 @@ public class CorrockCrownTileEntityRenderer implements BlockEntityRenderer<Corro
 	};
 
 	public CorrockCrownTileEntityRenderer(BlockEntityRendererProvider.Context context) {
-		this.standingModel = new CorrockCrownStandingModel(context.bakeLayer(CorrockCrownStandingModel.LOCATION));
-		this.wallModel = new CorrockCrownWallModel(context.bakeLayer(CorrockCrownWallModel.LOCATION));
+		this.standingModel = new CorrockCrownStandingModel(context.bakeLayer(EEModelLayers.CORROCK_CROWN_STANDING));
+		this.wallModel = new CorrockCrownWallModel(context.bakeLayer(EEModelLayers.CORROCK_CROWN_WALL));
 	}
 
 	@Override

src/main/java/com/teamabnormals/endergetic/client/renderer/block/DispensedBoofBlockTileEntityRenderer.java

@@ -7,6 +7,7 @@
 import com.teamabnormals.endergetic.common.block.entity.boof.DispensedBlockBoofTileEntity;
 import com.teamabnormals.endergetic.common.block.poise.boof.DispensedBoofBlock;
 import com.teamabnormals.endergetic.core.EndergeticExpansion;
+import com.teamabnormals.endergetic.core.other.EEModelLayers;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
@@ -19,7 +20,7 @@ public class DispensedBoofBlockTileEntityRenderer implements BlockEntityRenderer
 	private final BoofBlockDispenserModel model;
 
 	public DispensedBoofBlockTileEntityRenderer(BlockEntityRendererProvider.Context context) {
-		this.model = new BoofBlockDispenserModel(context.bakeLayer(BoofBlockDispenserModel.LOCATION));
+		this.model = new BoofBlockDispenserModel(context.bakeLayer(EEModelLayers.BOOF_BLOCK_DISPENSED));
 	}
 
 	@Override
@@ -32,7 +33,7 @@ public void render(DispensedBlockBoofTileEntity boof, float partialTicks, PoseSt
 		if (facing.getAxis().isVertical()) {
 			float offset = -facing.getAxisDirection().getStep();
 			matrixStack.mulPose(Axis.XP.rotationDegrees(90.0F * offset));
-			matrixStack.translate(0.0F, 1.125F, 1.0F * offset);
+			matrixStack.translate(0.0F, 1.125F, offset);
 		} else {
 			matrixStack.mulPose(Axis.YP.rotationDegrees(-facing.toYRot()));
 		}

src/main/java/com/teamabnormals/endergetic/client/renderer/block/EetleEggTileEntityRenderer.java

@@ -9,8 +9,9 @@
 import com.teamabnormals.endergetic.common.block.EetleEggBlock;
 import com.teamabnormals.endergetic.common.block.entity.EetleEggTileEntity;
 import com.teamabnormals.endergetic.core.EndergeticExpansion;
-import com.teamabnormals.endergetic.core.registry.EEBlocks;
+import com.teamabnormals.endergetic.core.other.EEModelLayers;
 import com.teamabnormals.endergetic.core.other.EERenderTypes;
+import com.teamabnormals.endergetic.core.registry.EEBlocks;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
@@ -34,9 +35,9 @@ public class EetleEggTileEntityRenderer implements BlockEntityRenderer<EetleEggT
 
 	public EetleEggTileEntityRenderer(BlockEntityRendererProvider.Context context) {
 		this.eggModels = new IEetleEggModel[]{
-				new SmallEetleEggModel(context.bakeLayer(SmallEetleEggModel.LOCATION)),
-				new MediumEetleEggModel(context.bakeLayer(MediumEetleEggModel.LOCATION)),
-				new LargeEetleEggModel(context.bakeLayer(LargeEetleEggModel.LOCATION))
+				new SmallEetleEggModel(context.bakeLayer(EEModelLayers.SMALL_EETLE_EGG)),
+				new MediumEetleEggModel(context.bakeLayer(EEModelLayers.MEDIUM_EETLE_EGG)),
+				new LargeEetleEggModel(context.bakeLayer(EEModelLayers.LARGE_EETLE_EGG))
 		};
 	}
 

src/main/java/com/teamabnormals/endergetic/client/renderer/entity/BolloomBalloonRenderer.java

@@ -5,6 +5,7 @@
 import com.mojang.math.Axis;
 import com.teamabnormals.endergetic.client.model.bolloom.BolloomBalloonModel;
 import com.teamabnormals.endergetic.common.entity.bolloom.BolloomBalloon;
+import com.teamabnormals.endergetic.core.other.EEModelLayers;
 import com.teamabnormals.endergetic.core.other.EERenderTypes;
 import net.minecraft.client.CameraType;
 import net.minecraft.client.Minecraft;
@@ -22,7 +23,7 @@ public final class BolloomBalloonRenderer extends EntityRenderer<BolloomBalloon>
 
 	public BolloomBalloonRenderer(EntityRendererProvider.Context context) {
 		super(context);
-		this.model = new BolloomBalloonModel<>(context.bakeLayer(BolloomBalloonModel.LOCATION));
+		this.model = new BolloomBalloonModel<>(context.bakeLayer(EEModelLayers.BOLLOOM_BALLOON));
 	}
 
 	@Override

src/main/java/com/teamabnormals/endergetic/client/renderer/entity/BolloomFruitRenderer.java

@@ -6,6 +6,7 @@
 import com.teamabnormals.endergetic.client.model.bolloom.BolloomFruitModel;
 import com.teamabnormals.endergetic.common.entity.bolloom.BolloomFruit;
 import com.teamabnormals.endergetic.core.EndergeticExpansion;
+import com.teamabnormals.endergetic.core.other.EEModelLayers;
 import com.teamabnormals.endergetic.core.other.EERenderTypes;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.EntityRenderer;
@@ -19,7 +20,7 @@ public class BolloomFruitRenderer extends EntityRenderer<BolloomFruit> {
 
 	public BolloomFruitRenderer(EntityRendererProvider.Context context) {
 		super(context);
-		this.model = new BolloomFruitModel<>(context.bakeLayer(BolloomFruitModel.LOCATION));
+		this.model = new BolloomFruitModel<>(context.bakeLayer(EEModelLayers.BOLLOOM_FRUIT));
 	}
 
 	@Override