mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Improved consistency and reduced redundancy

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-08-24 14:26:11 +02:00
parent 79b3baefed
commit 605862b400
9 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/AbstractEnergyProvider.java
View File

@ -44,13 +44,15 @@ public abstract class AbstractEnergyProvider extends SlimefunItem implements Inv
/**
* This method returns the title that is used for the {@link Inventory} of an
* {@link AGenerator} that has been opened by a Player.
* {@link AbstractEnergyProvider} that has been opened by a Player.
*
* Override this method to set the title.
*
* @return The title of the {@link Inventory} of this {@link AGenerator}
* @return The title of the {@link Inventory} of this {@link AbstractEnergyProvider}
*/
public abstract String getInventoryTitle();
public String getInventoryTitle() {
return getItemName();
}
/**
* This method returns the {@link ItemStack} that this {@link AGenerator} will

5
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java
View File

@ -94,9 +94,4 @@ public abstract class BioGenerator extends AGenerator {
return new ItemStack(Material.GOLDEN_HOE);
}
@Override
public String getInventoryTitle() {
return "&2Bio Reactor";
}
}

5
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/CoalGenerator.java
View File

@ -42,9 +42,4 @@ public abstract class CoalGenerator extends AGenerator {
return new ItemStack(Material.FLINT_AND_STEEL);
}
@Override
public String getInventoryTitle() {
return "&cCoal Generator";
}
}

5
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/CombustionGenerator.java
View File

@ -27,9 +27,4 @@ public abstract class CombustionGenerator extends AGenerator {
return new ItemStack(Material.FLINT_AND_STEEL);
}
@Override
public String getInventoryTitle() {
return "&cCombustion Reactor";
}
}

5
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/LavaGenerator.java
View File

@ -25,9 +25,4 @@ public abstract class LavaGenerator extends AGenerator {
return new ItemStack(Material.FLINT_AND_STEEL);
}
@Override
public String getInventoryTitle() {
return "&4Lava Generator";
}
}

5
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/MagnesiumGenerator.java
View File

@ -26,9 +26,4 @@ public abstract class MagnesiumGenerator extends AGenerator {
return new ItemStack(Material.FLINT_AND_STEEL);
}
@Override
public String getInventoryTitle() {
return "&cMagnesium-powered Generator";
}
}

5
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/NetherStarReactor.java
View File

@ -32,11 +32,6 @@ public abstract class NetherStarReactor extends Reactor {
super(category, item, recipeType, recipe);
}
@Override
public String getInventoryTitle() {
return "Nether Star Reactor";
}
@Override
protected void registerDefaultFuelTypes() {
registerFuel(new MachineFuel(1800, new ItemStack(Material.NETHER_STAR)));

5
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/NuclearReactor.java
View File

@ -26,11 +26,6 @@ public abstract class NuclearReactor extends Reactor {
super(category, item, recipeType, recipe);
}
@Override
public String getInventoryTitle() {
return "&2Nuclear Reactor";
}
@Override
protected void registerDefaultFuelTypes() {
registerFuel(new MachineFuel(1200, SlimefunItems.URANIUM, SlimefunItems.NEPTUNIUM));

6
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java
View File

@ -180,17 +180,17 @@ public abstract class Reactor extends AbstractEnergyProvider {
preset.addItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "), ChestMenuUtils.getEmptyClickHandler());
preset.addItem(1, new CustomItem(getFuelIcon(), "&7Fuel Slot", "", "&rThis Slot accepts radioactive Fuel such as:", "&2Uranium &ror &aNeptunium"), ChestMenuUtils.getEmptyClickHandler());
preset.addItem(1, new CustomItem(getFuelIcon(), "&7Fuel Slot", "", "&fThis Slot accepts radioactive Fuel such as:", "&2Uranium &for &aNeptunium"), ChestMenuUtils.getEmptyClickHandler());
for (int i : border_2) {
preset.addItem(i, new CustomItem(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "), ChestMenuUtils.getEmptyClickHandler());
}
if (needsCooling()) {
preset.addItem(7, new CustomItem(getCoolant(), "&bCoolant Slot", "", "&rThis Slot accepts Coolant Cells", "&4Without any Coolant Cells, your Reactor", "&4will explode"));
preset.addItem(7, new CustomItem(getCoolant(), "&bCoolant Slot", "", "&fThis Slot accepts Coolant Cells", "&4Without any Coolant Cells, your Reactor", "&4will explode"));
}
else {
preset.addItem(7, new CustomItem(new ItemStack(Material.BARRIER), "&bCoolant Slot", "", "&rThis Slot accepts Coolant Cells"));
preset.addItem(7, new CustomItem(new ItemStack(Material.BARRIER), "&bCoolant Slot", "", "&fThis Slot accepts Coolant Cells"));
for (int i : border_4) {
preset.addItem(i, new CustomItem(new ItemStack(Material.BARRIER), "&cNo Coolant Required"), ChestMenuUtils.getEmptyClickHandler());