refactor breaking up API and language defs

This commit is contained in:
gnembon committed 2020-09-09 15:37:03 -03:00
1 parent 34d548523d
commit 59575ec607
22 files changed
+5596 -5282

No files matched your search

@@ -1,8 +1,8 @@
package carpet.mixins;
import carpet.CarpetServer;
import carpet.script.CarpetExpression;
import carpet.CarpetSettings;
import carpet.script.api.Auxiliary;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.decoration.ArmorStandEntity;
@@ -32,9 +32,9 @@ public abstract class ArmorStandEntity_scarpetMarkerMixin extends LivingEntity
{
if ((CarpetSettings.scriptsAutoload || !CarpetSettings.commandScript.equals("false")) && !world.isClient)
{
if (getScoreboardTags().contains(CarpetExpression.MARKER_STRING))
if (getScoreboardTags().contains(Auxiliary.MARKER_STRING))
{
String prefix = CarpetExpression.MARKER_STRING+"_";
String prefix = Auxiliary.MARKER_STRING+"_";
Optional<String> owner = getScoreboardTags().stream().filter(s -> s.startsWith(prefix)).findFirst();
if (owner.isPresent())
{