mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Fixes #1157 (Also updated to CS-CoreLib2 v0.6.1)

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-10-05 22:16:55 +02:00
parent 03633fc173
commit 7800058ed1
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -136,7 +136,7 @@
<dependency>
<groupId>com.github.thebusybiscuit</groupId>
<artifactId>CS-CoreLib2</artifactId>
<version>0.6</version>
<version>0.6.1</version>
<scope>compile</scope>
</dependency>
<dependency>

2
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/cargo/AdvancedCargoOutputNode.java
View File

@ -125,7 +125,7 @@ public class AdvancedCargoOutputNode extends SlimefunItem {
);
}
else {
menu.replaceExistingItem(42, new CustomItem(new ItemStack(MaterialCollections.getAllWools().getAsArray()[channel]), "&bChannel ID: &3" + (channel + 1)));
menu.replaceExistingItem(42, new CustomItem(new ItemStack(MaterialCollections.getAllWoolColors().get(channel)), "&bChannel ID: &3" + (channel + 1)));
menu.addMenuClickHandler(42,
(p, slot, item, action) -> false
);

2
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/cargo/CargoInputNode.java
View File

@ -143,7 +143,7 @@ public class CargoInputNode extends SlimefunItem {
);
}
else {
menu.replaceExistingItem(42, new CustomItem(new ItemStack(MaterialCollections.getAllWools().getAsArray()[channel]), "&bChannel ID: &3" + (channel + 1)));
menu.replaceExistingItem(42, new CustomItem(new ItemStack(MaterialCollections.getAllWoolColors().get(channel)), "&bChannel ID: &3" + (channel + 1)));
menu.addMenuClickHandler(42,
(p, slot, item, action) -> false
);

2
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/cargo/CargoOutputNode.java
View File

@ -64,7 +64,7 @@ public class CargoOutputNode extends SlimefunItem {
);
}
else {
menu.replaceExistingItem(13, new CustomItem(new ItemStack(MaterialCollections.getAllWools().getAsArray()[channel]), "&bChannel ID: &3" + (channel + 1)));
menu.replaceExistingItem(13, new CustomItem(new ItemStack(MaterialCollections.getAllWoolColors().get(channel)), "&bChannel ID: &3" + (channel + 1)));
menu.addMenuClickHandler(13,
(p, slot, item, action) -> false
);

6
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Smeltery.java
View File

@ -18,6 +18,7 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.Damageable;
import org.bukkit.inventory.meta.ItemMeta;
import io.github.thebusybiscuit.cscorelib2.inventory.InvUtils;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem;
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
import me.mrCookieSlime.Slimefun.Lists.Categories;
@ -86,8 +87,11 @@ public class Smeltery extends MultiBlockMachine {
Inventory outputInv = findOutputInventory(adding, dispBlock, inv);
if (outputInv != null) {
for (ItemStack removing: inputs.get(i)) {
if (removing != null) inv.removeItem(removing);
if (removing != null) {
InvUtils.removeItem(inv, removing.getAmount(), true, stack -> SlimefunManager.isItemSimiliar(stack, removing, true));
}
}
outputInv.addItem(adding);
p.getWorld().playSound(p.getLocation(), Sound.BLOCK_LAVA_POP, 1, 1);
p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1);

10
src/me/mrCookieSlime/Slimefun/Objects/tasks/RainbowTicker.java
View File

@ -26,15 +26,15 @@ public class RainbowTicker extends BlockTicker {
@Override
public void tick(Block b, SlimefunItem item, Config data) {
if (MaterialCollections.getAllWools().contains(b.getType())) {
b.setType(MaterialCollections.getAllWools().getAsArray()[meta], false);
if (MaterialCollections.getAllWoolColors().contains(b.getType())) {
b.setType(MaterialCollections.getAllWoolColors().get(meta), false);
}
else if (MaterialCollections.getAllStainedGlassColors().contains(b.getType())) {
b.setType(MaterialCollections.getAllStainedGlassColors().getAsArray()[meta], false);
b.setType(MaterialCollections.getAllStainedGlassColors().get(meta), false);
}
else if (MaterialCollections.getAllStainedGlassPaneColors().contains(b.getType())){
boolean waterlogged = ((Waterlogged) b.getBlockData()).isWaterlogged();
b.setType(MaterialCollections.getAllStainedGlassPaneColors().getAsArray()[meta], true);
b.setType(MaterialCollections.getAllStainedGlassPaneColors().get(meta), true);
if (waterlogged) {
Waterlogged block = (Waterlogged) b.getBlockData();
@ -43,7 +43,7 @@ public class RainbowTicker extends BlockTicker {
}
}
else if (MaterialCollections.getAllTerracottaColors().contains(b.getType())){
b.setType(MaterialCollections.getAllTerracottaColors().getAsArray()[meta], false);
b.setType(MaterialCollections.getAllTerracottaColors().get(meta), false);
}
}