Merge remote-tracking branch 'glitch/entity-refactor' into 1.20.2

QuiltMC · Sep 25, 2023 · 97613ea · 97613ea
2 parents 2d137bb + 4bc7ed9
commit 97613ea
Show file tree

Hide file tree

Showing 57 changed files with 163 additions and 342 deletions.
diff --git a/library/entity/entity/build.gradle b/library/entity/entity/build.gradle
diff --git a/library/entity/entity/src/main/resources/quilt_entity.accesswidener b/library/entity/entity/src/main/resources/quilt_entity.accesswidener
diff --git a/library/entity/entity/src/main/resources/quilt_entity.mixins.json b/library/entity/entity/src/main/resources/quilt_entity.mixins.json
diff --git a/library/entity/entity/src/testmod/resources/quilt.mod.json b/library/entity/entity/src/testmod/resources/quilt.mod.json
diff --git a/library/entity/entity_extensions/build.gradle b/library/entity/entity_extensions/build.gradle
@@ -0,0 +1,22 @@
+plugins {
+	id("qsl.module")
+}
+
+qslModule {
+	name = "Quilt Entity Extensions"
+	moduleName = "entity_extensions"
+	id = "quilt_entity_extensions"
+	description = "Extensions for creating and working with entities."
+	moduleDependencies {
+		core {
+			api("resource_loader")
+			api("registry")
+			api("networking")
+			testmodOnly("qsl_base")
+		}
+	}
+	accessWidener()
+	injectedInterface("net/minecraft/class_1688") {
+		values = ["org/quiltmc/qsl/entity/extensions/api/MinecartComparatorLogic"]
+	}
+}
diff --git a/.../vehicle/api/MinecartComparatorLogic.java → ...tensions/api/MinecartComparatorLogic.java b/.../vehicle/api/MinecartComparatorLogic.java → ...tensions/api/MinecartComparatorLogic.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.vehicle.api;
+package org.quiltmc.qsl.entity.extensions.api;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;

diff --git a/...mc/qsl/poi/api/PointOfInterestHelper.java → ...extensions/api/PointOfInterestHelper.java b/...mc/qsl/poi/api/PointOfInterestHelper.java → ...extensions/api/PointOfInterestHelper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.poi.api;
+package org.quiltmc.qsl.entity.extensions.api;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -35,8 +35,8 @@
 import net.minecraft.world.poi.PointOfInterest;
 import net.minecraft.world.poi.PointOfInterestType;
 import net.minecraft.world.poi.PointOfInterestTypes;
-
-import org.quiltmc.qsl.poi.impl.PointOfInterestTypeExtensions;
+import org.quiltmc.qsl.entity.extensions.impl.PointOfInterestTypeExtensions;
+import org.quiltmc.qsl.entity.extensions.mixin.PointOfInterestTypesAccessor;
 
 /**
  * This class provides utilities to create a {@link PointOfInterestType}.
@@ -116,7 +116,7 @@ public static RegistryKey<PointOfInterestType> register(Identifier id, PointOfIn
 		var key = RegistryKey.of(RegistryKeys.POINT_OF_INTEREST_TYPE, id);
 		Registry.register(Registries.POINT_OF_INTEREST_TYPE, key, poiType);
 		poiType.blockStates().forEach(state -> {
-			Holder<PointOfInterestType> replaced = PointOfInterestTypes.STATE_TO_TYPE.put(state, Registries.POINT_OF_INTEREST_TYPE.getHolderOrThrow(key));
+			Holder<PointOfInterestType> replaced = PointOfInterestTypesAccessor.getStateToTypeMap().put(state, Registries.POINT_OF_INTEREST_TYPE.getHolderOrThrow(key));
 			if (replaced != null) {
 				throw Util.throwOrPause(new IllegalStateException(String.format("%s is defined in too many tags", state)));
 			}

diff --git a/...sl/entity/api/QuiltEntityTypeBuilder.java → ...xtensions/api/QuiltEntityTypeBuilder.java b/...sl/entity/api/QuiltEntityTypeBuilder.java → ...xtensions/api/QuiltEntityTypeBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.entity.api;
+package org.quiltmc.qsl.entity.extensions.api;
 
 import java.util.Objects;
 
@@ -39,7 +39,7 @@
 import net.minecraft.world.Heightmap;
 import net.minecraft.world.World;
 
-import org.quiltmc.qsl.entity.impl.QuiltEntityType;
+import org.quiltmc.qsl.entity.extensions.impl.QuiltEntityType;
 
 /**
  * Extended version of {@link EntityType.Builder} with added registration for

diff --git a/...mc/qsl/villager/api/TradeOfferHelper.java → ...tity/extensions/api/TradeOfferHelper.java b/...mc/qsl/villager/api/TradeOfferHelper.java → ...tity/extensions/api/TradeOfferHelper.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.villager.api;
+package org.quiltmc.qsl.entity.extensions.api;
 
 import java.util.List;
 import java.util.function.Consumer;
 
 import net.minecraft.village.TradeOffers;
 import net.minecraft.village.VillagerProfession;
+import org.quiltmc.qsl.entity.extensions.impl.TradeOfferInternals;
 
-import org.quiltmc.qsl.villager.impl.TradeOfferInternals;
 
 /**
  * Utilities to help with registration of trade offers.

diff --git a/...wn_data/QuiltExtendedSpawnDataEntity.java → ...working/QuiltExtendedSpawnDataEntity.java b/...wn_data/QuiltExtendedSpawnDataEntity.java → ...working/QuiltExtendedSpawnDataEntity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.entity.networking.api.extended_spawn_data;
+package org.quiltmc.qsl.entity.extensions.api.networking;
 
 import java.util.List;
 
@@ -24,8 +24,7 @@
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.s2c.PacketBundleS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
-
-import org.quiltmc.qsl.entity.networking.impl.QuiltEntityNetworkingInitializer;
+import org.quiltmc.qsl.entity.extensions.impl.networking.QuiltEntityNetworkingInitializer;
 import org.quiltmc.qsl.networking.api.PacketByteBufs;
 import org.quiltmc.qsl.networking.api.ServerPlayNetworking;
 

diff --git a/...data/QuiltTrackedDataHandlerRegistry.java → ...king/QuiltTrackedDataHandlerRegistry.java b/...data/QuiltTrackedDataHandlerRegistry.java → ...king/QuiltTrackedDataHandlerRegistry.java
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.entity.networking.api.tracked_data;
+package org.quiltmc.qsl.entity.extensions.api.networking;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 import net.minecraft.entity.data.TrackedDataHandler;
 import net.minecraft.util.Identifier;
-
-import org.quiltmc.qsl.entity.networking.impl.QuiltEntityNetworkingInitializer;
+import org.quiltmc.qsl.entity.extensions.impl.networking.QuiltEntityNetworkingInitializer;
 
 public final class QuiltTrackedDataHandlerRegistry {
 	/**

diff --git a/...i/impl/PointOfInterestTypeExtensions.java → ...s/impl/PointOfInterestTypeExtensions.java b/...i/impl/PointOfInterestTypeExtensions.java → ...s/impl/PointOfInterestTypeExtensions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.poi.impl;
+package org.quiltmc.qsl.entity.extensions.impl;
 
 import java.util.Collection;
 

diff --git a/...ltmc/qsl/entity/impl/QuiltEntityType.java → ...tity/extensions/impl/QuiltEntityType.java b/...ltmc/qsl/entity/impl/QuiltEntityType.java → ...tity/extensions/impl/QuiltEntityType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.entity.impl;
+package org.quiltmc.qsl.entity.extensions.impl;
 
 import com.google.common.collect.ImmutableSet;
 import org.jetbrains.annotations.ApiStatus;

diff --git a/...sl/villager/impl/TradeOfferInternals.java → .../extensions/impl/TradeOfferInternals.java b/...sl/villager/impl/TradeOfferInternals.java → .../extensions/impl/TradeOfferInternals.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.villager.impl;
+package org.quiltmc.qsl.entity.extensions.impl;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...iltEntityNetworkingClientInitializer.java → ...iltEntityNetworkingClientInitializer.java b/...iltEntityNetworkingClientInitializer.java → ...iltEntityNetworkingClientInitializer.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.entity.networking.impl;
+package org.quiltmc.qsl.entity.extensions.impl.networking;
 
 import com.mojang.logging.LogUtils;
 import org.jetbrains.annotations.ApiStatus;
+import org.quiltmc.qsl.entity.extensions.api.networking.QuiltExtendedSpawnDataEntity;
 import org.slf4j.Logger;
 
 import net.minecraft.registry.Registries;
 
 import org.quiltmc.loader.api.ModContainer;
 import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer;
-import org.quiltmc.qsl.entity.networking.api.extended_spawn_data.QuiltExtendedSpawnDataEntity;
 import org.quiltmc.qsl.networking.api.client.ClientPlayNetworking;
 
 @ApiStatus.Internal

diff --git a/...mpl/QuiltEntityNetworkingInitializer.java → ...ing/QuiltEntityNetworkingInitializer.java b/...mpl/QuiltEntityNetworkingInitializer.java → ...ing/QuiltEntityNetworkingInitializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.entity.networking.impl;
+package org.quiltmc.qsl.entity.extensions.impl.networking;
 
 import com.mojang.serialization.Lifecycle;
 import org.jetbrains.annotations.ApiStatus;

diff --git a/...le/mixin/AbstractMinecartEntityMixin.java → ...ns/mixin/AbstractMinecartEntityMixin.java b/...le/mixin/AbstractMinecartEntityMixin.java → ...ns/mixin/AbstractMinecartEntityMixin.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.vehicle.mixin;
+package org.quiltmc.qsl.entity.extensions.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
 
-import org.quiltmc.qsl.vehicle.api.MinecartComparatorLogic;
+import org.quiltmc.qsl.entity.extensions.api.MinecartComparatorLogic;
 
 @Mixin(AbstractMinecartEntity.class)
 public abstract class AbstractMinecartEntityMixin implements MinecartComparatorLogic {}
diff --git a/.../mixin/DefaultAttributeRegistryMixin.java → .../mixin/DefaultAttributeRegistryMixin.java b/.../mixin/DefaultAttributeRegistryMixin.java → .../mixin/DefaultAttributeRegistryMixin.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.entity.mixin;
+package org.quiltmc.qsl.entity.extensions.mixin;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...vehicle/mixin/DetectorRailBlockMixin.java → ...ensions/mixin/DetectorRailBlockMixin.java b/...vehicle/mixin/DetectorRailBlockMixin.java → ...ensions/mixin/DetectorRailBlockMixin.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.vehicle.mixin;
+package org.quiltmc.qsl.entity.extensions.mixin;
 
 import java.util.List;
 import java.util.function.Predicate;
@@ -34,7 +34,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import org.quiltmc.qsl.vehicle.api.MinecartComparatorLogic;
+import org.quiltmc.qsl.entity.extensions.api.MinecartComparatorLogic;
 
 @Mixin(DetectorRailBlock.class)
 public abstract class DetectorRailBlockMixin {

diff --git a/...l/poi/mixin/PointOfInterestTypeMixin.java → ...sions/mixin/PointOfInterestTypeMixin.java b/...l/poi/mixin/PointOfInterestTypeMixin.java → ...sions/mixin/PointOfInterestTypeMixin.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.poi.mixin;
-
-import static net.minecraft.world.poi.PointOfInterestTypes.STATE_TO_TYPE;
+package org.quiltmc.qsl.entity.extensions.mixin;
 
 import java.util.Collection;
 import java.util.Set;
 
 import com.google.common.collect.ImmutableSet;
+import org.quiltmc.qsl.entity.extensions.impl.PointOfInterestTypeExtensions;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
@@ -36,7 +35,6 @@
 import net.minecraft.util.Util;
 import net.minecraft.world.poi.PointOfInterestType;
 
-import org.quiltmc.qsl.poi.impl.PointOfInterestTypeExtensions;
 
 @Mixin(PointOfInterestType.class)
 public class PointOfInterestTypeMixin implements PointOfInterestTypeExtensions {
@@ -85,12 +83,12 @@ public class PointOfInterestTypeMixin implements PointOfInterestTypeExtensions {
 	private void quilt$setBlockStates(RegistryKey<PointOfInterestType> key, Collection<BlockState> states, boolean added) {
 		if (!added) {
 			for (BlockState state : this.blockStates) {
-				STATE_TO_TYPE.remove(state);
+				PointOfInterestTypesAccessor.getStateToTypeMap().remove(state);
 			}
 		}
 
 		for (BlockState state : states) {
-			Holder<PointOfInterestType> replaced = STATE_TO_TYPE.put(state, Registries.POINT_OF_INTEREST_TYPE.getHolderOrThrow(key));
+			Holder<PointOfInterestType> replaced = PointOfInterestTypesAccessor.getStateToTypeMap().put(state, Registries.POINT_OF_INTEREST_TYPE.getHolderOrThrow(key));
 			if (replaced != null) {
 				throw Util.throwOrPause(new IllegalStateException(String.format("%s is defined in too many tags", state)));
 			}

diff --git a/...s/src/main/java/org/quiltmc/qsl/entity/extensions/mixin/PointOfInterestTypesAccessor.java b/...s/src/main/java/org/quiltmc/qsl/entity/extensions/mixin/PointOfInterestTypesAccessor.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2023 The Quilt Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.quiltmc.qsl.entity.extensions.mixin;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.registry.Holder;
+import net.minecraft.world.poi.PointOfInterestType;
+import net.minecraft.world.poi.PointOfInterestTypes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+
+@Mixin(PointOfInterestTypes.class)
+public interface PointOfInterestTypesAccessor {
+	@Accessor("STATE_TO_TYPE")
+	static Map<BlockState, Holder<PointOfInterestType>> getStateToTypeMap() {
+		throw new IllegalStateException("Mixin injection failed");
+	}
+}
diff --git a/...ypeAwareBuyForOneEmeraldFactoryMixin.java → ...ypeAwareBuyForOneEmeraldFactoryMixin.java b/...ypeAwareBuyForOneEmeraldFactoryMixin.java → ...ypeAwareBuyForOneEmeraldFactoryMixin.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.villager.mixin;
+package org.quiltmc.qsl.entity.extensions.mixin;
 
 import java.util.stream.Stream;
 

diff --git a/.../entity/networking/mixin/EntityMixin.java → ...ensions/mixin/networking/EntityMixin.java b/.../entity/networking/mixin/EntityMixin.java → ...ensions/mixin/networking/EntityMixin.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package org.quiltmc.qsl.entity.networking.mixin;
+package org.quiltmc.qsl.entity.extensions.mixin.networking;
 
+import org.quiltmc.qsl.entity.extensions.api.networking.QuiltExtendedSpawnDataEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -25,8 +26,6 @@
 import net.minecraft.network.listener.ClientPlayPacketListener;
 import net.minecraft.network.packet.Packet;
 
-import org.quiltmc.qsl.entity.networking.api.extended_spawn_data.QuiltExtendedSpawnDataEntity;
-
 @Mixin(Entity.class)
 public abstract class EntityMixin {
 	@Inject(method = "createSpawnPacket", at = @At("RETURN"), cancellable = true)