Skip to content

Commit 30cf8f0

Browse files
authored
Merge pull request #213 from Sefiraat/fix/dynatech-changes
Fix DynaTech renaming
2 parents f026baa + ab75974 commit 30cf8f0

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
<dependency>
245245
<groupId>com.github.Slimefun</groupId>
246246
<artifactId>Slimefun4</artifactId>
247-
<version>03e5b9a</version>
247+
<version>d25f22439e</version>
248248
<scope>provided</scope>
249249
</dependency>
250250
<dependency>

src/main/java/io/github/sefiraat/slimetinker/items/tinkermaterials/setup/TinkersMaterialsDynatech.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -18,53 +18,52 @@ private TinkersMaterialsDynatech() {
1818

1919
private static final Map<String, TinkerMaterial> CM_MAP = new HashMap<>();
2020

21-
private static final TinkerMaterial STAINLESS_STEEL = new TinkerMaterial(Ids.STAINLESS_STEEL, SlimefunItem.getById("DT_STAINLESS_STEEL_INGOT").getItem(), "#d1d1d1")
21+
private static final TinkerMaterial STAINLESS_STEEL = new TinkerMaterial(Ids.STAINLESS_STEEL, SlimefunItem.getById("DYNATECH_STAINLESS_STEEL_INGOT").getItem(), "#d1d1d1")
2222
.setLiquidTexture(SkullTextures.ALLOY_SILVER)
2323
.setTraitToolHead(Traits.DYN_STAINLESS_STEEL_HEAD)
2424
.setTraitToolRod(Traits.DYN_STAINLESS_STEEL_ROD)
2525
.setTraitArmorPlates(Traits.DYN_STAINLESS_STEEL_PLATES)
2626
.setTraitArmorLinks(Traits.DYN_STAINLESS_STEEL_LINKS)
2727
.setFormNugget(Materials.NUGGET_CAST_STAINLESSSTEEL.getItemId())
28-
.setFormIngot("DT_STAINLESS_STEEL_INGOT")
28+
.setFormIngot("DYNATECH_STAINLESS_STEEL_INGOT")
2929
.setFormBlock(Materials.BLOCK_CAST_STAINLESSSTEEL.getItemId())
3030
.addAlloyRecipe(
3131
TinkersMaterialsCore.getCmMap().get(Ids.IRON).getLiquidItemStack(2),
3232
TinkersMaterialsCore.getCmMap().get(Ids.ZINC).getLiquidItemStack(1)
3333
)
3434
.build();
3535

36-
private static final TinkerMaterial VEX_GEM = new TinkerMaterial(Ids.VEX_GEM, SlimefunItem.getById("VEX_GEM").getItem(), "#38c0c2")
36+
private static final TinkerMaterial VEX_GEM = new TinkerMaterial(Ids.VEX_GEM, SlimefunItem.getById("DYNATECH_VEX_GEM").getItem(), "#38c0c2")
3737
.setLiquidTexture(SkullTextures.ALLOY_BLUE_PALE)
3838
.setTraitToolBinder(Traits.DYN_VEX_GEM_BINDING)
3939
.setTraitArmorGambeson(Traits.DYN_VEX_GEM_GAMBESON)
40-
.setFormGem("VEX_GEM")
40+
.setFormGem("DYNATECH_VEX_GEM")
4141
.build();
4242

43-
private static final TinkerMaterial STARDUST = new TinkerMaterial(Ids.STARDUST, SlimefunItem.getById("STAR_DUST").getItem(), "#fdff96")
43+
private static final TinkerMaterial STARDUST = new TinkerMaterial(Ids.STARDUST, SlimefunItem.getById("DYNATECH_STAR_DUST").getItem(), "#fdff96")
4444
.setLiquidTexture(SkullTextures.ALLOY_SILVER)
4545
.setTraitToolHead(Traits.DYN_STAR_DUST_HEAD)
4646
.setTraitToolRod(Traits.DYN_STAR_DUST_ROD)
4747
.setTraitArmorPlates(Traits.DYN_STAR_DUST_PLATES)
4848
.setTraitArmorLinks(Traits.DYN_STAR_DUST_LINKS)
49-
.setFormOre("STARDUST_METEOR")
50-
.setFormGem("STAR_DUST")
49+
.setFormGem("DYNATECH_STAR_DUST")
5150
.build();
5251

53-
private static final TinkerMaterial GHOSTLY_ESSENCE = new TinkerMaterial(Ids.GHOSTLY_ESSENCE, SlimefunItem.getById("GHOSTLY_ESSENCE").getItem(), "#d4ffef")
52+
private static final TinkerMaterial GHOSTLY_ESSENCE = new TinkerMaterial(Ids.GHOSTLY_ESSENCE, SlimefunItem.getById("DYNATECH_GHOSTLY_ESSENCE").getItem(), "#d4ffef")
5453
.setLiquidTexture(SkullTextures.ALLOY_BROWN)
5554
.setTraitToolBinder(Traits.DYN_GHOSTLY_ESSENCE_BINDING)
5655
.setTraitToolRod(Traits.DYN_GHOSTLY_ESSENCE_ROD)
5756
.setTraitArmorGambeson(Traits.DYN_GHOSTLY_ESSENCE_GAMBESON)
5857
.setTraitArmorLinks(Traits.DYN_GHOSTLY_ESSENCE_LINKS)
59-
.setFormDust("GHOSTLY_ESSENCE")
58+
.setFormDust("DYNATECH_GHOSTLY_ESSENCE")
6059
.build();
6160

62-
private static final TinkerMaterial TESSERACT = new TinkerMaterial(Ids.TESSERACT, SlimefunItem.getById("TESSERACTING_OBJ").getItem(), "#c7ba9f")
61+
private static final TinkerMaterial TESSERACT = new TinkerMaterial(Ids.TESSERACT, SlimefunItem.getById("DYNATECH_TESSERACTING_OBJECT").getItem(), "#c7ba9f")
6362
.setLiquidTexture(SkullTextures.ALLOY_TAN)
6463
.setTraitToolHead(Traits.DYN_TESSERACT_HEAD)
6564
.setTraitArmorPlates(Traits.DYN_TESSERACT_PLATES)
6665
.setTraitArmorLinks(Traits.DYN_TESSERACT_LINKS)
67-
.setFormBlock("TESSERACTING_OBJ")
66+
.setFormBlock("DYNATECH_TESSERACTING_OBJECT")
6867
.build();
6968

7069
static {

0 commit comments

Comments
 (0)