Merge pull request #349 from FTBTeam/dev

Dev

Author: desht

CHANGELOG.md

@@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 * Fixed light technical blocks (`minecraft:light`) rendering black on the map
 * Fixed a piston protection issue which allowed blocks to be pulled out of protected chunks with a sticky piston
+* Fixed some entities not rendering on the map/minimap at all
+  * Entities where the texture isn't known now show on the map as a generic "dot" icon
 
 ## [2101.1.7]
 

common/src/main/java/dev/ftb/mods/ftbchunks/api/event/ClaimedChunkEvent.java

@@ -16,23 +16,27 @@
  */
 public interface ClaimedChunkEvent {
 	/**
-	 * Fired when a chunk is about to be claimed. This can be cancelled by returning a non-null claim result; it is
-	 * recommended to use {@link ClaimResult#customProblem(String)} for this.
+	 * Fired when a chunk is about to be claimed. This can be cancelled by returning a failed claim result; it is
+	 * recommended to use {@link ClaimResult#customProblem(String)} for this. Return {@link ClaimResult#success()} to
+	 * allow the operation to continue.
 	 */
 	Event<Before> BEFORE_CLAIM = EventFactory.createCompoundEventResult();
 	/**
-	 * Fired when a chunk is about to be force-loaded. This can be cancelled by returning a non-null claim result; it is
-	 * recommended to use {@link ClaimResult#customProblem(String)} for this.
+	 * Fired when a chunk is about to be force-loaded. This can be cancelled by returning a failed claim result; it is
+	 * recommended to use {@link ClaimResult#customProblem(String)} for this. Return {@link ClaimResult#success()} to
+	 * allow the operation to continue.
 	 */
 	Event<Before> BEFORE_LOAD = EventFactory.createCompoundEventResult();
 	/**
-	 * Fired when a chunk is about to be un-claimed. This can be cancelled by returning a non-null claim result; it is
-	 * recommended to use {@link ClaimResult#customProblem(String)} for this.
+	 * Fired when a chunk is about to be unclaimed. This can be cancelled by returning a failed claim result; it is
+	 * recommended to use {@link ClaimResult#customProblem(String)} for this. Return {@link ClaimResult#success()} to
+	 * allow the operation to continue.
 	 */
 	Event<Before> BEFORE_UNCLAIM = EventFactory.createCompoundEventResult();
 	/**
-	 * Fired when a chunk is about to be un-force-loaded. This can be cancelled by returning a non-null claim result; it is
-	 * recommended to use {@link ClaimResult#customProblem(String)} for this.
+	 * Fired when a chunk is about to be un-force-loaded. This can be cancelled by returning a failed claim result; it is
+	 * recommended to use {@link ClaimResult#customProblem(String)} for this. Return {@link ClaimResult#success()} to
+	 * allow the operation to continue.
 	 */
 	Event<Before> BEFORE_UNLOAD = EventFactory.createCompoundEventResult();
 

common/src/main/java/dev/ftb/mods/ftbchunks/client/mapicon/EntityIcons.java

@@ -85,13 +85,11 @@ protected Map<EntityType<?>, EntityIconSettings> prepare(ResourceManager resourc
                 }
             }
 
-            if (entityIconSettings == null) {
-                if (entityType.getCategory() != MobCategory.MISC && FTBChunks.isDevMode()) {
+            if (entityIconSettings == null && entityType.getCategory() != MobCategory.MISC) {
+                if (FTBChunks.isDevMode()) {
                     LOGGER.error("Missing entity icon settings for {}", id);
-                    entityIconSettings = EntityIconSettings.OLD_HIDDEN;
-                } else {
-                    continue;
                 }
+                entityIconSettings = EntityIconSettings.OLD_HIDDEN;
             }
 
             map.put(entityType, entityIconSettings);

common/src/main/resources/assets/ftbchunks/textures/faces/minecolonies/citizen.json

@@ -0,0 +1,10 @@
+{
+  "texture": "minecolonies:textures/entity/citizen/default/citizenfemale1_a.png",
+  "slice": {
+    "x": 8,
+    "y": 8,
+    "width": 8,
+    "height": 8
+  },
+  "scale": 1.0
+}