Skip to content

Commit 8f217f1

Browse files
committed
More dynamic registration
1 parent dc708f7 commit 8f217f1

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Upcoming
44
* Changed recipes to always require a wooden shield as base, instead of upgrading Wood>Stone>Iron>Diamond
5+
* Internal changes to make registering shields easier
56

67
## 1.0.1
78
* Added "blocking damage" tooltip on Shields

src/main/java/com/insane96mcp/shieldsplus/setup/Client.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.insane96mcp.shieldsplus.item.SPShieldItem;
55
import net.minecraft.client.renderer.item.ItemProperties;
66
import net.minecraft.client.renderer.item.ItemPropertyFunction;
7-
import net.minecraft.world.inventory.InventoryMenu;
87
import net.minecraftforge.api.distmarker.Dist;
98
import net.minecraftforge.client.event.TextureStitchEvent;
109
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -21,8 +20,12 @@ public static void setup(final FMLClientSetupEvent event) {
2120

2221
@SubscribeEvent
2322
public static void onStitch(TextureStitchEvent.Pre event) {
24-
//TODO Check if I can loop the SPItems.SHIELDS to read all the textures from there
25-
if (event.getAtlas().location().equals(InventoryMenu.BLOCK_ATLAS)) {
23+
//TODO Check if I can loop the SPItems.SHIELDS to read all the textures from there=
24+
for (RegistryObject<SPShieldItem> shieldItem : SPItems.SHIELDS) {
25+
event.addSprite(shieldItem.get().material.material.texture());
26+
event.addSprite(shieldItem.get().material.noPatternMaterial.texture());
27+
}
28+
/*if (event.getAtlas().location().equals(InventoryMenu.BLOCK_ATLAS)) {
2629
event.addSprite(SPShieldMaterials.WOODEN.material.texture());
2730
event.addSprite(SPShieldMaterials.WOODEN.noPatternMaterial.texture());
2831
event.addSprite(SPShieldMaterials.STONE.material.texture());
@@ -33,7 +36,7 @@ public static void onStitch(TextureStitchEvent.Pre event) {
3336
event.addSprite(SPShieldMaterials.DIAMOND.noPatternMaterial.texture());
3437
event.addSprite(SPShieldMaterials.NETHERITE.material.texture());
3538
event.addSprite(SPShieldMaterials.NETHERITE.noPatternMaterial.texture());
36-
}
39+
}*/
3740
}
3841

3942
private static void initShields() {

0 commit comments

Comments
 (0)