Skip to content

Commit 5ab926d

Browse files
RyoramaRyorama
committedJul 28, 2023
Small updates
·
1.20.1-v0.51.20.1-v0.3
1 parent 13ef633 commit 5ab926d

File tree

11 files changed

+87
-9
lines changed

11 files changed

+87
-9
lines changed
 

‎common/src/main/java/com/ryorama/terrariamod/blocks/BlocksT.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package com.ryorama.terrariamod.blocks;
22

33
import com.ryorama.terrariamod.TerrariaMod;
4-
import com.ryorama.terrariamod.blocks.impl.BlockT;
5-
import com.ryorama.terrariamod.blocks.impl.CMBlockT;
6-
import com.ryorama.terrariamod.blocks.impl.PlantT;
7-
import com.ryorama.terrariamod.blocks.impl.TreeSegment;
4+
import com.ryorama.terrariamod.blocks.impl.*;
85
import com.ryorama.terrariamod.blocks.terraria.chests.*;
96
import com.ryorama.terrariamod.blocks.terraria.world.*;
107
import com.ryorama.terrariamod.client.TAudio;
@@ -98,10 +95,10 @@ public int applyAsInt(BlockState value) {
9895
public static final RegistrySupplier<Block> PLATINUM_ORE = register("platinum_ore", () -> new BlockT(AbstractBlock.Settings.create().mapColor(DyeColor.YELLOW).sounds(TAudio.STONE), 15, 15).setPick(true));
9996
public static final RegistrySupplier<Block> SILVER_ORE = register("silver_ore", () -> new BlockT(AbstractBlock.Settings.create().mapColor(DyeColor.YELLOW).sounds(TAudio.STONE), 15, 15).setPick(true));
10097
public static final RegistrySupplier<Block> TUNGSTEN_ORE = register("tungsten_ore", () -> new BlockT(AbstractBlock.Settings.create().mapColor(DyeColor.YELLOW).sounds(TAudio.STONE), 15, 15).setPick(true));
101-
public static final RegistrySupplier<Block> METEORITE_ORE = register("meteorite_ore", () -> new BlockT(AbstractBlock.Settings.create().mapColor(DyeColor.YELLOW).sounds(TAudio.STONE), 15, 15).setPick(true));
98+
public static final RegistrySupplier<Block> METEORITE_ORE = register("meteorite_ore", () -> new HotBlockT(AbstractBlock.Settings.create().mapColor(DyeColor.YELLOW).sounds(TAudio.STONE), 50, 50).setPick(true));
10299
public static final RegistrySupplier<Block> DEMONITE_ORE = register("demonite_ore", () -> new BlockT(AbstractBlock.Settings.create().mapColor(DyeColor.PURPLE).sounds(TAudio.STONE), 15, 15).setPick(true));
103100
public static final RegistrySupplier<Block> CRIMTANE_ORE = register("crimtane_ore", () -> new BlockT(AbstractBlock.Settings.create().mapColor(DyeColor.RED).sounds(TAudio.STONE), 15, 15).setPick(true));
104-
public static final RegistrySupplier<Block> HELLSTONE_ORE = register("hellstone_ore", () -> new BlockT(AbstractBlock.Settings.create().mapColor(DyeColor.ORANGE).sounds(TAudio.STONE), 50, 50, 10).setPick(true));
101+
public static final RegistrySupplier<Block> HELLSTONE_ORE = register("hellstone_ore", () -> new HotBlockT(AbstractBlock.Settings.create().mapColor(DyeColor.ORANGE).sounds(TAudio.STONE), 50, 50).setPick(true));
105102
public static final RegistrySupplier<Block> RUBY_ORE = register("ruby_ore", () -> new BlockT(AbstractBlock.Settings.create().mapColor(DyeColor.RED).sounds(TAudio.STONE), 15, 15).setPick(true));
106103
public static final RegistrySupplier<Block> SAPPHIRE_ORE = register("sapphire_ore", () -> new BlockT(AbstractBlock.Settings.create().mapColor(DyeColor.BLUE).sounds(TAudio.STONE), 15, 15).setPick(true));
107104
public static final RegistrySupplier<Block> DIAMOND_ORE = register("diamond_ore", () -> new BlockT(AbstractBlock.Settings.create().mapColor(DyeColor.BLUE).sounds(TAudio.STONE), 15, 15).setPick(true));

‎common/src/main/java/com/ryorama/terrariamod/blocks/impl/HotBlockT.java

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.ryorama.terrariamod.blocks.impl;
2+
3+
import net.minecraft.block.BlockState;
4+
import net.minecraft.enchantment.EnchantmentHelper;
5+
import net.minecraft.entity.Entity;
6+
import net.minecraft.entity.LivingEntity;
7+
import net.minecraft.util.math.BlockPos;
8+
import net.minecraft.world.World;
9+
10+
public class HotBlockT extends BlockT {
11+
public HotBlockT(Settings properties, float hardness, float difficulty) {
12+
super(properties, hardness, difficulty);
13+
}
14+
15+
public void onSteppedOn(World world, BlockPos pos, BlockState state, Entity entity) {
16+
if (!entity.bypassesSteppingEffects() && entity instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity) entity)) {
17+
entity.damage(world.getDamageSources().hotFloor(), 1);
18+
}
19+
20+
super.onSteppedOn(world, pos, state, entity);
21+
}
22+
}

‎common/src/main/java/com/ryorama/terrariamod/items/ItemsT.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ public class ItemsT {
107107
public static final IronTArmorMaterial IRON_MATERIAL = new IronTArmorMaterial();
108108
public static final GoldTArmorMaterial GOLD_MATERIAL = new GoldTArmorMaterial();
109109
public static final NinjaArmorMaterial NINJA_MATERIAL = new NinjaArmorMaterial();
110-
public static final CrownMaterial CROWN_MATERIAL = new CrownMaterial();
110+
public static final GoldCrownMaterial GOLD_CROWN_MATERIAL = new GoldCrownMaterial();
111+
public static final PlatinumCrownMaterial PLATINUM_CROWN_MATERIAL = new PlatinumCrownMaterial();
111112

112113
public static final RegistrySupplier<Item> COPPER_HELMET = register("copper_helmet", () -> new ArmorItem(COPPER_MATERIAL, ArmorItem.Type.HELMET, new Item.Settings().arch$tab(TERRARIAMOD_GROUP).maxCount(1)));
113114
public static final RegistrySupplier<Item> COPPER_CHESTPLATE = register("copper_chestplate", () -> new ArmorItem(COPPER_MATERIAL, ArmorItem.Type.CHESTPLATE, new Item.Settings().arch$tab(TERRARIAMOD_GROUP).maxCount(1)));
@@ -130,7 +131,8 @@ public class ItemsT {
130131
public static final RegistrySupplier<Item> LENS = register("lens", () -> new ItemT(new Item.Settings().maxCount(9999)).setRarity(2));
131132
public static final RegistrySupplier<Item> FALLEN_STAR = register("fallen_star", () -> new ItemT(new Item.Settings().maxCount(9999)).setRarity(2));
132133
public static final RegistrySupplier<Item> LIFE_CRYSTAL = register("life_crystal", () -> new LifeCrystal(new Item.Settings().maxCount(9999)).setRarity(4));
133-
public static final RegistrySupplier<Item> GOLD_CROWN = register("gold_crown", () -> new ArmorItem(CROWN_MATERIAL, ArmorItem.Type.HELMET, new Item.Settings().arch$tab(TERRARIAMOD_GROUP).maxCount(1)));
134+
public static final RegistrySupplier<Item> GOLD_CROWN = register("gold_crown", () -> new ArmorItem(GOLD_CROWN_MATERIAL, ArmorItem.Type.HELMET, new Item.Settings().arch$tab(TERRARIAMOD_GROUP).maxCount(1)));
135+
public static final RegistrySupplier<Item> PLATINUM_CROWN = register("platinum_crown", () -> new ArmorItem(PLATINUM_CROWN_MATERIAL, ArmorItem.Type.HELMET, new Item.Settings().arch$tab(TERRARIAMOD_GROUP).maxCount(1)));
134136
public static final RegistrySupplier<Item> COPPER_BAR = register("copper_bar", () -> new ItemT(new Item.Settings().maxCount(9999)).setRarity(2));
135137
public static final RegistrySupplier<Item> IRON_BAR = register("iron_bar", () -> new ItemT(new Item.Settings().maxCount(9999)).setRarity(2));
136138
public static final RegistrySupplier<Item> GOLD_BAR = register("gold_bar", () -> new ItemT(new Item.Settings().maxCount(9999)).setRarity(2));

‎common/src/main/java/com/ryorama/terrariamod/items/terraria/armor/CrownMaterial.java ‎common/src/main/java/com/ryorama/terrariamod/items/terraria/armor/GoldCrownMaterial.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import net.minecraft.recipe.Ingredient;
66
import net.minecraft.sound.SoundEvent;
77

8-
public class CrownMaterial implements ArmorMaterial {
8+
public class GoldCrownMaterial implements ArmorMaterial {
99

1010
@Override
1111
public int getDurability(ArmorItem.Type type) {

‎common/src/main/java/com/ryorama/terrariamod/items/terraria/armor/PlatinumCrownMaterial.java

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package com.ryorama.terrariamod.items.terraria.armor;
2+
3+
import net.minecraft.item.ArmorItem;
4+
import net.minecraft.item.ArmorMaterial;
5+
import net.minecraft.recipe.Ingredient;
6+
import net.minecraft.sound.SoundEvent;
7+
8+
public class PlatinumCrownMaterial implements ArmorMaterial {
9+
10+
@Override
11+
public int getDurability(ArmorItem.Type type) {
12+
return 9999999;
13+
}
14+
15+
@Override
16+
public int getProtection(ArmorItem.Type type) {
17+
return 5;
18+
}
19+
20+
@Override
21+
public int getEnchantability() {
22+
return 0;
23+
}
24+
25+
@Override
26+
public SoundEvent getEquipSound() {
27+
return null;
28+
}
29+
30+
@Override
31+
public Ingredient getRepairIngredient() {
32+
return null;
33+
}
34+
35+
@Override
36+
public String getName() {
37+
return "platinum_crown";
38+
}
39+
40+
@Override
41+
public float getToughness() {
42+
return 5;
43+
}
44+
45+
@Override
46+
public float getKnockbackResistance() {
47+
return 1;
48+
}
49+
50+
}

‎common/src/main/resources/assets/minecraft/textures/models/armor/gold_crown_layer_1.png

-15 KB
Loading

‎common/src/main/resources/assets/minecraft/textures/models/armor/platinum_crown_layer_1.png

255 Bytes
Loading

‎common/src/main/resources/assets/terrariamod/lang/en_us.json

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"item.terrariamod.magma_stone": "Magma Stone",
7070
"item.terrariamod.shackle": "Shackle",
7171
"item.terrariamod.gold_crown": "Gold Crown",
72+
"item.terrariamod.platinum_crown": "Platinum Crown",
7273
"block.terrariamod.wood": "Wood",
7374
"block.terrariamod.corrupted_wood": "Ebonwood",
7475
"block.terrariamod.crimson_wood": "Shadewood",

‎common/src/main/resources/assets/terrariamod/models/item/platinum_crown.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "terrariamod:item/armor/platinum_crown"
5+
}
6+
}

‎common/src/main/resources/assets/terrariamod/textures/item/armor/gold_crown.png

-52 Bytes
Loading

‎common/src/main/resources/assets/terrariamod/textures/item/armor/platinum_crown.png

155 Bytes
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.