mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-27 21:38:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Netherite armor tags

Browse source
This commit is contained in:
simibubi 2023-05-12 22:33:39 +02:00
parent f616220b2c
commit 56b35484d6
5 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/generated/resources/.cache/cache
View file

@ -5378,9 +5378,9 @@ ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/b
6b73c57912934d09233ad2966110968a6109f2c9 data/forge/tags/fluids/chocolate.json 6b73c57912934d09233ad2966110968a6109f2c9 data/forge/tags/fluids/chocolate.json
391c9b2be5740aea943a8a5fe27eb327e2d973b0 data/forge/tags/fluids/honey.json 391c9b2be5740aea943a8a5fe27eb327e2d973b0 data/forge/tags/fluids/honey.json
d6a4e4fe1204b718010543a28a9b9ec4e0977bd7 data/forge/tags/fluids/tea.json d6a4e4fe1204b718010543a28a9b9ec4e0977bd7 data/forge/tags/fluids/tea.json
58a0fbab3425558d993559e10fe14a1797b05eab data/forge/tags/items/armors/boots.json 277e826738027ad38b1e0102ea0e6a87f9a42407 data/forge/tags/items/armors/boots.json
7973972edb524683ef365bc103fcfcde0858a854 data/forge/tags/items/armors/chestplates.json 8c8f6658ee72bdea2fcef77bade7bfa48de784c8 data/forge/tags/items/armors/chestplates.json
615e86e25fc29ead90e0901cdaee9d0ed9b3e4b3 data/forge/tags/items/armors/helmets.json 2fa68898dd74fe40c404af7ecb0244b7765e58e6 data/forge/tags/items/armors/helmets.json
5af3164b14c92d2d6e235b5d4eebd93cbee37c0a data/forge/tags/items/buckets/honey.json 5af3164b14c92d2d6e235b5d4eebd93cbee37c0a data/forge/tags/items/buckets/honey.json
2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough.json 2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough.json
2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough/wheat.json 2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough/wheat.json

3
src/generated/resources/data/forge/tags/items/armors/boots.json
View file

@ -1,6 +1,7 @@
{ {
"replace": false, "replace": false,
"values": [ "values": [
"create:diving_boots" "create:copper_diving_boots",
"create:netherite_diving_boots"
] ]
} }

3
src/generated/resources/data/forge/tags/items/armors/chestplates.json
View file

@ -1,6 +1,7 @@
{ {
"replace": false, "replace": false,
"values": [ "values": [
"create:copper_backtank" "create:copper_backtank",
"create:netherite_backtank"
] ]
} }

3
src/generated/resources/data/forge/tags/items/armors/helmets.json
View file

@ -1,6 +1,7 @@
{ {
"replace": false, "replace": false,
"values": [ "values": [
"create:diving_helmet" "create:copper_diving_helmet",
"create:netherite_diving_helmet"
] ]
} }

16
src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java
View file

@ -11,6 +11,7 @@ import java.util.stream.Stream;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import com.simibubi.create.foundation.utility.BBHelper; import com.simibubi.create.foundation.utility.BBHelper;
import com.simibubi.create.foundation.utility.NBTProcessors;
import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
@ -18,6 +19,7 @@ import net.minecraft.core.Direction;
import net.minecraft.core.Holder; import net.minecraft.core.Holder;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.decoration.ArmorStand; import net.minecraft.world.entity.decoration.ArmorStand;
import net.minecraft.world.entity.decoration.ItemFrame; import net.minecraft.world.entity.decoration.ItemFrame;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
@ -73,14 +75,12 @@ public class SchematicWorld extends WrappedWorld implements ServerLevelAccessor
@Override @Override
public boolean addFreshEntity(Entity entityIn) { public boolean addFreshEntity(Entity entityIn) {
if (entityIn instanceof ItemFrame) if (entityIn instanceof ItemFrame itemFrame)
((ItemFrame) entityIn).getItem() itemFrame.setItem(NBTProcessors.withUnsafeNBTDiscarded(itemFrame.getItem()));
.setTag(null); if (entityIn instanceof ArmorStand armorStand)
if (entityIn instanceof ArmorStand) { for (EquipmentSlot equipmentSlot : EquipmentSlot.values())
ArmorStand armorStandEntity = (ArmorStand) entityIn; armorStand.setItemSlot(equipmentSlot,
armorStandEntity.getAllSlots() NBTProcessors.withUnsafeNBTDiscarded(armorStand.getItemBySlot(equipmentSlot)));
.forEach(stack -> stack.setTag(null));
}
return entities.add(entityIn); return entities.add(entityIn);
} }