void setPrivateValue(Class classToAccess, T instance, E value, String... fieldNames)
- {
- try
- {
- findField(classToAccess, fieldNames).set(instance, value);
- }
- catch (Exception e)
- {
- throw new UnableToAccessFieldException(fieldNames, e);
- }
- }
-
- @SuppressWarnings("unchecked")
- public static Class getClass(ClassLoader loader, String... classNames)
- {
- Exception err = null;
- for (String className : classNames)
- {
- try
- {
- return (Class) Class.forName(className, false, loader);
- }
- catch (Exception e)
- {
- err = e;
- }
- }
-
- throw new UnableToFindClassException(classNames, err);
- }
-
- /**
- * Finds a method with the specified name and parameters in the given class
- * and makes it accessible. Note: for performance, store the returned value
- * and avoid calling this repeatedly.
- *
- * Throws an exception if the method is not found.
- *
- * @param clazz
- * The class to find the method on.
- * @param methodName
- * The name of the method to find (used in developer
- * environments, i.e. "getLevelTime").
- * @param methodObfName
- * The obfuscated name of the method to find (used in obfuscated
- * environments, i.e. "getLevelTime"). If the name you are
- * looking for is on a class that is never obfuscated, this
- * should be null.
- * @param parameterTypes
- * The parameter types of the method to find.
- * @return The method with the specified name and parameters in the given
- * class.
- */
-
- /**
- * Finds a constructor in the specified class that has matching parameter
- * types.
- *
- * @param klass
- * The class to find the constructor in
- * @param parameterTypes
- * The parameter types of the constructor.
- * @param
- * The type
- * @return The constructor
- * @throws NullPointerException
- * if {@code klass} is null
- * @throws NullPointerException
- * if {@code parameterTypes} is null
- * @throws UnknownConstructorException
- * if the constructor could not be found
- */
- @Nonnull
- public static Constructor findConstructor(@Nonnull final Class klass, @Nonnull final Class... parameterTypes)
- {
- Preconditions.checkNotNull(klass, "class");
- Preconditions.checkNotNull(parameterTypes, "parameter types");
-
- final Constructor constructor;
- try
- {
- constructor = klass.getDeclaredConstructor(parameterTypes);
- constructor.setAccessible(true);
- }
- catch (final NoSuchMethodException e)
- {
- final StringBuilder desc = new StringBuilder();
- desc.append(klass.getSimpleName()).append('(');
- for (int i = 0, length = parameterTypes.length; i < length; i++)
- {
- desc.append(parameterTypes[i].getName());
- if (i > length)
- {
- desc.append(',').append(' ');
- }
- }
- desc.append(')');
- throw new UnknownConstructorException("Could not find constructor '" + desc.toString() + "' in " + klass);
- }
- return constructor;
- }
-}
\ No newline at end of file
diff --git a/old/src/main/java/tschipp/carryon/common/helper/ReflectionUtil.java b/old/src/main/java/tschipp/carryon/common/helper/ReflectionUtil.java
deleted file mode 100644
index d53d31d..0000000
--- a/old/src/main/java/tschipp/carryon/common/helper/ReflectionUtil.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package tschipp.carryon.common.helper;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import javax.annotation.Nullable;
-
-import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
-
-/**
- * Utility methods for reflection.
- *
- * @author Choonster
- */
-public class ReflectionUtil
-{
- /**
- * Get a {@link MethodHandle} for a method.
- *
- * @param clazz
- * The class
- * @param methodName
- * The possible names of the method
- * @param methodObfName
- * The obfuscated method name
- * @param parameterTypes
- * The argument types of the method
- * @return The MethodHandle
- */
- public static MethodHandle findMethod(final Class clazz, final String methodName, @Nullable final String methodObfName, final Class... parameterTypes)
- {
- final Method method = ObfuscationReflectionHelper.findMethod(clazz, methodName, parameterTypes);
- try
- {
- return MethodHandles.lookup().unreflect(method);
- }
- catch (IllegalAccessException e)
- {
- throw new ObfuscationReflectionHelper.UnableToFindMethodException(e);
- }
- }
-
- /**
- * Get a {@link MethodHandle} for a field's getter.
- *
- * @param clazz
- * The class
- * @param fieldNames
- * The possible names of the field
- * @return The MethodHandle
- */
- public static MethodHandle findFieldGetter(Class clazz, String... fieldNames)
- {
- final Field field = ReflectionHelper.findField(clazz, fieldNames);
-
- try
- {
- return MethodHandles.lookup().unreflectGetter(field);
- }
- catch (IllegalAccessException e)
- {
- throw new ReflectionHelper.UnableToAccessFieldException(fieldNames, e);
- }
- }
-
- /**
- * Get a {@link MethodHandle} for a field's setter.
- *
- * @param clazz
- * The class
- * @param fieldNames
- * The possible names of the field
- * @return The MethodHandle
- */
- public static MethodHandle findFieldSetter(Class clazz, String... fieldNames)
- {
- final Field field = ReflectionHelper.findField(clazz, fieldNames);
-
- try
- {
- return MethodHandles.lookup().unreflectSetter(field);
- }
- catch (IllegalAccessException e)
- {
- throw new ReflectionHelper.UnableToAccessFieldException(fieldNames, e);
- }
- }
-}
\ No newline at end of file
diff --git a/old/src/main/java/tschipp/carryon/common/helper/ScriptParseHelper.java b/old/src/main/java/tschipp/carryon/common/helper/ScriptParseHelper.java
deleted file mode 100644
index f08f2ad..0000000
--- a/old/src/main/java/tschipp/carryon/common/helper/ScriptParseHelper.java
+++ /dev/null
@@ -1,355 +0,0 @@
-package tschipp.carryon.common.helper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.material.Material;
-import net.minecraft.world.scores.Objective;
-import net.minecraft.world.scores.Score;
-import net.minecraft.world.scores.Scoreboard;
-import net.minecraftforge.registries.ForgeRegistries;
-
-public class ScriptParseHelper
-{
-
-
-
- public static boolean matches(double number, String cond)
- {
- if (cond == null || cond.isEmpty())
- return true;
-
- try
- {
- if (cond.contains("<="))
- {
- return number <= Double.parseDouble(cond.replace("<=", ""));
- }
- if (cond.contains(">="))
- {
- return number >= Double.parseDouble(cond.replace(">=", ""));
- }
- if (cond.contains("<"))
- {
- return number < Double.parseDouble(cond.replace("<", ""));
- }
- if (cond.contains(">"))
- {
- return number > Double.parseDouble(cond.replace(">", ""));
- }
- if (cond.contains("="))
- {
- return number == Double.parseDouble(cond.replace("=", ""));
- }
- else
- return number == Double.parseDouble(cond);
-
- }
- catch (Exception e)
- {
- new InvalidConfigException(e.getMessage()).printException();
- }
-
- return false;
- }
-
- public static boolean matches(Block block, String cond)
- {
- if (cond == null || cond.isEmpty())
- return true;
-
- Block toCheck = StringParser.getBlock(cond);
- if (toCheck != null)
- return block == toCheck;
-
- return false;
- }
-
- public static boolean matches(CompoundTag toCheck, CompoundTag toMatch)
- {
- if (toCheck == null || toMatch == null || toMatch.isEmpty())
- return true;
-
- boolean matching = true;
- for (String key : toMatch.getAllKeys())
- {
- Tag tag = toMatch.get(key);
- key = key.replace("\"", "");
- Tag tagToCheck = toCheck.get(key);
- if (!tag.equals(tagToCheck))
- matching = false;
- }
-
- return matching;
- }
-
- public static float[] getXYZArray(String s)
- {
- float[] d = new float[3];
- d[0] = getValueFromString(s, "x");
- d[1] = getValueFromString(s, "y");
- d[2] = getValueFromString(s, "z");
-
- return d;
- }
-
- public static float[] getScaled(String s)
- {
- float[] d = new float[3];
- d[0] = getScaledValueFromString(s, "x");
- d[1] = getScaledValueFromString(s, "y");
- d[2] = getScaledValueFromString(s, "z");
-
- return d;
- }
-
- public static float getScaledValueFromString(String toGetFrom, String key)
- {
- if (toGetFrom == null || toGetFrom.isEmpty())
- return 1;
-
- String[] s = toGetFrom.split(",");
- for (String string : s)
- {
- if (string.contains(key) && string.contains("="))
- {
- float numb = 1;
- string = string.replace(key + "=", "");
-
- try
- {
- numb = Float.parseFloat(string);
- }
- catch (Exception e)
- {
- }
-
- return numb;
- }
- }
-
- return 1;
- }
-
- public static boolean matchesScore(Player player, String cond)
- {
- if (cond == null || cond.isEmpty())
- return true;
-
- Scoreboard score = player.getScoreboard();
- String numb;
- String scorename;
- int iE = cond.indexOf("=");
- int iG = cond.indexOf(">");
- int iL = cond.indexOf("<");
-
- if (iG == -1 ? true : iE < iG && iL == -1 ? true : iE < iL && iE != -1)
- numb = cond.substring(iE);
- else if (iE == -1 ? true : iG < iE && iL == -1 ? true : iG < iL && iG != -1)
- numb = cond.substring(iG);
- else
- numb = cond.substring(iL);
-
- scorename = cond.replace(numb, "");
- Map o = score.getPlayerScores(player.getGameProfile().getName());
- if (o != null)
- {
- Score sc = o.get(score.getObjective(scorename));
- if (sc != null)
- {
- int points = sc.getScore();
-
- return matches(points, numb);
- }
- }
-
- return false;
- }
-
- public static boolean matches(BlockPos pos, String cond)
- {
- if (cond == null || cond.isEmpty())
- return true;
-
- BlockPos blockpos = new BlockPos(getValueFromString(cond, "x"), getValueFromString(cond, "y"), getValueFromString(cond, "z"));
- BlockPos expand = new BlockPos(getValueFromString(cond, "dx"), getValueFromString(cond, "dy"), getValueFromString(cond, "dz"));
- BlockPos expanded = blockpos.offset(expand);
-
- boolean x = pos.getX() >= blockpos.getX() && pos.getX() <= expanded.getX() || blockpos.getX() == 0;
- boolean y = pos.getY() >= blockpos.getY() && pos.getY() <= expanded.getY() || blockpos.getY() == 0;
- boolean z = pos.getZ() >= blockpos.getZ() && pos.getZ() <= expanded.getZ() || blockpos.getZ() == 0;
-
- return x && y && z;
- }
-
- public static float getValueFromString(String toGetFrom, String key)
- {
- if (toGetFrom == null || toGetFrom.isEmpty())
- return 0;
-
- String[] s = toGetFrom.split(",");
- for (String string : s)
- {
- if (string.contains(key) && string.contains("="))
- {
- float numb = 0;
- string = string.replace(key + "=", "");
-
- try
- {
- numb = Float.parseFloat(string);
- }
- catch (Exception e)
- {
- }
-
- return numb;
- }
- }
-
- return 0;
- }
-
- public static boolean hasEffects(Player player, String cond)
- {
- if (cond == null || cond.isEmpty())
- return true;
-
- Collection effects = player.getActiveEffects();
- String[] potions = cond.split(",");
-
- List names = new ArrayList<>();
- List levels = new ArrayList<>();
-
- for (String pot : potions)
- {
- if (pot.contains("#"))
- {
- String level = pot.substring(pot.indexOf("#"));
- String name = pot.substring(0, pot.indexOf("#"));
- level = level.replace("#", "");
- int lev = 0;
- try
- {
- lev = Integer.parseInt(level);
- }
- catch (Exception e)
- {
- }
-
- levels.add(lev);
- names.add(name);
- }
- else
- {
- levels.add(0);
- names.add(pot);
- }
- }
-
- int matches = 0;
- for (MobEffectInstance effect : effects)
- {
- int amp = effect.getAmplifier();
- String name = ForgeRegistries.MOB_EFFECTS.getKey(effect.getEffect()).toString();
-
- if (names.contains(name))
- {
- int idx = names.indexOf(name);
- int lev = levels.get(idx);
-
- if (lev == amp)
- matches++;
- }
- }
-
- return matches == potions.length;
- }
-
- public static boolean matches(Material material, String cond)
- {
- if (cond == null || cond.isEmpty())
- return true;
-
- switch (cond)
- {
- case "air":
- return material == Material.AIR;
- case "anvil":
- return material == Material.HEAVY_METAL;
- case "barrier":
- return material == Material.BARRIER;
- case "cactus":
- return material == Material.CACTUS;
- case "cake":
- return material == Material.CAKE;
- case "carpet":
- return material == Material.CLOTH_DECORATION;
- case "clay":
- return material == Material.CLAY;
- case "cloth":
- return material == Material.WOOL;
- case "dragon_egg":
- return material == Material.EGG;
- case "fire":
- return material == Material.FIRE;
- case "glass":
- return material == Material.GLASS;
- case "gourd":
- return material == Material.VEGETABLE;
- case "grass":
- return material == Material.GRASS;
- case "ground":
- return material == Material.GRASS;
- case "ice":
- return material == Material.ICE;
- case "iron":
- return material == Material.METAL;
- case "lava":
- return material == Material.LAVA;
- case "leaves":
- return material == Material.LEAVES;
- case "packed_ice":
- return material == Material.ICE_SOLID;
- case "piston":
- return material == Material.PISTON;
- case "plants":
- return material == Material.PLANT;
- case "portal":
- return material == Material.PORTAL;
- case "redstone_light":
- return material == Material.BUILDABLE_GLASS;
- case "rock":
- return material == Material.STONE;
- case "sand":
- return material == Material.SAND;
- case "snow":
- return material == Material.TOP_SNOW;
- case "sponge":
- return material == Material.SPONGE;
- case "structure_void":
- return material == Material.STRUCTURAL_AIR;
- case "tnt":
- return material == Material.EXPLOSIVE;
- case "vine":
- return material == Material.PLANT;
- case "water":
- return material == Material.WATER;
- case "web":
- return material == Material.WEB;
- case "wood":
- return material == Material.WOOD;
- default:
- return false;
- }
-
- }
-}
diff --git a/old/src/main/java/tschipp/carryon/common/helper/ScrollCallbackWrapper.java b/old/src/main/java/tschipp/carryon/common/helper/ScrollCallbackWrapper.java
deleted file mode 100644
index b71e8e9..0000000
--- a/old/src/main/java/tschipp/carryon/common/helper/ScrollCallbackWrapper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package tschipp.carryon.common.helper;
-
-import org.lwjgl.glfw.GLFW;
-import org.lwjgl.glfw.GLFWScrollCallback;
-
-import net.minecraft.client.Minecraft;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.Cancelable;
-import net.minecraftforge.eventbus.api.Event;
-
-//Thanks to gigaherz for the help!
-public class ScrollCallbackWrapper
-{
- GLFWScrollCallback oldCallback;
-
- public void setup(Minecraft mc)
- {
- this.oldCallback = GLFW.glfwSetScrollCallback(mc.getWindow().getWindow(), this::scrollCallback);
- }
-
- private void scrollCallback(long window, double xoffset, double yoffset)
- {
- MouseScrolledEvent event = new MouseScrolledEvent();
- MinecraftForge.EVENT_BUS.post(event);
-
- if (event.isCanceled())
- return;
-
- if (this.oldCallback != null)
- this.oldCallback.invoke(window, xoffset, yoffset);
- }
-
- @Cancelable
- public static class MouseScrolledEvent extends Event
- {
-
- }
-}
diff --git a/old/src/main/java/tschipp/carryon/common/helper/StringParser.java b/old/src/main/java/tschipp/carryon/common/helper/StringParser.java
deleted file mode 100644
index 668ffa7..0000000
--- a/old/src/main/java/tschipp/carryon/common/helper/StringParser.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package tschipp.carryon.common.helper;
-
-import javax.annotation.Nullable;
-
-import com.mojang.brigadier.StringReader;
-
-import net.minecraft.commands.arguments.blocks.BlockStateParser;
-import net.minecraft.commands.arguments.blocks.BlockStateParser.BlockResult;
-import net.minecraft.commands.arguments.item.ItemParser;
-import net.minecraft.commands.arguments.item.ItemParser.ItemResult;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.Registry;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.TagParser;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-
-public class StringParser
-{
-
- @Nullable
- public static Block getBlock(String string)
- {
- BlockState state = getBlockState(string);
- if (state != null)
- return state.getBlock();
-
- return null;
- }
-
- @Nullable
- public static BlockState getBlockState(String string)
- {
- if (string == null)
- return null;
-
-
- try
- {
- BlockResult result = BlockStateParser.parseForBlock(HolderLookup.forRegistry(Registry.BLOCK), new StringReader(string), false);
- return result.blockState();
- }
- catch (Exception e)
- {
- new InvalidConfigException("Blockstate parsing Exception at: " + string + " : " + e.getMessage()).printException();
- return null;
- }
- }
-
- @Nullable
- public static Item getItem(String string)
- {
- if (string == null)
- return null;
-
-
- try
- {
- ItemResult res = ItemParser.parseForItem(HolderLookup.forRegistry(Registry.ITEM), new StringReader(string));
- return res.item().get();
- }
- catch (Exception e)
- {
- new InvalidConfigException("Item parsing Exception at: " + string + " : " + e.getMessage()).printException();
- return null;
- }
- }
-
- public static ItemStack getItemStack(String string)
- {
- if (string == null)
- return null;
-
-
- try
- {
- ItemResult res = ItemParser.parseForItem(HolderLookup.forRegistry(Registry.ITEM), new StringReader(string));
-
- Item item = res.item().get();
- CompoundTag nbt = res.nbt();
-
- ItemStack stack = new ItemStack(item, 1);
-
- if (nbt != null)
- {
- stack.setTag(nbt);
- }
-
- return stack;
- }
- catch (Exception e)
- {
- new InvalidConfigException("Item parsing Exception at: " + string + " : " + e.getMessage()).printException();
- return ItemStack.EMPTY;
-
- }
-
- }
-
- @Nullable
- public static CompoundTag getTagCompound(String string)
- {
- CompoundTag tag = null;
- if (string == null)
- return null;
-
- if (string.contains("{"))
- {
- if (!string.contains("}"))
- new InvalidConfigException("Missing } at : " + string).printException();
-
- String nbt = string.substring(string.indexOf("{"));
- string = string.replace(nbt, "");
- try
- {
- tag = TagParser.parseTag(nbt);
- }
- catch (Exception e)
- {
- new InvalidConfigException("Error while parsing NBT: " + e.getMessage()).printException();
- return null;
- }
-
- }
- else if (string.contains("}"))
- new InvalidConfigException("Missing { at : " + string).printException();
-
- return tag;
- }
-
-}
diff --git a/old/src/main/java/tschipp/carryon/common/item/ItemCarryonBlock.java b/old/src/main/java/tschipp/carryon/common/item/ItemCarryonBlock.java
deleted file mode 100644
index 356084e..0000000
--- a/old/src/main/java/tschipp/carryon/common/item/ItemCarryonBlock.java
+++ /dev/null
@@ -1,389 +0,0 @@
-package tschipp.carryon.common.item;
-
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import com.google.common.base.CharMatcher;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.ClickEvent.Action;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.effect.MobEffects;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.item.context.UseOnContext;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.BlockSnapshot;
-import net.minecraftforge.event.level.BlockEvent.EntityPlaceEvent;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.registries.ForgeRegistries;
-import tschipp.carryon.CarryOn;
-import tschipp.carryon.client.keybinds.CarryOnKeybinds;
-import tschipp.carryon.common.config.Configs.Settings;
-import tschipp.carryon.common.event.ItemEvents;
-import tschipp.carryon.common.handler.CustomPickupOverrideHandler;
-import tschipp.carryon.common.handler.ModelOverridesHandler;
-
-public class ItemCarryonBlock extends Item
-{
-
- public static final String TILE_DATA_KEY = "tileData";
- public static final String[] FACING_KEYS = { "rotation", "rot", "facing", "face", "direction", "dir", "front", "forward" };
-
- public ItemCarryonBlock()
- {
- super(new Item.Properties().stacksTo(1));
- }
-
- @Override
- public Component getName(ItemStack stack)
- {
- if (hasTileData(stack))
- {
- BlockState state = getBlockState(stack);
- CompoundTag nbt = getTileData(stack);
-
- if (ModelOverridesHandler.hasCustomOverrideModel(state, nbt))
- {
- Object override = ModelOverridesHandler.getOverrideObject(state, nbt);
- if (override instanceof ItemStack)
- return ((ItemStack) override).getHoverName();
- else
- {
- BlockState ostate = (BlockState) override;
- return ostate.getBlock().getName();
- }
- }
-
- return getItemStack(stack).getHoverName();
- }
-
- return Component.literal("");
- }
-
- @Override
- public InteractionResult useOn(UseOnContext context)
- {
- Direction facing = context.getClickedFace();
- Player player = context.getPlayer();
- Level level = context.getLevel();
- BlockPos pos = context.getClickedPos();
- ItemStack stack = context.getItemInHand();
-
- if (ModList.get().isLoaded("betterplacement") && CarryOnKeybinds.isKeyPressed(player))
- return InteractionResult.FAIL;
-
- if (hasTileData(stack))
- {
- try
- {
- Vec3 vec = player.getLookAngle();
- Direction facing2 = Direction.getNearest((float) vec.x, 0f, (float) vec.z);
- BlockPos pos2 = pos;
- Block containedblock = getBlock(stack);
- BlockState containedstate = getBlockState(stack);
- if (!level.getBlockState(pos2).canBeReplaced(new BlockPlaceContext(context)))
- {
- pos2 = pos.relative(facing);
- }
-
- if (level.getBlockState(pos2).canBeReplaced(new BlockPlaceContext(context)) && containedblock != null)
- {
- boolean canPlace = containedstate.canSurvive(level, pos2);
-
- if (canPlace && player.mayUseItemAt(pos, facing, stack) && level.mayInteract(player, pos2))
- {
-
- BlockState placementState = containedblock.getStateForPlacement(new BlockPlaceContext(context));
-
- BlockState actualState = placementState == null ? containedstate : placementState;
-
- // Attempted fix for #287
- // for (IProperty prop :
- // placementState.getValues().keySet())
- // {
- // if (prop instanceof DirectionProperty)
- // actualState = actualState.with((DirectionProperty)
- // prop, placementState.get((DirectionProperty) prop));
- // else if (prop == BlockStateProperties.WATERLOGGED)
- // actualState = actualState.with((BooleanProperty)
- // prop, placementState.get((BooleanProperty) prop));
- // else if(prop instanceof EnumProperty)
- // {
- // Object value = placementState.get(prop);
- // if(value instanceof Direction.Axis)
- // {
- // actualState = actualState.with((EnumProperty)prop,
- // (Direction.Axis)value);
- // }
- // }
- // }
-
- BlockSnapshot snapshot = BlockSnapshot.create(level.dimension(), level, pos2);
- EntityPlaceEvent event = new EntityPlaceEvent(snapshot, level.getBlockState(pos), player);
- MinecraftForge.EVENT_BUS.post(event);
-
- if (!event.isCanceled())
- {
- level.setBlockAndUpdate(pos2, actualState);
-
- // If the blockstate doesn't handle rotation,
- // try to
- // change rotation via NBT
- if (!getTileData(stack).isEmpty())
- {
- CompoundTag tag = getTileData(stack);
- Set keys = tag.getAllKeys();
- keytester: for (String key : keys)
- {
- for (String facingKey : FACING_KEYS)
- {
- if (key.toLowerCase().equals(facingKey))
- {
- byte type = tag.getTagType(key);
- switch (type)
- {
- case 8:
- tag.putString(key, CharMatcher.javaUpperCase().matchesAllOf(tag.getString(key)) ? facing2.getOpposite().getName().toUpperCase() : facing2.getOpposite().getName());
- break;
- case 3:
- tag.putInt(key, facing2.getOpposite().get3DDataValue());
- break;
- case 1:
- tag.putByte(key, (byte) facing2.getOpposite().get3DDataValue());
- break;
- default:
- break;
- }
-
- break keytester;
- }
- }
- }
- }
-
- BlockEntity tile = level.getBlockEntity(pos2);
- if (tile != null)
- {
- CompoundTag data = getTileData(stack);
- updateTileLocation(data, pos2);
- tile.load(data);
- }
- clearTileData(stack);
- player.playSound(actualState.getSoundType(level, pos2, player).getPlaceSound(), 1.0f, 0.5f);
- player.setItemInHand(InteractionHand.MAIN_HAND, ItemStack.EMPTY);
- player.getPersistentData().remove("overrideKey");
- ItemEvents.sendPacket(player, 9, 0);
- return InteractionResult.SUCCESS;
-
- }
- }
- }
- }
- catch (Exception e)
- {
- e.printStackTrace();
-
- if (level != null && level.isClientSide)
- {
- CarryOn.LOGGER.info("Block: " + ItemCarryonBlock.getBlock(stack));
- CarryOn.LOGGER.info("BlockState: " + ItemCarryonBlock.getBlockState(stack));
- // CarryOn.LOGGER.info("Meta: " + itemTile.get().getMeta(stack));
- CarryOn.LOGGER.info("ItemStack: " + ItemCarryonBlock.getItemStack(stack));
-
- if (ModelOverridesHandler.hasCustomOverrideModel(ItemCarryonBlock.getBlockState(stack), ItemCarryonBlock.getTileData(stack)))
- CarryOn.LOGGER.info("Override Model: " + ModelOverridesHandler.getOverrideObject(ItemCarryonBlock.getBlockState(stack), ItemCarryonBlock.getTileData(stack)));
-
- if (CustomPickupOverrideHandler.hasSpecialPickupConditions(ItemCarryonBlock.getBlockState(stack)))
- CarryOn.LOGGER.info("Custom Pickup Condition: " + CustomPickupOverrideHandler.getPickupCondition(ItemCarryonBlock.getBlockState(stack)));
-
- player.displayClientMessage(Component.literal(ChatFormatting.RED + "Error detected. Cannot place block. Execute \"/carryon clear\" to remove the item"), false);
- Component s = Component.literal(ChatFormatting.GOLD + "here");
- s.getStyle().withClickEvent(new ClickEvent(Action.OPEN_URL, "https://github.com/Tschipp/CarryOn/issues"));
- player.displayClientMessage(Component.literal(ChatFormatting.RED + "Please report this error ").append(s), false);
-
- }
- }
-
- }
-
- return InteractionResult.FAIL;
- }
-
- @Override
- public void inventoryTick(ItemStack stack, Level level, Entity entity, int itemSlot, boolean isSelected)
- {
- if (hasTileData(stack))
- {
- if (entity instanceof LivingEntity)
- {
- if (entity instanceof Player && Settings.slownessInCreative.get() ? false : ((Player) entity).isCreative())
- return;
-
- ((LivingEntity) entity).addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 1, potionLevel(stack), false, false));
- }
- }
- else
- {
- stack = ItemStack.EMPTY;
- }
- }
-
- public static boolean hasTileData(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- return tag.contains(TILE_DATA_KEY) && tag.contains("block") && tag.contains("stateid");
- }
- return false;
- }
-
- public static boolean storeTileData(@Nullable BlockEntity tile, Level level, BlockPos pos, BlockState state, ItemStack stack)
- {
- if (stack.isEmpty())
- return false;
-
- CompoundTag tileTag = new CompoundTag();
- if (tile != null)
- tileTag = tile.saveWithId();
-
- CompoundTag tag = stack.hasTag() ? stack.getTag() : new CompoundTag();
- if (tag.contains(TILE_DATA_KEY))
- return false;
-
- tag.put(TILE_DATA_KEY, tileTag);
-
- // ItemStack drop = new ItemStack(state.getBlock().getItemDropped(state,
- // itemRand, 0), 1, state.getBlock().damageDropped(state));
-
- tag.putString("block", ForgeRegistries.BLOCKS.getKey(state.getBlock()).toString());
- // Item item = Item.getItemFromBlock(state.getBlock());
- // tag.setInt("meta", drop.getItemDamage());
- tag.putInt("stateid", Block.getId(state));
- stack.setTag(tag);
- return true;
- }
-
- public static void updateTileLocation(CompoundTag tag, BlockPos pos)
- {
- tag.putInt("x", pos.getX());
- tag.putInt("y", pos.getY());
- tag.putInt("z", pos.getZ());
- }
-
- public static void clearTileData(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- tag.remove(TILE_DATA_KEY);
- tag.remove("block");
- tag.remove("stateid");
- }
- }
-
- public static CompoundTag getTileData(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- return tag.getCompound(TILE_DATA_KEY);
- }
- return null;
- }
-
- public static Block getBlock(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- int id = tag.getInt("stateid");
- return Block.stateById(id).getBlock();
- }
- return Blocks.AIR;
- }
-
- // public static int getMeta(ItemStack stack)
- // {
- // if (stack.hasTag())
- // {
- // CompoundTag tag = stack.getTag();
- // int meta = tag.getInt("meta");
- // return meta;
- // }
- // return 0;
- // }
-
- public static ItemStack getItemStack(ItemStack stack)
- {
- return new ItemStack(getBlock(stack), 1);
- }
-
- public static BlockState getBlockState(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- int id = tag.getInt("stateid");
- return Block.stateById(id);
- }
- return Blocks.AIR.defaultBlockState();
- }
-
- public static boolean isLocked(BlockPos pos, Level level)
- {
- BlockEntity te = level.getBlockEntity(pos);
- if (te != null)
- {
- CompoundTag tag = new CompoundTag();
- te.saveWithId();
- return tag.contains("Lock") ? !tag.getString("Lock").equals("") : false;
- }
-
- return false;
- }
-
- // private boolean equal(Object[] a, Object[] b)
- // {
- // if (a.length != b.length)
- // return false;
- //
- // List lA = Arrays.asList(a);
- // List lB = Arrays.asList(b);
- //
- // return lA.containsAll(lB);
- // }
-
- private int potionLevel(ItemStack stack)
- {
- String nbt = getTileData(stack).toString();
- int i = nbt.length() / 500;
-
- if (i > 4)
- i = 4;
-
- if (!Settings.heavyTiles.get())
- i = 1;
-
- return (int) (i * Settings.blockSlownessMultiplier.get());
- }
-}
diff --git a/old/src/main/java/tschipp/carryon/common/item/ItemCarryonEntity.java b/old/src/main/java/tschipp/carryon/common/item/ItemCarryonEntity.java
deleted file mode 100644
index 531d217..0000000
--- a/old/src/main/java/tschipp/carryon/common/item/ItemCarryonEntity.java
+++ /dev/null
@@ -1,280 +0,0 @@
-package tschipp.carryon.common.item;
-
-import java.lang.reflect.Method;
-import java.util.Optional;
-
-import javax.annotation.Nonnull;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.effect.MobEffects;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.item.context.UseOnContext;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
-import tschipp.carryon.client.keybinds.CarryOnKeybinds;
-import tschipp.carryon.common.config.Configs.Settings;
-import tschipp.carryon.common.event.ItemEvents;
-
-public class ItemCarryonEntity extends Item
-{
-
- private static final Method initGoals;
-
- static
- {
- initGoals = ObfuscationReflectionHelper.findMethod(Mob.class, "m_8099_");
- initGoals.setAccessible(true);
- }
-
- public static final String ENTITY_DATA_KEY = "entityData";
-
- public ItemCarryonEntity()
- {
- super(new Item.Properties().stacksTo(1));
- }
-
- @Override
- public Component getName(ItemStack stack)
- {
- if (hasEntityData(stack))
- {
-
- return Component.translatable(getEntityType(stack).getDescriptionId());
- }
-
- return Component.literal("");
- }
-
- public static boolean hasEntityData(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- return tag.contains(ENTITY_DATA_KEY) && tag.contains("entity");
- }
- return false;
- }
-
- public static boolean storeEntityData(@Nonnull Entity entity, Level level, ItemStack stack)
- {
- if (entity == null || stack.isEmpty())
- return false;
-
- CompoundTag entityData = new CompoundTag();
- entity.saveWithoutId(entityData);
-
- String name = EntityType.getKey(entity.getType()).toString();
-
- CompoundTag tag = stack.hasTag() ? stack.getTag() : new CompoundTag();
- if (tag.contains(ENTITY_DATA_KEY))
- return false;
-
- tag.put(ENTITY_DATA_KEY, entityData);
- tag.putString("entity", name);
- stack.setTag(tag);
- return true;
- }
-
- @Override
- public InteractionResult useOn(UseOnContext context)
- {
- Player player = context.getPlayer();
- Level level = context.getLevel();
- BlockPos pos = context.getClickedPos();
- Direction facing = context.getClickedFace();
-
- ItemStack stack = context.getItemInHand();
-
- BlockState state = level.getBlockState(pos);
-
- if (ModList.get().isLoaded("betterplacement") && CarryOnKeybinds.isKeyPressed(player))
- return InteractionResult.FAIL;
-
- if (hasEntityData(stack))
- {
- BlockPos finalPos = pos;
-
- if (!state.canBeReplaced(new BlockPlaceContext(context)))
- {
- finalPos = pos.relative(facing);
- }
-
- Entity entity = getEntity(stack, level);
- if (entity != null)
- {
- if (!level.isClientSide)
- {
- entity.absMoveTo(finalPos.getX() + 0.5, finalPos.getY(), finalPos.getZ() + 0.5, 180 + player.yHeadRot, 0.0f);
- level.addFreshEntity(entity);
- if (entity instanceof Mob)
- {
- ((Mob) entity).playAmbientSound();
- }
- clearEntityData(stack);
- player.setItemInHand(InteractionHand.MAIN_HAND, ItemStack.EMPTY);
- ItemEvents.sendPacket(player, 9, 0);
-
- }
- player.getPersistentData().remove("overrideKey");
- return InteractionResult.SUCCESS;
- }
- }
-
- return InteractionResult.FAIL;
- }
-
- @Override
- public void inventoryTick(ItemStack stack, Level level, Entity entity, int itemSlot, boolean isSelected)
- {
- if (hasEntityData(stack))
- {
- if (getEntity(stack, level) == null)
- stack = ItemStack.EMPTY;
-
- if (entity instanceof LivingEntity)
- {
- if (entity instanceof Player && Settings.slownessInCreative.get() ? false : ((Player) entity).isCreative())
- return;
-
- ((LivingEntity) entity).addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 1, this.potionLevel(stack, level), false, false));
- }
-
- }
- else
- {
- stack = ItemStack.EMPTY;
- }
- }
-
- public static void clearEntityData(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- tag.remove(ENTITY_DATA_KEY);
- tag.remove("entity");
- }
- }
-
- public static CompoundTag getPersistentData(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- return tag.getCompound(ENTITY_DATA_KEY);
- }
- return null;
- }
-
- public static Entity getEntity(ItemStack stack, Level level)
- {
- if (level == null)
- return null;
-
- String name = getEntityName(stack);
-
- CompoundTag e = getPersistentData(stack);
- Optional> type = EntityType.byString(name);
- Entity entity = null;
-
- if (type.isPresent())
- {
- entity = type.get().create(level);
- }
-
- if (entity != null)
- {
- try
- {
- if (entity instanceof Mob)
- initGoals.invoke(entity);
- entity.deserializeNBT(e);
- }
- catch (Exception e1)
- {
- try
- {
- entity.deserializeNBT(e);
- }
- catch (Exception e2)
- {
- }
- }
- }
-
- return entity;
- }
-
- public static String getEntityName(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- return tag.getString("entity");
- }
- return null;
- }
-
- public static String getCustomName(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- if (tag.contains("CustomName") && !tag.getString("CustomName").isEmpty())
- {
- return tag.toString();
- }
- else
- {
- return tag.toString();
- }
- }
- return null;
- }
-
- public static EntityType getEntityType(ItemStack stack)
- {
- if (stack.hasTag())
- {
- CompoundTag tag = stack.getTag();
- String name = tag.getString("entity");
- Optional> type = EntityType.byString(name);
- if (type.isPresent())
- return type.get();
- }
- return null;
- }
-
- private int potionLevel(ItemStack stack, Level level)
- {
- Entity e = getEntity(stack, level);
- if (e == null)
- return 1;
-
- int i = (int) (e.getBbHeight() * e.getBbWidth());
- if (i > 4)
- i = 4;
-
- if (!Settings.heavyEntities.get())
- i = 1;
-
- double multiplier = Settings.entitySlownessMultiplier.get();
-
- return (int) (multiplier * i);
- }
-}
diff --git a/old/src/main/java/tschipp/carryon/common/scripting/CarryOnOverride.java b/old/src/main/java/tschipp/carryon/common/scripting/CarryOnOverride.java
deleted file mode 100644
index 511119b..0000000
--- a/old/src/main/java/tschipp/carryon/common/scripting/CarryOnOverride.java
+++ /dev/null
@@ -1,767 +0,0 @@
-package tschipp.carryon.common.scripting;
-
-import java.util.Objects;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.TagParser;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
-import tschipp.carryon.common.helper.InvalidConfigException;
-
-public class CarryOnOverride
-{
- // BLOCKS
- private CompoundTag typeBlockTag = new CompoundTag();
- private String typeNameBlock = "";
- private String typeMaterial = "";
- private String typeHardness = "";
- private String typeResistance = "";
-
- // ENTITIES
- private CompoundTag typeEntityTag;
- private String typeNameEntity = "";
- private String typeHeight = "";
- private String typeWidth = "";
- private String typeHealth = "";
-
- // CONDITIONS
- private String conditionGamestage = "";
- private String conditionAchievement = "";
- private String conditionXp = "";
- private String conditionGamemode = "";
- private String conditionScoreboard = "";
- private String conditionPosition = "";
- private String conditionEffects = "";
-
- // RENDER
- private String renderNameBlock = "";
- private String renderNameEntity = "";
- private CompoundTag renderNBT = new CompoundTag();
- private String renderTranslation = "";
- private String renderRotation = "";
- private String renderscaled = "";
- private String renderRotationLeftArm = "";
- private String renderRotationRightArm = "";
- private boolean renderLeftArm = true;
- private boolean renderRightArm = true;
-
- // EFFECTS
- private String commandInit = "";
- private String commandLoop = "";
- private String commandPlace = "";
-
- private boolean isBlock;
- private boolean isEntity;
- private String resourceLocation = "";
- public boolean isInvalid = false;
-
- public CarryOnOverride(String path)
- {
- this.resourceLocation = path;
- }
-
- public CarryOnOverride(JsonElement jsonElem, ResourceLocation loc)
- {
- boolean errored = false;
- this.resourceLocation = loc.toString();
-
- if (jsonElem != null && jsonElem.isJsonObject())
- {
- try
- {
- JsonObject json = jsonElem.getAsJsonObject();
- JsonObject object = (JsonObject) json.get("object");
- JsonObject conditions = (JsonObject) json.get("conditions");
- JsonObject render = (JsonObject) json.get("render");
- JsonObject effects = (JsonObject) json.get("effects");
-
- if (object != null && (conditions != null || render != null || effects != null))
- {
- JsonObject block = (JsonObject) object.get("block");
- JsonObject entity = (JsonObject) object.get("entity");
-
- if (block == null && entity == null || block != null && entity != null)
- errored = true;
-
- if (!errored)
- {
- if (block != null)
- {
- this.setBlock(true);
- JsonElement name = block.get("name");
- JsonElement material = block.get("material");
- JsonElement hardness = block.get("hardness");
- JsonElement resistance = block.get("resistance");
- JsonObject nbt = (JsonObject) block.get("nbt");
-
- if (name != null)
- this.setTypeNameBlock(name.getAsString());
- if (material != null)
- this.setTypeMaterial(material.getAsString());
- if (hardness != null)
- this.setTypeHardness(hardness.getAsString());
- if (resistance != null)
- this.setTypeResistance(resistance.getAsString());
- if (nbt != null)
- this.setTypeBlockTag(TagParser.parseTag(nbt.toString()));
- }
- else
- {
- this.setEntity(true);
- JsonElement name = entity.get("name");
- JsonElement health = entity.get("health");
- JsonElement height = entity.get("height");
- JsonElement width = entity.get("width");
- JsonObject nbt = (JsonObject) entity.get("nbt");
-
- if (name != null)
- this.setTypeNameEntity(name.getAsString());
- if (health != null)
- this.setTypeHealth(health.getAsString());
- if (height != null)
- this.setTypeHeight(height.getAsString());
- if (width != null)
- this.setTypeWidth(width.getAsString());
- if (nbt != null)
- this.setTypeEntityTag(TagParser.parseTag(nbt.toString()));
- }
-
- if (conditions != null)
- {
- JsonElement gamestage = conditions.get("gamestage");
- JsonElement achievement = conditions.get("advancement");
- JsonElement xp = conditions.get("xp");
- JsonElement gamemode = conditions.get("gamemode");
- JsonElement scoreboard = conditions.get("scoreboard");
- JsonElement position = conditions.get("position");
- JsonElement potionEffects = conditions.get("effects");
-
- if (gamestage != null)
- this.setConditionGamestage(gamestage.getAsString());
- if (achievement != null)
- this.setConditionAchievement(achievement.getAsString());
- if (xp != null)
- this.setConditionXp(xp.getAsString());
- if (gamemode != null)
- this.setConditionGamemode(gamemode.getAsString());
- if (scoreboard != null)
- this.setConditionScoreboard(scoreboard.getAsString());
- if (position != null)
- this.setConditionPosition(position.getAsString());
- if (potionEffects != null)
- this.setConditionEffects(potionEffects.getAsString());
- }
-
- if (render != null)
- {
- JsonElement name_block = render.get("name_block");
- JsonElement name_entity = render.get("name_entity");
- JsonObject nbt = (JsonObject) render.get("nbt");
- JsonElement translation = render.get("translation");
- JsonElement rotation = render.get("rotation");
- JsonElement scaled = render.get("scale");
- JsonElement rotationLeftArm = render.get("rotation_left_arm");
- JsonElement rotationRightArm = render.get("rotation_right_arm");
- JsonElement renderLeftArm = render.get("render_left_arm");
- JsonElement renderRightArm = render.get("render_right_arm");
-
- if (name_block != null)
- this.setRenderNameBlock(name_block.getAsString());
- if (name_entity != null)
- this.setRenderNameEntity(name_entity.getAsString());
- if (translation != null)
- this.setRenderTranslation(translation.getAsString());
- if (rotation != null)
- this.setRenderRotation(rotation.getAsString());
- if (scaled != null)
- this.setRenderscaled(scaled.getAsString());
- if (nbt != null)
- this.setRenderNBT(TagParser.parseTag(nbt.toString()));
- if (rotationLeftArm != null)
- this.setRenderRotationLeftArm(rotationLeftArm.getAsString());
- if (rotationRightArm != null)
- this.setRenderRotationRightArm(rotationRightArm.getAsString());
- if (renderLeftArm != null)
- this.setRenderLeftArm(renderLeftArm.getAsBoolean());
- if (renderRightArm != null)
- this.setRenderRightArm(renderRightArm.getAsBoolean());
- }
-
- if (effects != null)
- {
- JsonElement commandInit = effects.get("commandPickup");
- JsonElement commandLoop = effects.get("commandLoop");
- JsonElement commandPlace = effects.get("commandPlace");
-
- if (commandInit != null)
- this.setCommandInit(commandInit.getAsString());
- if (commandLoop != null)
- this.setCommandLoop(commandLoop.getAsString());
- if (commandPlace != null)
- this.setCommandPlace(commandPlace.getAsString());
- }
- }
- else
- this.isInvalid = true;
- }
- }
- catch (Exception e)
- {
- this.isInvalid = true;
- }
- }
- else
- this.isInvalid = true;
-
- if (!this.isBlock && !this.isEntity)
- this.isInvalid = true;
-
- if (this.isInvalid)
- new InvalidConfigException("The script parsing for " + this.resourceLocation + " has failed! Please double check!").printException();
- }
-
- public String getCommandInit()
- {
- return this.commandInit;
- }
-
- public void setCommandInit(String commandInit)
- {
- this.commandInit = commandInit;
- }
-
- public String getCommandLoop()
- {
- return this.commandLoop;
- }
-
- public void setCommandLoop(String commandLoop)
- {
- this.commandLoop = commandLoop;
- }
-
- public String getConditionEffects()
- {
- return this.conditionEffects;
- }
-
- public void setConditionEffects(String conditionEffects)
- {
- this.conditionEffects = conditionEffects;
- }
-
- public String getRenderRotationLeftArm()
- {
- return this.renderRotationLeftArm;
- }
-
- public void setRenderRotationLeftArm(String renderRotationLeftArm)
- {
- this.renderRotationLeftArm = renderRotationLeftArm;
- }
-
- public String getRenderRotationRightArm()
- {
- return this.renderRotationRightArm;
- }
-
- public void setRenderRotationRightArm(String renderRotationRightArm)
- {
- this.renderRotationRightArm = renderRotationRightArm;
- }
-
- public boolean isRenderLeftArm()
- {
- return this.renderLeftArm;
- }
-
- public void setRenderLeftArm(boolean renderLeftArm)
- {
- this.renderLeftArm = renderLeftArm;
- }
-
- public boolean isRenderRightArm()
- {
- return this.renderRightArm;
- }
-
- public void setRenderRightArm(boolean renderRightArm)
- {
- this.renderRightArm = renderRightArm;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- return prime * result + (this.resourceLocation == null ? 0 : this.resourceLocation.hashCode());
- }
-
- @Override
- public String toString()
- {
- return "Code: " + this.hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null || this.getClass() != obj.getClass())
- return false;
- CarryOnOverride other = (CarryOnOverride) obj;
- if (!Objects.equals(this.commandInit, other.commandInit) || !Objects.equals(this.commandLoop, other.commandLoop) || !Objects.equals(this.commandPlace, other.commandPlace) || !Objects.equals(this.conditionAchievement, other.conditionAchievement))
- {
- return false;
- }
- if (!Objects.equals(this.conditionEffects, other.conditionEffects) || !Objects.equals(this.conditionGamemode, other.conditionGamemode) || !Objects.equals(this.conditionGamestage, other.conditionGamestage) || !Objects.equals(this.conditionPosition, other.conditionPosition))
- {
- return false;
- }
- if (!Objects.equals(this.conditionScoreboard, other.conditionScoreboard))
- {
- return false;
- }
- if (!Objects.equals(this.conditionXp, other.conditionXp))
- {
- return false;
- }
- if (this.isBlock != other.isBlock)
- return false;
- if (this.isEntity != other.isEntity)
- return false;
- if (!Objects.equals(this.resourceLocation, other.resourceLocation))
- {
- return false;
- }
- if (this.renderLeftArm != other.renderLeftArm)
- return false;
- if (!Objects.equals(this.renderNBT, other.renderNBT))
- {
- return false;
- }
- if (!Objects.equals(this.renderNameBlock, other.renderNameBlock))
- {
- return false;
- }
- if (!Objects.equals(this.renderNameEntity, other.renderNameEntity))
- {
- return false;
- }
- if (this.renderRightArm != other.renderRightArm)
- return false;
- if (!Objects.equals(this.renderRotation, other.renderRotation))
- {
- return false;
- }
- if (!Objects.equals(this.renderRotationLeftArm, other.renderRotationLeftArm))
- {
- return false;
- }
- if (!Objects.equals(this.renderRotationRightArm, other.renderRotationRightArm))
- {
- return false;
- }
- if (!Objects.equals(this.renderscaled, other.renderscaled))
- {
- return false;
- }
- if (!Objects.equals(this.renderTranslation, other.renderTranslation))
- {
- return false;
- }
- if (!Objects.equals(this.typeBlockTag, other.typeBlockTag))
- {
- return false;
- }
- if (!Objects.equals(this.typeEntityTag, other.typeEntityTag))
- {
- return false;
- }
- if (!Objects.equals(this.typeHardness, other.typeHardness))
- {
- return false;
- }
- if (!Objects.equals(this.typeHealth, other.typeHealth))
- {
- return false;
- }
- if (!Objects.equals(this.typeHeight, other.typeHeight))
- {
- return false;
- }
- if (!Objects.equals(this.typeMaterial, other.typeMaterial))
- {
- return false;
- }
- if (!Objects.equals(this.typeNameBlock, other.typeNameBlock))
- {
- return false;
- }
- if (!Objects.equals(this.typeNameEntity, other.typeNameEntity))
- {
- return false;
- }
- if (!Objects.equals(this.typeResistance, other.typeResistance))
- {
- return false;
- }
- if (!Objects.equals(this.typeWidth, other.typeWidth))
- {
- return false;
- }
- return true;
- }
-
- public boolean isBlock()
- {
- return this.isBlock;
- }
-
- public void setBlock(boolean isBlock)
- {
- this.isBlock = isBlock;
- }
-
- public boolean isEntity()
- {
- return this.isEntity;
- }
-
- public void setEntity(boolean isEntity)
- {
- this.isEntity = isEntity;
- }
-
- public CompoundTag getTypeBlockTag()
- {
- return this.typeBlockTag;
- }
-
- public String getTypeNameBlock()
- {
- return this.typeNameBlock;
- }
-
- public String getTypeMaterial()
- {
- return this.typeMaterial;
- }
-
- public String getTypeHardness()
- {
- return this.typeHardness;
- }
-
- public String getTypeResistance()
- {
- return this.typeResistance;
- }
-
- public CompoundTag getTypeEntityTag()
- {
- return this.typeEntityTag;
- }
-
- public String getTypeNameEntity()
- {
- return this.typeNameEntity;
- }
-
- public String getTypeHeight()
- {
- return this.typeHeight;
- }
-
- public String getTypeWidth()
- {
- return this.typeWidth;
- }
-
- public String getTypeHealth()
- {
- return this.typeHealth;
- }
-
- public String getConditionGamestage()
- {
- return this.conditionGamestage;
- }
-
- public String getConditionAchievement()
- {
- return this.conditionAchievement;
- }
-
- public String getConditionXp()
- {
- return this.conditionXp;
- }
-
- public String getConditionGamemode()
- {
- return this.conditionGamemode;
- }
-
- public String getConditionScoreboard()
- {
- return this.conditionScoreboard;
- }
-
- public String getConditionPosition()
- {
- return this.conditionPosition;
- }
-
- public String getRenderNameBlock()
- {
- return this.renderNameBlock;
- }
-
- public String getRenderNameEntity()
- {
- return this.renderNameEntity;
- }
-
- public CompoundTag getRenderNBT()
- {
- return this.renderNBT;
- }
-
- public String getRenderTranslation()
- {
- return this.renderTranslation;
- }
-
- public String getRenderRotation()
- {
- return this.renderRotation;
- }
-
- public String getRenderScaled()
- {
- return this.renderscaled;
- }
-
- public void setTypeBlockTag(CompoundTag typeBlockTag)
- {
- this.typeBlockTag = typeBlockTag;
- }
-
- public void setTypeNameBlock(String typeNameBlock)
- {
- this.typeNameBlock = typeNameBlock;
- }
-
- public void setTypeMaterial(String typeMaterial)
- {
- this.typeMaterial = typeMaterial;
- }
-
- public void setTypeHardness(String typeHardness)
- {
- this.typeHardness = typeHardness;
- }
-
- public void setTypeResistance(String typeResistance)
- {
- this.typeResistance = typeResistance;
- }
-
- public void setTypeEntityTag(CompoundTag typeEntityTag)
- {
- this.typeEntityTag = typeEntityTag;
- }
-
- public void setTypeNameEntity(String typeNameEntity)
- {
- this.typeNameEntity = typeNameEntity;
- }
-
- public void setTypeHeight(String typeHeight)
- {
- this.typeHeight = typeHeight;
- }
-
- public void setTypeWidth(String typeWidth)
- {
- this.typeWidth = typeWidth;
- }
-
- public void setTypeHealth(String typeHealth)
- {
- this.typeHealth = typeHealth;
- }
-
- public void setConditionGamestage(String conditionGamestage)
- {
- this.conditionGamestage = conditionGamestage;
- }
-
- public void setConditionAchievement(String conditionAchievement)
- {
- this.conditionAchievement = conditionAchievement;
- }
-
- public void setConditionXp(String conditionXp)
- {
- this.conditionXp = conditionXp;
- }
-
- public void setConditionGamemode(String conditionGamemode)
- {
- this.conditionGamemode = conditionGamemode;
- }
-
- public void setConditionScoreboard(String conditionScoreboard)
- {
- this.conditionScoreboard = conditionScoreboard;
- }
-
- public void setConditionPosition(String conditionPosition)
- {
- this.conditionPosition = conditionPosition;
- }
-
- public void setRenderNameBlock(String renderNameBlock)
- {
- this.renderNameBlock = renderNameBlock;
- }
-
- public void setRenderNameEntity(String renderNameEntity)
- {
- this.renderNameEntity = renderNameEntity;
- }
-
- public void setRenderNBT(CompoundTag renderNBT)
- {
- this.renderNBT = renderNBT;
- }
-
- public void setRenderTranslation(String renderTranslation)
- {
- this.renderTranslation = renderTranslation;
- }
-
- public void setRenderRotation(String renderRotation)
- {
- this.renderRotation = renderRotation;
- }
-
- public void setRenderscaled(String renderscaled)
- {
- this.renderscaled = renderscaled;
- }
-
- public String getCommandPlace()
- {
- return this.commandPlace;
- }
-
- public void setCommandPlace(String commandPlace)
- {
- this.commandPlace = commandPlace;
- }
-
- public void serialize(FriendlyByteBuf buf)
- {
- // BLOCKS
- buf.writeNbt(this.typeBlockTag);
- buf.writeUtf(this.typeNameBlock);
- buf.writeUtf(this.typeMaterial);
- buf.writeUtf(this.typeHardness);
- buf.writeUtf(this.typeResistance);
-
- // ENTITIES
- buf.writeNbt(this.typeEntityTag);
- buf.writeUtf(this.typeNameEntity);
- buf.writeUtf(this.typeHeight);
- buf.writeUtf(this.typeWidth);
- buf.writeUtf(this.typeHealth);
-
- // CONDITIONS
- buf.writeUtf(this.conditionGamestage);
- buf.writeUtf(this.conditionAchievement);
- buf.writeUtf(this.conditionXp);
- buf.writeUtf(this.conditionGamemode);
- buf.writeUtf(this.conditionScoreboard);
- buf.writeUtf(this.conditionPosition);
- buf.writeUtf(this.conditionEffects);
-
- // RENDER
- buf.writeUtf(this.renderNameBlock);
- buf.writeUtf(this.renderNameEntity);
- buf.writeNbt(this.renderNBT);
- buf.writeUtf(this.renderTranslation);
- buf.writeUtf(this.renderRotation);
- buf.writeUtf(this.renderscaled);
- buf.writeUtf(this.renderRotationLeftArm);
- buf.writeUtf(this.renderRotationRightArm);
- buf.writeBoolean(this.renderLeftArm);
- buf.writeBoolean(this.renderRightArm);
-
- // EFFECTS
- buf.writeUtf(this.commandInit);
- buf.writeUtf(this.commandLoop);
- buf.writeUtf(this.commandPlace);
-
- buf.writeBoolean(this.isBlock);
- buf.writeBoolean(this.isEntity);
- buf.writeUtf(this.resourceLocation);
- }
-
- public static CarryOnOverride deserialize(FriendlyByteBuf buf)
- {
- CarryOnOverride override = new CarryOnOverride("");
- override.typeBlockTag = buf.readNbt();
- override.typeNameBlock = buf.readUtf();
- override.typeMaterial = buf.readUtf();
- override.typeHardness = buf.readUtf();
- override.typeResistance = buf.readUtf();
-
- // ENTITIES
- override.typeEntityTag = buf.readNbt();
- override.typeNameEntity = buf.readUtf();
- override.typeHeight = buf.readUtf();
- override.typeWidth = buf.readUtf();
- override.typeHealth = buf.readUtf();
-
- // CONDITIONS
- override.conditionGamestage = buf.readUtf();
- override.conditionAchievement = buf.readUtf();
- override.conditionXp = buf.readUtf();
- override.conditionGamemode = buf.readUtf();
- override.conditionScoreboard = buf.readUtf();
- override.conditionPosition = buf.readUtf();
- override.conditionEffects = buf.readUtf();
-
- // RENDER
- override.renderNameBlock = buf.readUtf();
- override.renderNameEntity = buf.readUtf();
- override.renderNBT = buf.readNbt();
- override.renderTranslation = buf.readUtf();
- override.renderRotation = buf.readUtf();
- override.renderscaled = buf.readUtf();
- override.renderRotationLeftArm = buf.readUtf();
- override.renderRotationRightArm = buf.readUtf();
- override.renderLeftArm = buf.readBoolean();
- override.renderRightArm = buf.readBoolean();
-
- // EFFECTS
- override.commandInit = buf.readUtf();
- override.commandLoop = buf.readUtf();
- override.commandPlace = buf.readUtf();
-
- override.isBlock = buf.readBoolean();
- override.isEntity = buf.readBoolean();
- override.resourceLocation = buf.readUtf();
-
- return override;
- }
-
-}
diff --git a/old/src/main/java/tschipp/carryon/common/scripting/ScriptChecker.java b/old/src/main/java/tschipp/carryon/common/scripting/ScriptChecker.java
deleted file mode 100644
index 9095910..0000000
--- a/old/src/main/java/tschipp/carryon/common/scripting/ScriptChecker.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package tschipp.carryon.common.scripting;
-
-import java.lang.reflect.Method;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.advancements.Advancement;
-import net.minecraft.core.BlockPos;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.ServerAdvancementManager;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.Material;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
-import net.minecraftforge.registries.ForgeRegistries;
-import tschipp.carryon.common.config.Configs.Settings;
-import tschipp.carryon.common.handler.ListHandler;
-import tschipp.carryon.common.helper.ScriptParseHelper;
-
-public class ScriptChecker
-{
- @Nullable
- public static CarryOnOverride inspectBlock(BlockState state, Level level, BlockPos pos, @Nullable CompoundTag tag)
- {
- if (!Settings.useScripts.get())
- return null;
-
- Block block = state.getBlock();
- Material material = state.getMaterial();
- float hardness = state.getDestroySpeed(level, pos);
- @SuppressWarnings("deprecation")
- float resistance = block.getExplosionResistance();
- CompoundTag nbt = tag;
-
- boolean isAllowed = Settings.useWhitelistBlocks.get() ? ListHandler.isAllowed(block) : !ListHandler.isForbidden(block);
-
- if (isAllowed)
- {
- for (CarryOnOverride override : ScriptReader.OVERRIDES.values())
- {
- if (override.isBlock() && matchesAll(override, block, material, hardness, resistance, nbt))
- return override;
- }
- }
-
- return null;
- }
-
- @Nullable
- public static CarryOnOverride inspectEntity(Entity entity)
- {
- if (!Settings.useScripts.get())
- return null;
-
- String name = ForgeRegistries.ENTITY_TYPES.getKey(entity.getType()).toString();
- float height = entity.getBbHeight();
- float width = entity.getBbWidth();
- float health = entity instanceof LivingEntity ? ((LivingEntity) entity).getHealth() : 0.0f;
- CompoundTag tag = entity.serializeNBT();
-
- boolean isAllowed = Settings.useWhitelistEntities.get() ? ListHandler.isAllowed(entity) : !ListHandler.isForbidden(entity);
-
- if (isAllowed)
- {
- for (CarryOnOverride override : ScriptReader.OVERRIDES.values())
- {
- if (override.isEntity() && matchesAll(override, name, height, width, health, tag))
- return override;
- }
- }
-
- return null;
- }
-
- public static boolean matchesAll(CarryOnOverride override, String name, float height, float width, float health, CompoundTag tag)
- {
- boolean matchname = override.getTypeNameEntity().isEmpty() ? true : name.equals(override.getTypeNameEntity());
- boolean matchheight = ScriptParseHelper.matches(height, override.getTypeHeight());
- boolean matchwidth = ScriptParseHelper.matches(width, override.getTypeWidth());
- boolean matchhealth = ScriptParseHelper.matches(health, override.getTypeHealth());
- boolean matchnbt = ScriptParseHelper.matches(tag, override.getTypeEntityTag());
-
- return matchname && matchheight && matchwidth && matchhealth && matchnbt;
- }
-
- public static boolean matchesAll(CarryOnOverride override, Block block, Material material, float hardness, float resistance, CompoundTag nbt)
- {
- boolean matchnbt = ScriptParseHelper.matches(nbt, override.getTypeBlockTag());
- boolean matchblock = ScriptParseHelper.matches(block, override.getTypeNameBlock());
- boolean matchmaterial = ScriptParseHelper.matches(material, override.getTypeMaterial());
- boolean matchhardness = ScriptParseHelper.matches(hardness, override.getTypeHardness());
- boolean matchresistance = ScriptParseHelper.matches(resistance, override.getTypeResistance());
-
- return matchnbt && matchblock && matchmaterial && matchhardness && matchresistance;
- }
-
- public static boolean fulfillsConditions(CarryOnOverride override, Player player)
- {
- ServerAdvancementManager manager = ((ServerPlayer) player).server.getAdvancements();
- Advancement adv = manager.getAdvancement(new ResourceLocation(override.getConditionAchievement().isEmpty() ? "" : override.getConditionAchievement()));
-
- boolean achievement = adv == null ? true : ((ServerPlayer) player).getAdvancements().getOrStartProgress(adv).isDone();
- boolean gamemode = ScriptParseHelper.matches(((ServerPlayer) player).gameMode.getGameModeForPlayer().getId(), override.getConditionGamemode());
- boolean gamestage = true;
- if (ModList.get().isLoaded("gamestages") && !override.getConditionGamestage().isEmpty())
- {
- try
- {
- Class gameStageHelper = Class.forName("net.darkhax.gamestages.GameStageHelper");
- Class iStageData = Class.forName("net.darkhax.gamestages.data.IStageData");
-
- Method getPlayerData = ObfuscationReflectionHelper.findMethod(gameStageHelper, "getPlayerData", Player.class);
- Method hasStage = ObfuscationReflectionHelper.findMethod(iStageData, "hasStage", String.class);
-
- Object stageData = getPlayerData.invoke(null, player);
- String condition = override.getConditionGamestage();
- gamestage = (boolean) hasStage.invoke(stageData, condition);
- }
- catch (Exception e)
- {
- try
- {
- Class playerDataHandler = Class.forName("net.darkhax.gamestages.capabilities.PlayerDataHandler");
- Class iStageData = Class.forName("net.darkhax.gamestages.capabilities.PlayerDataHandler$IStageData");
-
- Method getStageData = ObfuscationReflectionHelper.findMethod(playerDataHandler, "getStageData", Player.class);
- Method hasUnlockedStage = ObfuscationReflectionHelper.findMethod(iStageData, "hasUnlockedStage", String.class);
-
- Object stageData = getStageData.invoke(null, player);
- String condition = override.getConditionGamestage();
- gamestage = (boolean) hasUnlockedStage.invoke(stageData, condition);
-
- }
- catch (Exception ex)
- {
- }
- }
-
- }
-
- boolean position = ScriptParseHelper.matches(player.blockPosition(), override.getConditionPosition());
- boolean xp = ScriptParseHelper.matches(player.experienceLevel, override.getConditionXp());
- boolean scoreboard = ScriptParseHelper.matchesScore(player, override.getConditionScoreboard());
- boolean effects = ScriptParseHelper.hasEffects(player, override.getConditionEffects());
-
- return achievement && gamemode && gamestage && position && xp && scoreboard && effects;
- }
-
- @Nullable
- public static CarryOnOverride getOverride(Player player)
- {
- CompoundTag tag = player.getPersistentData();
-
- if (tag != null && tag.contains("overrideKey"))
- {
- int key = tag.getInt("overrideKey");
-
- return ScriptReader.OVERRIDES.get(key);
- }
-
- return null;
- }
-
- public static void setCarryOnOverride(Player player, int i)
- {
- CompoundTag tag = player.getPersistentData();
-
- if (tag != null)
- tag.putInt("overrideKey", i);
- }
-
-}
diff --git a/old/src/main/java/tschipp/carryon/common/scripting/ScriptReader.java b/old/src/main/java/tschipp/carryon/common/scripting/ScriptReader.java
deleted file mode 100644
index 9d68dbd..0000000
--- a/old/src/main/java/tschipp/carryon/common/scripting/ScriptReader.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package tschipp.carryon.common.scripting;
-
-import java.util.HashMap;
-
-public class ScriptReader
-{
- public static HashMap OVERRIDES = new HashMap<>();
-
- // public static HashSet OVERRIDES = new
- // HashSet();
-
- // public static void preInit()
- // {
- // scripts.clear();
- //
- // CarryOn.CONFIGURATION_FILE = new
- // File(FMLPaths.CONFIGDIR.get().toString(), "/carryon-scripts/");
- //
- // if (!CarryOn.CONFIGURATION_FILE.exists())
- // CarryOn.CONFIGURATION_FILE.mkdir();
- //
- // for (File file : CarryOn.CONFIGURATION_FILE.listFiles())
- // {
- // if (file.getName().endsWith(".json"))
- // scripts.add(file);
- // }
- //
- // }
-
- // public static void parseScripts()
- // {
- // OVERRIDES.clear();
- //
- // try
- // {
- // if (!Settings.useScripts.get())
- // return;
- //
- // for (File file : scripts)
- // {
- // boolean errored = false;
- // JsonParser parser = new JsonParser();
- // JsonObject json = (JsonObject) parser.parse(new
- // FileReader(file.getAbsolutePath()));
- //
- // JsonObject object = (JsonObject) json.get("object");
- // JsonObject conditions = (JsonObject) json.get("conditions");
- // JsonObject render = (JsonObject) json.get("render");
- // JsonObject effects = (JsonObject) json.get("effects");
- //
- // if ((object != null && conditions != null) || (object != null && render
- // != null) || (object != null && effects != null))
- // {
- // JsonObject block = (JsonObject) object.get("block");
- // JsonObject entity = (JsonObject) object.get("entity");
- //
- // if ((block == null && entity == null) || (block != null && entity !=
- // null))
- // errored = true;
- //
- // if (!errored)
- // {
- // CarryOnOverride override = new CarryOnOverride(file.getAbsolutePath());
- //
- // if (block != null)
- // {
- // override.setBlock(true);
- // JsonElement name = block.get("name");
- // JsonElement material = block.get("material");
- // JsonElement hardness = block.get("hardness");
- // JsonElement resistance = block.get("resistance");
- // JsonObject nbt = (JsonObject) block.get("nbt");
- //
- // if (name != null)
- // override.setTypeNameBlock(name.getAsString());
- // if (material != null)
- // override.setTypeMaterial(material.getAsString());
- // if (hardness != null)
- // override.setTypeHardness(hardness.getAsString());
- // if (resistance != null)
- // override.setTypeResistance(resistance.getAsString());
- // if (nbt != null)
- // override.setTypeBlockTag(JsonToNBT.getTagFromJson(nbt.toString()));
- // } else
- // {
- // override.setEntity(true);
- // JsonElement name = entity.get("name");
- // JsonElement health = entity.get("health");
- // JsonElement height = entity.get("height");
- // JsonElement width = entity.get("width");
- // JsonObject nbt = (JsonObject) entity.get("nbt");
- //
- // if (name != null)
- // override.setTypeNameEntity(name.getAsString());
- // if (health != null)
- // override.setTypeHealth(health.getAsString());
- // if (height != null)
- // override.setTypeHeight(height.getAsString());
- // if (width != null)
- // override.setTypeWidth(width.getAsString());
- // if (nbt != null)
- // override.setTypeEntityTag(JsonToNBT.getTagFromJson(nbt.toString()));
- // }
- //
- // if (conditions != null)
- // {
- // JsonElement gamestage = conditions.get("gamestage");
- // JsonElement achievement = conditions.get("advancement");
- // JsonElement xp = conditions.get("xp");
- // JsonElement gamemode = conditions.get("gamemode");
- // JsonElement scoreboard = conditions.get("scoreboard");
- // JsonElement position = conditions.get("position");
- // JsonElement potionEffects = conditions.get("effects");
- //
- // if (gamestage != null)
- // override.setConditionGamestage(gamestage.getAsString());
- // if (achievement != null)
- // override.setConditionAchievement(achievement.getAsString());
- // if (xp != null)
- // override.setConditionXp(xp.getAsString());
- // if (gamemode != null)
- // override.setConditionGamemode(gamemode.getAsString());
- // if (scoreboard != null)
- // override.setConditionScoreboard(scoreboard.getAsString());
- // if (position != null)
- // override.setConditionPosition(position.getAsString());
- // if (potionEffects != null)
- // override.setConditionEffects(potionEffects.getAsString());
- // }
- //
- // if (render != null)
- // {
- // JsonElement name_block = render.get("name_block");
- // JsonElement name_entity = render.get("name_entity");
- // JsonObject nbt = (JsonObject) render.get("nbt");
- // JsonElement translation = render.get("translation");
- // JsonElement rotation = render.get("rotation");
- // JsonElement scaled = render.get("scale");
- // JsonElement rotationLeftArm = render.get("rotation_left_arm");
- // JsonElement rotationRightArm = render.get("rotation_right_arm");
- // JsonElement renderLeftArm = render.get("render_left_arm");
- // JsonElement renderRightArm = render.get("render_right_arm");
- //
- // if (name_block != null)
- // override.setRenderNameBlock(name_block.getAsString());
- // if (name_entity != null)
- // override.setRenderNameEntity(name_entity.getAsString());
- // if (translation != null)
- // override.setRenderTranslation(translation.getAsString());
- // if (rotation != null)
- // override.setRenderRotation(rotation.getAsString());
- // if (scaled != null)
- // override.setRenderscaled(scaled.getAsString());
- // if (nbt != null)
- // override.setRenderNBT(JsonToNBT.getTagFromJson(nbt.toString()));
- // if (rotationLeftArm != null)
- // override.setRenderRotationLeftArm(rotationLeftArm.getAsString());
- // if (rotationRightArm != null)
- // override.setRenderRotationRightArm(rotationRightArm.getAsString());
- // if (renderLeftArm != null)
- // override.setRenderLeftArm(renderLeftArm.getAsBoolean());
- // if (renderRightArm != null)
- // override.setRenderRightArm(renderRightArm.getAsBoolean());
- // }
- //
- // if (effects != null)
- // {
- // JsonElement commandInit = effects.get("commandPickup");
- // JsonElement commandLoop = effects.get("commandLoop");
- // JsonElement commandPlace = effects.get("commandPlace");
- //
- // if (commandInit != null)
- // override.setCommandInit(commandInit.getAsString());
- // if (commandLoop != null)
- // override.setCommandLoop(commandLoop.getAsString());
- // if (commandPlace != null)
- // override.setCommandPlace(commandPlace.getAsString());
- // }
- //
- // OVERRIDES.put(override.hashCode(), override);
- // }
- // }
- // }
- //
- // System.out.println("Successfully parsed scripts!");
- // } catch (Exception e)
- // {
- // CarryOn.LOGGER.error(e);
- // }
- // }
-}
diff --git a/old/src/main/java/tschipp/carryon/common/scripting/ScriptReloadListener.java b/old/src/main/java/tschipp/carryon/common/scripting/ScriptReloadListener.java
deleted file mode 100644
index 3a16dbf..0000000
--- a/old/src/main/java/tschipp/carryon/common/scripting/ScriptReloadListener.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package tschipp.carryon.common.scripting;
-
-import java.util.Map;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener;
-import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraftforge.event.AddReloadListenerEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
-import net.minecraftforge.fml.util.thread.EffectiveSide;
-import net.minecraftforge.network.PacketDistributor;
-import net.minecraftforge.server.ServerLifecycleHooks;
-import tschipp.carryon.CarryOn;
-import tschipp.carryon.network.client.ScriptReloadPacket;
-
-@EventBusSubscriber(modid = CarryOn.MODID, bus = Bus.FORGE)
-public class ScriptReloadListener extends SimpleJsonResourceReloadListener
-{
- private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
-
- public ScriptReloadListener()
- {
- super(GSON, "carryon/scripts");
- }
-
- @Override
- protected void apply(Map objects, ResourceManager manager, ProfilerFiller profiler)
- {
- ScriptReader.OVERRIDES.clear();
-
- objects.forEach((path, jsonElem) -> {
- CarryOnOverride override = new CarryOnOverride(jsonElem, path);
- if (!override.isInvalid)
- ScriptReader.OVERRIDES.put(override.hashCode(), override);
- });
-
- if (EffectiveSide.get().isServer() && ServerLifecycleHooks.getCurrentServer() != null)
- {
- CarryOn.network.send(PacketDistributor.ALL.noArg(), new ScriptReloadPacket(ScriptReader.OVERRIDES.values()));
- }
- }
-
- @SubscribeEvent
- public static void onDatapackRegister(AddReloadListenerEvent event)
- {
- event.addListener(new ScriptReloadListener());
- }
-}
diff --git a/old/src/main/java/tschipp/carryon/compat/obfuscate/ObfuscateEvents.java b/old/src/main/java/tschipp/carryon/compat/obfuscate/ObfuscateEvents.java
deleted file mode 100644
index 0974ac7..0000000
--- a/old/src/main/java/tschipp/carryon/compat/obfuscate/ObfuscateEvents.java
+++ /dev/null
@@ -1,125 +0,0 @@
-// package tschipp.carryon.compat.obfuscate;
-//
-// import com.mrcrayfish.obfuscate.client.event.PlayerModelEvent;
-//
-// import net.minecraft.client.model.PlayerModel;
-// import net.minecraft.client.renderer.model.ModelRenderer;
-// import net.minecraft.entity.player.PlayerEntity;
-// import net.minecraft.world.item.ItemStack;
-// import net.minecraftforge.api.distmarker.Dist;
-// import net.minecraftforge.api.distmarker.OnlyIn;
-// import net.minecraftforge.eventbus.api.SubscribeEvent;
-// import tschipp.carryon.common.config.Configs.Settings;
-// import tschipp.carryon.common.handler.RegistrationHandler;
-// import tschipp.carryon.common.helper.ScriptParseHelper;
-// import tschipp.carryon.common.item.ItemCarryonBlock;
-// import tschipp.carryon.common.item.ItemCarryonEntity;
-// import tschipp.carryon.common.scripting.CarryOnOverride;
-// import tschipp.carryon.common.scripting.ScriptChecker;
-//
-// public class ObfuscateEvents
-// {
-//
-// @SubscribeEvent
-// public void preModelPlayerEvent(PlayerModelEvent.SetupAngles.Post event)
-// {
-// if(!Settings.renderArms.get())
-// return;
-//
-// PlayerEntity player = event.getPlayer();
-//
-// Pose pose = player.getPose();
-// if (pose == Pose.SWIMMING || pose == Pose.FALL_FLYING)
-// return;
-//
-// PlayerModel model = event.getModelPlayer();
-// ItemStack stack = player.getMainHandItem();
-// if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile.get() &&
-// ItemCarryonBlock.hasTileData(stack) || stack.getItem() ==
-// RegistrationHandler.itemEntity.get() && ItemCarryonEntity.hasEntityData(stack))
-// {
-//
-// float rotation = 0;
-//
-// CarryOnOverride overrider = ScriptChecker.getOverride(player);
-// if (overrider != null)
-// {
-// float[] rotLeft = null;
-// float[] rotRight = null;
-// if (overrider.getRenderRotationLeftArm() != null)
-// rotLeft =
-// ScriptParseHelper.getXYZArray(overrider.getRenderRotationLeftArm());
-// if (overrider.getRenderRotationRightArm() != null)
-// rotRight =
-// ScriptParseHelper.getXYZArray(overrider.getRenderRotationRightArm());
-//
-// boolean renderRight = overrider.isRenderRightArm();
-// boolean renderLeft = overrider.isRenderLeftArm();
-//
-// if (renderLeft && rotLeft != null)
-// {
-// renderArmPre(model.leftArm, (float) rotLeft[0], (float) rotLeft[2],
-// rotation);
-// renderArmPre(model.leftSleeve, (float) rotLeft[0], (float) rotLeft[2],
-// rotation);
-// }
-// else if (renderLeft)
-// {
-// renderArmPre(model.leftArm, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) -
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0),
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0), rotation);
-// renderArmPre(model.leftSleeve, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) -
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0),
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0), rotation);
-// }
-//
-// if (renderRight && rotRight != null)
-// {
-// renderArmPre(model.rightArm, (float) rotRight[0], (float) rotRight[2],
-// rotation);
-// renderArmPre(model.rightSleeve, (float) rotRight[0], (float) rotRight[2],
-// rotation);
-// }
-// else if (renderRight)
-// {
-// renderArmPre(model.rightArm, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) -
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0),
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0), rotation);
-// renderArmPre(model.rightSleeve, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f)
-// - (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0),
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0), rotation);
-// }
-//
-// }
-// else
-// {
-// renderArmPre(model.rightArm, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) -
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0),
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0), rotation);
-// renderArmPre(model.rightSleeve, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f)
-// - (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0),
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.15f : 0), rotation);
-// renderArmPre(model.leftArm, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) -
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0),
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0), rotation);
-// renderArmPre(model.leftSleeve, 0.8F + (player.isShiftKeyDown() ? 0.2f : 0f) -
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? -0.2f : 0),
-// (stack.getItem() == RegistrationHandler.itemEntity.get() ? 0.15f : 0), rotation);
-// }
-//
-// }
-//
-// }
-//
-//
-// @OnlyIn(Dist.CLIENT)
-// private void renderArmPre(ModelRenderer arm, float x, float z, float
-// rotation)
-// {
-// arm.xRot = (float) -x;
-// arm.yRot = (float) -Math.toRadians(rotation);
-// arm.zRot = (float) z;
-// }
-//
-//
-// }
diff --git a/old/src/main/java/tschipp/carryon/network/client/CarrySlotPacket.java b/old/src/main/java/tschipp/carryon/network/client/CarrySlotPacket.java
deleted file mode 100644
index ed15dce..0000000
--- a/old/src/main/java/tschipp/carryon/network/client/CarrySlotPacket.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package tschipp.carryon.network.client;
-
-import java.util.function.Supplier;
-
-import io.netty.buffer.ByteBuf;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraftforge.network.NetworkEvent;
-import tschipp.carryon.CarryOn;
-import tschipp.carryon.common.scripting.ScriptChecker;
-
-public class CarrySlotPacket
-{
- public int slot;
- public int carryOverride = 0;
- public int entityid;
-
- public CarrySlotPacket(ByteBuf buf)
- {
- this.slot = buf.readInt();
- this.carryOverride = buf.readInt();
- this.entityid = buf.readInt();
- }
-
- public CarrySlotPacket(int slot, int entityid)
- {
- this.slot = slot;
- this.entityid = entityid;
- }
-
- public CarrySlotPacket(int slot, int entityid, int carryOverride)
- {
- this.slot = slot;
- this.carryOverride = carryOverride;
- this.entityid = entityid;
- }
-
- public void toBytes(ByteBuf buf)
- {
- buf.writeInt(this.slot);
- buf.writeInt(this.carryOverride);
- buf.writeInt(this.entityid);
- }
-
- public boolean handle(Supplier ctx)
- {
- if (ctx.get().getDirection().getReceptionSide().isClient())
- {
- ctx.get().setPacketHandled(true);
-
- ctx.get().enqueueWork(() -> {
-
- Level level = CarryOn.proxy.getLevel();
- ctx.get().setPacketHandled(true);
-
- if (level != null)
- {
- Entity e = level.getEntity(this.entityid);
-
- if (e instanceof Player player)
- {
-
-
- if (this.slot >= 9)
- {
- player.getPersistentData().remove("carrySlot");
- player.getPersistentData().remove("overrideKey");
- }
- else
- {
-
- player.getPersistentData().putInt("carrySlot", this.slot);
- if (this.carryOverride != 0)
- ScriptChecker.setCarryOnOverride(player, this.carryOverride);
- }
- }
-
- }
- });
- }
-
- return true;
- }
-
-}
diff --git a/old/src/main/java/tschipp/carryon/network/client/ScriptReloadPacket.java b/old/src/main/java/tschipp/carryon/network/client/ScriptReloadPacket.java
deleted file mode 100644
index a3bfc62..0000000
--- a/old/src/main/java/tschipp/carryon/network/client/ScriptReloadPacket.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package tschipp.carryon.network.client;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Supplier;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.network.NetworkEvent;
-import tschipp.carryon.common.scripting.CarryOnOverride;
-import tschipp.carryon.common.scripting.ScriptReader;
-
-public class ScriptReloadPacket
-{
- private List overrides = new ArrayList<>();
-
-// public ScriptReloadPacket()
-// {
-// }
-
- public ScriptReloadPacket(Collection collection)
- {
- this.overrides.addAll(collection);
- }
-
- public ScriptReloadPacket(FriendlyByteBuf buf)
- {
- int size = buf.readInt();
- for (int i = 0; i < size; i++)
- {
- this.overrides.add(CarryOnOverride.deserialize(buf));
- }
- }
-
- public void toBytes(FriendlyByteBuf buf)
- {
- buf.writeInt(this.overrides.size());
- this.overrides.forEach(override -> override.serialize(buf));
- }
-
- public boolean handle(Supplier ctx)
- {
- if (ctx.get().getDirection().getReceptionSide().isClient())
- {
- ctx.get().setPacketHandled(true);
- ctx.get().enqueueWork(() -> {
-
- ScriptReader.OVERRIDES.clear();
-
- this.overrides.forEach(override -> {
- ScriptReader.OVERRIDES.put(override.hashCode(), override);
- });
-
- });
- }
-
- return true;
-
- }
-}
diff --git a/old/src/main/java/tschipp/carryon/network/server/SyncKeybindPacket.java b/old/src/main/java/tschipp/carryon/network/server/SyncKeybindPacket.java
deleted file mode 100644
index 90b0367..0000000
--- a/old/src/main/java/tschipp/carryon/network/server/SyncKeybindPacket.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package tschipp.carryon.network.server;
-
-import java.util.function.Supplier;
-
-import io.netty.buffer.ByteBuf;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraftforge.network.NetworkEvent;
-import tschipp.carryon.client.keybinds.CarryOnKeybinds;
-
-public class SyncKeybindPacket
-{
- public boolean pressed;
-
- public SyncKeybindPacket(ByteBuf buf)
- {
- this.pressed = buf.readBoolean();
- }
-
- public SyncKeybindPacket(boolean pressed)
- {
- this.pressed = pressed;
- }
-
- public void toBytes(ByteBuf buf)
- {
- buf.writeBoolean(this.pressed);
- }
-
- public boolean handle(Supplier ctx)
- {
- if (ctx.get().getDirection().getReceptionSide().isServer())
- {
- ctx.get().setPacketHandled(true);
- ctx.get().enqueueWork(() -> {
-
- ServerPlayer player = ctx.get().getSender();
-
- CarryOnKeybinds.setKeyPressed(player, this.pressed);
-
- });
- }
-
- return true;
- }
-
-}
diff --git a/old/src/main/java/tschipp/carryon/proxy/ClientProxy.java b/old/src/main/java/tschipp/carryon/proxy/ClientProxy.java
deleted file mode 100644
index 9de6241..0000000
--- a/old/src/main/java/tschipp/carryon/proxy/ClientProxy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package tschipp.carryon.proxy;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import tschipp.carryon.client.keybinds.CarryOnKeybinds;
-import tschipp.carryon.common.handler.RegistrationHandler;
-import tschipp.carryon.common.helper.KeyboardCallbackWrapper;
-import tschipp.carryon.common.helper.ScrollCallbackWrapper;
-
-public class ClientProxy implements IProxy
-{
-
- @Override
- public void setup(FMLCommonSetupEvent event)
- {
- RegistrationHandler.regClientEvents();
-
- new ScrollCallbackWrapper().setup(Minecraft.getInstance());
- new KeyboardCallbackWrapper().setup(Minecraft.getInstance());
- }
-
- @Override
- public Player getPlayer()
- {
-
- return Minecraft.getInstance().player;
- }
-
- @Override
- public Level getLevel()
- {
- return Minecraft.getInstance().level;
- }
-}
diff --git a/old/src/main/java/tschipp/carryon/proxy/IProxy.java b/old/src/main/java/tschipp/carryon/proxy/IProxy.java
deleted file mode 100644
index 7125387..0000000
--- a/old/src/main/java/tschipp/carryon/proxy/IProxy.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package tschipp.carryon.proxy;
-
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-
-public interface IProxy
-{
-
- public void setup(final FMLCommonSetupEvent event);
-
- public Player getPlayer();
-
- public Level getLevel();
-}
diff --git a/old/src/main/java/tschipp/carryon/proxy/ServerProxy.java b/old/src/main/java/tschipp/carryon/proxy/ServerProxy.java
deleted file mode 100644
index 2f8e1c8..0000000
--- a/old/src/main/java/tschipp/carryon/proxy/ServerProxy.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package tschipp.carryon.proxy;
-
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-
-public class ServerProxy implements IProxy
-{
-
- @Override
- public void setup(FMLCommonSetupEvent event)
- {
-
- }
-
- @Override
- public Player getPlayer()
- {
- return null;
- }
-
- @Override
- public Level getLevel()
- {
- return null;
- }
-
-}
diff --git a/old/src/main/resources/META-INF/mods.toml b/old/src/main/resources/META-INF/mods.toml
deleted file mode 100644
index 46c77ae..0000000
--- a/old/src/main/resources/META-INF/mods.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-modLoader="javafml"
-loaderVersion="[41,)"
-issueTrackerURL="https://github.com/Tschipp/CarryOn/issues"
-logoFile="logo.png"
-license="GNU LGPLv3"
-
-[[mods]]
- modId="carryon"
- version="${file.jarVersion}"
- displayName="Carry On"
- description='''Carry On is a simple mod that improves game interaction by allowing players to pick up, carry, and place single block Tile Entities using only their empty hands.'''
- authors="Tschipp, Purplicious_Cow, cy4n" #mandatory
- displayURL="https://minecraft.curseforge.com/projects/carry-on" #mandatory
-
-[[dependencies.carryon]] #optional
- # the modid of the dependency
- modId="forge" #mandatory
- # Does this dependency have to exist - if not, ordering below must be specified
- mandatory=true #mandatory
- # The version range of the dependency
- versionRange="[41,)" #mandatory
- # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
- ordering="NONE"
- # Side this dependency is applied on - BOTH, CLIENT or SERVER
- side="BOTH"
-
-[[dependencies.carryon]]
- modId="minecraft"
- mandatory=true
- versionRange="[1.19,1.20)"
- ordering="NONE"
- side="BOTH"
diff --git a/old/src/main/resources/assets/carryon/lang/en_ud.json b/old/src/main/resources/assets/carryon/lang/en_ud.json
deleted file mode 100644
index 77a6461..0000000
--- a/old/src/main/resources/assets/carryon/lang/en_ud.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "carryon.category.settings": "sᵷuᴉʇʇǝS",
- "carryon.category.blacklist": "ʇsᴉꞁʞɔɐꞁᗺ",
- "carryon.category.modeloverrides": "(pǝɔuɐʌpⱯ) sǝpᴉɹɹǝʌO ꞁǝpoW",
- "carryon.category.custompickupconditions": "(pǝɔuɐʌpⱯ) suoᴉʇᴉpuoƆ dnʞɔᴉԀ ɯoʇsnƆ",
- "carryon.category.whitelist": "ʇsᴉꞁǝʇᴉɥM",
-
- "carryon.general.modeloverrides.modeloverrides": "sǝpᴉɹɹǝʌO ꞁǝpoW",
- "carryon.general.blacklist.forbiddenentities": "dn ʞɔᴉd ʇouuɐɔ ɹǝʎɐꞁԀ ǝɥʇ ʇɐɥʇ sǝᴉʇᴉʇuƎ",
- "carryon.general.blacklist.forbiddentiles": "dn ʞɔᴉd ʇouuɐɔ ɹǝʎɐꞁԀ ǝɥʇ ʇɐɥʇ sʞɔoꞁᗺ",
- "carryon.category.custompickupconditions.custompickupconditionsblocks": "suoᴉʇᴉpuoƆ dnʞɔᴉԀ ʞɔoꞁᗺ ɯoʇsnƆ",
- "carryon.category.custompickupconditions.custompickupconditionsentities": "suoᴉʇᴉpuoƆ dnʞɔᴉԀ ʎʇᴉʇuƎ ɯoʇsnƆ",
-
- "key.carry.desc": "ʎɹɹɐƆ",
- "key.carry.category": "uO ʎɹɹɐƆ"
-}
\ No newline at end of file
diff --git a/old/src/main/resources/assets/carryon/lang/en_us.json b/old/src/main/resources/assets/carryon/lang/en_us.json
deleted file mode 100644
index 8cea73d..0000000
--- a/old/src/main/resources/assets/carryon/lang/en_us.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "carryon.category.settings": "Settings",
- "carryon.category.blacklist": "Blacklist",
- "carryon.category.modeloverrides": "Model Overrides (Advanced)",
- "carryon.category.custompickupconditions": "Custom Pickup Conditions (Advanced)",
- "carryon.category.whitelist": "Whitelist",
-
- "carryon.general.modeloverrides.modeloverrides": "Model Overrides",
- "carryon.general.blacklist.forbiddenentities": "Entities that the Player cannot pick up",
- "carryon.general.blacklist.forbiddentiles": "Blocks that the Player cannot pick up",
- "carryon.category.custompickupconditions.custompickupconditionsblocks": "Custom Block Pickup Conditions",
- "carryon.category.custompickupconditions.custompickupconditionsentities": "Custom Entity Pickup Conditions",
-
- "key.carry.desc": "Carry",
- "key.carry.category": "Carry On"
-}
\ No newline at end of file
diff --git a/old/src/main/resources/assets/carryon/lang/es_es.json b/old/src/main/resources/assets/carryon/lang/es_es.json
deleted file mode 100644
index b652a9f..0000000
--- a/old/src/main/resources/assets/carryon/lang/es_es.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "carryon.category.settings": "Configuración",
- "carryon.category.blacklist": "Lista negra",
- "carryon.category.modeloverrides": "Reescribir modelo (Avanzado)",
- "carryon.category.custompickupconditions": "Customizar condiciones de recoger (Avanzado)",
- "carryon.category.whitelist": "Lista blanca",
-
- "carryon.general.modeloverrides.modeloverrides": "Reescribir modelo",
- "carryon.general.blacklist.forbiddenentities": "Entidades que el jugador no puede recoger",
- "carryon.general.blacklist.forbiddentiles": "Bloques que el jugador no puede recoger",
- "carryon.category.custompickupconditions.custompickupconditionsblocks": "Customizar condiciones para recoger bloques",
- "carryon.category.custompickupconditions.custompickupconditionsentities": "Customizar condiciones para recoger entidades",
-
- "key.carry.desc": "Agarrar",
- "key.carry.category": "Carry On"
-}
\ No newline at end of file
diff --git a/old/src/main/resources/assets/carryon/lang/it_it.json b/old/src/main/resources/assets/carryon/lang/it_it.json
deleted file mode 100644
index 5402e38..0000000
--- a/old/src/main/resources/assets/carryon/lang/it_it.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "carryon.category.settings": "Inpostazioni",
- "carryon.category.blacklist": "Blacklist",
- "carryon.category.modeloverrides": "Sostituzioni modello (avanzate)",
- "carryon.category.custompickupconditions": "Condizioni di prelievo personalizzate (avanzate)",
- "carryon.category.whitelist": "Whitelist",
-
- "carryon.general.modeloverrides.modeloverrides": "Sostituzioni modello",
- "carryon.general.blacklist.forbiddenentities": "Entità che il giocatore non può raccogliere",
- "carryon.general.blacklist.forbiddentiles": "Blocchi che il giocatore non può raccogliere",
- "carryon.category.custompickupconditions.custompickupconditionsblocks": "Condizioni di prelievo blocco personalizzate",
- "carryon.category.custompickupconditions.custompickupconditionsentities": "Condizioni di prelievo entità personalizzate",
-
- "key.carry.desc": "Afferra",
- "key.carry.category": "Carry On Mod"
-}
\ No newline at end of file
diff --git a/old/src/main/resources/assets/carryon/lang/ko_kr.json b/old/src/main/resources/assets/carryon/lang/ko_kr.json
deleted file mode 100644
index 90f8d90..0000000
--- a/old/src/main/resources/assets/carryon/lang/ko_kr.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "carryon.category.settings": "설정",
- "carryon.category.blacklist": "블랙리스트",
- "carryon.category.modeloverrides": "모델 오버라이딩 (고급)",
- "carryon.category.custompickupconditions": "커스텀 들기 컨디션 (고급)",
- "carryon.category.whitelist": "화이트리스트",
-
- "carryon.general.modeloverrides.modeloverrides": "모델 오버라이딩",
- "carryon.general.blacklist.forbiddenentities": "플레이어가 들 수 없는 엔티티",
- "carryon.general.blacklist.forbiddentiles": "플레이어가 들 수 없는 블록",
- "carryon.category.custompickupconditions.custompickupconditionsblocks": "커스텀 블록 들기 컨디션",
- "carryon.category.custompickupconditions.custompickupconditionsentities": "커스텀 엔티티 들기 컨디션",
-
- "key.carry.desc": "들고 나르기",
- "key.carry.category": "Carry On"
-}
\ No newline at end of file
diff --git a/old/src/main/resources/assets/carryon/lang/ru_ru.json b/old/src/main/resources/assets/carryon/lang/ru_ru.json
deleted file mode 100644
index 36257f0..0000000
--- a/old/src/main/resources/assets/carryon/lang/ru_ru.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "carryon.category.settings": "Настройки",
- "carryon.category.blacklist": "Чёрный список",
- "carryon.category.modeloverrides": "Переопределения модели (Улучшенное)",
- "carryon.category.custompickupconditions": "Индивидуальные условия поднятия (Улучшенное)",
- "carryon.category.whitelist": "Белый список",
-
- "carryon.general.modeloverrides.modeloverrides": "Переопределения модели",
- "carryon.general.blacklist.forbiddenentities": "Сущности, которых игрок не может поднять",
- "carryon.general.blacklist.forbiddentiles": "Блоки, которые игрок не может поднять",
- "carryon.category.custompickupconditions.custompickupconditionsblocks": "Пользовательские условия поднятия блока",
- "carryon.category.custompickupconditions.custompickupconditionsentities": "Пользовательские условия поднятия сущности",
-
- "key.carry.desc": "Поднять",
- "key.carry.category": "Carry On"
-}
\ No newline at end of file
diff --git a/old/src/main/resources/assets/carryon/models/item/entity_item.json b/old/src/main/resources/assets/carryon/models/item/entity_item.json
deleted file mode 100644
index 3480261..0000000
--- a/old/src/main/resources/assets/carryon/models/item/entity_item.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "parent": "item/generated",
- "textures": {
- "layer0": "carryon:item/tile"
- }
-}
diff --git a/old/src/main/resources/assets/carryon/models/item/tile_item.json b/old/src/main/resources/assets/carryon/models/item/tile_item.json
deleted file mode 100644
index 3480261..0000000
--- a/old/src/main/resources/assets/carryon/models/item/tile_item.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "parent": "item/generated",
- "textures": {
- "layer0": "carryon:item/tile"
- }
-}
diff --git a/old/src/main/resources/assets/carryon/textures/item/tile.png b/old/src/main/resources/assets/carryon/textures/item/tile.png
deleted file mode 100644
index 8241ee7..0000000
Binary files a/old/src/main/resources/assets/carryon/textures/item/tile.png and /dev/null differ
diff --git a/old/src/main/resources/data/carryon/tags/blocks/block_blacklist.json b/old/src/main/resources/data/carryon/tags/blocks/block_blacklist.json
deleted file mode 100644
index a22514f..0000000
--- a/old/src/main/resources/data/carryon/tags/blocks/block_blacklist.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "replace": false,
- "values": [
- ]
-}
\ No newline at end of file
diff --git a/old/src/main/resources/data/carryon/tags/blocks/block_whitelist.json b/old/src/main/resources/data/carryon/tags/blocks/block_whitelist.json
deleted file mode 100644
index a22514f..0000000
--- a/old/src/main/resources/data/carryon/tags/blocks/block_whitelist.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "replace": false,
- "values": [
- ]
-}
\ No newline at end of file
diff --git a/old/src/main/resources/data/carryon/tags/entity_types/entity_blacklist.json b/old/src/main/resources/data/carryon/tags/entity_types/entity_blacklist.json
deleted file mode 100644
index a22514f..0000000
--- a/old/src/main/resources/data/carryon/tags/entity_types/entity_blacklist.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "replace": false,
- "values": [
- ]
-}
\ No newline at end of file
diff --git a/old/src/main/resources/data/carryon/tags/entity_types/entity_whitelist.json b/old/src/main/resources/data/carryon/tags/entity_types/entity_whitelist.json
deleted file mode 100644
index a22514f..0000000
--- a/old/src/main/resources/data/carryon/tags/entity_types/entity_whitelist.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "replace": false,
- "values": [
- ]
-}
\ No newline at end of file
diff --git a/old/src/main/resources/data/carryon/tags/entity_types/stacking_blacklist.json b/old/src/main/resources/data/carryon/tags/entity_types/stacking_blacklist.json
deleted file mode 100644
index a22514f..0000000
--- a/old/src/main/resources/data/carryon/tags/entity_types/stacking_blacklist.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "replace": false,
- "values": [
- ]
-}
\ No newline at end of file
diff --git a/old/src/main/resources/data/carryon/tags/entity_types/stacking_whitelist.json b/old/src/main/resources/data/carryon/tags/entity_types/stacking_whitelist.json
deleted file mode 100644
index a22514f..0000000
--- a/old/src/main/resources/data/carryon/tags/entity_types/stacking_whitelist.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "replace": false,
- "values": [
- ]
-}
\ No newline at end of file
diff --git a/old/src/main/resources/logo.png b/old/src/main/resources/logo.png
deleted file mode 100644
index 1b9a978..0000000
Binary files a/old/src/main/resources/logo.png and /dev/null differ
diff --git a/old/src/main/resources/pack.mcmeta b/old/src/main/resources/pack.mcmeta
deleted file mode 100644
index 46e9e2c..0000000
--- a/old/src/main/resources/pack.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "pack": {
- "description": "Carryon Resources and Data",
- "pack_format": 6
- }
-}