mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 10:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renaming.

Browse Source
This commit is contained in:
Vatuu 2022-05-14 20:31:23 +02:00
parent 6500ed2075
commit d08f326477
No known key found for this signature in database
GPG Key ID: C6F07B79B2ED9150
6 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/core/link/BlockDataProvider.java → src/main/java/com/volmit/iris/core/link/ExternalDataProvider.java
View File

@ -11,7 +11,7 @@ import org.bukkit.plugin.Plugin;
import java.util.MissingResourceException; import java.util.MissingResourceException;
@RequiredArgsConstructor @RequiredArgsConstructor
public abstract class BlockDataProvider { public abstract class ExternalDataProvider {
@Getter @Getter
private final String pluginId; private final String pluginId;

4
src/main/java/com/volmit/iris/core/link/ItemAdderLink.java → src/main/java/com/volmit/iris/core/link/ItemAdderDataProvider.java
View File

@ -10,9 +10,9 @@ import org.bukkit.inventory.ItemStack;
import java.util.MissingResourceException; import java.util.MissingResourceException;
public class ItemAdderLink extends BlockDataProvider { public class ItemAdderDataProvider extends ExternalDataProvider {
public ItemAdderLink() { public ItemAdderDataProvider() {
super("ItemsAdder"); super("ItemsAdder");
} }

2
src/main/java/com/volmit/iris/core/link/OraxenDataProvider.java
View File

@ -40,7 +40,7 @@ import java.util.Map;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import java.util.Optional; import java.util.Optional;
public class OraxenDataProvider extends BlockDataProvider { public class OraxenDataProvider extends ExternalDataProvider {
private static final String FIELD_FACTORIES_MAP = "FACTORIES_BY_MECHANIC_ID"; private static final String FIELD_FACTORIES_MAP = "FACTORIES_BY_MECHANIC_ID";

20
src/main/java/com/volmit/iris/core/service/CustomBlockDataSVC.java → src/main/java/com/volmit/iris/core/service/ExternalDataSVC.java
View File

@ -19,8 +19,8 @@
package com.volmit.iris.core.service; package com.volmit.iris.core.service;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.link.BlockDataProvider; import com.volmit.iris.core.link.ExternalDataProvider;
import com.volmit.iris.core.link.ItemAdderLink; import com.volmit.iris.core.link.ItemAdderDataProvider;
import com.volmit.iris.core.link.OraxenDataProvider; import com.volmit.iris.core.link.OraxenDataProvider;
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;
@ -33,20 +33,20 @@ import java.util.MissingResourceException;
import java.util.Optional; import java.util.Optional;
@Data @Data
public class CustomBlockDataSVC implements IrisService { public class ExternalDataSVC implements IrisService {
private KList<BlockDataProvider> providers = new KList<>(); private KList<ExternalDataProvider> providers = new KList<>();
@Override @Override
public void onEnable() { public void onEnable() {
addProvider(new OraxenDataProvider(), new ItemAdderLink()); addProvider(new OraxenDataProvider(), new ItemAdderDataProvider());
} }
@Override @Override
public void onDisable() { } public void onDisable() { }
public void addProvider(BlockDataProvider... provider) { public void addProvider(ExternalDataProvider... provider) {
for(BlockDataProvider p : provider) { for(ExternalDataProvider p : provider) {
if(p.getPlugin() != null) { if(p.getPlugin() != null) {
providers.add(p); providers.add(p);
p.init(); p.init();
@ -55,7 +55,7 @@ public class CustomBlockDataSVC implements IrisService {
} }
public Optional<BlockData> getBlockData(NamespacedKey key) { public Optional<BlockData> getBlockData(NamespacedKey key) {
Optional<BlockDataProvider> provider = providers.stream().filter(p -> p.isPresent() && p.isValidProvider(key)).findFirst(); Optional<ExternalDataProvider> provider = providers.stream().filter(p -> p.isPresent() && p.isValidProvider(key)).findFirst();
if(provider.isEmpty()) if(provider.isEmpty())
return Optional.empty(); return Optional.empty();
try { try {
@ -67,7 +67,7 @@ public class CustomBlockDataSVC implements IrisService {
} }
public Optional<ItemStack> getItemStack(NamespacedKey key) { public Optional<ItemStack> getItemStack(NamespacedKey key) {
Optional<BlockDataProvider> provider = providers.stream().filter(p -> p.isPresent() && p.isValidProvider(key)).findFirst(); Optional<ExternalDataProvider> provider = providers.stream().filter(p -> p.isPresent() && p.isValidProvider(key)).findFirst();
if(provider.isEmpty()) if(provider.isEmpty())
return Optional.empty(); return Optional.empty();
try { try {
@ -80,7 +80,7 @@ public class CustomBlockDataSVC implements IrisService {
public NamespacedKey[] getAllIdentifiers() { public NamespacedKey[] getAllIdentifiers() {
KList<NamespacedKey> names = new KList<>(); KList<NamespacedKey> names = new KList<>();
providers.stream().filter(BlockDataProvider::isPresent).forEach(p -> names.add(p.getBlockTypes())); providers.stream().filter(ExternalDataProvider::isPresent).forEach(p -> names.add(p.getBlockTypes()));
return names.toArray(new NamespacedKey[0]); return names.toArray(new NamespacedKey[0]);
} }
} }

9
src/main/java/com/volmit/iris/engine/object/IrisLoot.java
View File

@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.service.CustomBlockDataSVC; import com.volmit.iris.core.service.ExternalDataSVC;
import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.ArrayType;
import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Desc;
@ -37,7 +37,6 @@ import com.volmit.iris.util.format.Form;
import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.json.JSONObject;
import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.noise.CNG;
import com.volmit.iris.util.plugin.IrisService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -55,7 +54,6 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.material.Colorable; import org.bukkit.material.Colorable;
import javax.xml.stream.events.Namespace;
import java.awt.Color; import java.awt.Color;
import java.util.Optional; import java.util.Optional;
@ -124,8 +122,9 @@ public class IrisLoot {
try { try {
ItemStack is; ItemStack is;
if(!type.startsWith("minecraft:") && type.contains(":")) { if(!type.startsWith("minecraft:") && type.contains(":")) {
Optional<ItemStack> opt = Iris.service(CustomBlockDataSVC.class).getItemStack(NamespacedKey.fromString(type)); Optional<ItemStack> opt = Iris.service(ExternalDataSVC.class).getItemStack(NamespacedKey.fromString(type));
if(opt.isEmpty()) { if(opt.isEmpty()) {
//TODO Better third party provider
Iris.warn("Unknown Material: " + type); Iris.warn("Unknown Material: " + type);
return null; return null;
} }
@ -215,7 +214,7 @@ public class IrisLoot {
try { try {
ItemStack is; ItemStack is;
if(!type.startsWith("minecraft:") && type.contains(":")) { if(!type.startsWith("minecraft:") && type.contains(":")) {
Optional<ItemStack> opt = Iris.service(CustomBlockDataSVC.class).getItemStack(NamespacedKey.fromString(type)); Optional<ItemStack> opt = Iris.service(ExternalDataSVC.class).getItemStack(NamespacedKey.fromString(type));
if(opt.isEmpty()) { if(opt.isEmpty()) {
Iris.warn("Unknown Material: " + type); Iris.warn("Unknown Material: " + type);
return null; return null;

6
src/main/java/com/volmit/iris/util/data/B.java
View File

@ -20,7 +20,7 @@ package com.volmit.iris.util.data;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.core.service.CustomBlockDataSVC; import com.volmit.iris.core.service.ExternalDataSVC;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.ChronoLatch;
@ -472,7 +472,7 @@ public class B {
if(!ix.startsWith("minecraft:") && ix.contains(":")) { if(!ix.startsWith("minecraft:") && ix.contains(":")) {
NamespacedKey key = NamespacedKey.fromString(ix); NamespacedKey key = NamespacedKey.fromString(ix);
Optional<BlockData> bd = Iris.service(CustomBlockDataSVC.class).getBlockData(key); Optional<BlockData> bd = Iris.service(ExternalDataSVC.class).getBlockData(key);
if(bd.isPresent()) if(bd.isPresent())
bx = bd.get(); bx = bd.get();
} }
@ -647,7 +647,7 @@ public class B {
} }
} }
for(NamespacedKey id : Iris.service(CustomBlockDataSVC.class).getAllIdentifiers()) for(NamespacedKey id : Iris.service(ExternalDataSVC.class).getAllIdentifiers())
bt.add(id.toString()); bt.add(id.toString());
bt.addAll(custom.k()); bt.addAll(custom.k());