Merge pull request #44 from TBoshoven/1.15-particles

TBoshoven · web-flow · commit 0f318276de0c · 2020-07-02T19:11:42.000-04:00
Make doorway particles the right texture.
diff --git a/MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/tileentities/MagicDoorwayPartBaseTileEntity.java b/MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/tileentities/MagicDoorwayPartBaseTileEntity.java
@@ -4,6 +4,7 @@
 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;
@@ -55,6 +56,11 @@ 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.
@@ -145,6 +151,7 @@ public IModelData getModelData() {
         }
         return new ModelDataMap.Builder()
                 .withInitial(SUBMODEL_DATA, submodelModelData)
+                .withInitial(TEXTURE_PARTICLE, blockMaterial)
                 .build();
     }
 
diff --git a/MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ITextureMapper.java b/MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ITextureMapper.java
@@ -24,4 +24,10 @@ 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);
 }
diff --git a/MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ModelDataTextureMapper.java b/MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ModelDataTextureMapper.java
@@ -33,4 +33,16 @@ 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());
+    }
 }
diff --git a/MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ModelTextureProperty.java b/MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ModelTextureProperty.java
@@ -19,6 +19,7 @@ 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;
 
@@ -40,6 +41,10 @@ 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;
@@ -52,4 +57,6 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(name);
     }
+
+    public static class ModelParticleTextureProperty extends ModelProperty<Material> {}
 }
diff --git a/MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/TexturedBakedModel.java b/MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/TexturedBakedModel.java
@@ -23,6 +23,7 @@
 import net.minecraftforge.client.model.data.EmptyModelData;
 import net.minecraftforge.client.model.data.IModelData;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.List;
@@ -161,6 +162,12 @@ public ItemOverrideList getOverrides() {
         return new TexturedOverrideList(super.getOverrides());
     }
 
+    @Override
+    public TextureAtlasSprite getParticleTexture(@Nonnull IModelData data) {
+        Material particleTextureLocation = textureMapper.getParticleTexture(data);
+        return bakedTextureGetter.apply(particleTextureLocation);
+    }
+
     /**
      * We use override lists to dynamically texture items.
      */
diff --git a/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_door_bottom.json b/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_door_bottom.json
@@ -1,8 +1,6 @@
 {
-  "loader": "forge:composite",
-  "textures": {
-    "particle": "minecraft:block/obsidian"
-  },
+  "loader": "magic_doorknob:textured",
+  "base_loader": "forge:composite",
   "parts": {
     "door": {
       "parent": "magic_doorknob:block/part/magic_door"
diff --git a/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_door_top.json b/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_door_top.json
@@ -1,8 +1,6 @@
 {
-  "loader": "forge:composite",
-  "textures": {
-    "particle": "minecraft:block/obsidian"
-  },
+  "loader": "magic_doorknob:textured",
+  "base_loader": "forge:composite",
   "parts": {
     "door": {
       "parent": "magic_doorknob:block/part/magic_door"
diff --git a/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_closed_bottom.json b/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_closed_bottom.json
@@ -1,8 +1,6 @@
 {
-  "loader": "forge:composite",
-  "textures": {
-    "particle": "minecraft:block/obsidian"
-  },
+  "loader": "magic_doorknob:textured",
+  "base_loader": "forge:composite",
   "parts": {
     "pillar1": {
       "parent": "magic_doorknob:block/part/magic_doorway_wall"
diff --git a/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_closed_top.json b/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_closed_top.json
@@ -1,8 +1,6 @@
 {
-  "loader": "forge:composite",
-  "textures": {
-    "particle": "minecraft:block/obsidian"
-  },
+  "loader": "magic_doorknob:textured",
+  "base_loader": "forge:composite",
   "parts": {
     "top": {
       "parent": "magic_doorknob:block/part/magic_doorway_top"
diff --git a/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_half_open_bottom.json b/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_half_open_bottom.json
@@ -1,8 +1,6 @@
 {
-  "loader": "forge:composite",
-  "textures": {
-    "particle": "minecraft:block/obsidian"
-  },
+  "loader": "magic_doorknob:textured",
+  "base_loader": "forge:composite",
   "parts": {
     "wall1": {
       "parent": "magic_doorknob:block/part/magic_doorway_wall"
diff --git a/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_half_open_top.json b/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_half_open_top.json
@@ -1,8 +1,6 @@
 {
-  "loader": "forge:composite",
-  "textures": {
-    "particle": "minecraft:block/obsidian"
-  },
+  "loader": "magic_doorknob:textured",
+  "base_loader": "forge:composite",
   "parts": {
     "top": {
       "parent": "magic_doorknob:block/part/magic_doorway_top"
diff --git a/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_open_bottom.json b/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_open_bottom.json
@@ -1,8 +1,6 @@
 {
-  "loader": "forge:composite",
-  "textures": {
-    "particle": "minecraft:block/obsidian"
-  },
+  "loader": "magic_doorknob:textured",
+  "base_loader": "forge:composite",
   "parts": {
     "pillar1": {
       "parent": "magic_doorknob:block/part/magic_doorway_pillar"
diff --git a/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_open_top.json b/MagicDoorknob/src/main/resources/assets/magic_doorknob/models/block/magic_doorway_open_top.json
@@ -1,8 +1,6 @@
 {
-  "loader": "forge:composite",
-  "textures": {
-    "particle": "minecraft:block/obsidian"
-  },
+  "loader": "magic_doorknob:textured",
+  "base_loader": "forge:composite",
   "parts": {
     "top": {
       "parent": "magic_doorknob:block/part/magic_doorway_top"

Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,16 @@ public Material mapSprite(PropertySprite spriteToMap, @Nullable BlockState block`
`33`	`33`	`}`
`34`	`34`	`return new Material(PlayerContainer.LOCATION_BLOCKS_TEXTURE, MissingTextureSprite.getLocation());`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ @Override`
	`38`	`+ public Material getParticleTexture(@Nullable IModelData extraData) {`
	`39`	`+ if (extraData != null) {`
	`40`	`+ ModelProperty<Material> modelProperty = ModelTextureProperty.getParticleProperty();`
	`41`	`+ Material spriteLocation = extraData.getData(modelProperty);`
	`42`	`+ if (spriteLocation != null) {`
	`43`	`+ return spriteLocation;`
	`44`	`+ }`
	`45`	`+ }`
	`46`	`+ return new Material(PlayerContainer.LOCATION_BLOCKS_TEXTURE, MissingTextureSprite.getLocation());`
	`47`	`+ }`
`36`	`48`	`}`