Skip to content
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

Jump to bottom

Add Smaller Quantum Storage (512) #162

Closed
wants to merge 1 commit into from
Closed

Add Smaller Quantum Storage (512) #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Please note we have a code of conduct, please follow it in all your interactions
1. Ensure any install or build dependencies are removed before the end of the layer when doing a
build.
2. Ensure valid annotations and JavaDocs have been added to new, public, methods and code has been commented for clarify where appropriate.
3. Increase the version numbers in the pon.xml file to the new version that this
3. Increase the version numbers in the pom.xml file to the new version that this
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
4. You may merge the Pull Request in once you have the sign-off of one other developer, or if you
do not have permission to do that, you may request the reviewer to merge it for you.
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<modelVersion>4.1.0</modelVersion>
<groupId>io.github.sefiraat</groupId>
<artifactId>networks</artifactId>
<version>MODIFIED_1.2.0</version>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/github/sefiraat/networks/commands/NetworksMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class NetworksMain implements CommandExecutor {
private static final Map<Integer, NetworkQuantumStorage> QUANTUM_REPLACEMENT_MAP = new HashMap<>();

static {
QUANTUM_REPLACEMENT_MAP.put(512, NetworkSlimefunItems.NETWORK_QUANTUM_STORAGE_0);
QUANTUM_REPLACEMENT_MAP.put(4096, NetworkSlimefunItems.NETWORK_QUANTUM_STORAGE_1);
QUANTUM_REPLACEMENT_MAP.put(32768, NetworkSlimefunItems.NETWORK_QUANTUM_STORAGE_2);
QUANTUM_REPLACEMENT_MAP.put(262144, NetworkSlimefunItems.NETWORK_QUANTUM_STORAGE_3);
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/io/github/sefiraat/networks/slimefun/NetworkSlimefunItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public class NetworkSlimefunItems {
public static final NetworkCell NETWORK_CELL;
public static final NetworkGreedyBlock NETWORK_GREEDY_BLOCK;
public static final NetworkQuantumWorkbench NETWORK_QUANTUM_WORKBENCH;
public static final NetworkQuantumStorage NETWORK_QUANTUM_STORAGE_0;
public static final NetworkQuantumStorage NETWORK_QUANTUM_STORAGE_1;
public static final NetworkQuantumStorage NETWORK_QUANTUM_STORAGE_2;
public static final NetworkQuantumStorage NETWORK_QUANTUM_STORAGE_3;
Expand Down Expand Up @@ -470,6 +471,18 @@ public class NetworkSlimefunItems {
}
);

NETWORK_QUANTUM_STORAGE_0 = new NetworkQuantumStorage(
NetworksItemGroups.NETWORK_QUANTUMS,
NetworksSlimefunItemStacks.NETWORK_QUANTUM_STORAGE_0,
NetworkQuantumWorkbench.TYPE,
new ItemStack[]{
OPTIC_GLASS.getItem(), OPTIC_GLASS.getItem(), OPTIC_GLASS.getItem(),
OPTIC_CABLE.getItem(), SlimefunItems.ELECTRIC_MOTOR, OPTIC_CABLE.getItem(),
OPTIC_GLASS.getItem(), OPTIC_GLASS.getItem(), OPTIC_GLASS.getItem()
},
NetworkQuantumStorage.getSizes()[0]
);

NETWORK_QUANTUM_STORAGE_1 = new NetworkQuantumStorage(
NetworksItemGroups.NETWORK_QUANTUMS,
NetworksSlimefunItemStacks.NETWORK_QUANTUM_STORAGE_1,
Expand Down Expand Up @@ -869,6 +882,7 @@ public static void setup() {
NETWORK_CELL.register(plugin);
NETWORK_GREEDY_BLOCK.register(plugin);
NETWORK_QUANTUM_WORKBENCH.register(plugin);
NETWORK_QUANTUM_STORAGE_0.register(plugin);
NETWORK_QUANTUM_STORAGE_1.register(plugin);
NETWORK_QUANTUM_STORAGE_2.register(plugin);
NETWORK_QUANTUM_STORAGE_3.register(plugin);
Expand Down
26 changes: 19 additions & 7 deletions src/main/java/io/github/sefiraat/networks/slimefun/NetworksSlimefunItemStacks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public class NetworksSlimefunItemStacks {
public static final SlimefunItemStack NETWORK_CELL;
public static final SlimefunItemStack NETWORK_GREEDY_BLOCK;
public static final SlimefunItemStack NETWORK_QUANTUM_WORKBENCH;
public static final SlimefunItemStack NETWORK_QUANTUM_STORAGE_0;
public static final SlimefunItemStack NETWORK_QUANTUM_STORAGE_1;
public static final SlimefunItemStack NETWORK_QUANTUM_STORAGE_2;
public static final SlimefunItemStack NETWORK_QUANTUM_STORAGE_3;
Expand Down Expand Up @@ -436,13 +437,24 @@ public class NetworksSlimefunItemStacks {
"Allows the crafting of Quantum Storages."
);

NETWORK_QUANTUM_STORAGE_0 = Theme.themedSlimefunItemStack(
"NTW_QUANTUM_STORAGE_0",
new ItemStack(Material.YELLOW_TERRACOTTA),
Theme.MACHINE,
"Network Quantum Storage (512)",
"Stores " + NetworkQuantumStorage.getSizes()[0] + " items",
"",
"Stores items in mass quantities within",
"a quantum singularity."
);


NETWORK_QUANTUM_STORAGE_1 = Theme.themedSlimefunItemStack(
"NTW_QUANTUM_STORAGE_1",
new ItemStack(Material.WHITE_TERRACOTTA),
Theme.MACHINE,
"Network Quantum Storage (4K)",
"Stores " + NetworkQuantumStorage.getSizes()[0] + " items",
"Stores " + NetworkQuantumStorage.getSizes()[1] + " items",
"",
"Stores items in mass quantities within",
"a quantum singularity."
Expand All @@ -453,7 +465,7 @@ public class NetworksSlimefunItemStacks {
new ItemStack(Material.LIGHT_GRAY_TERRACOTTA),
Theme.MACHINE,
"Network Quantum Storage (32K)",
"Stores " + NetworkQuantumStorage.getSizes()[1] + " items",
"Stores " + NetworkQuantumStorage.getSizes()[2] + " items",
"",
"Stores items in mass quantities within",
"a quantum singularity."
Expand All @@ -464,7 +476,7 @@ public class NetworksSlimefunItemStacks {
new ItemStack(Material.GRAY_TERRACOTTA),
Theme.MACHINE,
"Network Quantum Storage (262K)",
"Stores " + NetworkQuantumStorage.getSizes()[2] + " items",
"Stores " + NetworkQuantumStorage.getSizes()[3] + " items",
"",
"Stores items in mass quantities within",
"a quantum singularity."
Expand All @@ -475,7 +487,7 @@ public class NetworksSlimefunItemStacks {
new ItemStack(Material.BROWN_TERRACOTTA),
Theme.MACHINE,
"Network Quantum Storage (2M)",
"Stores " + NetworkQuantumStorage.getSizes()[3] + " items",
"Stores " + NetworkQuantumStorage.getSizes()[4] + " items",
"",
"Stores items in mass quantities within",
"a quantum singularity."
Expand All @@ -486,7 +498,7 @@ public class NetworksSlimefunItemStacks {
new ItemStack(Material.BLACK_TERRACOTTA),
Theme.MACHINE,
"Network Quantum Storage (16M)",
"Stores " + NetworkQuantumStorage.getSizes()[4] + " items",
"Stores " + NetworkQuantumStorage.getSizes()[5] + " items",
"",
"Stores items in mass quantities within",
"a quantum singularity."
Expand All @@ -497,7 +509,7 @@ public class NetworksSlimefunItemStacks {
new ItemStack(Material.PURPLE_TERRACOTTA),
Theme.MACHINE,
"Network Quantum Storage (134M)",
"Stores " + NetworkQuantumStorage.getSizes()[5] + " items",
"Stores " + NetworkQuantumStorage.getSizes()[6] + " items",
"",
"Stores items in mass quantities within",
"a quantum singularity."
Expand All @@ -508,7 +520,7 @@ public class NetworksSlimefunItemStacks {
new ItemStack(Material.MAGENTA_TERRACOTTA),
Theme.MACHINE,
"Network Quantum Storage (1B)",
"Stores " + NetworkQuantumStorage.getSizes()[6] + " items",
"Stores " + NetworkQuantumStorage.getSizes()[7] + " items",
"",
"Stores items in mass quantities within",
"a quantum singularity."
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
public class NetworkQuantumStorage extends SlimefunItem implements DistinctiveItem {

private static final int[] SIZES = new int[]{
512,
4096,
32768,
262144,
Expand Down