Skip to content

Replace copper ingot with copper from original Minecraft. #4306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: experimental
Choose a base branch
from
Open

Replace copper ingot with copper from original Minecraft. #4306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee2726e
Update SlimefunItems.java - Remove Copper Ingot in favor of Vanilla C…
Outfit8TSB Apr 7, 2025
796be3b
Update SlimefunItemSetup.java - Replace Copper_Ingot(SF) with Copper_…
Outfit8TSB Apr 7, 2025
e641418
Update SlimefunItemSetup.java
Outfit8TSB Apr 7, 2025
5f80a97
Update SlimefunItemSetup.java - fix errors
Outfit8TSB Apr 14, 2025
6f66d3f
Update ResearchSetup.java - Fix Errors
Outfit8TSB Apr 14, 2025
df98eef
Update ElectricPress.java
Outfit8TSB Apr 14, 2025
108cf3a
Merge branch 'Slimefun:experimental' into replace-sfcopper-with-mccopper
Outfit8TSB Jun 14, 2025
cdf0627
Update SlimefunItemSetup.java
Outfit8TSB Jun 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,6 @@ private SlimefunItems() {}
public static final SlimefunItemStack RAINBOW_GLAZED_TERRACOTTA_HALLOWEEN = new SlimefunItemStack("RAINBOW_GLAZED_TERRACOTTA_HALLOWEEN", Material.ORANGE_GLAZED_TERRACOTTA, "&5Rainbow Glazed Terracotta &7(Halloween)", "", HALLOWEEN);

/* Ingots */
public static final SlimefunItemStack COPPER_INGOT = new SlimefunItemStack("COPPER_INGOT", Material.BRICK, "&bCopper Ingot");
public static final SlimefunItemStack TIN_INGOT = new SlimefunItemStack("TIN_INGOT", Material.IRON_INGOT, "&bTin Ingot");
public static final SlimefunItemStack SILVER_INGOT = new SlimefunItemStack("SILVER_INGOT", Material.IRON_INGOT, "&bSilver Ingot");
public static final SlimefunItemStack ALUMINUM_INGOT = new SlimefunItemStack("ALUMINUM_INGOT", Material.IRON_INGOT, "&bAluminum Ingot");
Expand Down
2 changes: 1 addition & 1 deletion ...github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected void registerDefaultRecipes() {
addRecipe(3, new ItemStack(Material.CLAY_BALL, 4), new ItemStack(Material.CLAY));
addRecipe(3, new ItemStack(Material.BRICK, 4), new ItemStack(Material.BRICKS));

addRecipe(6, SlimefunItems.COPPER_INGOT.item(), CustomItemStack.create(SlimefunItems.COPPER_WIRE.item(), 3));
addRecipe(6, new ItemStack(Material.COPPER_INGOT), CustomItemStack.create(SlimefunItems.COPPER_WIRE.item(), 3));
addRecipe(16, new SlimefunItemStack(SlimefunItems.STEEL_INGOT, 8), SlimefunItems.STEEL_PLATE);
addRecipe(18, new SlimefunItemStack(SlimefunItems.REINFORCED_ALLOY_INGOT, 8), SlimefunItems.REINFORCED_PLATE);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static void setupResearches() {
register("cactus_armor", 31, "Cactus Suit", 5, SlimefunItems.CACTUS_BOOTS, SlimefunItems.CACTUS_CHESTPLATE, SlimefunItems.CACTUS_HELMET, SlimefunItems.CACTUS_LEGGINGS);
register("gold_pan", 32, "Gold Pan", 5, SlimefunItems.GOLD_PAN);
register("magical_book_cover", 33, "Magical Book Binding", 5, SlimefunItems.MAGICAL_BOOK_COVER);
register("slimefun_metals", 34, "New Metals", 6, SlimefunItems.COPPER_INGOT, SlimefunItems.TIN_INGOT, SlimefunItems.SILVER_INGOT, SlimefunItems.LEAD_INGOT, SlimefunItems.ALUMINUM_INGOT, SlimefunItems.ZINC_INGOT, SlimefunItems.MAGNESIUM_INGOT);
register("slimefun_metals", 34, "New Metals", 6, SlimefunItems.TIN_INGOT, SlimefunItems.SILVER_INGOT, SlimefunItems.LEAD_INGOT, SlimefunItems.ALUMINUM_INGOT, SlimefunItems.ZINC_INGOT, SlimefunItems.MAGNESIUM_INGOT);
register("ore_crusher", 35, "Ore Doubling", 6, SlimefunItems.ORE_CRUSHER);
register("bronze", 36, "Bronze Creation", 8, SlimefunItems.BRONZE_INGOT);
register("alloys", 37, "Advanced Alloys", 12, SlimefunItems.BILLON_INGOT, SlimefunItems.DURALUMIN_INGOT, SlimefunItems.ALUMINUM_BRASS_INGOT, SlimefunItems.ALUMINUM_BRONZE_INGOT, SlimefunItems.SOLDER_INGOT, SlimefunItems.CORINTHIAN_BRONZE_INGOT, SlimefunItems.BRASS_INGOT);
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ public static void setup(@Nonnull Slimefun plugin) {
new PressureChamber(itemGroups.basicMachines, SlimefunItems.PRESSURE_CHAMBER).register(plugin);

new UnplaceableBlock(itemGroups.technicalComponents, SlimefunItems.BATTERY, RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {null, new ItemStack(Material.REDSTONE), null, SlimefunItems.ZINC_INGOT.item(), SlimefunItems.SULFATE.item(), SlimefunItems.COPPER_INGOT.item(), SlimefunItems.ZINC_INGOT.item(), SlimefunItems.SULFATE.item(), SlimefunItems.COPPER_INGOT.item()})
new ItemStack[] {null, new ItemStack(Material.REDSTONE), null, SlimefunItems.ZINC_INGOT.item(), SlimefunItems.SULFATE.item(), new ItemStack(Material.COPPER_INGOT), SlimefunItems.ZINC_INGOT.item(), SlimefunItems.SULFATE.item(), new ItemStack(Material.COPPER_INGOT)})
.register(plugin);

registerArmorSet(itemGroups.magicalArmor, new ItemStack(Material.GLOWSTONE), new ItemStack[] {SlimefunItems.GLOWSTONE_HELMET.item(), SlimefunItems.GLOWSTONE_CHESTPLATE.item(), SlimefunItems.GLOWSTONE_LEGGINGS.item(), SlimefunItems.GLOWSTONE_BOOTS.item()}, "GLOWSTONE", false,
Expand Down Expand Up @@ -490,7 +490,7 @@ public static void setup(@Nonnull Slimefun plugin) {
.register(plugin);

new AlloyIngot(itemGroups.resources, SlimefunItems.BRONZE_INGOT,
new ItemStack[] {SlimefunItems.COPPER_DUST.item(), SlimefunItems.TIN_DUST.item(), SlimefunItems.COPPER_INGOT.item(), null, null, null, null, null, null})
new ItemStack[] {SlimefunItems.COPPER_DUST.item(), SlimefunItems.TIN_DUST.item(), new ItemStack(Material.COPPER_INGOT), null, null, null, null, null, null})
.register(plugin);

new AlloyIngot(itemGroups.resources, SlimefunItems.DURALUMIN_INGOT,
Expand All @@ -502,7 +502,7 @@ public static void setup(@Nonnull Slimefun plugin) {
.register(plugin);

new AlloyIngot(itemGroups.resources, SlimefunItems.BRASS_INGOT,
new ItemStack[] {SlimefunItems.COPPER_DUST.item(), SlimefunItems.ZINC_DUST.item(), SlimefunItems.COPPER_INGOT.item(), null, null, null, null, null, null})
new ItemStack[] {SlimefunItems.COPPER_DUST.item(), SlimefunItems.ZINC_DUST.item(), new ItemStack(Material.COPPER_INGOT), null, null, null, null, null, null})
.register(plugin);

new AlloyIngot(itemGroups.resources, SlimefunItems.ALUMINUM_BRASS_INGOT,
Expand Down Expand Up @@ -551,6 +551,11 @@ public static void setup(@Nonnull Slimefun plugin) {
new ItemStack[] {new ItemStack(Material.IRON_INGOT), SlimefunItems.IRON_DUST.item(), SlimefunItems.SILICON.item(), null, null, null, null, null, null})
.register(plugin);

new SlimefunItem(itemGroups.resources, SlimefunItems.COPPER_DUST, RecipeType.ORE_CRUSHER,
new ItemStack[] {new ItemStack(Material.COPPER_ORE), null, null, null, null, null, null, null, null},
new SlimefunItemStack(SlimefunItems.COPPER_DUST, oreCrusher.isOreDoublingEnabled() ? 2 : 1).item())
.register(plugin);

new SlimefunItem(itemGroups.resources, SlimefunItems.IRON_DUST, RecipeType.ORE_CRUSHER,
new ItemStack[] {new ItemStack(Material.IRON_ORE), null, null, null, null, null, null, null, null},
new SlimefunItemStack(SlimefunItems.IRON_DUST, oreCrusher.isOreDoublingEnabled() ? 2 : 1).item())
Expand Down Expand Up @@ -589,10 +594,6 @@ public static void setup(@Nonnull Slimefun plugin) {
new ItemStack[] {SlimefunItems.SIFTED_ORE.item(), null, null, null, null, null, null, null, null})
.register(plugin);

new SlimefunItem(itemGroups.resources, SlimefunItems.COPPER_INGOT, RecipeType.SMELTERY,
new ItemStack[] {SlimefunItems.COPPER_DUST.item(), null, null, null, null, null, null, null, null})
.register(plugin);

new SlimefunItem(itemGroups.resources, SlimefunItems.TIN_INGOT, RecipeType.SMELTERY,
new ItemStack[] {SlimefunItems.TIN_DUST.item(), null, null, null, null, null, null, null, null})
.register(plugin);
Expand Down Expand Up @@ -1389,7 +1390,7 @@ public static void setup(@Nonnull Slimefun plugin) {
.register(plugin);

new UnplaceableBlock(itemGroups.technicalComponents, SlimefunItems.COPPER_WIRE, RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {null, null, null, SlimefunItems.COPPER_INGOT.item(), SlimefunItems.COPPER_INGOT.item(), SlimefunItems.COPPER_INGOT.item(), null, null, null},
new ItemStack[] {null, null, null, new ItemStack(Material.COPPER_INGOT), new ItemStack(Material.COPPER_INGOT), new ItemStack(Material.COPPER_INGOT), null, null, null},
new SlimefunItemStack(SlimefunItems.COPPER_WIRE, 8).item())
.register(plugin);

Expand Down Expand Up @@ -1660,7 +1661,7 @@ public static void setup(@Nonnull Slimefun plugin) {
.register(plugin);

new ElectricDustWasher(itemGroups.electricity, SlimefunItems.ELECTRIC_DUST_WASHER, RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {null, new ItemStack(Material.WATER_BUCKET), null, SlimefunItems.ELECTRO_MAGNET.item(), SlimefunItems.ELECTRIC_GOLD_PAN.item(), SlimefunItems.ELECTRO_MAGNET.item(), SlimefunItems.COPPER_INGOT.item(), SlimefunItems.COPPER_INGOT.item(), SlimefunItems.COPPER_INGOT.item()})
new ItemStack[] {null, new ItemStack(Material.WATER_BUCKET), null, SlimefunItems.ELECTRO_MAGNET.item(), SlimefunItems.ELECTRIC_GOLD_PAN.item(), SlimefunItems.ELECTRO_MAGNET.item(), new ItemStack(Material.COPPER_INGOT), new ItemStack(Material.COPPER_INGOT), new ItemStack(Material.COPPER_INGOT)})
.setCapacity(128)
.setEnergyConsumption(3)
.setProcessingSpeed(1)
Expand Down Expand Up @@ -1870,7 +1871,7 @@ public static void setup(@Nonnull Slimefun plugin) {
.register(plugin);

new Multimeter(itemGroups.technicalGadgets, SlimefunItems.MULTIMETER, RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {SlimefunItems.COPPER_INGOT.item(), null, SlimefunItems.COPPER_INGOT.item(), null, SlimefunItems.REDSTONE_ALLOY.item(), null, null, SlimefunItems.GOLD_6K.item(), null})
new ItemStack[] {new ItemStack(Material.COPPER_INGOT), null, new ItemStack(Material.COPPER_INGOT), null, SlimefunItems.REDSTONE_ALLOY.item(), null, null, SlimefunItems.GOLD_6K.item(), null})
.register(plugin);

new SlimefunItem(itemGroups.technicalComponents, SlimefunItems.PLASTIC_SHEET, RecipeType.HEATED_PRESSURE_CHAMBER,
Expand Down