mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-06-17 14:21:33 +00:00
Probably fixed *
This commit is contained in:
@@ -1,11 +1,13 @@
|
|||||||
package com.volmit.iris.core.link;
|
package com.volmit.iris.core.link;
|
||||||
|
|
||||||
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import dev.lone.itemsadder.api.CustomBlock;
|
import dev.lone.itemsadder.api.CustomBlock;
|
||||||
import dev.lone.itemsadder.api.CustomStack;
|
import dev.lone.itemsadder.api.CustomStack;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.MissingResourceException;
|
import java.util.MissingResourceException;
|
||||||
|
|
||||||
public class ItemAdderDataProvider extends ExternalDataProvider {
|
public class ItemAdderDataProvider extends ExternalDataProvider {
|
||||||
@@ -21,11 +23,12 @@ public class ItemAdderDataProvider extends ExternalDataProvider {
|
|||||||
this.itemNamespaces = new KList<>();
|
this.itemNamespaces = new KList<>();
|
||||||
this.blockNamespaces = new KList<>();
|
this.blockNamespaces = new KList<>();
|
||||||
|
|
||||||
for(Identifier i : getItemTypes()) {
|
for (Identifier i : getItemTypes()) {
|
||||||
itemNamespaces.addIfMissing(i.namespace());
|
itemNamespaces.addIfMissing(i.namespace());
|
||||||
}
|
}
|
||||||
for(Identifier i : getBlockTypes()) {
|
for (Identifier i : getBlockTypes()) {
|
||||||
blockNamespaces.addIfMissing(i.namespace());
|
blockNamespaces.addIfMissing(i.namespace());
|
||||||
|
Iris.info("Found ItemAdder Block: " + i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -51,6 +51,8 @@ public class OraxenDataProvider extends ExternalDataProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
|
Iris.info("Setting up Oraxen Link...");
|
||||||
|
this.factories = new WrappedField<>(MechanicsManager.class, FIELD_FACTORIES_MAP);
|
||||||
if(this.factories.hasFailed()) {
|
if(this.factories.hasFailed()) {
|
||||||
Iris.error("Failed to set up Oraxen Link: Unable to fetch MechanicFactoriesMap!");
|
Iris.error("Failed to set up Oraxen Link: Unable to fetch MechanicFactoriesMap!");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import com.volmit.iris.Iris;
|
|||||||
import com.volmit.iris.core.link.*;
|
import com.volmit.iris.core.link.*;
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import com.volmit.iris.util.plugin.IrisService;
|
import com.volmit.iris.util.plugin.IrisService;
|
||||||
|
import io.th0rgal.oraxen.api.OraxenBlocks;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
@@ -39,10 +40,17 @@ public class ExternalDataSVC implements IrisService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
|
Iris.info("Loading ExternalDataProvider...");
|
||||||
Bukkit.getPluginManager().registerEvents(this, Iris.instance);
|
Bukkit.getPluginManager().registerEvents(this, Iris.instance);
|
||||||
|
|
||||||
providers.add(new OraxenDataProvider());
|
providers.add(new OraxenDataProvider());
|
||||||
|
if (Bukkit.getPluginManager().getPlugin("Oraxen") != null){
|
||||||
|
Iris.info("Oraxen found, loading OraxenDataProvider...");
|
||||||
|
}
|
||||||
providers.add(new ItemAdderDataProvider());
|
providers.add(new ItemAdderDataProvider());
|
||||||
|
if (Bukkit.getPluginManager().getPlugin("ItemAdder") != null){
|
||||||
|
Iris.info("ItemAdder found, loading ItemAdderDataProvider...");
|
||||||
|
}
|
||||||
|
|
||||||
for (ExternalDataProvider p : providers) {
|
for (ExternalDataProvider p : providers) {
|
||||||
if (p.isReady()) {
|
if (p.isReady()) {
|
||||||
|
|||||||
@@ -473,6 +473,7 @@ public class B {
|
|||||||
if (!ix.startsWith("minecraft:") && ix.contains(":")) {
|
if (!ix.startsWith("minecraft:") && ix.contains(":")) {
|
||||||
Identifier key = Identifier.fromString(ix);
|
Identifier key = Identifier.fromString(ix);
|
||||||
Optional<BlockData> bd = Iris.service(ExternalDataSVC.class).getBlockData(key);
|
Optional<BlockData> bd = Iris.service(ExternalDataSVC.class).getBlockData(key);
|
||||||
|
Iris.info("Loading block data " + key);
|
||||||
if (bd.isPresent())
|
if (bd.isPresent())
|
||||||
bx = bd.get();
|
bx = bd.get();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user