Skip to content

Commit

Permalink
deprecate malum
Browse files Browse the repository at this point in the history
  • Loading branch information
KrLite committed Oct 4, 2023
1 parent 78bd009 commit 2d62563
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import static dm.earth.cabricality.Mod.Entry.CREATE;
import static dm.earth.cabricality.Mod.Entry.INDREV;
import static dm.earth.cabricality.Mod.Entry.MC;
import static dm.earth.cabricality.Mod.Entry.MLM;
import static dm.earth.cabricality.Mod.Entry.PROMENADE;

public enum Reagents {
Expand Down Expand Up @@ -57,14 +56,14 @@ public enum Reagents {
Reagent.of("obsidian", CREATE.id("powdered_obsidian"), 0x271F3C),
Reagent.of("gunpowder", MC.id("gunpowder"), 0x727272),
Reagent.of("prismarine", MC.id("prismarine_shard"), 0xA5D1C2),
Reagent.of("hex", MLM.id("hex_ash"), 0xA235BC),
// Reagent.of("hex", MLM.id("hex_ash"), 0xA235BC),
Reagent.of("ender", AE2.id("ender_dust"), 0x38CCB1)),

CRYSTAL("crystal", 0xffb037, 1, true,
Reagent.of("sulfur", INDREV.id("sulfur_dust"), 0xc7a94a),
Reagent.of("certus_quartz", AE2.id("certus_quartz_dust"), 0xbbdcfd),
Reagent.of("cinnabar", MC.id("redstone"), 0xe8364f),
Reagent.of("blazing_quartz", MLM.id("blazing_quartz"), 0xfee568),
// Reagent.of("blazing_quartz", MLM.id("blazing_quartz"), 0xfee568),
Reagent.of("nether_quartz", MC.id("quartz"), 0xddd4c7)),

METAL("metal", 0xc9c9c9, 1, true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import static dm.earth.cabricality.Mod.Entry.FARMERS_DELIGHT;
import static dm.earth.cabricality.Mod.Entry.INDREV;
import static dm.earth.cabricality.Mod.Entry.MC;
import static dm.earth.cabricality.Mod.Entry.MLM;
import static dm.earth.cabricality.Mod.Entry.PROMENADE;
import static dm.earth.cabricality.Mod.Entry.TC;
import static dm.earth.cabricality.Mod.Entry.TERRESTRIA;
Expand Down Expand Up @@ -54,9 +53,9 @@ public enum Professions {
of(PROMENADE.id("palm_log"), 32, SILVER, 1, 0x4d433a),
of(PROMENADE.id("cherry_oak_log"), 32, SILVER, 1, 0x401c15),
of(PROMENADE.id("dark_amaranth_stem"), 24, SILVER, 1, 0x4e4053),
of(MLM.id("runewood_log"), 24, SILVER, 1, 0x583434),
of(MLM.id("exposed_runewood_log"), 16, SILVER, 1, 0x683a30),
of(MLM.id("soulwood_log"), 16, SILVER, 1, 0x34232e),
// of(MLM.id("runewood_log"), 24, SILVER, 1, 0x583434),
// of(MLM.id("exposed_runewood_log"), 16, SILVER, 1, 0x683a30),
// of(MLM.id("soulwood_log"), 16, SILVER, 1, 0x34232e),
// terrestria
of(TERRESTRIA.id("redwood_log"), 32, SILVER, 1, 0x482a22),
of(TERRESTRIA.id("hemlock_log"), 32, SILVER, 1, 0x28281c),
Expand Down Expand Up @@ -84,7 +83,7 @@ public enum Professions {
of(CABF.id("crushed_raw_ostrum"), 1, SILVER, 4, 0x644a59),
of(CABF.id("crushed_raw_desh"), 1, SILVER, 2, 0xdfa562),
of(CABF.id("crushed_raw_cobalt"), 2, SILVER, 3, 0x2a79da),
of(MLM.id("crushed_soulstone"), 1, SILVER, 1, 0x734c77),
// of(MLM.id("crushed_soulstone"), 1, SILVER, 1, 0x734c77),
of(MC.id("andesite"), 64, SILVER, 1, 0x868887),
of(MC.id("granite"), 64, SILVER, 1, 0x9e6b5a),
of(MC.id("diorite"), 64, SILVER, 1, 0xe6e2e6),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import static dm.earth.cabricality.Mod.Entry.AD_ASTRA;
import static dm.earth.cabricality.Mod.Entry.AP;
import static dm.earth.cabricality.Mod.Entry.MC;
import static dm.earth.cabricality.Mod.Entry.MLM;
import static dm.earth.cabricality.Mod.Entry.PROMENADE;
import static dm.earth.cabricality.Mod.Entry.TC;
import static dm.earth.cabricality.Mod.Entry.TERRESTRIA;
Expand Down Expand Up @@ -83,6 +82,7 @@ public enum WoodCuttingEntry {
"palm_wood", "stripped_palm_wood"
),

/*
RUNEWOOD(
MLM.id("runewood"),
"runewood_planks", "runewood_planks_slab",
Expand All @@ -97,6 +97,8 @@ public enum WoodCuttingEntry {
"soulwood", "stripped_soulwood"
),
*/

BLOODSHROOM(
TC.id("bloodshroom"),
"bloodshroom_planks", "bloodshroom_planks_slab",
Expand Down

0 comments on commit 2d62563

Please sign in to comment.