Merge pull request #47 from TBoshoven/1.15-simplified-particle-textures

Simplify the particle texture logic.

Author: TBoshoven

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/tileentities/MagicDoorwayPartBaseTileEntity.java

@@ -4,7 +4,6 @@
 import com.tomboshoven.minecraft.magicdoorknob.items.Items;
 import com.tomboshoven.minecraft.magicdoorknob.items.MagicDoorknobItem;
 import com.tomboshoven.minecraft.magicdoorknob.modelloaders.textured.ModelTextureProperty;
-import com.tomboshoven.minecraft.magicdoorknob.modelloaders.textured.ModelTextureProperty.ModelParticleTextureProperty;
 import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -56,11 +55,6 @@ public abstract class MagicDoorwayPartBaseTileEntity extends TileEntity {
      */
     private static final String[] SUBMODEL_NAMES = {"door", "doorknob", "top", "wall1", "wall2", "pillar1", "pillar2", "pillar3", "pillar4"};
 
-    /**
-     * The particle texture of the doorway (based on base block).
-     */
-    private static final ModelParticleTextureProperty TEXTURE_PARTICLE = ModelTextureProperty.getParticleProperty();
-
     // The block we're basing the appearance of this block on.
     private BlockState baseBlockState = Blocks.AIR.getDefaultState();
     // The doorknob that caused this block to be created.
@@ -151,7 +145,8 @@ public IModelData getModelData() {
         }
         return new ModelDataMap.Builder()
                 .withInitial(SUBMODEL_DATA, submodelModelData)
-                .withInitial(TEXTURE_PARTICLE, blockMaterial)
+                .withInitial(TEXTURE_MAIN, blockMaterial)
+                .withInitial(TEXTURE_HIGHLIGHT, doorknobMaterial)
                 .build();
     }
 

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ITextureMapper.java

@@ -24,10 +24,4 @@ public interface ITextureMapper {
      * @return The appropriate material
      */
     Material mapSprite(PropertySprite spriteToMap, @Nullable BlockState blockState, @Nullable IModelData extraData);
-
-    /**
-     * @param extraData   Extra model data if available
-     * @return The location of the appropriate particle texture
-     */
-    Material getParticleTexture(@Nullable IModelData extraData);
 }

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ModelDataTextureMapper.java

@@ -33,16 +33,4 @@ public Material mapSprite(PropertySprite spriteToMap, @Nullable BlockState block
         }
         return new Material(PlayerContainer.LOCATION_BLOCKS_TEXTURE, MissingTextureSprite.getLocation());
     }
-
-    @Override
-    public Material getParticleTexture(@Nullable IModelData extraData) {
-        if (extraData != null) {
-            ModelProperty<Material> modelProperty = ModelTextureProperty.getParticleProperty();
-            Material spriteLocation = extraData.getData(modelProperty);
-            if (spriteLocation != null) {
-                return spriteLocation;
-            }
-        }
-        return new Material(PlayerContainer.LOCATION_BLOCKS_TEXTURE, MissingTextureSprite.getLocation());
-    }
 }

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ModelTextureProperty.java

@@ -19,7 +19,6 @@ public final class ModelTextureProperty extends ModelProperty<Material> {
     // Lazily filled map of model texture properties.
     // Can't just use equality as they are used in an IdentityHashMap.
     private static final Map<ResourceLocation, ModelTextureProperty> PROPERTIES = Maps.newHashMap();
-    private static final ModelParticleTextureProperty PARTICLE_PROPERTY = new ModelParticleTextureProperty();
 
     private final ResourceLocation name;
 
@@ -41,10 +40,6 @@ public static ModelTextureProperty get(ResourceLocation name) {
         return PROPERTIES.computeIfAbsent(name, ModelTextureProperty::new);
     }
 
-    public static ModelParticleTextureProperty getParticleProperty() {
-        return PARTICLE_PROPERTY;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -57,6 +52,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(name);
     }
-
-    public static class ModelParticleTextureProperty extends ModelProperty<Material> {}
 }

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/TexturedBakedModel.java

@@ -164,8 +164,12 @@ public ItemOverrideList getOverrides() {
 
     @Override
     public TextureAtlasSprite getParticleTexture(@Nonnull IModelData data) {
-        Material particleTextureLocation = textureMapper.getParticleTexture(data);
-        return bakedTextureGetter.apply(particleTextureLocation);
+        TextureAtlasSprite sprite = super.getParticleTexture(data);
+        if (sprite instanceof PropertySprite) {
+            Material spriteLocation = textureMapper.mapSprite((PropertySprite) sprite, null, data);
+            sprite = bakedTextureGetter.apply(spriteLocation);
+        }
+        return sprite;
     }
 
     /**

MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_door_bottom.json

@@ -1,6 +1,9 @@
 {
   "loader": "magic_doorknob:textured",
   "base_loader": "forge:composite",
+  "textures": {
+    "particle": "property:texture_main"
+  },
   "parts": {
     "door": {
       "parent": "magic_doorknob:block/part/magic_door"

MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_door_top.json

@@ -1,6 +1,9 @@
 {
   "loader": "magic_doorknob:textured",
   "base_loader": "forge:composite",
+  "textures": {
+    "particle": "property:texture_main"
+  },
   "parts": {
     "door": {
       "parent": "magic_doorknob:block/part/magic_door"

MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_closed_bottom.json

@@ -1,6 +1,9 @@
 {
   "loader": "magic_doorknob:textured",
   "base_loader": "forge:composite",
+  "textures": {
+    "particle": "property:texture_main"
+  },
   "parts": {
     "pillar1": {
       "parent": "magic_doorknob:block/part/magic_doorway_wall"

MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_closed_top.json

@@ -1,6 +1,9 @@
 {
   "loader": "magic_doorknob:textured",
   "base_loader": "forge:composite",
+  "textures": {
+    "particle": "property:texture_main"
+  },
   "parts": {
     "top": {
       "parent": "magic_doorknob:block/part/magic_doorway_top"

MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_half_open_bottom.json

@@ -1,6 +1,9 @@
 {
   "loader": "magic_doorknob:textured",
   "base_loader": "forge:composite",
+  "textures": {
+    "particle": "property:texture_main"
+  },
   "parts": {
     "wall1": {
       "parent": "magic_doorknob:block/part/magic_doorway_wall"

MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_half_open_top.json

@@ -1,6 +1,9 @@
 {
   "loader": "magic_doorknob:textured",
   "base_loader": "forge:composite",
+  "textures": {
+    "particle": "property:texture_main"
+  },
   "parts": {
     "top": {
       "parent": "magic_doorknob:block/part/magic_doorway_top"

MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_open_bottom.json

@@ -1,6 +1,9 @@
 {
   "loader": "magic_doorknob:textured",
   "base_loader": "forge:composite",
+  "textures": {
+    "particle": "property:texture_main"
+  },
   "parts": {
     "pillar1": {
       "parent": "magic_doorknob:block/part/magic_doorway_pillar"

MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_open_top.json

@@ -1,6 +1,9 @@
 {
   "loader": "magic_doorknob:textured",
   "base_loader": "forge:composite",
+  "textures": {
+    "particle": "property:texture_main"
+  },
   "parts": {
     "top": {
       "parent": "magic_doorknob:block/part/magic_doorway_top"