diff --git a/.gitattributes b/.gitattributes index 2517484..6d1c9e0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,3 +6,4 @@ src/generated/**/*.json text eol=lf *.png filter=lfs diff=lfs merge=lfs -text *.gif filter=lfs diff=lfs merge=lfs -text *.pxc filter=lfs diff=lfs merge=lfs -text +*.bbmodel filter=lfs diff=lfs merge=lfs -text diff --git a/LICENSE.txt b/LICENSE.txt index 5d88235..6fe1343 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ zlib License -(C) 2024 Shylie +(C) 2024 shylie This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/gradle.properties b/gradle.properties index eae8845..300774b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -42,9 +42,9 @@ mapping_version=1.20.1 # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} # Must match the String constant located in the main mod class annotated with @Mod. -mod_id=ashes +mod_id=apparatus # The human-readable display name for the mod. -mod_name=Ashes +mod_name=Apparatus # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=zlib # The mod version. See https://semver.org/ @@ -52,11 +52,11 @@ mod_version=0.1.0 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html -mod_group_id=info.shylie.ashes +mod_group_id=info.shylie.apparatus # The authors of the mod. This is a simple text string that is used for display purposes in the mod list. -mod_authors=Shylie +mod_authors=shylie # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description=Embers addon focused on ash-related content. +mod_description=Golems. embers_version=5571196 jei_version=15.2.0.23 diff --git a/src/main/java/info/shylie/ashes/Ashes.java b/src/main/java/info/shylie/apparatus/ApparatusMod.java similarity index 75% rename from src/main/java/info/shylie/ashes/Ashes.java rename to src/main/java/info/shylie/apparatus/ApparatusMod.java index c1ff824..6f2901e 100644 --- a/src/main/java/info/shylie/ashes/Ashes.java +++ b/src/main/java/info/shylie/apparatus/ApparatusMod.java @@ -1,10 +1,10 @@ -package info.shylie.ashes; +package info.shylie.apparatus; import com.mojang.logging.LogUtils; -import info.shylie.ashes.api.tooltip.SingleItemTooltip; -import info.shylie.ashes.datagen.ItemModels; -import info.shylie.ashes.entity.AshenGolemEntity; -import info.shylie.ashes.entity.render.AshenGolemRenderer; +import info.shylie.apparatus.api.tooltip.SingleItemTooltip; +import info.shylie.apparatus.datagen.ItemModels; +import info.shylie.apparatus.entity.AshenGolemEntity; +import info.shylie.apparatus.entity.render.AshenGolemRenderer; import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.minecraftforge.api.distmarker.Dist; @@ -25,24 +25,24 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.slf4j.Logger; -@Mod(Ashes.MODID) -public class Ashes +@Mod(ApparatusMod.MODID) +public class ApparatusMod { - public static final String MODID = "ashes"; + public static final String MODID = "apparatus"; public static final Logger LOGGER = LogUtils.getLogger(); - public Ashes() { + public ApparatusMod() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); modEventBus.addListener(this::commonSetup); modEventBus.addListener(this::gatherData); modEventBus.addListener(this::entityAttributes); - AshesRegistry.BLOCKS.register(modEventBus); - AshesRegistry.ITEMS.register(modEventBus); - AshesRegistry.ENTITY_TYPES.register(modEventBus); - AshesRegistry.CREATIVE_TABS.register(modEventBus); - AshesRegistry.RUNES.register(modEventBus); + ApparatusRegistry.BLOCKS.register(modEventBus); + ApparatusRegistry.ITEMS.register(modEventBus); + ApparatusRegistry.ENTITY_TYPES.register(modEventBus); + ApparatusRegistry.CREATIVE_TABS.register(modEventBus); + ApparatusRegistry.RUNES.register(modEventBus); MinecraftForge.EVENT_BUS.register(this); @@ -54,7 +54,7 @@ public class Ashes } private void entityAttributes(EntityAttributeCreationEvent event) { - event.put(AshesRegistry.ASHEN_GOLEM.get(), AshenGolemEntity.createAttributes().build()); + event.put(ApparatusRegistry.ASHEN_GOLEM.get(), AshenGolemEntity.createAttributes().build()); } private void gatherData(GatherDataEvent event) { @@ -80,7 +80,7 @@ public class Ashes @OnlyIn(Dist.CLIENT) @SubscribeEvent public static void registerRenderers(EntityRenderersEvent.RegisterRenderers event) { - event.registerEntityRenderer(AshesRegistry.ASHEN_GOLEM.get(), AshenGolemRenderer::new); + event.registerEntityRenderer(ApparatusRegistry.ASHEN_GOLEM.get(), AshenGolemRenderer::new); } } } diff --git a/src/main/java/info/shylie/ashes/AshesRegistry.java b/src/main/java/info/shylie/apparatus/ApparatusRegistry.java similarity index 83% rename from src/main/java/info/shylie/ashes/AshesRegistry.java rename to src/main/java/info/shylie/apparatus/ApparatusRegistry.java index 2574cb2..e831f0b 100644 --- a/src/main/java/info/shylie/ashes/AshesRegistry.java +++ b/src/main/java/info/shylie/apparatus/ApparatusRegistry.java @@ -1,15 +1,15 @@ -package info.shylie.ashes; +package info.shylie.apparatus; import com.rekindled.embers.RegistryManager; import com.rekindled.embers.util.Misc; -import info.shylie.ashes.api.rune.Rune; -import info.shylie.ashes.api.rune.RuneType; -import info.shylie.ashes.entity.AshenGolemEntity; -import info.shylie.ashes.item.RuneItem; -import info.shylie.ashes.rune.param.BlockPosRune; -import info.shylie.ashes.rune.param.ItemRune; -import info.shylie.ashes.rune.task.composite.*; -import info.shylie.ashes.rune.task.leaf.*; +import info.shylie.apparatus.api.rune.Rune; +import info.shylie.apparatus.api.rune.RuneType; +import info.shylie.apparatus.entity.AshenGolemEntity; +import info.shylie.apparatus.item.RuneItem; +import info.shylie.apparatus.rune.param.BlockPosRune; +import info.shylie.apparatus.rune.param.ItemRune; +import info.shylie.apparatus.rune.task.composite.*; +import info.shylie.apparatus.rune.task.leaf.*; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -26,12 +26,12 @@ import net.minecraftforge.registries.*; import java.util.function.Supplier; -public class AshesRegistry { - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Ashes.MODID); - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Ashes.MODID); - public static final DeferredRegister> ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, Ashes.MODID); - public static final DeferredRegister CREATIVE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Ashes.MODID); - public static final DeferredRegister> RUNES = DeferredRegister.create(new ResourceLocation(Ashes.MODID, "rune"), Ashes.MODID); +public class ApparatusRegistry { + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ApparatusMod.MODID); + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ApparatusMod.MODID); + public static final DeferredRegister> ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, ApparatusMod.MODID); + public static final DeferredRegister CREATIVE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, ApparatusMod.MODID); + public static final DeferredRegister> RUNES = DeferredRegister.create(new ResourceLocation(ApparatusMod.MODID, "rune"), ApparatusMod.MODID); public static final Supplier>> RUNE_REGISTRY = RUNES.makeRegistry(RegistryBuilder::new); @@ -41,7 +41,7 @@ public class AshesRegistry { public static final RegistryObject> ASHEN_GOLEM; - public static final RegistryObject ASHES_TAB; + public static final RegistryObject APPARATUS_TAB; public static final RegistryObject> BLOCK_POS_RUNE; public static final RegistryObject> ITEM_RUNE; @@ -73,14 +73,14 @@ public class AshesRegistry { () -> EntityType.Builder.of(AshenGolemEntity::new, MobCategory.MISC) .sized(0.6F, 1.8F) .fireImmune() - .build(Ashes.MODID + "ashen_golem") + .build(ApparatusMod.MODID + "ashen_golem") ); ASHEN_GOLEM_SPAWN_EGG = registerSpawnEgg(ASHEN_GOLEM, Misc.intColor(38, 38, 38), Misc.intColor(66, 66, 66)); - ASHES_TAB = CREATIVE_TABS.register("ashes_tab", + APPARATUS_TAB = CREATIVE_TABS.register("apparatus_tab", () -> CreativeModeTab.builder() .icon(() -> new ItemStack(RegistryManager.INTELLIGENT_APPARATUS.get())) - .title(Component.translatable("itemgroup." + Ashes.MODID)) + .title(Component.translatable("itemgroup." + ApparatusMod.MODID)) .withTabsBefore(CreativeModeTabs.SPAWN_EGGS) .displayItems((params, output) -> { for (var item : ITEMS.getEntries()) { diff --git a/src/main/java/info/shylie/ashes/Config.java b/src/main/java/info/shylie/apparatus/Config.java similarity index 79% rename from src/main/java/info/shylie/ashes/Config.java rename to src/main/java/info/shylie/apparatus/Config.java index d78879c..77bdc63 100644 --- a/src/main/java/info/shylie/ashes/Config.java +++ b/src/main/java/info/shylie/apparatus/Config.java @@ -1,11 +1,11 @@ -package info.shylie.ashes; +package info.shylie.apparatus; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.config.ModConfigEvent; -@Mod.EventBusSubscriber(modid = Ashes.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +@Mod.EventBusSubscriber(modid = ApparatusMod.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) public class Config { private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder(); diff --git a/src/main/java/info/shylie/ashes/Utils.java b/src/main/java/info/shylie/apparatus/Utils.java similarity index 88% rename from src/main/java/info/shylie/ashes/Utils.java rename to src/main/java/info/shylie/apparatus/Utils.java index 5a316a7..cfc2083 100644 --- a/src/main/java/info/shylie/ashes/Utils.java +++ b/src/main/java/info/shylie/apparatus/Utils.java @@ -1,8 +1,9 @@ -package info.shylie.ashes; +package info.shylie.apparatus; import java.lang.reflect.Array; public class Utils { + @SafeVarargs public static T[] concat(T[] b, T... a) { @SuppressWarnings("unchecked") T[] c = (T[])Array.newInstance(a.getClass().getComponentType(), a.length + b.length); diff --git a/src/main/java/info/shylie/ashes/api/golem/IGolem.java b/src/main/java/info/shylie/apparatus/api/golem/IGolem.java similarity index 91% rename from src/main/java/info/shylie/ashes/api/golem/IGolem.java rename to src/main/java/info/shylie/apparatus/api/golem/IGolem.java index f61cf5e..12fd088 100644 --- a/src/main/java/info/shylie/ashes/api/golem/IGolem.java +++ b/src/main/java/info/shylie/apparatus/api/golem/IGolem.java @@ -1,7 +1,7 @@ -package info.shylie.ashes.api.golem; +package info.shylie.apparatus.api.golem; import com.mojang.authlib.GameProfile; -import info.shylie.ashes.api.rune.TaskRune; +import info.shylie.apparatus.api.rune.TaskRune; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.animal.AbstractGolem; diff --git a/src/main/java/info/shylie/ashes/api/rune/CompositeTaskRune.java b/src/main/java/info/shylie/apparatus/api/rune/CompositeTaskRune.java similarity index 96% rename from src/main/java/info/shylie/ashes/api/rune/CompositeTaskRune.java rename to src/main/java/info/shylie/apparatus/api/rune/CompositeTaskRune.java index 5c7635b..93820f9 100644 --- a/src/main/java/info/shylie/ashes/api/rune/CompositeTaskRune.java +++ b/src/main/java/info/shylie/apparatus/api/rune/CompositeTaskRune.java @@ -1,6 +1,6 @@ -package info.shylie.ashes.api.rune; +package info.shylie.apparatus.api.rune; -import info.shylie.ashes.api.golem.IGolem; +import info.shylie.apparatus.api.golem.IGolem; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/src/main/java/info/shylie/ashes/api/rune/LeafTaskRune.java b/src/main/java/info/shylie/apparatus/api/rune/LeafTaskRune.java similarity index 88% rename from src/main/java/info/shylie/ashes/api/rune/LeafTaskRune.java rename to src/main/java/info/shylie/apparatus/api/rune/LeafTaskRune.java index 1cb23dc..970f3ce 100644 --- a/src/main/java/info/shylie/ashes/api/rune/LeafTaskRune.java +++ b/src/main/java/info/shylie/apparatus/api/rune/LeafTaskRune.java @@ -1,6 +1,6 @@ -package info.shylie.ashes.api.rune; +package info.shylie.apparatus.api.rune; -import info.shylie.ashes.Ashes; +import info.shylie.apparatus.ApparatusMod; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; @@ -29,7 +29,7 @@ public abstract class LeafTaskRune extends TaskRune { parameters[index] = parameter; } else { - Ashes.LOGGER.warn("Invalid parameter type '{}' provided to leaf of type '{}'", parameter.getTypeID(), getTypeID()); + ApparatusMod.LOGGER.warn("Invalid parameter type '{}' provided to leaf of type '{}'", parameter.getTypeID(), getTypeID()); } } diff --git a/src/main/java/info/shylie/ashes/api/rune/ParameterRune.java b/src/main/java/info/shylie/apparatus/api/rune/ParameterRune.java similarity index 97% rename from src/main/java/info/shylie/ashes/api/rune/ParameterRune.java rename to src/main/java/info/shylie/apparatus/api/rune/ParameterRune.java index 1f310db..ebf131b 100644 --- a/src/main/java/info/shylie/ashes/api/rune/ParameterRune.java +++ b/src/main/java/info/shylie/apparatus/api/rune/ParameterRune.java @@ -1,4 +1,4 @@ -package info.shylie.ashes.api.rune; +package info.shylie.apparatus.api.rune; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/info/shylie/ashes/api/rune/Rune.java b/src/main/java/info/shylie/apparatus/api/rune/Rune.java similarity index 82% rename from src/main/java/info/shylie/ashes/api/rune/Rune.java rename to src/main/java/info/shylie/apparatus/api/rune/Rune.java index 8bd4339..3fa47be 100644 --- a/src/main/java/info/shylie/ashes/api/rune/Rune.java +++ b/src/main/java/info/shylie/apparatus/api/rune/Rune.java @@ -1,6 +1,6 @@ -package info.shylie.ashes.api.rune; +package info.shylie.apparatus.api.rune; -import info.shylie.ashes.AshesRegistry; +import info.shylie.apparatus.ApparatusRegistry; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -17,7 +17,7 @@ public abstract class Rune { } public ResourceLocation getTypeID() { - return AshesRegistry.RUNE_REGISTRY.get().getKey(type); + return ApparatusRegistry.RUNE_REGISTRY.get().getKey(type); } public Component getTooltip() { @@ -29,7 +29,7 @@ public abstract class Rune { } public void save(CompoundTag tag) { - tag.putString(RUNE_TYPE_TAG, AshesRegistry.RUNE_REGISTRY.get().getKey(type).toString()); + tag.putString(RUNE_TYPE_TAG, ApparatusRegistry.RUNE_REGISTRY.get().getKey(type).toString()); CompoundTag runeData = new CompoundTag(); saveImpl(runeData); tag.put(RUNE_DATA_TAG, runeData); @@ -52,7 +52,7 @@ public abstract class Rune { ResourceLocation location = ResourceLocation.tryParse(tag.getString(RUNE_TYPE_TAG)); if (location == null) { return null; } - RuneType type = AshesRegistry.RUNE_REGISTRY.get().getValue(location); + RuneType type = ApparatusRegistry.RUNE_REGISTRY.get().getValue(location); if (type == null) { return null; } Rune rune = type.create(); diff --git a/src/main/java/info/shylie/ashes/api/rune/RuneType.java b/src/main/java/info/shylie/apparatus/api/rune/RuneType.java similarity index 83% rename from src/main/java/info/shylie/ashes/api/rune/RuneType.java rename to src/main/java/info/shylie/apparatus/api/rune/RuneType.java index f8fead0..e8779af 100644 --- a/src/main/java/info/shylie/ashes/api/rune/RuneType.java +++ b/src/main/java/info/shylie/apparatus/api/rune/RuneType.java @@ -1,6 +1,6 @@ -package info.shylie.ashes.api.rune; +package info.shylie.apparatus.api.rune; -import info.shylie.ashes.AshesRegistry; +import info.shylie.apparatus.ApparatusRegistry; public class RuneType { private final RuneFactory factory; @@ -15,7 +15,7 @@ public class RuneType { @Override public String toString() { - return AshesRegistry.RUNE_REGISTRY.get().getKey(this).toString(); + return ApparatusRegistry.RUNE_REGISTRY.get().getKey(this).toString(); } public interface RuneFactory { diff --git a/src/main/java/info/shylie/ashes/api/rune/TaskRune.java b/src/main/java/info/shylie/apparatus/api/rune/TaskRune.java similarity index 91% rename from src/main/java/info/shylie/ashes/api/rune/TaskRune.java rename to src/main/java/info/shylie/apparatus/api/rune/TaskRune.java index e28c281..6c13383 100644 --- a/src/main/java/info/shylie/ashes/api/rune/TaskRune.java +++ b/src/main/java/info/shylie/apparatus/api/rune/TaskRune.java @@ -1,6 +1,6 @@ -package info.shylie.ashes.api.rune; +package info.shylie.apparatus.api.rune; -import info.shylie.ashes.api.golem.IGolem; +import info.shylie.apparatus.api.golem.IGolem; public abstract class TaskRune extends Rune { boolean ran; diff --git a/src/main/java/info/shylie/ashes/api/rune/leaf/BEInteractRune.java b/src/main/java/info/shylie/apparatus/api/rune/leaf/BEInteractRune.java similarity index 76% rename from src/main/java/info/shylie/ashes/api/rune/leaf/BEInteractRune.java rename to src/main/java/info/shylie/apparatus/api/rune/leaf/BEInteractRune.java index 2d0513b..15ce122 100644 --- a/src/main/java/info/shylie/ashes/api/rune/leaf/BEInteractRune.java +++ b/src/main/java/info/shylie/apparatus/api/rune/leaf/BEInteractRune.java @@ -1,9 +1,9 @@ -package info.shylie.ashes.api.rune.leaf; +package info.shylie.apparatus.api.rune.leaf; -import info.shylie.ashes.Utils; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.LeafTaskRune; -import info.shylie.ashes.api.rune.RuneType; +import info.shylie.apparatus.Utils; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.LeafTaskRune; +import info.shylie.apparatus.api.rune.RuneType; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/info/shylie/ashes/api/tooltip/SingleItemTooltip.java b/src/main/java/info/shylie/apparatus/api/tooltip/SingleItemTooltip.java similarity index 94% rename from src/main/java/info/shylie/ashes/api/tooltip/SingleItemTooltip.java rename to src/main/java/info/shylie/apparatus/api/tooltip/SingleItemTooltip.java index c4285c6..1127a6b 100644 --- a/src/main/java/info/shylie/ashes/api/tooltip/SingleItemTooltip.java +++ b/src/main/java/info/shylie/apparatus/api/tooltip/SingleItemTooltip.java @@ -1,4 +1,4 @@ -package info.shylie.ashes.api.tooltip; +package info.shylie.apparatus.api.tooltip; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; @@ -7,7 +7,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; public class SingleItemTooltip implements TooltipComponent { private final Item item; diff --git a/src/main/java/info/shylie/ashes/datagen/ItemModels.java b/src/main/java/info/shylie/apparatus/datagen/ItemModels.java similarity index 78% rename from src/main/java/info/shylie/ashes/datagen/ItemModels.java rename to src/main/java/info/shylie/apparatus/datagen/ItemModels.java index 93df815..3527a89 100644 --- a/src/main/java/info/shylie/ashes/datagen/ItemModels.java +++ b/src/main/java/info/shylie/apparatus/datagen/ItemModels.java @@ -1,7 +1,7 @@ -package info.shylie.ashes.datagen; +package info.shylie.apparatus.datagen; -import info.shylie.ashes.Ashes; -import info.shylie.ashes.AshesRegistry; +import info.shylie.apparatus.ApparatusMod; +import info.shylie.apparatus.ApparatusRegistry; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; @@ -11,14 +11,14 @@ import net.minecraftforge.registries.RegistryObject; public class ItemModels extends ItemModelProvider { public ItemModels(PackOutput gen, ExistingFileHelper exFileHelper) { - super(gen, Ashes.MODID, exFileHelper); + super(gen, ApparatusMod.MODID, exFileHelper); } @Override protected void registerModels() { - basicItem(AshesRegistry.HEATED_ASHY_INGOT.get()); - basicItem(AshesRegistry.RUNE.get()); - spawnEgg(AshesRegistry.ASHEN_GOLEM_SPAWN_EGG); + basicItem(ApparatusRegistry.HEATED_ASHY_INGOT.get()); + basicItem(ApparatusRegistry.RUNE.get()); + spawnEgg(ApparatusRegistry.ASHEN_GOLEM_SPAWN_EGG); } private void itemWithTexture(RegistryObject registryObject, String texture) { diff --git a/src/main/java/info/shylie/ashes/entity/AshenGolemEntity.java b/src/main/java/info/shylie/apparatus/entity/AshenGolemEntity.java similarity index 91% rename from src/main/java/info/shylie/ashes/entity/AshenGolemEntity.java rename to src/main/java/info/shylie/apparatus/entity/AshenGolemEntity.java index f24f1d3..15c2ba3 100644 --- a/src/main/java/info/shylie/ashes/entity/AshenGolemEntity.java +++ b/src/main/java/info/shylie/apparatus/entity/AshenGolemEntity.java @@ -1,10 +1,10 @@ -package info.shylie.ashes.entity; +package info.shylie.apparatus.entity; import com.rekindled.embers.datagen.EmbersSounds; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.Rune; -import info.shylie.ashes.api.rune.TaskRune; -import info.shylie.ashes.entity.ai.GolemTaskGoal; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.Rune; +import info.shylie.apparatus.api.rune.TaskRune; +import info.shylie.apparatus.entity.ai.GolemTaskGoal; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.sounds.SoundEvent; diff --git a/src/main/java/info/shylie/ashes/entity/ai/GolemTaskGoal.java b/src/main/java/info/shylie/apparatus/entity/ai/GolemTaskGoal.java similarity index 76% rename from src/main/java/info/shylie/ashes/entity/ai/GolemTaskGoal.java rename to src/main/java/info/shylie/apparatus/entity/ai/GolemTaskGoal.java index dc4098a..0ae0f6c 100644 --- a/src/main/java/info/shylie/ashes/entity/ai/GolemTaskGoal.java +++ b/src/main/java/info/shylie/apparatus/entity/ai/GolemTaskGoal.java @@ -1,8 +1,7 @@ -package info.shylie.ashes.entity.ai; +package info.shylie.apparatus.entity.ai; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.TaskRune; -import net.minecraft.nbt.CompoundTag; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.TaskRune; import net.minecraft.world.entity.ai.goal.Goal; public class GolemTaskGoal extends Goal { diff --git a/src/main/java/info/shylie/ashes/entity/render/AshenGolemRenderer.java b/src/main/java/info/shylie/apparatus/entity/render/AshenGolemRenderer.java similarity index 85% rename from src/main/java/info/shylie/ashes/entity/render/AshenGolemRenderer.java rename to src/main/java/info/shylie/apparatus/entity/render/AshenGolemRenderer.java index 660422a..592e23d 100644 --- a/src/main/java/info/shylie/ashes/entity/render/AshenGolemRenderer.java +++ b/src/main/java/info/shylie/apparatus/entity/render/AshenGolemRenderer.java @@ -1,10 +1,10 @@ -package info.shylie.ashes.entity.render; +package info.shylie.apparatus.entity.render; import com.rekindled.embers.Embers; import com.rekindled.embers.entity.render.AncientGolemEyeLayer; import com.rekindled.embers.model.AncientGolemModel; -import info.shylie.ashes.Ashes; -import info.shylie.ashes.entity.AshenGolemEntity; +import info.shylie.apparatus.ApparatusMod; +import info.shylie.apparatus.entity.AshenGolemEntity; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; @@ -15,7 +15,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) public class AshenGolemRenderer extends MobRenderer> { public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(Embers.MODID, "ancient_golem"), "main"); - public static final ResourceLocation TEXTURE = new ResourceLocation(Ashes.MODID, "textures/entity/golem.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation(ApparatusMod.MODID, "textures/entity/golem.png"); public AshenGolemRenderer(EntityRendererProvider.Context context) { super(context, new AncientGolemModel<>(context.bakeLayer(LAYER_LOCATION)), 0.5F); diff --git a/src/main/java/info/shylie/ashes/item/RuneItem.java b/src/main/java/info/shylie/apparatus/item/RuneItem.java similarity index 97% rename from src/main/java/info/shylie/ashes/item/RuneItem.java rename to src/main/java/info/shylie/apparatus/item/RuneItem.java index 242dbce..58402a1 100644 --- a/src/main/java/info/shylie/ashes/item/RuneItem.java +++ b/src/main/java/info/shylie/apparatus/item/RuneItem.java @@ -1,7 +1,7 @@ -package info.shylie.ashes.item; +package info.shylie.apparatus.item; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.*; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.*; import net.minecraft.Util; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/info/shylie/ashes/rune/param/BlockPosRune.java b/src/main/java/info/shylie/apparatus/rune/param/BlockPosRune.java similarity index 91% rename from src/main/java/info/shylie/ashes/rune/param/BlockPosRune.java rename to src/main/java/info/shylie/apparatus/rune/param/BlockPosRune.java index d362f0f..89dc904 100644 --- a/src/main/java/info/shylie/ashes/rune/param/BlockPosRune.java +++ b/src/main/java/info/shylie/apparatus/rune/param/BlockPosRune.java @@ -1,7 +1,7 @@ -package info.shylie.ashes.rune.param; +package info.shylie.apparatus.rune.param; -import info.shylie.ashes.api.rune.ParameterRune; -import info.shylie.ashes.api.rune.RuneType; +import info.shylie.apparatus.api.rune.ParameterRune; +import info.shylie.apparatus.api.rune.RuneType; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/info/shylie/ashes/rune/param/ItemRune.java b/src/main/java/info/shylie/apparatus/rune/param/ItemRune.java similarity index 85% rename from src/main/java/info/shylie/ashes/rune/param/ItemRune.java rename to src/main/java/info/shylie/apparatus/rune/param/ItemRune.java index 4031b72..795a34a 100644 --- a/src/main/java/info/shylie/ashes/rune/param/ItemRune.java +++ b/src/main/java/info/shylie/apparatus/rune/param/ItemRune.java @@ -1,8 +1,8 @@ -package info.shylie.ashes.rune.param; +package info.shylie.apparatus.rune.param; -import info.shylie.ashes.api.rune.ParameterRune; -import info.shylie.ashes.api.rune.RuneType; -import info.shylie.ashes.api.tooltip.SingleItemTooltip; +import info.shylie.apparatus.api.rune.ParameterRune; +import info.shylie.apparatus.api.rune.RuneType; +import info.shylie.apparatus.api.tooltip.SingleItemTooltip; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.tooltip.TooltipComponent; diff --git a/src/main/java/info/shylie/ashes/rune/task/composite/InverterRune.java b/src/main/java/info/shylie/apparatus/rune/task/composite/InverterRune.java similarity index 68% rename from src/main/java/info/shylie/ashes/rune/task/composite/InverterRune.java rename to src/main/java/info/shylie/apparatus/rune/task/composite/InverterRune.java index 9ba6a74..b855e8f 100644 --- a/src/main/java/info/shylie/ashes/rune/task/composite/InverterRune.java +++ b/src/main/java/info/shylie/apparatus/rune/task/composite/InverterRune.java @@ -1,8 +1,8 @@ -package info.shylie.ashes.rune.task.composite; +package info.shylie.apparatus.rune.task.composite; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.CompositeTaskRune; -import info.shylie.ashes.api.rune.RuneType; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.CompositeTaskRune; +import info.shylie.apparatus.api.rune.RuneType; public class InverterRune extends CompositeTaskRune { public InverterRune(RuneType type) { diff --git a/src/main/java/info/shylie/ashes/rune/task/composite/SelectorRune.java b/src/main/java/info/shylie/apparatus/rune/task/composite/SelectorRune.java similarity index 63% rename from src/main/java/info/shylie/ashes/rune/task/composite/SelectorRune.java rename to src/main/java/info/shylie/apparatus/rune/task/composite/SelectorRune.java index 6262f57..0072d94 100644 --- a/src/main/java/info/shylie/ashes/rune/task/composite/SelectorRune.java +++ b/src/main/java/info/shylie/apparatus/rune/task/composite/SelectorRune.java @@ -1,9 +1,9 @@ -package info.shylie.ashes.rune.task.composite; +package info.shylie.apparatus.rune.task.composite; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.CompositeTaskRune; -import info.shylie.ashes.api.rune.RuneType; -import info.shylie.ashes.api.rune.TaskRune; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.CompositeTaskRune; +import info.shylie.apparatus.api.rune.RuneType; +import info.shylie.apparatus.api.rune.TaskRune; public class SelectorRune extends CompositeTaskRune { public SelectorRune(RuneType type) { diff --git a/src/main/java/info/shylie/ashes/rune/task/composite/SequenceRune.java b/src/main/java/info/shylie/apparatus/rune/task/composite/SequenceRune.java similarity index 63% rename from src/main/java/info/shylie/ashes/rune/task/composite/SequenceRune.java rename to src/main/java/info/shylie/apparatus/rune/task/composite/SequenceRune.java index 1937d2d..a180cdb 100644 --- a/src/main/java/info/shylie/ashes/rune/task/composite/SequenceRune.java +++ b/src/main/java/info/shylie/apparatus/rune/task/composite/SequenceRune.java @@ -1,9 +1,9 @@ -package info.shylie.ashes.rune.task.composite; +package info.shylie.apparatus.rune.task.composite; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.RuneType; -import info.shylie.ashes.api.rune.TaskRune; -import info.shylie.ashes.api.rune.CompositeTaskRune; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.RuneType; +import info.shylie.apparatus.api.rune.TaskRune; +import info.shylie.apparatus.api.rune.CompositeTaskRune; public class SequenceRune extends CompositeTaskRune { public SequenceRune(RuneType type) { diff --git a/src/main/java/info/shylie/ashes/rune/task/composite/StepSelectorRune.java b/src/main/java/info/shylie/apparatus/rune/task/composite/StepSelectorRune.java similarity index 75% rename from src/main/java/info/shylie/ashes/rune/task/composite/StepSelectorRune.java rename to src/main/java/info/shylie/apparatus/rune/task/composite/StepSelectorRune.java index 68662c3..e7c8b81 100644 --- a/src/main/java/info/shylie/ashes/rune/task/composite/StepSelectorRune.java +++ b/src/main/java/info/shylie/apparatus/rune/task/composite/StepSelectorRune.java @@ -1,8 +1,8 @@ -package info.shylie.ashes.rune.task.composite; +package info.shylie.apparatus.rune.task.composite; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.CompositeTaskRune; -import info.shylie.ashes.api.rune.RuneType; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.CompositeTaskRune; +import info.shylie.apparatus.api.rune.RuneType; public class StepSelectorRune extends CompositeTaskRune { private int current; diff --git a/src/main/java/info/shylie/ashes/rune/task/composite/StepSequenceRune.java b/src/main/java/info/shylie/apparatus/rune/task/composite/StepSequenceRune.java similarity index 75% rename from src/main/java/info/shylie/ashes/rune/task/composite/StepSequenceRune.java rename to src/main/java/info/shylie/apparatus/rune/task/composite/StepSequenceRune.java index c26d1f7..c0bcc3a 100644 --- a/src/main/java/info/shylie/ashes/rune/task/composite/StepSequenceRune.java +++ b/src/main/java/info/shylie/apparatus/rune/task/composite/StepSequenceRune.java @@ -1,8 +1,8 @@ -package info.shylie.ashes.rune.task.composite; +package info.shylie.apparatus.rune.task.composite; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.CompositeTaskRune; -import info.shylie.ashes.api.rune.RuneType; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.CompositeTaskRune; +import info.shylie.apparatus.api.rune.RuneType; public class StepSequenceRune extends CompositeTaskRune { private int current; diff --git a/src/main/java/info/shylie/ashes/rune/task/leaf/HasItemRune.java b/src/main/java/info/shylie/apparatus/rune/task/leaf/HasItemRune.java similarity index 65% rename from src/main/java/info/shylie/ashes/rune/task/leaf/HasItemRune.java rename to src/main/java/info/shylie/apparatus/rune/task/leaf/HasItemRune.java index fc1d62e..c39b332 100644 --- a/src/main/java/info/shylie/ashes/rune/task/leaf/HasItemRune.java +++ b/src/main/java/info/shylie/apparatus/rune/task/leaf/HasItemRune.java @@ -1,8 +1,8 @@ -package info.shylie.ashes.rune.task.leaf; +package info.shylie.apparatus.rune.task.leaf; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.LeafTaskRune; -import info.shylie.ashes.api.rune.RuneType; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.LeafTaskRune; +import info.shylie.apparatus.api.rune.RuneType; import net.minecraft.world.item.Item; public class HasItemRune extends LeafTaskRune { diff --git a/src/main/java/info/shylie/ashes/rune/task/leaf/InteractRune.java b/src/main/java/info/shylie/apparatus/rune/task/leaf/InteractRune.java similarity index 87% rename from src/main/java/info/shylie/ashes/rune/task/leaf/InteractRune.java rename to src/main/java/info/shylie/apparatus/rune/task/leaf/InteractRune.java index 1946004..6ca9935 100644 --- a/src/main/java/info/shylie/ashes/rune/task/leaf/InteractRune.java +++ b/src/main/java/info/shylie/apparatus/rune/task/leaf/InteractRune.java @@ -1,8 +1,8 @@ -package info.shylie.ashes.rune.task.leaf; +package info.shylie.apparatus.rune.task.leaf; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.LeafTaskRune; -import info.shylie.ashes.api.rune.RuneType; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.LeafTaskRune; +import info.shylie.apparatus.api.rune.RuneType; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/info/shylie/ashes/rune/task/leaf/MoveRune.java b/src/main/java/info/shylie/apparatus/rune/task/leaf/MoveRune.java similarity index 87% rename from src/main/java/info/shylie/ashes/rune/task/leaf/MoveRune.java rename to src/main/java/info/shylie/apparatus/rune/task/leaf/MoveRune.java index 184396c..54cfb4b 100644 --- a/src/main/java/info/shylie/ashes/rune/task/leaf/MoveRune.java +++ b/src/main/java/info/shylie/apparatus/rune/task/leaf/MoveRune.java @@ -1,8 +1,8 @@ -package info.shylie.ashes.rune.task.leaf; +package info.shylie.apparatus.rune.task.leaf; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.LeafTaskRune; -import info.shylie.ashes.api.rune.RuneType; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.LeafTaskRune; +import info.shylie.apparatus.api.rune.RuneType; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.MoverType; import net.minecraft.world.entity.animal.AbstractGolem; diff --git a/src/main/java/info/shylie/ashes/rune/task/leaf/PutItemRune.java b/src/main/java/info/shylie/apparatus/rune/task/leaf/PutItemRune.java similarity index 86% rename from src/main/java/info/shylie/ashes/rune/task/leaf/PutItemRune.java rename to src/main/java/info/shylie/apparatus/rune/task/leaf/PutItemRune.java index 06bc0be..f55f985 100644 --- a/src/main/java/info/shylie/ashes/rune/task/leaf/PutItemRune.java +++ b/src/main/java/info/shylie/apparatus/rune/task/leaf/PutItemRune.java @@ -1,8 +1,8 @@ -package info.shylie.ashes.rune.task.leaf; +package info.shylie.apparatus.rune.task.leaf; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.RuneType; -import info.shylie.ashes.api.rune.leaf.BEInteractRune; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.RuneType; +import info.shylie.apparatus.api.rune.leaf.BEInteractRune; import net.minecraft.world.InteractionHand; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/info/shylie/ashes/rune/task/leaf/TakeItemRune.java b/src/main/java/info/shylie/apparatus/rune/task/leaf/TakeItemRune.java similarity index 91% rename from src/main/java/info/shylie/ashes/rune/task/leaf/TakeItemRune.java rename to src/main/java/info/shylie/apparatus/rune/task/leaf/TakeItemRune.java index 4ab3bc3..6108dba 100644 --- a/src/main/java/info/shylie/ashes/rune/task/leaf/TakeItemRune.java +++ b/src/main/java/info/shylie/apparatus/rune/task/leaf/TakeItemRune.java @@ -1,8 +1,8 @@ -package info.shylie.ashes.rune.task.leaf; +package info.shylie.apparatus.rune.task.leaf; -import info.shylie.ashes.api.golem.IGolem; -import info.shylie.ashes.api.rune.RuneType; -import info.shylie.ashes.api.rune.leaf.BEInteractRune; +import info.shylie.apparatus.api.golem.IGolem; +import info.shylie.apparatus.api.rune.RuneType; +import info.shylie.apparatus.api.rune.leaf.BEInteractRune; import net.minecraft.world.InteractionHand; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/resources/assets/ashes/textures/block/inscriber.png b/src/main/resources/assets/ashes/textures/block/inscriber.png new file mode 100644 index 0000000..b278cb5 --- /dev/null +++ b/src/main/resources/assets/ashes/textures/block/inscriber.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfd1398415a520d6fb045aa4643e28660db869328574546b42d72b4bbef586a0 +size 825 diff --git a/src/main/resources/assets/inscriber.bbmodel b/src/main/resources/assets/inscriber.bbmodel new file mode 100644 index 0000000..f4a0302 --- /dev/null +++ b/src/main/resources/assets/inscriber.bbmodel @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02bac7ab34fdfedab55cfd739f9ac9d4be8a0089a9147b52e34be7c835f1c1df +size 17386