diff --git a/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 b/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 index adad41801..f01f54e4d 100644 --- a/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 +++ b/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 @@ -1,4 +1,4 @@ -// 1.19.2 2023-08-23T20:23:54.8788866 LootTables +// 1.19.2 2023-08-25T15:56:37.4286904 LootTables 2d891dd38aebe5d06ea2a6b4c9a1533a97324ea2 data/unordinary_basics/loot_tables/blocks/acacia_log.json fab1894dc8e69c683171e47b29a645e6e97cd770 data/unordinary_basics/loot_tables/blocks/acacia_log_slab.json c5c5610df3573a30e467de223f0974f2a88fda06 data/unordinary_basics/loot_tables/blocks/acacia_log_stairs.json @@ -213,6 +213,7 @@ e20499cc7ff92f8ef8d1e3904906702423a8a332 data/unordinary_basics/loot_tables/bloc 1f35f00e62f74aef6b416a330fd79f2cedd40470 data/unordinary_basics/loot_tables/blocks/magenta_wool_stairs.json bf5ba560db458b7de0d8cbb2ac01c9e4a4e10d99 data/unordinary_basics/loot_tables/blocks/magma_block_slab.json d14144e813e323be20dbaa16a47584335908af6b data/unordinary_basics/loot_tables/blocks/magma_block_stairs.json +2b2a4bde1a1c86393b28fa3ff9b81ef1ddeed22d data/unordinary_basics/loot_tables/blocks/master_sword_shrine.json 6265ae596de7368904e9e860f5d644582c771c48 data/unordinary_basics/loot_tables/blocks/melon_slab.json 2280212b13c15a43ad36dba64f85f1493755f41f data/unordinary_basics/loot_tables/blocks/melon_stairs.json ea161257a464b2f22b461876078dab4febcdec76 data/unordinary_basics/loot_tables/blocks/mycelium_slab.json diff --git a/src/generated/resources/.cache/70523485b7a61b421f0f56a7858d4558f403faab b/src/generated/resources/.cache/70523485b7a61b421f0f56a7858d4558f403faab index 110f3f481..9ad078149 100644 --- a/src/generated/resources/.cache/70523485b7a61b421f0f56a7858d4558f403faab +++ b/src/generated/resources/.cache/70523485b7a61b421f0f56a7858d4558f403faab @@ -1,4 +1,4 @@ -// 1.19.2 2023-08-23T21:27:40.4597567 Item Models: unordinary_basics +// 1.19.2 2023-08-25T15:56:37.4346909 Item Models: unordinary_basics c591a65ab6847e5ed4e223cb18d37d8c12c9502c assets/unordinary_basics/models/item/andesite_brick_wall.json 5ce567547fddda86908f7d8019ae022837bf1d93 assets/unordinary_basics/models/item/animal_bait.json 3fa35354859867f37932c7a7447b24132918cc78 assets/unordinary_basics/models/item/barrel_backpack.json @@ -7,6 +7,7 @@ fa77afdd737e5e1ca27f8a23decd2bc5224a359f assets/unordinary_basics/models/item/bu bf17d078bb82d81df6832bd253b54d653efde40e assets/unordinary_basics/models/item/chest_backpack.json 9772ab6e4ab1b878b167551cade62b90fee43fa3 assets/unordinary_basics/models/item/chiseled_soul_sandstone_wall.json 01dcce72c146a1e60af4d996c5f00d54aa04a8bb assets/unordinary_basics/models/item/cut_soul_sandstone_wall.json +c83445154d310a9407b1ff73f58251fe0d66e579 assets/unordinary_basics/models/item/decayed_master_sword.json 7e79e3447f2a6ce7ef01b13eccfa1959f1a1949e assets/unordinary_basics/models/item/diorite_brick_wall.json 592af3fce7e2806bb6a5bb657025d5f3501e7801 assets/unordinary_basics/models/item/dripstone_brick_wall.json 4c1a65d0658434951780fbc0e73e81a6395e91dc assets/unordinary_basics/models/item/equine_tracker.json @@ -15,6 +16,8 @@ bf17d078bb82d81df6832bd253b54d653efde40e assets/unordinary_basics/models/item/ch 47517d7c241cf49f8409d444d91b392faa04ba08 assets/unordinary_basics/models/item/granite_brick_wall.json 6baf37e2a4a314d83da934d5196b3180dbfe36f3 assets/unordinary_basics/models/item/item_sorter.json 7aeb40e3fc8a63220b899dc85b6ed634a2d54a9d assets/unordinary_basics/models/item/map_book.json +688db9238fd4601381b9097bf84cc9fff118044a assets/unordinary_basics/models/item/master_sword.json +2cd877cc4df1e44e3e2f2dcf754f845646b6b88c assets/unordinary_basics/models/item/master_sword_shrine.json 3d2ab708f1fd998245fcf681300da04d4753c74a assets/unordinary_basics/models/item/milk_bottle.json 59cf1bbbc6cf48622bf2b4e92b3e75b762011c59 assets/unordinary_basics/models/item/music_disc_queen.json 30f10936ad54d4371665d9bd0a4565654d1713c9 assets/unordinary_basics/models/item/polished_andesite_brick_wall.json diff --git a/src/generated/resources/.cache/d7b3aac43b2c3c8ddf2d88d57d32ba6e7a4e9167 b/src/generated/resources/.cache/d7b3aac43b2c3c8ddf2d88d57d32ba6e7a4e9167 new file mode 100644 index 000000000..b5a25acab --- /dev/null +++ b/src/generated/resources/.cache/d7b3aac43b2c3c8ddf2d88d57d32ba6e7a4e9167 @@ -0,0 +1,2 @@ +// 1.19.2 2023-08-27T16:07:23.6958312 Tags for minecraft:worldgen/structure +845b0fda38f04fb44f51691a9953acf48c2d42a7 data/unordinary_basics/tags/worldgen/structure/master_sword_shrine.json diff --git a/src/generated/resources/.cache/fcc0d197db45e404a8bc894ca09c0611e5a65cab b/src/generated/resources/.cache/fcc0d197db45e404a8bc894ca09c0611e5a65cab new file mode 100644 index 000000000..428c1f146 --- /dev/null +++ b/src/generated/resources/.cache/fcc0d197db45e404a8bc894ca09c0611e5a65cab @@ -0,0 +1,2 @@ +// 1.19.2 2023-08-27T16:04:30.9998563 Tags for minecraft:entity_type +70011fc296dd8a255dbdd79d17501368c0d7bd16 data/forge/tags/entity_types/sculk_enemies.json diff --git a/src/generated/resources/assets/unordinary_basics/models/item/decayed_master_sword.json b/src/generated/resources/assets/unordinary_basics/models/item/decayed_master_sword.json new file mode 100644 index 000000000..7bc296017 --- /dev/null +++ b/src/generated/resources/assets/unordinary_basics/models/item/decayed_master_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "unordinary_basics:item/decayed_master_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/unordinary_basics/models/item/master_sword.json b/src/generated/resources/assets/unordinary_basics/models/item/master_sword.json new file mode 100644 index 000000000..1ec05c580 --- /dev/null +++ b/src/generated/resources/assets/unordinary_basics/models/item/master_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "unordinary_basics:item/master_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/unordinary_basics/models/item/master_sword_shrine.json b/src/generated/resources/assets/unordinary_basics/models/item/master_sword_shrine.json new file mode 100644 index 000000000..a158c749d --- /dev/null +++ b/src/generated/resources/assets/unordinary_basics/models/item/master_sword_shrine.json @@ -0,0 +1,3 @@ +{ + "parent": "unordinary_basics:block/master_sword_shrine" +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/entity_types/sculk_enemies.json b/src/generated/resources/data/forge/tags/entity_types/sculk_enemies.json new file mode 100644 index 000000000..87e7d3aca --- /dev/null +++ b/src/generated/resources/data/forge/tags/entity_types/sculk_enemies.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:warden" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/unordinary_basics/loot_tables/blocks/master_sword_shrine.json b/src/generated/resources/data/unordinary_basics/loot_tables/blocks/master_sword_shrine.json new file mode 100644 index 000000000..38fe9914a --- /dev/null +++ b/src/generated/resources/data/unordinary_basics/loot_tables/blocks/master_sword_shrine.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:air" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/unordinary_basics/tags/worldgen/structure/master_sword_shrine.json b/src/generated/resources/data/unordinary_basics/tags/worldgen/structure/master_sword_shrine.json new file mode 100644 index 000000000..f0a90f5f8 --- /dev/null +++ b/src/generated/resources/data/unordinary_basics/tags/worldgen/structure/master_sword_shrine.json @@ -0,0 +1,5 @@ +{ + "values": [ + "unordinary_basics:master_sword_shrine" + ] +} \ No newline at end of file diff --git a/src/main/java/com/github/manasmods/unordinary_basics/Unordinary_Basics.java b/src/main/java/com/github/manasmods/unordinary_basics/UnordinaryBasics.java similarity index 86% rename from src/main/java/com/github/manasmods/unordinary_basics/Unordinary_Basics.java rename to src/main/java/com/github/manasmods/unordinary_basics/UnordinaryBasics.java index 86ab57bc4..ada1eadeb 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/Unordinary_Basics.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/UnordinaryBasics.java @@ -12,7 +12,9 @@ import com.github.manasmods.unordinary_basics.network.Unordinary_BasicsNetwork; import com.github.manasmods.unordinary_basics.network.toclient.UBInventoryClientSync; import com.github.manasmods.unordinary_basics.painting.UBPaintings; -import com.github.manasmods.unordinary_basics.registry.Unordinary_BasicsRegistry; +import com.github.manasmods.unordinary_basics.registry.UBRegistry; +import com.github.manasmods.unordinary_basics.utils.TreasureMapForEmeralds; +import com.github.manasmods.unordinary_basics.utils.UBTags; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.core.Direction; @@ -21,12 +23,14 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.npc.VillagerProfession; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; +import net.minecraft.world.level.saveddata.maps.MapDecoration; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.*; import net.minecraftforge.common.util.LazyOptional; @@ -38,6 +42,7 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.event.level.BlockEvent; +import net.minecraftforge.event.village.VillagerTradesEvent; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.ModList; @@ -50,7 +55,6 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.openjdk.nashorn.internal.objects.annotations.Getter; import java.io.File; import java.io.FileOutputStream; @@ -62,12 +66,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -@Mod(Unordinary_Basics.MOD_ID) -public class Unordinary_Basics { +@Mod(UnordinaryBasics.MOD_ID) +public class UnordinaryBasics { public static final String MOD_ID = "unordinary_basics"; public static final Logger LOGGER = LogManager.getLogger(); - public static Unordinary_Basics getInstance() { + public static UnordinaryBasics getInstance() { return instance; } @@ -75,14 +79,14 @@ public Optional getApotheosisIntegration() { return apotheosisIntegration; } - private static Unordinary_Basics instance; + private static UnordinaryBasics instance; private Optional apotheosisIntegration = Optional.empty(); - public Unordinary_Basics() { + public UnordinaryBasics() { instance = this; IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); IEventBus forgeBus = MinecraftForge.EVENT_BUS; - Unordinary_BasicsRegistry.register(modEventBus); + UBRegistry.register(modEventBus); modEventBus.addListener(this::setup); modEventBus.addListener(this::generateData); modEventBus.addListener(this::registerCapabilities); @@ -92,6 +96,7 @@ public Unordinary_Basics() { forgeBus.addListener(this::handleUBInventoryDrops); forgeBus.addListener(this::playerJoinWorld); forgeBus.addListener(this::playerTick); + forgeBus.addListener(this::villagerTradesEvent); forgeBus.addGenericListener(Entity.class,this::attachCapabilities); modEventBus.addListener(UBEntityHandler::entityAttributeEvent); UBPaintings.register(modEventBus); @@ -112,15 +117,17 @@ private void setup(final FMLCommonSetupEvent event) { } private void generateData(final GatherDataEvent event) { - event.getGenerator().addProvider(event.includeClient(),new Unordinary_BasicsBlockStateProvider(event)); - event.getGenerator().addProvider(event.includeClient(),new Unordinary_BasicsItemModelProvider(event)); - event.getGenerator().addProvider(event.includeServer(),new Unordinary_BasicsRecipeProvider(event)); - event.getGenerator().addProvider(event.includeServer(),new Unordinary_BasicsLootTableProvider(event)); - event.getGenerator().addProvider(event.includeServer(),new Unordinary_BasicsBlockTagProvider(event)); - event.getGenerator().addProvider(event.includeServer(),new Unordinary_BasicsFletchingRecipeProvider(event)); - Unordinary_BasicsBlockTagProvider blockTagProvider = new Unordinary_BasicsBlockTagProvider(event); + event.getGenerator().addProvider(event.includeClient(),new UBBlockStateProvider(event)); + event.getGenerator().addProvider(event.includeClient(),new UBItemModelProvider(event)); + event.getGenerator().addProvider(event.includeServer(),new UBRecipeProvider(event)); + event.getGenerator().addProvider(event.includeServer(),new UBLootTableProvider(event)); + event.getGenerator().addProvider(event.includeServer(),new UBBlockTagProvider(event)); + event.getGenerator().addProvider(event.includeServer(),new UBEntityTypeTagProvider(event)); + event.getGenerator().addProvider(event.includeServer(),new UBFletchingRecipeProvider(event)); + UBBlockTagProvider blockTagProvider = new UBBlockTagProvider(event); event.getGenerator().addProvider(event.includeServer(),blockTagProvider); - event.getGenerator().addProvider(event.includeServer(),new Unordinary_BasicsItemTagProvider(event, blockTagProvider)); + event.getGenerator().addProvider(event.includeServer(),new UBItemTagProvider(event, blockTagProvider)); + event.getGenerator().addProvider(event.includeServer(), new UBStructureTagProvider(event.getGenerator(),event.getExistingFileHelper())); } private void entityPlaceEvent(final BlockEvent.EntityPlaceEvent event){ @@ -131,6 +138,12 @@ private void entityPlaceEvent(final BlockEvent.EntityPlaceEvent event){ } } + private void villagerTradesEvent(final VillagerTradesEvent event){ + if (event.getType().equals(VillagerProfession.CARTOGRAPHER)) { + event.getTrades().get(3).add(new TreasureMapForEmeralds(12, UBTags.Structures.MASTER_SWORD_SHRINE,"filled_map.unordinary_basics.master_sword_shrine", MapDecoration.Type.RED_X,2,5)); + } + } + public void playerJoinWorld(EntityJoinLevelEvent event){ if(!event.getLevel().isClientSide()) { if(event.getEntity() instanceof ServerPlayer player) { @@ -183,7 +196,7 @@ public LazyOptional getCapability(@NotNull Capability cap, @Nullable D } }; - event.addCapability(new ResourceLocation(Unordinary_Basics.MOD_ID,"ub_inventory"),provider); + event.addCapability(new ResourceLocation(UnordinaryBasics.MOD_ID,"ub_inventory"),provider); } private void handleUBInventoryDrops(final LivingDropsEvent event){ @@ -277,7 +290,7 @@ private static void copyImprovedTexturesIfMissing() { if(!target.exists()) try { dir.mkdirs(); - InputStream in = Unordinary_Basics.class.getResourceAsStream("/assets/unordinary_basics/improved_textures.zip"); + InputStream in = UnordinaryBasics.class.getResourceAsStream("/assets/unordinary_basics/improved_textures.zip"); FileOutputStream out = new FileOutputStream(target); byte[] buf = new byte[16384]; diff --git a/src/main/java/com/github/manasmods/unordinary_basics/block/ItemSorterBlock.java b/src/main/java/com/github/manasmods/unordinary_basics/block/ItemSorterBlock.java index 1f414f5e8..3fd3d24d0 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/block/ItemSorterBlock.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/block/ItemSorterBlock.java @@ -10,11 +10,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.BaseEntityBlock; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Mirror; -import net.minecraft.world.level.block.RenderShape; -import net.minecraft.world.level.block.Rotation; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -23,7 +19,7 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.network.NetworkHooks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -68,7 +64,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder { + return makeShapeEW(); + } + case NORTH, SOUTH -> { + return makeShapeNS(); + } + } + return makeShapeNS(); + } + /* FACING */ + @Override + public BlockState getStateForPlacement(BlockPlaceContext pContext) { + return this.defaultBlockState().setValue(FACING, pContext.getHorizontalDirection().getOpposite()); + } + + @Override + public BlockState rotate(BlockState pState, Rotation pRotation) { + return pState.setValue(FACING, pRotation.rotate(pState.getValue(FACING))); + } + + @Override + public BlockState mirror(BlockState pState, Mirror pMirror) { + return pState.rotate(pMirror.getRotation(pState.getValue(FACING))); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder pBuilder) { + pBuilder.add(FACING); + } + + @Override + public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Player pPlayer, InteractionHand pHand, BlockHitResult pHit) { + if (pPlayer instanceof ServerPlayer serverPlayer) { + if (serverPlayer.getAdvancements().getOrStartProgress(pLevel.getServer().getAdvancements().getAdvancement(new ResourceLocation("minecraft","end/kill_dragon"))).isDone()) { + ItemEntity itemEntity = new ItemEntity(pLevel,pPos.getX(),pPos.getY() + 3,pPos.getZ(),new ItemStack(Unordinary_BasicsItems.MASTER_SWORD)); + pLevel.addFreshEntity(itemEntity); + pLevel.setBlock(pPos, Blocks.AIR.defaultBlockState(),1); + System.out.println(); + return InteractionResult.SUCCESS; + } else { + pPlayer.displayClientMessage(Component.translatable("unordinary_basics.message.master_sword_deny"),true); + System.out.println("loser"); + } + } + + return InteractionResult.FAIL; + } +} diff --git a/src/main/java/com/github/manasmods/unordinary_basics/block/Unordinary_BasicsBlocks.java b/src/main/java/com/github/manasmods/unordinary_basics/block/Unordinary_BasicsBlocks.java index be081d3ad..609c6e5d2 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/block/Unordinary_BasicsBlocks.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/block/Unordinary_BasicsBlocks.java @@ -11,6 +11,8 @@ public class Unordinary_BasicsBlocks { public static final Block ENCHANTMENT_LIBRARY = null; @ObjectHolder(registryName = "block", value = "unordinary_basics:item_sorter") public static final Block ITEM_SORTER = null; + @ObjectHolder(registryName = "block", value = "unordinary_basics:master_sword_shrine") + public static final Block MASTER_SWORD_SHRINE = null; @ObjectHolder(registryName = "block", value = "unordinary_basics:andesite_bricks") public static final Block ANDESITE_BRICKS = null; diff --git a/src/main/java/com/github/manasmods/unordinary_basics/block/entity/Unordinary_BasicsBlockEntities.java b/src/main/java/com/github/manasmods/unordinary_basics/block/entity/Unordinary_BasicsBlockEntities.java index fc922f050..17420e69b 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/block/entity/Unordinary_BasicsBlockEntities.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/block/entity/Unordinary_BasicsBlockEntities.java @@ -1,8 +1,6 @@ package com.github.manasmods.unordinary_basics.block.entity; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ObjectHolder; public class Unordinary_BasicsBlockEntities { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/client/UBClient.java b/src/main/java/com/github/manasmods/unordinary_basics/client/UBClient.java index a99ebe94c..0a15e2eee 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/client/UBClient.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/client/UBClient.java @@ -3,12 +3,14 @@ import com.github.manasmods.manascore.client.keybinding.KeybindingRegistry; import com.github.manasmods.manascore.tab.InventoryTabRegistry; import com.github.manasmods.manascore.tab.TabPosition; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.block.Unordinary_BasicsBlocks; import com.github.manasmods.unordinary_basics.block.entity.Unordinary_BasicsBlockEntities; import com.github.manasmods.unordinary_basics.client.block_entity_renderer.ItemSorterBlockEntityRenderer; import com.github.manasmods.unordinary_basics.client.gui.*; import com.github.manasmods.unordinary_basics.client.keybind.UBKeybindings; +import com.github.manasmods.unordinary_basics.entity.client.MasterSwordBeamModel; +import com.github.manasmods.unordinary_basics.entity.client.MasterSwordBeamRenderer; import com.github.manasmods.unordinary_basics.entity.client.NonExplosiveWitherSkullRenderer; import com.github.manasmods.unordinary_basics.integration.apotheosis.ApotheosisIntegrationClient; import com.github.manasmods.unordinary_basics.integration.patchouli.PageMultiSpotlight; @@ -40,8 +42,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BannerPattern; -import net.minecraft.world.level.block.entity.BannerPatterns; import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -56,19 +56,18 @@ import vazkii.patchouli.client.book.ClientBookRegistry; import javax.annotation.Nullable; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.*; +import java.util.Arrays; +import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class UBClient { private static final List BANNER_PATTERN_HASHES = Arrays.asList("b", "bl", "bo", "br", "bri", "bs", "bt", "bts", "cbo", "cr", "cre", "cs", "dls", "drs", "flo", "glb", "gra", "gru", "hh", "hhb", "ld", "ls", "lud", "mc", "moj", "mr", "ms", "pig", "rd", "rs", "rud", "sc", "sku", "ss", "tl", "tr", "ts", "tt", "tts", "vh", "vhr"); @SubscribeEvent public void init(FMLCommonSetupEvent event) { - Unordinary_Basics.getInstance().getApotheosisIntegration().ifPresent(apotheosisIntegration -> { + UnordinaryBasics.getInstance().getApotheosisIntegration().ifPresent(apotheosisIntegration -> { event.enqueueWork(() -> MinecraftForge.EVENT_BUS.addListener(ApotheosisIntegrationClient::onOpenApotheosisMenu)); }); } @@ -77,9 +76,9 @@ public void init(FMLCommonSetupEvent event) { public static void init(final FMLClientSetupEvent e) { // Patchouli custom page try { - ClientBookRegistry.INSTANCE.pageTypes.put(new ResourceLocation(Unordinary_Basics.MOD_ID, "multi_spotlight"), PageMultiSpotlight.class); + ClientBookRegistry.INSTANCE.pageTypes.put(new ResourceLocation(UnordinaryBasics.MOD_ID, "multi_spotlight"), PageMultiSpotlight.class); } catch (Exception ex) { - Unordinary_Basics.LOGGER.info("Patchouli not found"); + UnordinaryBasics.LOGGER.info("Patchouli not found"); } e.enqueueWork(UBClient::registerBlockTransparencies); @@ -98,11 +97,16 @@ public static void registerRenderers(final EntityRenderersEvent.RegisterRenderer ItemSorterBlockEntityRenderer::new); } + @SubscribeEvent + public static void registerLayerDefinitons(final EntityRenderersEvent.RegisterLayerDefinitions event) { + event.registerLayerDefinition(MasterSwordBeamModel.LAYER_LOCATION, MasterSwordBeamModel::createBodyLayer); + } + @SubscribeEvent public static void onTextureStitch(TextureStitchEvent.Pre event) { if (event.getAtlas().location() == Sheets.BANNER_SHEET) { for (String hash : BANNER_PATTERN_HASHES) { - event.addSprite(new ResourceLocation(Unordinary_Basics.MOD_ID, "entity/banner/" + hash)); + event.addSprite(new ResourceLocation(UnordinaryBasics.MOD_ID, "entity/banner/" + hash)); } } @@ -116,7 +120,7 @@ public static void onTextureStitch(TextureStitchEvent.Pre event) { ); for (String s : registerValues) { - event.addSprite(new ResourceLocation(Unordinary_Basics.MOD_ID, "item/empty_slots/empty_armor_slot_" + s)); + event.addSprite(new ResourceLocation(UnordinaryBasics.MOD_ID, "item/empty_slots/empty_armor_slot_" + s)); } } } @@ -131,6 +135,7 @@ private static void registerEntityRenderer() { // EntityRenderers.register(UBEntityTypes.GROLAR_BEAR.get(), GrolarBearRenderer::new); // EntityRenderers.register(UBEntityTypes.GRIZZLY_BEAR.get(), GrizzlyBearRenderer::new); EntityRenderers.register(UBEntityTypes.NON_EXPLOSIVE_WITHER_SKULL.get(), NonExplosiveWitherSkullRenderer::new); + EntityRenderers.register(UBEntityTypes.MASTER_SWORD_BEAM.get(), MasterSwordBeamRenderer::new); } private static void registerMenuScreens() { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/BuildersGloveScreen.java b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/BuildersGloveScreen.java index 64c36f8d4..56ab7de79 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/BuildersGloveScreen.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/BuildersGloveScreen.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.client.gui; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.menu.BuildersGloveMenu; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; @@ -12,7 +12,7 @@ public class BuildersGloveScreen extends AbstractContainerScreen { private static final ResourceLocation TEXTURE = - new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/glove_inventory.png"); + new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/glove_inventory.png"); public BuildersGloveScreen(BuildersGloveMenu pMenu, Inventory pPlayerInventory, Component pTitle) { super(pMenu, pPlayerInventory, pTitle); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/FletchingTableScreen.java b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/FletchingTableScreen.java index ad9d833b9..9fff80398 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/FletchingTableScreen.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/FletchingTableScreen.java @@ -1,7 +1,7 @@ package com.github.manasmods.unordinary_basics.client.gui; import com.github.manasmods.manascore.api.client.gui.widget.ImagePredicateButton; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.integration.apotheosis.ApotheosisIntegration; import com.github.manasmods.unordinary_basics.menu.FletchingTableMenu; import com.mojang.blaze3d.systems.RenderSystem; @@ -13,18 +13,18 @@ import net.minecraft.world.entity.player.Inventory; public class FletchingTableScreen extends AbstractContainerScreen { - private static final ResourceLocation BACKGROUND = new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/fletching_table.png"); - private static final ResourceLocation APOTHEOSIS_LOGO = new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/apotheosis_logo.png"); + private static final ResourceLocation BACKGROUND = new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/fletching_table.png"); + private static final ResourceLocation APOTHEOSIS_LOGO = new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/apotheosis_logo.png"); private final ImagePredicateButton openApotheosisMenuButton; public FletchingTableScreen(FletchingTableMenu pMenu, Inventory pPlayerInventory, Component pTitle) { super(pMenu, pPlayerInventory, pTitle); imageHeight = 178; this.openApotheosisMenuButton = new ImagePredicateButton(0, 0, 24, 24, APOTHEOSIS_LOGO, pButton -> { - Unordinary_Basics.getInstance().getApotheosisIntegration().ifPresent(ApotheosisIntegration::requestApotheosisFletchingMenu); + UnordinaryBasics.getInstance().getApotheosisIntegration().ifPresent(ApotheosisIntegration::requestApotheosisFletchingMenu); }, (pButton, pPoseStack, pMouseX, pMouseY) -> { - renderTooltip(pPoseStack, Component.translatable(Unordinary_Basics.MOD_ID + ".menu.fletching_table.switch.apotheosis"), pMouseX, pMouseY); - }, () -> Unordinary_Basics.getInstance().getApotheosisIntegration().isPresent()); + renderTooltip(pPoseStack, Component.translatable(UnordinaryBasics.MOD_ID + ".menu.fletching_table.switch.apotheosis"), pMouseX, pMouseY); + }, () -> UnordinaryBasics.getInstance().getApotheosisIntegration().isPresent()); } @@ -57,7 +57,7 @@ protected void init() { removeWidget(openApotheosisMenuButton); openApotheosisMenuButton.x = getGuiLeft() + imageWidth - openApotheosisMenuButton.getWidth() - 4; openApotheosisMenuButton.y = getGuiTop() + 6; - if (Unordinary_Basics.getInstance().getApotheosisIntegration().isPresent()) { + if (UnordinaryBasics.getInstance().getApotheosisIntegration().isPresent()) { addRenderableWidget(openApotheosisMenuButton); } } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/ItemSorterScreen.java b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/ItemSorterScreen.java index 9eef7690e..f4774afc8 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/ItemSorterScreen.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/ItemSorterScreen.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.client.gui; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.menu.ItemSorterMenu; import com.github.manasmods.unordinary_basics.menu.slot.GhostSlot; import com.github.manasmods.unordinary_basics.network.Unordinary_BasicsNetwork; @@ -19,7 +19,7 @@ public class ItemSorterScreen extends AbstractContainerScreen { private static final ResourceLocation TEXTURE = - new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/item_sorter.png"); + new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/item_sorter.png"); private EditBox text; public ItemSorterScreen(ItemSorterMenu pMenu, Inventory pPlayerInventory, Component pTitle) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/JukeBoxScreen.java b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/JukeBoxScreen.java index ca28cbb39..f721b46e6 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/JukeBoxScreen.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/JukeBoxScreen.java @@ -1,7 +1,7 @@ package com.github.manasmods.unordinary_basics.client.gui; import com.github.manasmods.manascore.api.client.gui.widget.ImagePredicateButton; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.menu.JukeBoxMenu; import com.github.manasmods.unordinary_basics.network.Unordinary_BasicsNetwork; import com.github.manasmods.unordinary_basics.network.toserver.RequestJukeboxUpdate; @@ -16,9 +16,9 @@ public class JukeBoxScreen extends AbstractContainerScreen { private final ImagePredicateButton playButton, stopButton; - private static final ResourceLocation BACKGROUND = new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/jukebox.png"); - private static final ResourceLocation PLAY_BUTTON = new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/play_button.png"); - private static final ResourceLocation STOP_BUTTON = new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/stop_button.png"); + private static final ResourceLocation BACKGROUND = new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/jukebox.png"); + private static final ResourceLocation PLAY_BUTTON = new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/play_button.png"); + private static final ResourceLocation STOP_BUTTON = new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/stop_button.png"); public JukeBoxScreen(JukeBoxMenu pMenu, Inventory pPlayerInventory, Component pTitle) { super(pMenu, pPlayerInventory, pTitle); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/Unordinary_BasicsInventoryScreen.java b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/Unordinary_BasicsInventoryScreen.java index 9430e76a6..963c9ae7d 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/Unordinary_BasicsInventoryScreen.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/Unordinary_BasicsInventoryScreen.java @@ -1,8 +1,7 @@ package com.github.manasmods.unordinary_basics.client.gui; import com.github.manasmods.manascore.api.tab.annotation.ScreenForTab; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; -import com.github.manasmods.unordinary_basics.capability.IUBInventoryItem; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.menu.UBInventoryMenu; import com.github.manasmods.unordinary_basics.tab.Unordinary_BasicsInventoryTab; import com.mojang.blaze3d.platform.Lighting; @@ -26,7 +25,7 @@ @OnlyIn(Dist.CLIENT) public class Unordinary_BasicsInventoryScreen extends AbstractContainerScreen { - public static final ResourceLocation UB_INVENTORY_LOCATION = new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/ub_inventory.png"); + public static final ResourceLocation UB_INVENTORY_LOCATION = new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/ub_inventory.png"); private float xMouse; private float yMouse; diff --git a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/Unordinary_BasicsItemInventoryScreen.java b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/Unordinary_BasicsItemInventoryScreen.java index 48f0b0255..7423688f2 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/Unordinary_BasicsItemInventoryScreen.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/Unordinary_BasicsItemInventoryScreen.java @@ -1,11 +1,8 @@ package com.github.manasmods.unordinary_basics.client.gui; import com.github.manasmods.manascore.api.tab.annotation.ScreenForTab; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; import com.github.manasmods.unordinary_basics.capability.IUBInventoryItem; -import com.github.manasmods.unordinary_basics.menu.UBInventoryMenu; import com.github.manasmods.unordinary_basics.menu.UBItemInventoryMenu; -import com.github.manasmods.unordinary_basics.tab.Unordinary_BasicsInventoryTab; import com.github.manasmods.unordinary_basics.tab.Unordinary_BasicsItemInventoryTab; import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/overlay/OverlayEventHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/overlay/OverlayEventHandler.java index 30132b0c4..2c8883938 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/client/gui/overlay/OverlayEventHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/client/gui/overlay/OverlayEventHandler.java @@ -1,12 +1,12 @@ package com.github.manasmods.unordinary_basics.client.gui.overlay; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderGuiOverlayEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = Unordinary_Basics.MOD_ID) +@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = UnordinaryBasics.MOD_ID) public class OverlayEventHandler { private static final QuiverArrowHudOverlay quiverOverlay = new QuiverArrowHudOverlay(); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/core/MixinApothFletchingBlock.java b/src/main/java/com/github/manasmods/unordinary_basics/core/MixinApothFletchingBlock.java index efa1a19ad..47131e1be 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/core/MixinApothFletchingBlock.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/core/MixinApothFletchingBlock.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.core; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.menu.FletchingTableMenu; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; @@ -31,7 +31,7 @@ public MixinApothFletchingBlock(Properties p_53499_) { @Inject(method = "use(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)Lnet/minecraft/world/InteractionResult;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;openMenu(Lnet/minecraft/world/MenuProvider;)Ljava/util/OptionalInt;"), cancellable = true) private void onGetMenuProvider(BlockState state, Level worldIn, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit, CallbackInfoReturnable cir) { - NetworkHooks.openScreen((ServerPlayer) player, new SimpleMenuProvider((pContainerId, pInventory, pPlayer1) -> new FletchingTableMenu(pContainerId, ContainerLevelAccess.create(worldIn, pos), pPlayer1.getInventory(),pos), Component.translatable(Unordinary_Basics.MOD_ID + ".menu.fletching_table.title")), buffer -> { + NetworkHooks.openScreen((ServerPlayer) player, new SimpleMenuProvider((pContainerId, pInventory, pPlayer1) -> new FletchingTableMenu(pContainerId, ContainerLevelAccess.create(worldIn, pos), pPlayer1.getInventory(),pos), Component.translatable(UnordinaryBasics.MOD_ID + ".menu.fletching_table.title")), buffer -> { buffer.writeBlockPos(pos); buffer.writeResourceLocation(worldIn.dimension().location()); }); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/core/MixinFletchingTableBlock.java b/src/main/java/com/github/manasmods/unordinary_basics/core/MixinFletchingTableBlock.java index 1c568a273..d65a685df 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/core/MixinFletchingTableBlock.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/core/MixinFletchingTableBlock.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.core; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.menu.FletchingTableMenu; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; @@ -32,7 +32,7 @@ private void onUse(BlockState pState, Level pLevel, BlockPos pPos, Player pPlaye if (pLevel.isClientSide) { cir.setReturnValue(InteractionResult.SUCCESS); } else { - NetworkHooks.openScreen((ServerPlayer) pPlayer, new SimpleMenuProvider((pContainerId, pInventory, pPlayer1) -> new FletchingTableMenu(pContainerId, ContainerLevelAccess.create(pLevel, pPos), pPlayer1.getInventory(), pPos), Component.translatable(Unordinary_Basics.MOD_ID + ".menu.fletching_table.title")), buffer -> { + NetworkHooks.openScreen((ServerPlayer) pPlayer, new SimpleMenuProvider((pContainerId, pInventory, pPlayer1) -> new FletchingTableMenu(pContainerId, ContainerLevelAccess.create(pLevel, pPos), pPlayer1.getInventory(), pPos), Component.translatable(UnordinaryBasics.MOD_ID + ".menu.fletching_table.title")), buffer -> { buffer.writeBlockPos(pPos); buffer.writeResourceLocation(pLevel.dimension().location()); }); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/core/MixinItemStack.java b/src/main/java/com/github/manasmods/unordinary_basics/core/MixinItemStack.java index 9bd3d3cb6..6f2bd2b0b 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/core/MixinItemStack.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/core/MixinItemStack.java @@ -21,7 +21,7 @@ public class MixinItemStack { @Inject(method = "use(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder;", at = @At("HEAD"), cancellable = true) public void onUse(Level level, Player player, InteractionHand hand, CallbackInfoReturnable> callback) { - if (player.isShiftKeyDown()) { + if (!player.isCrouching()) { ItemStack stack = player.getItemInHand(hand); Map enchantmentMap = EnchantmentHelper.getEnchantments(stack); if (stack.getItem().canBeDepleted() && player.experienceLevel >= 1 && enchantmentMap.containsKey(Enchantments.MENDING) && stack.getDamageValue() > 0) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/core/MixinJukeBoxBlock.java b/src/main/java/com/github/manasmods/unordinary_basics/core/MixinJukeBoxBlock.java index 3e9e6875f..cefc986c1 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/core/MixinJukeBoxBlock.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/core/MixinJukeBoxBlock.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.core; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.block.entity.JukeboxBlockEntity; import com.github.manasmods.unordinary_basics.menu.JukeBoxMenu; import net.minecraft.core.BlockPos; @@ -49,7 +49,7 @@ public void onSetPlacedBy(Level pLevel, BlockPos pPos, BlockState pState, Living if (tag.contains("isPlaying")) { pLevel.setBlock(pPos, pState.setValue(JukeboxBlock.HAS_RECORD, tag.getBoolean("isPlaying")), 2); } else { - Unordinary_Basics.getLogger().error("Missing nbt data on {}. No isPlaying value found.", pStack); + UnordinaryBasics.getLogger().error("Missing nbt data on {}. No isPlaying value found.", pStack); } ci.cancel(); } @@ -60,7 +60,7 @@ public void onUse(BlockState pState, Level pLevel, BlockPos pPos, Player pPlayer NetworkHooks.openScreen((ServerPlayer) pPlayer, new SimpleMenuProvider((pContainerId, pInventory, pPlayer1) -> { JukeboxBlockEntity blockEntity = (JukeboxBlockEntity) pLevel.getBlockEntity(pPos); return new JukeBoxMenu(pContainerId, pPlayer1.getInventory(), blockEntity, ContainerLevelAccess.create(pLevel, pPos)); - }, Component.translatable(Unordinary_Basics.MOD_ID + ".menu.jukebox.title")), buffer -> { + }, Component.translatable(UnordinaryBasics.MOD_ID + ".menu.jukebox.title")), buffer -> { buffer.writeBlockPos(pPos); buffer.writeResourceLocation(pLevel.dimension().location()); }); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsBlockLoot.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBBlockLoot.java similarity index 98% rename from src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsBlockLoot.java rename to src/main/java/com/github/manasmods/unordinary_basics/data/UBBlockLoot.java index 41d05095d..04cb24d66 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsBlockLoot.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBBlockLoot.java @@ -1,20 +1,23 @@ package com.github.manasmods.unordinary_basics.data; import com.github.manasmods.unordinary_basics.block.Unordinary_BasicsBlocks; -import com.github.manasmods.unordinary_basics.registry.Unordinary_BasicsRegistry; +import com.github.manasmods.unordinary_basics.registry.UBRegistry; import net.minecraft.data.loot.BlockLoot; +import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; -public class Unordinary_BasicsBlockLoot extends BlockLoot { +public class UBBlockLoot extends BlockLoot { @Override protected Iterable getKnownBlocks() { - return Unordinary_BasicsRegistry.getKnownBlocks(); + return UBRegistry.getKnownBlocks(); } + @SuppressWarnings("ConstantConditions") protected void addTables() { this.dropSelf(Unordinary_BasicsBlocks.ENCHANTMENT_LIBRARY); this.dropSelf(Unordinary_BasicsBlocks.ITEM_SORTER); + this.dropOther(Unordinary_BasicsBlocks.MASTER_SWORD_SHRINE, Items.AIR); this.dropSelf(Unordinary_BasicsBlocks.ANDESITE_BRICKS); this.dropSelf(Unordinary_BasicsBlocks.ANDESITE_BRICK_STAIRS); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsBlockStateProvider.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBBlockStateProvider.java similarity index 99% rename from src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsBlockStateProvider.java rename to src/main/java/com/github/manasmods/unordinary_basics/data/UBBlockStateProvider.java index c3610c158..4dbafabe0 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsBlockStateProvider.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBBlockStateProvider.java @@ -1,7 +1,7 @@ package com.github.manasmods.unordinary_basics.data; import com.github.manasmods.manascore.api.data.gen.BlockStateProvider; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.block.Unordinary_BasicsBlocks; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; @@ -15,10 +15,10 @@ import java.util.Objects; -public class Unordinary_BasicsBlockStateProvider extends BlockStateProvider { +public class UBBlockStateProvider extends BlockStateProvider { - public Unordinary_BasicsBlockStateProvider(GatherDataEvent gatherDataEvent) { - super(gatherDataEvent, Unordinary_Basics.MOD_ID); + public UBBlockStateProvider(GatherDataEvent gatherDataEvent) { + super(gatherDataEvent, UnordinaryBasics.MOD_ID); } @Override @@ -409,7 +409,6 @@ private void modSlabs() { private void modWalls() { - System.out.println("ModWalls"); wallBlock((WallBlock) Unordinary_BasicsBlocks.ANDESITE_BRICK_WALL, blockTexture(Unordinary_BasicsBlocks.ANDESITE_BRICKS)); wallBlock((WallBlock) Unordinary_BasicsBlocks.POLISHED_ANDESITE_BRICK_WALL, blockTexture(Unordinary_BasicsBlocks.POLISHED_ANDESITE_BRICKS)); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsBlockTagProvider.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBBlockTagProvider.java similarity index 99% rename from src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsBlockTagProvider.java rename to src/main/java/com/github/manasmods/unordinary_basics/data/UBBlockTagProvider.java index 5e7c9d066..68f46588c 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsBlockTagProvider.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBBlockTagProvider.java @@ -1,7 +1,7 @@ package com.github.manasmods.unordinary_basics.data; import com.github.manasmods.manascore.api.data.gen.BlockTagProvider; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.block.Unordinary_BasicsBlocks; import com.github.manasmods.unordinary_basics.utils.UBTags; import net.minecraft.tags.BlockTags; @@ -9,9 +9,9 @@ import net.minecraftforge.common.Tags; import net.minecraftforge.data.event.GatherDataEvent; -public class Unordinary_BasicsBlockTagProvider extends BlockTagProvider { - public Unordinary_BasicsBlockTagProvider(GatherDataEvent gatherDataEvent) { - super(gatherDataEvent, Unordinary_Basics.MOD_ID); +public class UBBlockTagProvider extends BlockTagProvider { + public UBBlockTagProvider(GatherDataEvent gatherDataEvent) { + super(gatherDataEvent, UnordinaryBasics.MOD_ID); } @Override diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/UBEntityLoot.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBEntityLoot.java new file mode 100644 index 000000000..a397cc7e7 --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBEntityLoot.java @@ -0,0 +1,11 @@ +package com.github.manasmods.unordinary_basics.data; + +import com.github.manasmods.manascore.api.data.gen.EntityLoot; + +public class UBEntityLoot extends EntityLoot { + + @Override + protected void loadTables() { + + } +} diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/UBEntityTypeTagProvider.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBEntityTypeTagProvider.java new file mode 100644 index 000000000..99cb95feb --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBEntityTypeTagProvider.java @@ -0,0 +1,26 @@ +package com.github.manasmods.unordinary_basics.data; + +import com.github.manasmods.unordinary_basics.UnordinaryBasics; +import com.github.manasmods.unordinary_basics.utils.UBTags; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.EntityTypeTagsProvider; +import net.minecraft.world.entity.EntityType; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.data.event.GatherDataEvent; + +import javax.annotation.Nullable; + +public class UBEntityTypeTagProvider extends EntityTypeTagsProvider { + public UBEntityTypeTagProvider(DataGenerator generator, String modId, @Nullable ExistingFileHelper existingFileHelper) { + super(generator, modId, existingFileHelper); + } + + public UBEntityTypeTagProvider(GatherDataEvent gatherDataEvent) { + this(gatherDataEvent.getGenerator(), UnordinaryBasics.MOD_ID, gatherDataEvent.getExistingFileHelper()); + } + + @Override + protected void addTags() { + tag(UBTags.EntityTypes.SCULK_ENEMIES).add(EntityType.WARDEN); + } +} diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsFletchingRecipeProvider.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBFletchingRecipeProvider.java similarity index 92% rename from src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsFletchingRecipeProvider.java rename to src/main/java/com/github/manasmods/unordinary_basics/data/UBFletchingRecipeProvider.java index cabef8a9b..22e39fbbe 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsFletchingRecipeProvider.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBFletchingRecipeProvider.java @@ -15,8 +15,8 @@ import java.util.function.Consumer; -public class Unordinary_BasicsFletchingRecipeProvider extends FletchingRecipeProvider { - public Unordinary_BasicsFletchingRecipeProvider(GatherDataEvent gatherDataEvent) { +public class UBFletchingRecipeProvider extends FletchingRecipeProvider { + public UBFletchingRecipeProvider(GatherDataEvent gatherDataEvent) { super(gatherDataEvent.getGenerator()); } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsItemModelProvider.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBItemModelProvider.java similarity index 76% rename from src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsItemModelProvider.java rename to src/main/java/com/github/manasmods/unordinary_basics/data/UBItemModelProvider.java index 09be597b1..062ac55c1 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsItemModelProvider.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBItemModelProvider.java @@ -1,7 +1,7 @@ package com.github.manasmods.unordinary_basics.data; import com.github.manasmods.manascore.api.data.gen.ItemModelProvider; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.block.Unordinary_BasicsBlocks; import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsItems; import net.minecraft.resources.ResourceLocation; @@ -13,12 +13,13 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -public class Unordinary_BasicsItemModelProvider extends ItemModelProvider { - public Unordinary_BasicsItemModelProvider(GatherDataEvent gatherDataEvent) { - super(gatherDataEvent, Unordinary_Basics.MOD_ID); +public class UBItemModelProvider extends ItemModelProvider { + public UBItemModelProvider(GatherDataEvent gatherDataEvent) { + super(gatherDataEvent, UnordinaryBasics.MOD_ID); } @Override + @SuppressWarnings("ConstantConditions") protected void generate() { singleTexture(Unordinary_BasicsItems.ANIMAL_BAIT); singleTexture(Unordinary_BasicsItems.GOAT_MILK_BOTTLE); @@ -42,10 +43,13 @@ protected void generate() { singleTexture(Item.byBlock(Unordinary_BasicsBlocks.ITEM_SORTER)); - basicItem(new ResourceLocation(Unordinary_Basics.MOD_ID,"quiver_no_items")); - basicItem(new ResourceLocation(Unordinary_Basics.MOD_ID,"quiver_has_items")); + handheldSingleTexture(Unordinary_BasicsItems.DECAYED_MASTER_SWORD); + handheldSingleTexture(Unordinary_BasicsItems.MASTER_SWORD); - basicItem(new ResourceLocation(Unordinary_Basics.MOD_ID,"builders_glove_gui")); + basicItem(new ResourceLocation(UnordinaryBasics.MOD_ID,"quiver_no_items")); + basicItem(new ResourceLocation(UnordinaryBasics.MOD_ID,"quiver_has_items")); + + basicItem(new ResourceLocation(UnordinaryBasics.MOD_ID,"builders_glove_gui")); wallItem(Unordinary_BasicsBlocks.ANDESITE_BRICK_WALL, Unordinary_BasicsBlocks.ANDESITE_BRICKS); wallItem(Unordinary_BasicsBlocks.POLISHED_ANDESITE_BRICK_WALL, Unordinary_BasicsBlocks.POLISHED_ANDESITE_BRICKS); @@ -66,11 +70,13 @@ protected void generate() { wallItem(Unordinary_BasicsBlocks.RED_SANDSTONE_BRICK_WALL, Unordinary_BasicsBlocks.RED_SANDSTONE_BRICKS); wallItem(Unordinary_BasicsBlocks.SOUL_SANDSTONE_BRICK_WALL, Unordinary_BasicsBlocks.SOUL_SANDSTONE_BRICKS); + blockItem(Unordinary_BasicsBlocks.MASTER_SWORD_SHRINE); + //generate models for slime compass for (int i = 0; i < 32; ++i){ if (i >= 10) { - basicItem(new ResourceLocation(Unordinary_Basics.MOD_ID, "slime_compass/slime_compass_" + i),new ResourceLocation("unordinary_basics", "item/slime_compass/slime_compass_" + i)); - } else basicItem(new ResourceLocation(Unordinary_Basics.MOD_ID, "slime_compass/slime_compass_0" + i),new ResourceLocation("unordinary_basics", "item/slime_compass/slime_compass_0" + i)); + basicItem(new ResourceLocation(UnordinaryBasics.MOD_ID, "slime_compass/slime_compass_" + i),new ResourceLocation("unordinary_basics", "item/slime_compass/slime_compass_" + i)); + } else basicItem(new ResourceLocation(UnordinaryBasics.MOD_ID, "slime_compass/slime_compass_0" + i),new ResourceLocation("unordinary_basics", "item/slime_compass/slime_compass_0" + i)); } } @@ -89,22 +95,27 @@ public void trapdoorItem(RegistryObject block) { public void fenceItem(RegistryObject block, RegistryObject baseBlock) { this.withExistingParent(ForgeRegistries.BLOCKS.getKey(block.get()).getPath(), mcLoc("block/fence_inventory")) - .texture("texture", new ResourceLocation(Unordinary_Basics.MOD_ID, "block/" + ForgeRegistries.BLOCKS.getKey(baseBlock.get()).getPath())); + .texture("texture", new ResourceLocation(UnordinaryBasics.MOD_ID, "block/" + ForgeRegistries.BLOCKS.getKey(baseBlock.get()).getPath())); } public void buttonItem(RegistryObject block, RegistryObject baseBlock) { this.withExistingParent(ForgeRegistries.BLOCKS.getKey(block.get()).getPath(), mcLoc("block/button_inventory")) - .texture("texture", new ResourceLocation(Unordinary_Basics.MOD_ID, "block/" + ForgeRegistries.BLOCKS.getKey(baseBlock.get()).getPath())); + .texture("texture", new ResourceLocation(UnordinaryBasics.MOD_ID, "block/" + ForgeRegistries.BLOCKS.getKey(baseBlock.get()).getPath())); } public void wallItem(Block block, Block baseBlock) { this.withExistingParent(ForgeRegistries.BLOCKS.getKey(block).getPath(), mcLoc("block/wall_inventory")) - .texture("wall", new ResourceLocation(Unordinary_Basics.MOD_ID, "block/" + ForgeRegistries.BLOCKS.getKey(baseBlock).getPath())); + .texture("wall", new ResourceLocation(UnordinaryBasics.MOD_ID, "block/" + ForgeRegistries.BLOCKS.getKey(baseBlock).getPath())); } private ItemModelBuilder simpleBlockItem(RegistryObject item) { return withExistingParent(item.getId().getPath(), new ResourceLocation("item/generated")).texture("layer0", - new ResourceLocation(Unordinary_Basics.MOD_ID,"item/" + item.getId().getPath())); + new ResourceLocation(UnordinaryBasics.MOD_ID,"item/" + item.getId().getPath())); + } + + private ItemModelBuilder blockItem(Block block) { + return withExistingParent(ForgeRegistries.BLOCKS.getKey(block).getPath(), + new ResourceLocation(UnordinaryBasics.MOD_ID,"block/" + ForgeRegistries.BLOCKS.getKey(block).getPath())); } } \ No newline at end of file diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsItemTagProvider.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBItemTagProvider.java similarity index 82% rename from src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsItemTagProvider.java rename to src/main/java/com/github/manasmods/unordinary_basics/data/UBItemTagProvider.java index 05c006e67..b15af5ba6 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsItemTagProvider.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBItemTagProvider.java @@ -2,17 +2,17 @@ import com.github.manasmods.manascore.api.data.gen.BlockTagProvider; import com.github.manasmods.manascore.api.data.gen.ItemTagProvider; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsItems; import com.github.manasmods.unordinary_basics.utils.UBTags; import net.minecraft.world.item.Items; import net.minecraftforge.common.Tags; import net.minecraftforge.data.event.GatherDataEvent; -public class Unordinary_BasicsItemTagProvider extends ItemTagProvider { +public class UBItemTagProvider extends ItemTagProvider { - public Unordinary_BasicsItemTagProvider(GatherDataEvent gatherDataEvent, BlockTagProvider blockTagProvider) { - super(gatherDataEvent, Unordinary_Basics.MOD_ID, blockTagProvider); + public UBItemTagProvider(GatherDataEvent gatherDataEvent, BlockTagProvider blockTagProvider) { + super(gatherDataEvent, UnordinaryBasics.MOD_ID, blockTagProvider); } @Override diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsLootTableProvider.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBLootTableProvider.java similarity index 82% rename from src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsLootTableProvider.java rename to src/main/java/com/github/manasmods/unordinary_basics/data/UBLootTableProvider.java index 7ae5c2549..2df74fb06 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsLootTableProvider.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBLootTableProvider.java @@ -17,17 +17,17 @@ import java.util.function.Consumer; import java.util.function.Supplier; -public class Unordinary_BasicsLootTableProvider extends LootTableProvider { +public class UBLootTableProvider extends LootTableProvider { - public Unordinary_BasicsLootTableProvider(GatherDataEvent gatherDataEvent) { + public UBLootTableProvider(GatherDataEvent gatherDataEvent) { super(gatherDataEvent.getGenerator()); } @Override protected List>>, LootContextParamSet>> getTables() { - return ImmutableList.of(Pair.of(Unordinary_BasicsBlockLoot::new, LootContextParamSets.BLOCK)); + return ImmutableList.of(Pair.of(UBBlockLoot::new, LootContextParamSets.BLOCK)); } @Override diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsRecipeProvider.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBRecipeProvider.java similarity index 96% rename from src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsRecipeProvider.java rename to src/main/java/com/github/manasmods/unordinary_basics/data/UBRecipeProvider.java index 039532297..4ee3c3646 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsRecipeProvider.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBRecipeProvider.java @@ -1,7 +1,7 @@ package com.github.manasmods.unordinary_basics.data; import com.github.manasmods.manascore.api.data.gen.RecipeProvider; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.block.Unordinary_BasicsBlocks; import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsItems; import com.github.manasmods.unordinary_basics.utils.UBTags; @@ -25,9 +25,9 @@ import java.util.function.Consumer; -public class Unordinary_BasicsRecipeProvider extends RecipeProvider { +public class UBRecipeProvider extends RecipeProvider { - public Unordinary_BasicsRecipeProvider(GatherDataEvent gatherDataEvent) { + public UBRecipeProvider(GatherDataEvent gatherDataEvent) { super(gatherDataEvent); } @@ -60,7 +60,7 @@ private void vanillaRecipes(Consumer consumer) { .of(Items.IRON_INGOT).build())) .unlockedBy("has_wooden_storage", inventoryTrigger(ItemPredicate.Builder.item() .of(UBTags.Items.STORAGE_WOODEN).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.HOPPER).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.HOPPER).getPath())); ShapedRecipeBuilder.shaped(Blocks.FURNACE) .define('#', UBTags.Items.STONE) @@ -69,7 +69,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("###") .unlockedBy("has_stones", inventoryTrigger(ItemPredicate.Builder.item() .of(UBTags.Items.STONE).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.FURNACE).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.FURNACE).getPath())); ShapedRecipeBuilder.shaped(Blocks.DISPENSER) .define('#', UBTags.Items.STONE) @@ -80,7 +80,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("#R#") .unlockedBy("has_stones", inventoryTrigger(ItemPredicate.Builder.item() .of(UBTags.Items.STONE).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.DISPENSER).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.DISPENSER).getPath())); ShapedRecipeBuilder.shaped(Blocks.DROPPER) .define('#', UBTags.Items.STONE) @@ -90,7 +90,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("#R#") .unlockedBy("has_stones", inventoryTrigger(ItemPredicate.Builder.item() .of(UBTags.Items.STONE).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.DROPPER).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.DROPPER).getPath())); ShapedRecipeBuilder.shaped(Blocks.OBSERVER) .define('#', UBTags.Items.STONE) @@ -101,7 +101,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("###") .unlockedBy("has_stones", inventoryTrigger(ItemPredicate.Builder.item() .of(UBTags.Items.STONE).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.OBSERVER).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.OBSERVER).getPath())); ShapedRecipeBuilder.shaped(Blocks.PISTON) .define('#', UBTags.Items.STONE) @@ -113,7 +113,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("#R#") .unlockedBy("has_stones", inventoryTrigger(ItemPredicate.Builder.item() .of(UBTags.Items.STONE).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.PISTON).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.PISTON).getPath())); ShapedRecipeBuilder.shaped(Items.STONE_SWORD) .define('#', UBTags.Items.STONE) @@ -125,7 +125,7 @@ private void vanillaRecipes(Consumer consumer) { .of(UBTags.Items.STONE).build())) .unlockedBy("has_stick", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.STICK).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.STONE_SWORD).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.STONE_SWORD).getPath())); ShapedRecipeBuilder.shaped(Items.STONE_PICKAXE) .define('#', UBTags.Items.STONE) @@ -137,7 +137,7 @@ private void vanillaRecipes(Consumer consumer) { .of(UBTags.Items.STONE).build())) .unlockedBy("has_stick", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.STICK).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.STONE_PICKAXE).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.STONE_PICKAXE).getPath())); ShapedRecipeBuilder.shaped(Items.STONE_AXE) .define('#', UBTags.Items.STONE) @@ -149,7 +149,7 @@ private void vanillaRecipes(Consumer consumer) { .of(UBTags.Items.STONE).build())) .unlockedBy("has_stick", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.STICK).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.STONE_AXE).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.STONE_AXE).getPath())); ShapedRecipeBuilder.shaped(Items.STONE_SHOVEL) .define('#', UBTags.Items.STONE) @@ -161,7 +161,7 @@ private void vanillaRecipes(Consumer consumer) { .of(UBTags.Items.STONE).build())) .unlockedBy("has_stick", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.STICK).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.STONE_SHOVEL).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.STONE_SHOVEL).getPath())); ShapedRecipeBuilder.shaped(Items.STONE_HOE) .define('#', UBTags.Items.STONE) @@ -173,7 +173,7 @@ private void vanillaRecipes(Consumer consumer) { .of(UBTags.Items.STONE).build())) .unlockedBy("has_stick", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.STICK).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.STONE_HOE).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.STONE_HOE).getPath())); ShapedRecipeBuilder.shaped(Items.SADDLE) .define('L', Items.LEATHER) @@ -184,7 +184,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("S S") .unlockedBy("has_leather", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.LEATHER).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.SADDLE).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.SADDLE).getPath())); ShapedRecipeBuilder.shaped(Items.NAME_TAG) .define('P', Items.PAPER) @@ -193,7 +193,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("S") .unlockedBy("has_string", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.PAPER).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.NAME_TAG).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.NAME_TAG).getPath())); ShapedRecipeBuilder.shaped(Items.TRIDENT) .define('I', Items.IRON_INGOT) @@ -204,7 +204,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern(" P ") .unlockedBy("has_prismarine_shard", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.PRISMARINE_SHARD).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.TRIDENT).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.TRIDENT).getPath())); ShapedRecipeBuilder.shaped(Items.CHAINMAIL_HELMET) .define('I', Items.IRON_INGOT) @@ -213,7 +213,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("N N") .unlockedBy("has_iron_nugget", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.IRON_NUGGET).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.CHAINMAIL_HELMET).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.CHAINMAIL_HELMET).getPath())); ShapedRecipeBuilder.shaped(Items.CHAINMAIL_CHESTPLATE) .define('I', Items.IRON_INGOT) @@ -223,7 +223,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("NNN") .unlockedBy("has_iron_nugget", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.IRON_NUGGET).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.CHAINMAIL_CHESTPLATE).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.CHAINMAIL_CHESTPLATE).getPath())); ShapedRecipeBuilder.shaped(Items.CHAINMAIL_LEGGINGS) .define('I', Items.IRON_INGOT) @@ -233,7 +233,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("N N") .unlockedBy("has_iron_nugget", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.IRON_NUGGET).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.CHAINMAIL_LEGGINGS).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.CHAINMAIL_LEGGINGS).getPath())); ShapedRecipeBuilder.shaped(Items.CHAINMAIL_BOOTS) .define('I', Items.IRON_INGOT) @@ -242,7 +242,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("I I") .unlockedBy("has_iron_nugget", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.IRON_NUGGET).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.CHAINMAIL_BOOTS).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.CHAINMAIL_BOOTS).getPath())); ShapelessRecipeBuilder.shapeless(Items.ARROW) .requires(ItemTags.ARROWS) @@ -257,7 +257,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("ISI") .unlockedBy("has_leather", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.LEATHER).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.LEATHER_HORSE_ARMOR).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.LEATHER_HORSE_ARMOR).getPath())); ShapedRecipeBuilder.shaped(Items.IRON_HORSE_ARMOR) .define('I', Items.IRON_INGOT) @@ -268,7 +268,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("ISI") .unlockedBy("has_iron_ingot", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.IRON_INGOT).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.IRON_HORSE_ARMOR).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.IRON_HORSE_ARMOR).getPath())); ShapedRecipeBuilder.shaped(Items.GOLDEN_HORSE_ARMOR) .define('I', Items.GOLD_INGOT) @@ -279,7 +279,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("ISI") .unlockedBy("has_gold_ingot", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.GOLD_INGOT).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.GOLDEN_HORSE_ARMOR).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.GOLDEN_HORSE_ARMOR).getPath())); ShapedRecipeBuilder.shaped(Items.DIAMOND_HORSE_ARMOR) .define('I', Items.DIAMOND) @@ -290,7 +290,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("ISI") .unlockedBy("has_diamond", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.DIAMOND).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.DIAMOND_HORSE_ARMOR).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.DIAMOND_HORSE_ARMOR).getPath())); ShapedRecipeBuilder.shaped(Items.ENCHANTED_GOLDEN_APPLE, 2) .define('A', Items.GOLDEN_APPLE) @@ -301,7 +301,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("BAB") .unlockedBy("has_golden_apple", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.GOLDEN_APPLE).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.ENCHANTED_GOLDEN_APPLE).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.ENCHANTED_GOLDEN_APPLE).getPath())); ShapelessRecipeBuilder.shapeless(Items.GREEN_DYE, 2) .requires(Items.YELLOW_DYE) @@ -310,13 +310,13 @@ private void vanillaRecipes(Consumer consumer) { .of(Items.YELLOW_DYE).build())) .unlockedBy("has_blue_dye", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.BLUE_DYE).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.GREEN_DYE).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.GREEN_DYE).getPath())); ShapelessRecipeBuilder.shapeless(Items.BLACK_DYE, 2) .requires(UBTags.Items.BLACK_DYE_RESOURCES) .unlockedBy("has_black_dyes", inventoryTrigger(ItemPredicate.Builder.item() .of(UBTags.Items.BLACK_DYE_RESOURCES).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.BLACK_DYE).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.BLACK_DYE).getPath())); ShapedRecipeBuilder.shaped(Items.BROWN_MUSHROOM_BLOCK, 4) .define('M', Items.BROWN_MUSHROOM) @@ -324,7 +324,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("MM") .unlockedBy("has_brown_mushroom", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.BROWN_MUSHROOM).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.BROWN_MUSHROOM_BLOCK).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.BROWN_MUSHROOM_BLOCK).getPath())); ShapedRecipeBuilder.shaped(Items.RED_MUSHROOM_BLOCK, 4) .define('M', Items.RED_MUSHROOM) @@ -332,7 +332,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("MM") .unlockedBy("has_red_mushroom", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.RED_MUSHROOM).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.RED_MUSHROOM_BLOCK).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.RED_MUSHROOM_BLOCK).getPath())); ShapedRecipeBuilder.shaped(Items.MUSHROOM_STEM, 4) .define('R', Items.RED_MUSHROOM) @@ -343,7 +343,7 @@ private void vanillaRecipes(Consumer consumer) { .of(Items.BROWN_MUSHROOM).build())) .unlockedBy("has_red_mushroom", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.RED_MUSHROOM).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.MUSHROOM_STEM).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.MUSHROOM_STEM).getPath())); ShapedRecipeBuilder.shaped(Items.CAKE, 1) .define('#', UBTags.Items.MILK_BOTTLE) @@ -357,7 +357,7 @@ private void vanillaRecipes(Consumer consumer) { .of(Unordinary_BasicsItems.GOAT_MILK_BOTTLE).build())) .unlockedBy("has_milk_bottle", inventoryTrigger(ItemPredicate.Builder.item() .of(Unordinary_BasicsItems.MILK_BOTTLE).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.CAKE).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.CAKE).getPath())); // Brick Blocks @@ -368,7 +368,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("###") .unlockedBy("has_brick", inventoryTrigger(ItemPredicate.Builder.item() .of(Items.BRICK).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.BRICK).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Items.BRICK).getPath())); ShapedRecipeBuilder.shaped(Blocks.STONE_BRICKS, 9) .define('#', Blocks.STONE) @@ -377,7 +377,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("###") .unlockedBy("has_stone", inventoryTrigger(ItemPredicate.Builder.item() .of(Blocks.STONE).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Item.byBlock(Blocks.STONE)).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Item.byBlock(Blocks.STONE)).getPath())); ShapedRecipeBuilder.shaped(Blocks.QUARTZ_BRICKS, 9) .define('#', Blocks.QUARTZ_BLOCK) @@ -386,7 +386,7 @@ private void vanillaRecipes(Consumer consumer) { .pattern("###") .unlockedBy("has_quartz_block", inventoryTrigger(ItemPredicate.Builder.item() .of(Blocks.QUARTZ_BLOCK).build())) - .save(consumer,new ResourceLocation(Unordinary_Basics.MOD_ID,ForgeRegistries.ITEMS.getKey(Item.byBlock(Blocks.QUARTZ_BLOCK)).getPath())); + .save(consumer,new ResourceLocation(UnordinaryBasics.MOD_ID,ForgeRegistries.ITEMS.getKey(Item.byBlock(Blocks.QUARTZ_BLOCK)).getPath())); } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/UBStructureTagProvider.java b/src/main/java/com/github/manasmods/unordinary_basics/data/UBStructureTagProvider.java new file mode 100644 index 000000000..36f029248 --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/UBStructureTagProvider.java @@ -0,0 +1,23 @@ +package com.github.manasmods.unordinary_basics.data; + +import com.github.manasmods.unordinary_basics.UnordinaryBasics; +import com.github.manasmods.unordinary_basics.utils.UBTags; +import com.github.manasmods.unordinary_basics.world.structure.UBStructures; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.StructureTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +public class UBStructureTagProvider extends StructureTagsProvider { + + public UBStructureTagProvider(DataGenerator pGenerator, @Nullable ExistingFileHelper existingFileHelper) { + super(pGenerator, UnordinaryBasics.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags() { + + tag(UBTags.Structures.MASTER_SWORD_SHRINE).add(UBStructures.MASTER_SWORD_SHRINE); + + } +} diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/gen/FletchingRecipeBuilder.java b/src/main/java/com/github/manasmods/unordinary_basics/data/gen/FletchingRecipeBuilder.java index cc37c8a65..8a4168528 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/data/gen/FletchingRecipeBuilder.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/gen/FletchingRecipeBuilder.java @@ -51,6 +51,11 @@ public FletchingRecipeBuilder group(@Nullable String pGroupName) { return this; } + @Override + public Item getResult() { + return result; + } + @Override public void save(Consumer pFinishedRecipeConsumer, ResourceLocation pRecipeId) { this.ensureValid(pRecipeId); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/data/gen/FletchingRecipeProvider.java b/src/main/java/com/github/manasmods/unordinary_basics/data/gen/FletchingRecipeProvider.java index ae0e69ff0..cc5f6be3a 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/data/gen/FletchingRecipeProvider.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/data/gen/FletchingRecipeProvider.java @@ -1,30 +1,21 @@ package com.github.manasmods.unordinary_basics.data.gen; -//TODO: FIX THE CACHING PART OF THIS - -import com.github.manasmods.unordinary_basics.Unordinary_Basics; -import com.google.common.base.Preconditions; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.google.common.collect.Sets; -import com.google.common.hash.Hashing; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import lombok.RequiredArgsConstructor; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataGenerator; import net.minecraft.data.DataProvider; -import net.minecraft.data.HashCache; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ItemLike; -import java.io.BufferedWriter; import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; -import java.util.Objects; import java.util.Set; import java.util.function.Consumer; @@ -51,7 +42,7 @@ private static void saveRecipe(CachedOutput pCache, JsonObject pRecipeJson, Path try { DataProvider.saveStable(pCache, pRecipeJson, pPath); } catch (IOException e) { - Unordinary_Basics.getLogger().error("Couldn't save fletching recipe to {}", pPath, e); + UnordinaryBasics.getLogger().error("Couldn't save fletching recipe to {}", pPath, e); } } @@ -59,7 +50,7 @@ private static void saveRecipe(CachedOutput pCache, JsonObject pRecipeJson, Path @Override public String getName() { - return Unordinary_Basics.MOD_ID + ":fletching"; + return UnordinaryBasics.MOD_ID + ":fletching"; } protected FletchingRecipeBuilder fletch(ItemLike result, int amount) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/entity/MasterSwordBeam.java b/src/main/java/com/github/manasmods/unordinary_basics/entity/MasterSwordBeam.java new file mode 100644 index 000000000..43f4d6c86 --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/entity/MasterSwordBeam.java @@ -0,0 +1,90 @@ +package com.github.manasmods.unordinary_basics.entity; + +import com.github.manasmods.unordinary_basics.registry.UBEntityTypes; +import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.projectile.AbstractHurtingProjectile; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.EntityHitResult; +import net.minecraft.world.phys.HitResult; + +public class MasterSwordBeam extends AbstractHurtingProjectile { + + public MasterSwordBeam(EntityType pEntityType, Level pLevel) { + super(pEntityType, pLevel); + } + + public MasterSwordBeam(Level pLevel, LivingEntity pShooter, double pOffsetX, double pOffsetY, double pOffsetZ) { + super(UBEntityTypes.MASTER_SWORD_BEAM.get(), pShooter, pOffsetX, pOffsetY, pOffsetZ, pLevel); + } + + + /** + * Return the motion factor for this projectile. The factor is multiplied by the original motion. + */ + protected float getInertia() { + return super.getInertia(); + } + + /** + * Returns {@code true} if the entity is on fire. Used by render to add the fire effect on rendering. + */ + public boolean isOnFire() { + return false; + } + + + /** + * Called when the arrow hits an entity + */ + protected void onHitEntity(EntityHitResult pResult) { + super.onHitEntity(pResult); + if (!this.level.isClientSide) { + Entity entity = pResult.getEntity(); + Entity entity1 = this.getOwner(); + boolean flag; + if (entity1 instanceof LivingEntity) { + LivingEntity livingentity = (LivingEntity)entity1; + flag = entity.hurt(DamageSource.MAGIC, 8.0F); + if (flag) { + if (entity.isAlive()) { + this.doEnchantDamageEffects(livingentity, entity); + } else { + livingentity.heal(5.0F); + } + } + } else { + entity.hurt(DamageSource.MAGIC, 5.0F); + } + } + } + + protected void onHit(HitResult pResult) { + super.onHit(pResult); + if (!this.level.isClientSide) { + this.discard(); + } + + } + + public boolean isPickable() { + return false; + } + + public boolean hurt(DamageSource pSource, float pAmount) { + return false; + } + + protected boolean shouldBurn() { + return false; + } + + @Override + protected ParticleOptions getTrailParticle() { + return ParticleTypes.ASH; + } +} diff --git a/src/main/java/com/github/manasmods/unordinary_basics/entity/client/MasterSwordBeamModel.java b/src/main/java/com/github/manasmods/unordinary_basics/entity/client/MasterSwordBeamModel.java new file mode 100644 index 000000000..45a21898f --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/entity/client/MasterSwordBeamModel.java @@ -0,0 +1,54 @@ +package com.github.manasmods.unordinary_basics.entity.client; + +import com.github.manasmods.unordinary_basics.UnordinaryBasics; +import com.github.manasmods.unordinary_basics.entity.MasterSwordBeam; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.model.EntityModel; +import net.minecraft.client.model.geom.ModelLayerLocation; +import net.minecraft.client.model.geom.ModelPart; +import net.minecraft.client.model.geom.PartPose; +import net.minecraft.client.model.geom.builders.*; +import net.minecraft.resources.ResourceLocation; + +public class MasterSwordBeamModel extends EntityModel { + // This layer location should be baked with EntityRendererProvider.Context in the entity renderer and passed into this model's constructor + public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(UnordinaryBasics.MOD_ID, "master_sword_beam"), "main"); + private final ModelPart beam; + + public MasterSwordBeamModel(ModelPart root) { + this.beam = root.getChild("bone"); + } + + public static LayerDefinition createBodyLayer() { + MeshDefinition meshdefinition = new MeshDefinition(); + PartDefinition partdefinition = meshdefinition.getRoot(); + + PartDefinition bone = partdefinition.addOrReplaceChild("bone", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); + + bone.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(-16, 0).addBox(-8.0F, 0.0F, -8.0F, 16.0F, 0.0F, 16.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0F, 3.1416F, 0.0F)); + + return LayerDefinition.create(meshdefinition, 32, 16); + } + + + + @Override + public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { + beam.render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha); + } + + @Override + public void setupAnim(T pEntity, float pLimbSwing, float pLimbSwingAmount, float pAgeInTicks, float pNetHeadYaw, float pHeadPitch) { + + } + + public void rotate(MasterSwordBeam pEntity){ + beam.yRot = pEntity.getLevel().getGameTime() % 360; + } + + public void rotBeam(float p_103812_, float p_103813_) { + this.beam.yRot = p_103812_ * ((float)Math.PI / 180F); + this.beam.xRot = p_103813_ * ((float)Math.PI / 180F); + } +} diff --git a/src/main/java/com/github/manasmods/unordinary_basics/entity/client/MasterSwordBeamRenderer.java b/src/main/java/com/github/manasmods/unordinary_basics/entity/client/MasterSwordBeamRenderer.java new file mode 100644 index 000000000..1e7b2525b --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/entity/client/MasterSwordBeamRenderer.java @@ -0,0 +1,52 @@ +package com.github.manasmods.unordinary_basics.entity.client; + +import com.github.manasmods.unordinary_basics.entity.MasterSwordBeam; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.entity.EntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; + +import java.util.Arrays; + +public class MasterSwordBeamRenderer extends EntityRenderer { + protected static final ResourceLocation[] TEXTURES = { + new ResourceLocation("unordinary_basics:textures/entity/master_sword_beam/master_sword_beam_0.png"), + new ResourceLocation("unordinary_basics:textures/entity/master_sword_beam/master_sword_beam_1.png"), + new ResourceLocation("unordinary_basics:textures/entity/master_sword_beam/master_sword_beam_2.png"), + new ResourceLocation("unordinary_basics:textures/entity/master_sword_beam/master_sword_beam_3.png"), + new ResourceLocation("unordinary_basics:textures/entity/master_sword_beam/master_sword_beam_4.png"), + new ResourceLocation("unordinary_basics:textures/entity/master_sword_beam/master_sword_beam_5.png"), + new ResourceLocation("unordinary_basics:textures/entity/master_sword_beam/master_sword_beam_6.png"), + new ResourceLocation("unordinary_basics:textures/entity/master_sword_beam/master_sword_beam_7.png") + }; + + private final MasterSwordBeamModel model; + + public MasterSwordBeamRenderer(EntityRendererProvider.Context pContext) { + super(pContext); + model = new MasterSwordBeamModel<>(pContext.bakeLayer(MasterSwordBeamModel.LAYER_LOCATION)); + } + + public ResourceLocation getTextureLocation(MasterSwordBeam instance) { + ResourceLocation[] resourceLocations = TEXTURES; + return Arrays.stream(resourceLocations).toList().get((instance.tickCount) % resourceLocations.length); + } + + public void render(MasterSwordBeam pEntity, float pEntityYaw, float pPartialTicks, PoseStack pMatrixStack, MultiBufferSource pBuffer, int pPackedLight) { + pMatrixStack.pushPose(); + pMatrixStack.scale(-1.0F, -1.0F, 1.0F); + pMatrixStack.translate(0d,0d,0d); + VertexConsumer vertexconsumer = pBuffer.getBuffer(this.model.renderType(this.getTextureLocation(pEntity))); + float f = Mth.rotlerp(pEntity.yRotO, pEntity.getYRot(), pPartialTicks); + float f1 = Mth.lerp(pPartialTicks, pEntity.xRotO, pEntity.getXRot()); + this.model.rotBeam(f,f1); + //this.model.rotate(pEntity); + this.model.renderToBuffer(pMatrixStack, vertexconsumer, pPackedLight, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F); + pMatrixStack.popPose(); + super.render(pEntity, pEntityYaw, pPartialTicks, pMatrixStack, pBuffer, pPackedLight); + } +} diff --git a/src/main/java/com/github/manasmods/unordinary_basics/entity/client/NonExplosiveWitherSkullRenderer.java b/src/main/java/com/github/manasmods/unordinary_basics/entity/client/NonExplosiveWitherSkullRenderer.java index fe0045a90..0b532e0a6 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/entity/client/NonExplosiveWitherSkullRenderer.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/entity/client/NonExplosiveWitherSkullRenderer.java @@ -5,11 +5,6 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.SkullModel; import net.minecraft.client.model.geom.ModelLayers; -import net.minecraft.client.model.geom.PartPose; -import net.minecraft.client.model.geom.builders.CubeListBuilder; -import net.minecraft.client.model.geom.builders.LayerDefinition; -import net.minecraft.client.model.geom.builders.MeshDefinition; -import net.minecraft.client.model.geom.builders.PartDefinition; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; @@ -17,7 +12,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; -import net.minecraft.world.entity.projectile.WitherSkull; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -32,13 +26,6 @@ public NonExplosiveWitherSkullRenderer(EntityRendererProvider.Context pContext) this.model = new SkullModel(pContext.bakeLayer(ModelLayers.WITHER_SKULL)); } - public static LayerDefinition createSkullLayer() { - MeshDefinition meshdefinition = new MeshDefinition(); - PartDefinition partdefinition = meshdefinition.getRoot(); - partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 35).addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F), PartPose.ZERO); - return LayerDefinition.create(meshdefinition, 64, 64); - } - protected int getBlockLightLevel(NonExplosiveWitherSkull pEntity, BlockPos pPos) { return 15; } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/UBEffectsHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/UBEffectsHandler.java index 955ac2488..b4924652c 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/UBEffectsHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/UBEffectsHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsItems; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; @@ -10,7 +10,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID) public class UBEffectsHandler { @SubscribeEvent diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/UBEntityHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/UBEntityHandler.java index 62e8b8284..975fd64b8 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/UBEntityHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/UBEntityHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsItems; import com.github.manasmods.unordinary_basics.utils.UBUtils; import net.minecraft.world.entity.PathfinderMob; @@ -17,7 +17,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class UBEntityHandler { /** Used to add the {@link TemptGoal} for the animal bait item to all targeted entities. */ @SubscribeEvent @@ -41,6 +41,7 @@ public static void entityAttributeEvent(EntityAttributeCreationEvent event) { // event.put(UBEntityTypes.GRIZZLY_BEAR.get(), GrizzlyBearEntity.createAttributes().build()); // event.put(UBEntityTypes.GROLAR_BEAR.get(), GrolarBearEntity.createAttributes().build()); } + public static void registerEntityPlacements() { // SpawnPlacements.register(UBEntityTypes.GRIZZLY_BEAR.get(), // SpawnPlacements.Type.IN_WATER, diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/UBFurnaceFuelHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/UBFurnaceFuelHandler.java index 8882985de..7e44f4a67 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/UBFurnaceFuelHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/UBFurnaceFuelHandler.java @@ -1,12 +1,12 @@ package com.github.manasmods.unordinary_basics.handler; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import net.minecraft.world.item.Items; import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class UBFurnaceFuelHandler { @SubscribeEvent public static void onFurnaceFuelBurnTimeEvent(final FurnaceFuelBurnTimeEvent event) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/UBProneHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/UBProneHandler.java index 1db631c56..345c3a5de 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/UBProneHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/UBProneHandler.java @@ -1,15 +1,13 @@ package com.github.manasmods.unordinary_basics.handler; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; -import net.minecraft.core.BlockPos; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.block.Blocks; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid= Unordinary_Basics.MOD_ID) +@Mod.EventBusSubscriber(modid= UnordinaryBasics.MOD_ID) public class UBProneHandler { @SubscribeEvent diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/UBWeaponHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/UBWeaponHandler.java new file mode 100644 index 000000000..740af36b2 --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/UBWeaponHandler.java @@ -0,0 +1,19 @@ +package com.github.manasmods.unordinary_basics.handler; + +import com.github.manasmods.unordinary_basics.UnordinaryBasics; +import com.github.manasmods.unordinary_basics.utils.UBTags; +import net.minecraft.world.entity.LivingEntity; +import net.minecraftforge.event.entity.living.LivingDamageEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID) +public class UBWeaponHandler { + @SubscribeEvent + public static void onDamageEntity(LivingDamageEvent event) { + LivingEntity entity = event.getEntity(); + if (entity.getType().is(UBTags.EntityTypes.SCULK_ENEMIES)) { + event.setAmount(event.getAmount() * 1.5F); + } + } +} diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/Unordinary_BasicsColorHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/Unordinary_BasicsColorHandler.java index b260d2b38..345923166 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/Unordinary_BasicsColorHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/Unordinary_BasicsColorHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.block.Unordinary_BasicsBlocks; import net.minecraft.client.renderer.BiomeColors; import net.minecraft.world.item.BlockItem; @@ -11,7 +11,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class Unordinary_BasicsColorHandler { @SubscribeEvent public static void onInitBlockColor(final RegisterColorHandlersEvent.Block event) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/CropTenderHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/CropTenderHandler.java index b05465ffc..bd24078e4 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/CropTenderHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/CropTenderHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.enchantments; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.enchantment.UnordinaryBasicsEnchantments; import com.github.manasmods.unordinary_basics.utils.BlockBreakHelper; import com.github.manasmods.unordinary_basics.utils.UBTags; @@ -16,7 +16,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class CropTenderHandler { //If this isn't working, try rerunning data, as the tags may not be present diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/CurseOfBreakingHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/CurseOfBreakingHandler.java index f7d757caf..940a45c17 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/CurseOfBreakingHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/CurseOfBreakingHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.enchantments; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.enchantment.BreakingCurseEnchantment; import com.github.manasmods.unordinary_basics.enchantment.UnordinaryBasicsEnchantments; import net.minecraft.world.InteractionHand; @@ -12,7 +12,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class CurseOfBreakingHandler { @SubscribeEvent public static void onBlockBreak(BlockEvent.BreakEvent event) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/FatigueCurseHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/FatigueCurseHandler.java index 1c31df913..ec34dc916 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/FatigueCurseHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/FatigueCurseHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.enchantments; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.enchantment.FatigueCurseEnchantment; import com.github.manasmods.unordinary_basics.enchantment.UnordinaryBasicsEnchantments; import net.minecraft.world.entity.player.Player; @@ -9,7 +9,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class FatigueCurseHandler { @SubscribeEvent public static void onPlayerTick(TickEvent.PlayerTickEvent event) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/HallucinationCurseHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/HallucinationCurseHandler.java index 53acf86a0..1393156cb 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/HallucinationCurseHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/HallucinationCurseHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.enchantments; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.enchantment.HallucinationCurseEnchantment; import com.github.manasmods.unordinary_basics.enchantment.UnordinaryBasicsEnchantments; import net.minecraft.world.entity.player.Player; @@ -9,7 +9,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class HallucinationCurseHandler { @SubscribeEvent public static void onPlayerTick(TickEvent.PlayerTickEvent event) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/MasterMinerHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/MasterMinerHandler.java index dde1c3519..dd585ef2e 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/MasterMinerHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/MasterMinerHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.enchantments; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.enchantment.BreakingCurseEnchantment; import com.github.manasmods.unordinary_basics.enchantment.UnordinaryBasicsEnchantments; import net.minecraft.core.BlockPos; @@ -25,7 +25,7 @@ import java.util.Arrays; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class MasterMinerHandler { @SubscribeEvent diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/TreeFellerHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/TreeFellerHandler.java index c3e8ce15a..d45524cfc 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/TreeFellerHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/TreeFellerHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.enchantments; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.enchantment.UnordinaryBasicsEnchantments; import com.github.manasmods.unordinary_basics.utils.BlockBreakHelper; import com.github.manasmods.unordinary_basics.utils.UBTags; @@ -16,7 +16,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class TreeFellerHandler { //If this isn't working, try rerunning data, as the tags may not be present diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/TrimmerHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/TrimmerHandler.java index 2faaa7121..cc7fbb5c0 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/TrimmerHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/TrimmerHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.enchantments; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.enchantment.UnordinaryBasicsEnchantments; import com.github.manasmods.unordinary_basics.utils.BlockBreakHelper; import com.github.manasmods.unordinary_basics.utils.UBTags; @@ -16,7 +16,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class TrimmerHandler { //If this isn't working, try rerunning data, as the tags may not be present diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/VeinMinerHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/VeinMinerHandler.java index ed4442150..8d53a84e2 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/VeinMinerHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/enchantments/VeinMinerHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.enchantments; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.enchantment.UnordinaryBasicsEnchantments; import com.github.manasmods.unordinary_basics.utils.BlockBreakHelper; import com.github.manasmods.unordinary_basics.utils.UBTags; @@ -16,7 +16,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class VeinMinerHandler { //If this isn't working, try rerunning data, as the tags may not be present diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/ChainmailArmorHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/ChainmailArmorHandler.java index d1db47680..9afe0b65a 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/ChainmailArmorHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/ChainmailArmorHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.qol; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.utils.UBUtils; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; @@ -11,7 +11,7 @@ import java.util.Set; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class ChainmailArmorHandler { private static final Set CHAINMAIL_ARMOR = Set.of(Items.CHAINMAIL_HELMET, Items.CHAINMAIL_CHESTPLATE, Items.CHAINMAIL_LEGGINGS, Items.CHAINMAIL_BOOTS); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/HoeHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/HoeHandler.java index a36c915e8..b48485f63 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/HoeHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/HoeHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.qol; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.BlockTags; @@ -18,7 +18,7 @@ import java.util.List; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class HoeHandler { @SubscribeEvent public static void onHarvest(final BlockEvent.BreakEvent e) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/LadderHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/LadderHandler.java index 6301f69bf..02d7f6a86 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/LadderHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/LadderHandler.java @@ -1,12 +1,12 @@ package com.github.manasmods.unordinary_basics.handler.qol; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.utils.LadderHelper; import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class LadderHandler { @SubscribeEvent public static void onBlockBreak(final BlockEvent.BreakEvent event) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/NetheriteArmorHandler.java b/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/NetheriteArmorHandler.java index 7aec9aa98..d6f85c8b0 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/NetheriteArmorHandler.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/handler/qol/NetheriteArmorHandler.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.handler.qol; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.utils.UBUtils; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.player.Player; @@ -12,7 +12,7 @@ import java.util.Set; -@Mod.EventBusSubscriber(modid = Unordinary_Basics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = UnordinaryBasics.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class NetheriteArmorHandler { private static final Set NETHERITE_ARMOR = Set.of(Items.NETHERITE_HELMET,Items.NETHERITE_CHESTPLATE,Items.NETHERITE_LEGGINGS,Items.NETHERITE_BOOTS); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/integration/apotheosis/ApotheosisIntegration.java b/src/main/java/com/github/manasmods/unordinary_basics/integration/apotheosis/ApotheosisIntegration.java index b26505205..32ea3a861 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/integration/apotheosis/ApotheosisIntegration.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/integration/apotheosis/ApotheosisIntegration.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.integration.apotheosis; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.core.FletchingContainerAccessor; import com.github.manasmods.unordinary_basics.menu.FletchingTableMenu; import com.github.manasmods.unordinary_basics.network.Unordinary_BasicsNetwork; @@ -18,7 +18,7 @@ public class ApotheosisIntegration { public ApotheosisIntegration() { - Unordinary_Basics.getLogger().info("Apotheosis integration automatically enabled!"); + UnordinaryBasics.getLogger().info("Apotheosis integration automatically enabled!"); } public void requestApotheosisFletchingMenu() { @@ -31,7 +31,7 @@ public void requestUnordinaryBasicsFletchingMenu() { public void openApotheosisFletchingMenu(ServerPlayer player) { if (!(player.containerMenu instanceof FletchingTableMenu fletchingTableMenu)) { - Unordinary_Basics.getLogger() + UnordinaryBasics.getLogger() .error("Player {} tried to open Apotheosis Fletching Menu using MenuChange Packet but he wasn't able to send that packet. He might Cheat!", player.getStringUUID()); return; } @@ -43,13 +43,13 @@ public void openApotheosisFletchingMenu(ServerPlayer player) { public void openUnordinaryBasicsFletchingMenu(ServerPlayer player) { if (!(player.containerMenu instanceof FletchingContainer fletchingContainer)) { - Unordinary_Basics.getLogger().error("Player {} tried to open UB Fletching Menu using MenuChange Packet but he wasn't able to send that packet. He might Cheat!", player.getStringUUID()); + UnordinaryBasics.getLogger().error("Player {} tried to open UB Fletching Menu using MenuChange Packet but he wasn't able to send that packet. He might Cheat!", player.getStringUUID()); return; } BlockPos pos = ((FletchingContainerAccessor) fletchingContainer).getPos(); NetworkHooks.openScreen(player, new SimpleMenuProvider((pContainerId, pInventory, pPlayer1) -> new FletchingTableMenu(pContainerId, ContainerLevelAccess.create(player.level, pos), pPlayer1.getInventory(), pos), - Component.translatable(Unordinary_Basics.MOD_ID + ".menu.fletching_table.title")), buffer -> { + Component.translatable(UnordinaryBasics.MOD_ID + ".menu.fletching_table.title")), buffer -> { buffer.writeBlockPos(pos); buffer.writeResourceLocation(player.level.dimension().location()); }); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/integration/apotheosis/ApotheosisIntegrationClient.java b/src/main/java/com/github/manasmods/unordinary_basics/integration/apotheosis/ApotheosisIntegrationClient.java index 51cfe2a84..574cff6d5 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/integration/apotheosis/ApotheosisIntegrationClient.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/integration/apotheosis/ApotheosisIntegrationClient.java @@ -1,7 +1,7 @@ package com.github.manasmods.unordinary_basics.integration.apotheosis; import com.github.manasmods.manascore.api.client.gui.widget.ImagePredicateButton; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.core.AbstractContainerScreenAccessor; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -9,15 +9,15 @@ import shadows.apotheosis.village.fletching.FletchingScreen; public class ApotheosisIntegrationClient { - private static final ResourceLocation UNORDINARY_BASICS_LOGO = new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/ub_logo.png"); + private static final ResourceLocation UNORDINARY_BASICS_LOGO = new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/ub_logo.png"); public static void onOpenApotheosisMenu(final ScreenEvent.Init.Post e) { if (!(e.getScreen() instanceof FletchingScreen screen)) return; int imageWidth = ((AbstractContainerScreenAccessor) screen).getImageWidth(); e.addListener(new ImagePredicateButton(screen.getGuiLeft() + imageWidth - 24 - 4, screen.getGuiTop() + 6, 24, 24, UNORDINARY_BASICS_LOGO, pButton -> { - Unordinary_Basics.getInstance().getApotheosisIntegration().ifPresent(ApotheosisIntegration::requestUnordinaryBasicsFletchingMenu); + UnordinaryBasics.getInstance().getApotheosisIntegration().ifPresent(ApotheosisIntegration::requestUnordinaryBasicsFletchingMenu); }, (pButton, pPoseStack, pMouseX, pMouseY) -> { - screen.renderTooltip(pPoseStack, Component.translatable(Unordinary_Basics.MOD_ID + ".menu.fletching_table.switch.ub"), pMouseX, pMouseY); - }, () -> Unordinary_Basics.getInstance().getApotheosisIntegration().isPresent())); + screen.renderTooltip(pPoseStack, Component.translatable(UnordinaryBasics.MOD_ID + ".menu.fletching_table.switch.ub"), pMouseX, pMouseY); + }, () -> UnordinaryBasics.getInstance().getApotheosisIntegration().isPresent())); } } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/FletchingTableRecipeCategory.java b/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/FletchingTableRecipeCategory.java index 7fa4549d9..4ccb12f69 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/FletchingTableRecipeCategory.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/FletchingTableRecipeCategory.java @@ -1,9 +1,8 @@ package com.github.manasmods.unordinary_basics.integration.jei; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.menu.container.FletchingContainer; import com.github.manasmods.unordinary_basics.recipe.FletchingRecipe; -import com.github.manasmods.unordinary_basics.utils.Translation; import lombok.Getter; import lombok.extern.log4j.Log4j2; import mezz.jei.api.constants.VanillaTypes; @@ -26,10 +25,10 @@ @Log4j2 public class FletchingTableRecipeCategory implements IRecipeCategory { - public final static ResourceLocation UID = new ResourceLocation(Unordinary_Basics.MOD_ID, "fletching"); + public final static ResourceLocation UID = new ResourceLocation(UnordinaryBasics.MOD_ID, "fletching"); public final static ResourceLocation TEXTURE = - new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/fletching_table.png"); - public static final RecipeType TYPE = RecipeType.create(Unordinary_Basics.MOD_ID, "fletching", FletchingRecipe.class); + new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/fletching_table.png"); + public static final RecipeType TYPE = RecipeType.create(UnordinaryBasics.MOD_ID, "fletching", FletchingRecipe.class); @Getter private final IDrawable background; @@ -45,7 +44,7 @@ public FletchingTableRecipeCategory(IGuiHelper helper) { @Override public RecipeType getRecipeType() { - return RecipeType.create(Unordinary_Basics.MOD_ID,"fletching",FletchingRecipe.class); + return RecipeType.create(UnordinaryBasics.MOD_ID,"fletching",FletchingRecipe.class); } @Override diff --git a/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/FletchingTableTransferInfo.java b/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/FletchingTableTransferInfo.java index cf1481a80..364ea9915 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/FletchingTableTransferInfo.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/FletchingTableTransferInfo.java @@ -1,12 +1,11 @@ package com.github.manasmods.unordinary_basics.integration.jei; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.menu.FletchingTableMenu; import com.github.manasmods.unordinary_basics.menu.Unordinary_BasicsMenuTypes; import com.github.manasmods.unordinary_basics.recipe.FletchingRecipe; import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.recipe.transfer.IRecipeTransferInfo; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; @@ -26,7 +25,7 @@ public Optional> getMenuType() { @Override public RecipeType getRecipeType() { - return RecipeType.create(Unordinary_Basics.MOD_ID,"fletching",FletchingRecipe.class); + return RecipeType.create(UnordinaryBasics.MOD_ID,"fletching",FletchingRecipe.class); } @Override diff --git a/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/JEIUnordinaryBasicsPlugin.java b/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/JEIUnordinaryBasicsPlugin.java index f0cebccb0..7a4f16d0d 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/JEIUnordinaryBasicsPlugin.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/integration/jei/JEIUnordinaryBasicsPlugin.java @@ -1,8 +1,8 @@ package com.github.manasmods.unordinary_basics.integration.jei; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.recipe.FletchingRecipe; -import com.github.manasmods.unordinary_basics.registry.Unordinary_BasicsRecipeTypeRegistry; +import com.github.manasmods.unordinary_basics.registry.UBRecipeTypeRegistry; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.recipe.RecipeType; @@ -23,7 +23,7 @@ public class JEIUnordinaryBasicsPlugin implements IModPlugin { @Override public ResourceLocation getPluginUid() { - return new ResourceLocation(Unordinary_Basics.MOD_ID, "jei_plugin"); + return new ResourceLocation(UnordinaryBasics.MOD_ID, "jei_plugin"); } @Override @@ -34,7 +34,7 @@ public void registerCategories(IRecipeCategoryRegistration registration) { @Override public void registerRecipes(IRecipeRegistration registration) { RecipeManager rm = Objects.requireNonNull(Minecraft.getInstance().level).getRecipeManager(); - List recipes = rm.getAllRecipesFor(Unordinary_BasicsRecipeTypeRegistry.FLETCHING_RECIPE.get()); + List recipes = rm.getAllRecipesFor(UBRecipeTypeRegistry.FLETCHING_RECIPE.get()); registration.addRecipes(new RecipeType<>(FletchingTableRecipeCategory.UID, FletchingRecipe.class), recipes); } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/UBArmorMaterials.java b/src/main/java/com/github/manasmods/unordinary_basics/item/UBArmorMaterials.java index f403298f0..5e6c3ae73 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/UBArmorMaterials.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/UBArmorMaterials.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.item; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.minecraft.sounds.SoundEvent; @@ -39,7 +39,7 @@ public int getDefenseForSlot(EquipmentSlot pSlot) { } public String getName() { - return Unordinary_Basics.MOD_ID + ":" + this.name; + return UnordinaryBasics.MOD_ID + ":" + this.name; } public Ingredient getRepairIngredient() { return this.repairIngredient.get(); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/UBToolTiers.java b/src/main/java/com/github/manasmods/unordinary_basics/item/UBToolTiers.java index 8a656b37e..46b72a9c6 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/UBToolTiers.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/UBToolTiers.java @@ -5,9 +5,8 @@ import net.minecraftforge.common.Tags; public class UBToolTiers { - public static final ForgeTier ZENITH = new ForgeTier(4, 10000, 12.0F, 0, 30, - Tags.Blocks.NEEDS_NETHERITE_TOOL, - Ingredient::of); - + Tags.Blocks.NEEDS_NETHERITE_TOOL, Ingredient::of); + public static final ForgeTier MASTER = new ForgeTier(5, 250, 10.0F, 0, 30, + Tags.Blocks.NEEDS_NETHERITE_TOOL, Ingredient::of); } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/Unordinary_BasicsCreativeTab.java b/src/main/java/com/github/manasmods/unordinary_basics/item/Unordinary_BasicsCreativeTab.java index f693cad05..78895022f 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/Unordinary_BasicsCreativeTab.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/Unordinary_BasicsCreativeTab.java @@ -1,25 +1,25 @@ package com.github.manasmods.unordinary_basics.item; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.block.Unordinary_BasicsBlocks; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; public class Unordinary_BasicsCreativeTab { - public static final CreativeModeTab CUSTOM_BLOCKS = new CreativeModeTab(Unordinary_Basics.MOD_ID + ".tab") { + public static final CreativeModeTab CUSTOM_BLOCKS = new CreativeModeTab(UnordinaryBasics.MOD_ID + ".tab") { @Override public ItemStack makeIcon() { return new ItemStack(Unordinary_BasicsBlocks.ITEM_SORTER); } }; - public static final CreativeModeTab BLOCKS = new CreativeModeTab(Unordinary_Basics.MOD_ID + ".tab2") { + public static final CreativeModeTab BLOCKS = new CreativeModeTab(UnordinaryBasics.MOD_ID + ".tab2") { @Override public ItemStack makeIcon() { return new ItemStack(Unordinary_BasicsBlocks.ANDESITE_BRICKS); } }; - public static final CreativeModeTab ITEMS = new CreativeModeTab(Unordinary_Basics.MOD_ID + ".tab3") { + public static final CreativeModeTab ITEMS = new CreativeModeTab(UnordinaryBasics.MOD_ID + ".tab3") { @Override public ItemStack makeIcon() { return new ItemStack(Unordinary_BasicsItems.POUCH); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/Unordinary_BasicsItems.java b/src/main/java/com/github/manasmods/unordinary_basics/item/Unordinary_BasicsItems.java index b0b7ea78e..953faa4f9 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/Unordinary_BasicsItems.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/Unordinary_BasicsItems.java @@ -1,6 +1,5 @@ package com.github.manasmods.unordinary_basics.item; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; import net.minecraft.world.item.Item; import net.minecraftforge.registries.ObjectHolder; @@ -21,6 +20,10 @@ public class Unordinary_BasicsItems { public static final Item LEAPER = null; @ObjectHolder(registryName = "item", value = "unordinary_basics:map_book") public static final Item MAP_BOOK = null; + @ObjectHolder(registryName = "item", value = "unordinary_basics:decayed_master_sword") + public static final Item DECAYED_MASTER_SWORD = null; + @ObjectHolder(registryName = "item", value = "unordinary_basics:master_sword") + public static final Item MASTER_SWORD = null; @ObjectHolder(registryName = "item", value = "unordinary_basics:milk_bottle") public static final Item MILK_BOTTLE = null; @ObjectHolder(registryName = "item", value = "unordinary_basics:potion_belt") diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/BackpackItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/BackpackItem.java index edfe29e43..5f0b94af7 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/BackpackItem.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/BackpackItem.java @@ -1,13 +1,11 @@ package com.github.manasmods.unordinary_basics.item.custom; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.capability.CapabilityUBInventory; import com.github.manasmods.unordinary_basics.capability.IUBInventoryItem; import com.github.manasmods.unordinary_basics.capability.ItemStackHandlerCapabilityProvider; -import com.github.manasmods.unordinary_basics.client.gui.Unordinary_BasicsInventoryScreen; import com.github.manasmods.unordinary_basics.client.gui.Unordinary_BasicsItemInventoryScreen; import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsItems; -import com.github.manasmods.unordinary_basics.menu.UBInventoryMenu; import com.github.manasmods.unordinary_basics.menu.UBItemInventoryMenu; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; @@ -19,7 +17,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.SlotItemHandler; import org.jetbrains.annotations.NotNull; @@ -27,7 +24,7 @@ @SuppressWarnings({"ConstantConditions"}) public class BackpackItem extends Item implements IUBInventoryItem { - public static final ResourceLocation TEXTURE = new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/backpack_slots.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/backpack_slots.png"); public BackpackItem(Properties pProperties) { super(pProperties); } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/BuildersGloveItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/BuildersGloveItem.java index 776b0a0fd..8facc25e1 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/BuildersGloveItem.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/BuildersGloveItem.java @@ -1,10 +1,9 @@ package com.github.manasmods.unordinary_basics.item.custom; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.capability.ItemStackHandlerCapabilityProvider; import com.github.manasmods.unordinary_basics.menu.BuildersGloveMenu; import com.github.manasmods.unordinary_basics.utils.BlockBreakHelper; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -170,7 +169,7 @@ private void placeBlockNativeMethod(UseOnContext pContext, ItemStack blockStack, UseOnContext customContext = new UseOnContext(pContext.getLevel(), pContext.getPlayer(), pContext.getHand(), blockStack, hitResult); result.set(blockStack.getItem().useOn(customContext)); } else { - Unordinary_Basics.getLogger().error("Couldn't get hit result! Unable to place block."); + UnordinaryBasics.getLogger().error("Couldn't get hit result! Unable to place block."); } } @@ -198,7 +197,7 @@ private void refillItems(ItemStack pStack, Entity pEntity) { @Override public InteractionResultHolder use(Level pLevel, Player pPlayer, InteractionHand pUsedHand) { - if (!pLevel.isClientSide && !(pPlayer.getInventory().offhand.get(0).getItem() instanceof BlockItem) && Screen.hasShiftDown()) { + if (!pLevel.isClientSide && !(pPlayer.getInventory().offhand.get(0).getItem() instanceof BlockItem) && pPlayer.isCrouching()) { pPlayer.getItemInHand(pUsedHand).getCapability(ForgeCapabilities.ITEM_HANDLER).ifPresent(handler -> ((ItemStackHandler) handler).deserializeNBT(pPlayer.getItemInHand(pUsedHand).getOrCreateTag().getCompound("inventory"))); NetworkHooks.openScreen((ServerPlayer) pPlayer, new SimpleMenuProvider((id, inv, p) -> new BuildersGloveMenu(id, inv, pPlayer.getInventory().selected), Component.translatable("item.unordinary_basics.builders_glove")), buf -> buf.writeVarInt(pPlayer.getInventory().selected)); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/DecayedMasterSwordItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/DecayedMasterSwordItem.java new file mode 100644 index 000000000..e3de9e855 --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/DecayedMasterSwordItem.java @@ -0,0 +1,105 @@ +package com.github.manasmods.unordinary_basics.item.custom; + +import com.github.manasmods.unordinary_basics.item.UBToolTiers; +import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsCreativeTab; +import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsItems; +import net.minecraft.ChatFormatting; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public class DecayedMasterSwordItem extends SwordItem { + public DecayedMasterSwordItem() { + super(UBToolTiers.MASTER, 0, -2.4F, + new Item.Properties().tab(Unordinary_BasicsCreativeTab.ITEMS).fireResistant().rarity(Rarity.RARE)); + } + + public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List pTooltipComponents, TooltipFlag pIsAdvanced) { + int sec = calculateSec(pStack); + if (sec < 10) { + pTooltipComponents.add(Component.translatable("item.unordinary_basics.master_sword.recharge_second", + calculateMin(pStack), sec).withStyle(ChatFormatting.DARK_AQUA)); + } else { + pTooltipComponents.add(Component.translatable("item.unordinary_basics.master_sword.recharge", + calculateMin(pStack), sec).withStyle(ChatFormatting.DARK_AQUA)); + } + } + + private int calculateMin(ItemStack pStack) { + int ticks = 12000 - pStack.getOrCreateTag().getInt("formHeal"); + return ticks / 1200; + } + + private int calculateSec(ItemStack pStack) { + int ticks = 12000 - pStack.getOrCreateTag().getInt("formHeal"); + return (ticks - calculateMin(pStack) * 1200) / 20; + } + + public boolean canBeDepleted() { + return false; + } + + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + return false; + } + + public boolean hurtEnemy(ItemStack pStack, LivingEntity pTarget, LivingEntity pEntity) { + CompoundTag tag = pStack.getOrCreateTag(); + tag.putInt("formHeal",tag.getInt("formHeal") - 1200); + pEntity.getLevel().playSound(null, pEntity.blockPosition(), SoundEvents.PLAYER_ATTACK_WEAK, SoundSource.PLAYERS, 1.0F, 10f); + return true; + } + + public boolean mineBlock(ItemStack pStack, Level pLevel, BlockState pState, BlockPos pPos, LivingEntity pEntity) { + CompoundTag tag = pStack.getOrCreateTag(); + tag.putInt("formHeal",tag.getInt("formHeal") - 1200); + pEntity.getLevel().playSound(null, pEntity.blockPosition(), SoundEvents.PLAYER_ATTACK_WEAK, SoundSource.PLAYERS, 1.0F, 10f); + return true; + } + + public void inventoryTick(ItemStack pStack, Level pLevel, Entity pEntity, int pSlotId, boolean pIsSelected) { + super.inventoryTick(pStack, pLevel, pEntity, pSlotId, pIsSelected); + CompoundTag tag = pStack.getOrCreateTag(); + + if (pStack.isDamaged()) { + int heal = tag.getInt("durabilityHeal"); + if (heal < 200) { + tag.putInt("durabilityHeal", heal + 1); + } else { + pStack.setDamageValue(pStack.getDamageValue() - 1); + tag.putInt("durabilityHeal", 0); + } + } + + int formTick = tag.getInt("formHeal"); + if (formTick < 12000) { + tag.putInt("formHeal",formTick + 1); + } else { + tag.remove("formHeal"); + + ItemStack evolvingItem = new ItemStack(Unordinary_BasicsItems.MASTER_SWORD); + evolvingItem.setTag(tag.copy()); //copy every tag from old sword, so enchantments and stuff gets reserved + pEntity.getSlot(pSlotId).set(evolvingItem); + + pEntity.getLevel().playSound(null, pEntity.blockPosition(), + SoundEvents.ENCHANTMENT_TABLE_USE, SoundSource.PLAYERS, 1.0F, 10f); //I just like sound effects + } + } +} + + + diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/MasterSwordItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/MasterSwordItem.java new file mode 100644 index 000000000..c75beae4c --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/MasterSwordItem.java @@ -0,0 +1,115 @@ +package com.github.manasmods.unordinary_basics.item.custom; + +import com.github.manasmods.unordinary_basics.entity.MasterSwordBeam; +import com.github.manasmods.unordinary_basics.item.UBToolTiers; +import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsCreativeTab; +import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsItems; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; + +import java.util.function.Consumer; + +public class MasterSwordItem extends SwordItem { + public MasterSwordItem() { + super(UBToolTiers.MASTER, 11, -2.4F, + new Properties().tab(Unordinary_BasicsCreativeTab.ITEMS).fireResistant().rarity(Rarity.RARE)); + } + + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + return false; + } + + public int damageItem(ItemStack pStack, int amount, T pEntity, Consumer onBroken) { + if (pStack.getDamageValue() + amount >= pStack.getMaxDamage()) { + ItemStack decay = new ItemStack(Unordinary_BasicsItems.DECAYED_MASTER_SWORD); + decay.setTag(pStack.getOrCreateTag().copy()); + + if (pEntity.getMainHandItem().is(pStack.getItem())) { + pEntity.setItemInHand(InteractionHand.MAIN_HAND, decay); + } else if (pEntity.getOffhandItem().is(pStack.getItem())) { + pEntity.setItemInHand(InteractionHand.OFF_HAND, decay); + } + + pEntity.getLevel().playSound(null, pEntity.blockPosition(), SoundEvents.ITEM_BREAK, SoundSource.PLAYERS, 1.0F, 10f); + return 0; + } + return amount; + } + + public void inventoryTick(ItemStack pStack, Level pLevel, Entity pEntity, int pSlotId, boolean pIsSelected) { + super.inventoryTick(pStack, pLevel, pEntity, pSlotId, pIsSelected); + + if (pStack.isDamaged()) { + if (pStack.getDamageValue() >= pStack.getMaxDamage() - 1) { + ItemStack decay = new ItemStack(Unordinary_BasicsItems.DECAYED_MASTER_SWORD); + decay.setTag(pStack.getOrCreateTag().copy()); + pEntity.getSlot(pSlotId).set(decay); + + pEntity.getLevel().playSound(null, pEntity.blockPosition(), + SoundEvents.ENCHANTMENT_TABLE_USE, SoundSource.PLAYERS, 1.0F, 10f); + return; + } + + CompoundTag tag = pStack.getOrCreateTag(); + int heal = tag.getInt("durabilityHeal"); + + if (heal < 200) { + tag.putInt("durabilityHeal", heal + 1); + } else { + pStack.setDamageValue(pStack.getDamageValue() - 1); + tag.putInt("durabilityHeal", 0); + } + } + } + + @Override + public InteractionResultHolder use(Level pLevel, Player pPlayer, InteractionHand pUsedHand) { + if (pPlayer.getMaxHealth() != pPlayer.getHealth()) return InteractionResultHolder.fail(pPlayer.getItemInHand(pUsedHand)); + + ItemStack itemstack = pPlayer.getItemInHand(pUsedHand); + Vec3 rot = pPlayer.getLookAngle(); + Vec3 spawnPos = pPlayer.getEyePosition(); + MasterSwordBeam swordBeam = new MasterSwordBeam(pLevel,pPlayer,rot.x,rot.y,rot.z); + + swordBeam.setOwner(pPlayer); + swordBeam.setPosRaw(spawnPos.x + rot.x,spawnPos.y - 0.2d,spawnPos.z + rot.z); + + int speed = 2; + + swordBeam.xPower = swordBeam.xPower * speed; + swordBeam.yPower = swordBeam.yPower * speed; + swordBeam.zPower = swordBeam.zPower * speed; + + pLevel.addFreshEntity(swordBeam); + + /*if (pLevel.isClientSide) { + if (new Random().nextBoolean()) { + pLevel.playSound(pPlayer,swordBeam.blockPosition(), SoundEvents.WITHER_SHOOT, SoundSource.PLAYERS,0.5f,1f); + } else { + pLevel.playSound(pPlayer,swordBeam.blockPosition(), SoundEvents.WITHER_AMBIENT, SoundSource.PLAYERS,0.5f,1f); + } + }*/ + //TODO: add sounds + + pPlayer.getCooldowns().addCooldown(this, 60); + + //itemstack.getOrCreateTag().putInt("activated_timer",30); + + return InteractionResultHolder.sidedSuccess(itemstack, pLevel.isClientSide()); + } +} + + + diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/PotionBeltItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/PotionBeltItem.java index a4172be71..2d422eb23 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/PotionBeltItem.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/PotionBeltItem.java @@ -1,12 +1,10 @@ package com.github.manasmods.unordinary_basics.item.custom; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.capability.CapabilityUBInventory; import com.github.manasmods.unordinary_basics.capability.IUBInventoryItem; import com.github.manasmods.unordinary_basics.capability.ItemStackHandlerCapabilityProvider; -import com.github.manasmods.unordinary_basics.client.gui.Unordinary_BasicsInventoryScreen; import com.github.manasmods.unordinary_basics.client.gui.Unordinary_BasicsItemInventoryScreen; -import com.github.manasmods.unordinary_basics.menu.UBInventoryMenu; import com.github.manasmods.unordinary_basics.menu.UBItemInventoryMenu; import com.github.manasmods.unordinary_basics.utils.UBTags; import com.mojang.blaze3d.systems.RenderSystem; @@ -22,7 +20,6 @@ import net.minecraft.world.item.PotionItem; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.SlotItemHandler; import org.jetbrains.annotations.NotNull; @@ -30,8 +27,8 @@ public class PotionBeltItem extends Item implements IUBInventoryItem { - public static final ResourceLocation TEXTURE = new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/potion_belt_slots.png"); - public static final ResourceLocation EMPTY_ARMOR_SLOT_POTION_BELT = new ResourceLocation(Unordinary_Basics.MOD_ID,"item/empty_slots/empty_armor_slot_potion_belt"); + public static final ResourceLocation TEXTURE = new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/potion_belt_slots.png"); + public static final ResourceLocation EMPTY_ARMOR_SLOT_POTION_BELT = new ResourceLocation(UnordinaryBasics.MOD_ID,"item/empty_slots/empty_armor_slot_potion_belt"); public PotionBeltItem(Properties pProperties) { super(pProperties); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/QuiverItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/QuiverItem.java index f24d04b41..97535eb32 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/QuiverItem.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/QuiverItem.java @@ -1,12 +1,10 @@ package com.github.manasmods.unordinary_basics.item.custom; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.capability.CapabilityUBInventory; import com.github.manasmods.unordinary_basics.capability.IUBInventoryItem; import com.github.manasmods.unordinary_basics.capability.ItemStackHandlerCapabilityProvider; -import com.github.manasmods.unordinary_basics.client.gui.Unordinary_BasicsInventoryScreen; import com.github.manasmods.unordinary_basics.client.gui.Unordinary_BasicsItemInventoryScreen; -import com.github.manasmods.unordinary_basics.menu.UBInventoryMenu; import com.github.manasmods.unordinary_basics.menu.UBItemInventoryMenu; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; @@ -26,7 +24,7 @@ import org.jetbrains.annotations.Nullable; public class QuiverItem extends Item implements IUBInventoryItem { - public static final ResourceLocation TEXTURE = new ResourceLocation(Unordinary_Basics.MOD_ID, "textures/gui/quiver_slots.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation(UnordinaryBasics.MOD_ID, "textures/gui/quiver_slots.png"); public QuiverItem(Properties pProperties) { super(pProperties); } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/RedstonePouchItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/RedstonePouchItem.java index f1e71df7f..f4089f3b0 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/RedstonePouchItem.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/RedstonePouchItem.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.item.custom; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.capability.RedstonePouchCapabilityProvider; import com.google.common.util.concurrent.AtomicDouble; import net.minecraft.nbt.CompoundTag; @@ -60,7 +60,7 @@ public InteractionResult useOn(UseOnContext pContext) { pouchItem.getOrCreateTag().put("inventory", ((ItemStackHandler) handler).serializeNBT()); } else { - Unordinary_Basics.getLogger().error("Couldn't get hit result! Unable to place block."); + UnordinaryBasics.getLogger().error("Couldn't get hit result! Unable to place block."); } }); return result.get(); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/ZenithItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/ZenithItem.java index e991aef6e..dd14aa83a 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/ZenithItem.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/ZenithItem.java @@ -11,6 +11,7 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; import net.minecraft.world.item.SwordItem; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; @@ -25,7 +26,7 @@ public ZenithItem() { super(UBToolTiers.ZENITH, 15, -2.5F, new Properties().tab(Unordinary_BasicsCreativeTab.ITEMS) .durability(3000) - .fireResistant()); + .fireResistant().rarity(Rarity.EPIC)); } @Override public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List pTooltipComponents, TooltipFlag pIsAdvanced) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/loot/ModLootModifiers.java b/src/main/java/com/github/manasmods/unordinary_basics/loot/ModLootModifiers.java index 403150610..cad16980b 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/loot/ModLootModifiers.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/loot/ModLootModifiers.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.loot; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.mojang.serialization.Codec; import net.minecraftforge.common.loot.IGlobalLootModifier; import net.minecraftforge.eventbus.api.IEventBus; @@ -10,7 +10,7 @@ public class ModLootModifiers { public static final DeferredRegister> LOOT_MODIFIER_SERIALIZERS = - DeferredRegister.create(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, Unordinary_Basics.MOD_ID); + DeferredRegister.create(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, UnordinaryBasics.MOD_ID); public static final RegistryObject> ADD_ITEM = LOOT_MODIFIER_SERIALIZERS.register("add_item", AddItemModifier.CODEC); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/menu/FletchingTableMenu.java b/src/main/java/com/github/manasmods/unordinary_basics/menu/FletchingTableMenu.java index beb1d09d6..66f7e305f 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/menu/FletchingTableMenu.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/menu/FletchingTableMenu.java @@ -4,7 +4,7 @@ import com.github.manasmods.unordinary_basics.menu.slot.FilteredSlot; import com.github.manasmods.unordinary_basics.menu.slot.FletchingResultSlot; import com.github.manasmods.unordinary_basics.recipe.FletchingRecipe; -import com.github.manasmods.unordinary_basics.registry.Unordinary_BasicsRecipeTypeRegistry; +import com.github.manasmods.unordinary_basics.registry.UBRecipeTypeRegistry; import lombok.Getter; import net.minecraft.core.BlockPos; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; @@ -12,7 +12,10 @@ import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.*; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.ContainerLevelAccess; +import net.minecraft.world.inventory.ResultContainer; +import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; @@ -177,7 +180,7 @@ protected static void slotChangedCraftingGrid(FletchingTableMenu menu, Level lev if (player instanceof ServerPlayer serverPlayer) { ItemStack itemstack = ItemStack.EMPTY; - Optional optional = level.getServer().getRecipeManager().getRecipeFor(Unordinary_BasicsRecipeTypeRegistry.FLETCHING_RECIPE.get(), craftingContainer, level); + Optional optional = level.getServer().getRecipeManager().getRecipeFor(UBRecipeTypeRegistry.FLETCHING_RECIPE.get(), craftingContainer, level); if (optional.isPresent()) { FletchingRecipe fletchingRecipe = optional.get(); if (resultContainer.setRecipeUsed(level, serverPlayer, fletchingRecipe)) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/menu/UBInventoryMenu.java b/src/main/java/com/github/manasmods/unordinary_basics/menu/UBInventoryMenu.java index e1f335394..2d775ae00 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/menu/UBInventoryMenu.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/menu/UBInventoryMenu.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.menu; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.capability.CapabilityUBInventory; import com.github.manasmods.unordinary_basics.capability.IUBInventoryItem; import com.github.manasmods.unordinary_basics.capability.UBInventoryItemStackHandler; @@ -51,10 +51,10 @@ public class UBInventoryMenu extends RecipeBookMenu { public static final ResourceLocation EMPTY_ARMOR_SLOT_LEGGINGS = new ResourceLocation("item/empty_armor_slot_leggings"); public static final ResourceLocation EMPTY_ARMOR_SLOT_BOOTS = new ResourceLocation("item/empty_armor_slot_boots"); public static final ResourceLocation EMPTY_ARMOR_SLOT_SHIELD = new ResourceLocation("item/empty_armor_slot_shield"); - public static final ResourceLocation EMPTY_ARMOR_SLOT_BACK_PACK = new ResourceLocation(Unordinary_Basics.MOD_ID,"item/empty_slots/empty_armor_slot_back_pack"); - public static final ResourceLocation EMPTY_ARMOR_SLOT_BACK_WINGS = new ResourceLocation(Unordinary_Basics.MOD_ID,"item/empty_slots/empty_armor_slot_back_wings"); - public static final ResourceLocation EMPTY_ARMOR_SLOT_BACK_QUIVER = new ResourceLocation(Unordinary_Basics.MOD_ID,"item/empty_slots/empty_armor_slot_back_quiver"); - public static final ResourceLocation EMPTY_ARMOR_SLOT_WAIST = new ResourceLocation(Unordinary_Basics.MOD_ID,"item/empty_slots/empty_armor_slot_waist"); + public static final ResourceLocation EMPTY_ARMOR_SLOT_BACK_PACK = new ResourceLocation(UnordinaryBasics.MOD_ID,"item/empty_slots/empty_armor_slot_back_pack"); + public static final ResourceLocation EMPTY_ARMOR_SLOT_BACK_WINGS = new ResourceLocation(UnordinaryBasics.MOD_ID,"item/empty_slots/empty_armor_slot_back_wings"); + public static final ResourceLocation EMPTY_ARMOR_SLOT_BACK_QUIVER = new ResourceLocation(UnordinaryBasics.MOD_ID,"item/empty_slots/empty_armor_slot_back_quiver"); + public static final ResourceLocation EMPTY_ARMOR_SLOT_WAIST = new ResourceLocation(UnordinaryBasics.MOD_ID,"item/empty_slots/empty_armor_slot_waist"); static final ResourceLocation[] TEXTURE_EMPTY_SLOTS = new ResourceLocation[]{EMPTY_ARMOR_SLOT_BOOTS, EMPTY_ARMOR_SLOT_LEGGINGS, EMPTY_ARMOR_SLOT_CHESTPLATE, EMPTY_ARMOR_SLOT_HELMET}; private final int windowId; diff --git a/src/main/java/com/github/manasmods/unordinary_basics/menu/slot/FletchingResultSlot.java b/src/main/java/com/github/manasmods/unordinary_basics/menu/slot/FletchingResultSlot.java index 4dc0e0e81..045fa9bd9 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/menu/slot/FletchingResultSlot.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/menu/slot/FletchingResultSlot.java @@ -1,7 +1,7 @@ package com.github.manasmods.unordinary_basics.menu.slot; import com.github.manasmods.unordinary_basics.menu.container.FletchingContainer; -import com.github.manasmods.unordinary_basics.registry.Unordinary_BasicsRecipeTypeRegistry; +import com.github.manasmods.unordinary_basics.registry.UBRecipeTypeRegistry; import net.minecraft.core.NonNullList; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; @@ -24,7 +24,7 @@ public FletchingResultSlot(Player player, FletchingContainer container, Containe public void onTake(Player pPlayer, ItemStack pStack) { this.checkTakeAchievements(pStack); ForgeHooks.setCraftingPlayer(pPlayer); - NonNullList remainingItems = pPlayer.level.getRecipeManager().getRemainingItemsFor(Unordinary_BasicsRecipeTypeRegistry.FLETCHING_RECIPE.get(), this.container, pPlayer.level); + NonNullList remainingItems = pPlayer.level.getRecipeManager().getRemainingItemsFor(UBRecipeTypeRegistry.FLETCHING_RECIPE.get(), this.container, pPlayer.level); ForgeHooks.setCraftingPlayer(null); for (int i = 0; i < remainingItems.size(); i++) { @@ -39,18 +39,18 @@ protected void onQuickCraft(ItemStack pStack, int pAmount) { ItemStack craftResult = pStack.copy(); ForgeHooks.setCraftingPlayer(player); - NonNullList remainingItems = player.level.getRecipeManager().getRemainingItemsFor(Unordinary_BasicsRecipeTypeRegistry.FLETCHING_RECIPE.get(), this.container, player.level); + NonNullList remainingItems = player.level.getRecipeManager().getRemainingItemsFor(UBRecipeTypeRegistry.FLETCHING_RECIPE.get(), this.container, player.level); ForgeHooks.setCraftingPlayer(null); for (int i = 0; i < remainingItems.size(); i++) { container.setItem(i, remainingItems.get(i)); } - while (player.level.getRecipeManager().getRecipeFor(Unordinary_BasicsRecipeTypeRegistry.FLETCHING_RECIPE.get(), container, player.level).isPresent() && + while (player.level.getRecipeManager().getRecipeFor(UBRecipeTypeRegistry.FLETCHING_RECIPE.get(), container, player.level).isPresent() && player.getInventory().add(craftResult.copy()) && pStack.getCount() + pAmount < 65) { ForgeHooks.setCraftingPlayer(player); - remainingItems = player.level.getRecipeManager().getRemainingItemsFor(Unordinary_BasicsRecipeTypeRegistry.FLETCHING_RECIPE.get(), this.container, player.level); + remainingItems = player.level.getRecipeManager().getRemainingItemsFor(UBRecipeTypeRegistry.FLETCHING_RECIPE.get(), this.container, player.level); ForgeHooks.setCraftingPlayer(null); for (int i = 0; i < remainingItems.size(); i++) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/network/Unordinary_BasicsNetwork.java b/src/main/java/com/github/manasmods/unordinary_basics/network/Unordinary_BasicsNetwork.java index 561fb117f..f548a18fb 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/network/Unordinary_BasicsNetwork.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/network/Unordinary_BasicsNetwork.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.network; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.network.toclient.UBInventoryClientSync; import com.github.manasmods.unordinary_basics.network.toserver.*; import net.minecraft.resources.ResourceLocation; @@ -10,7 +10,7 @@ public class Unordinary_BasicsNetwork { private static final String PROTOCOL_VERSION = String.valueOf(5); private static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel( - new ResourceLocation(Unordinary_Basics.MOD_ID, "main"), () -> PROTOCOL_VERSION, PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals); + new ResourceLocation(UnordinaryBasics.MOD_ID, "main"), () -> PROTOCOL_VERSION, PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals); public static void registerPackets() { int messageId = 0; diff --git a/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestMenuChange.java b/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestMenuChange.java index 06f9590b2..7dae87977 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestMenuChange.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestMenuChange.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.network.toserver; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import lombok.RequiredArgsConstructor; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; @@ -25,10 +25,10 @@ public void handle(Supplier ctx) { ServerPlayer player = ctx.get().getSender(); switch (targetMenu) { - case UB_FLETCHING -> Unordinary_Basics.getInstance().getApotheosisIntegration().ifPresent(apotheosisIntegration -> { + case UB_FLETCHING -> UnordinaryBasics.getInstance().getApotheosisIntegration().ifPresent(apotheosisIntegration -> { apotheosisIntegration.openUnordinaryBasicsFletchingMenu(player); }); - case APOTHEOSIS_FLETCHING -> Unordinary_Basics.getInstance().getApotheosisIntegration().ifPresent(apotheosisIntegration -> { + case APOTHEOSIS_FLETCHING -> UnordinaryBasics.getInstance().getApotheosisIntegration().ifPresent(apotheosisIntegration -> { apotheosisIntegration.openApotheosisFletchingMenu(player); }); } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestUBInventoryMenu.java b/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestUBInventoryMenu.java index 5da9ddf49..28beff407 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestUBInventoryMenu.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestUBInventoryMenu.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.network.toserver; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.menu.UBInventoryMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -27,7 +27,7 @@ public void toBytes(FriendlyByteBuf buf) { public void handle(Supplier ctx) { ctx.get().enqueueWork(() -> { //No checks since opening is always possible - NetworkHooks.openScreen(ctx.get().getSender(), new SimpleMenuProvider(UBInventoryMenu::new, Component.translatable(Unordinary_Basics.MOD_ID + ".inventory.title"))); + NetworkHooks.openScreen(ctx.get().getSender(), new SimpleMenuProvider(UBInventoryMenu::new, Component.translatable(UnordinaryBasics.MOD_ID + ".inventory.title"))); }); ctx.get().setPacketHandled(true); } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestUBItemInventoryMenu.java b/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestUBItemInventoryMenu.java index d74bae20f..8686b3b29 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestUBItemInventoryMenu.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/network/toserver/RequestUBItemInventoryMenu.java @@ -1,7 +1,6 @@ package com.github.manasmods.unordinary_basics.network.toserver; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; -import com.github.manasmods.unordinary_basics.menu.UBInventoryMenu; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.menu.UBItemInventoryMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -28,7 +27,7 @@ public void toBytes(FriendlyByteBuf buf) { public void handle(Supplier ctx) { ctx.get().enqueueWork(() -> { //No checks since opening is always possible - NetworkHooks.openScreen(ctx.get().getSender(), new SimpleMenuProvider(UBItemInventoryMenu::new, Component.translatable(Unordinary_Basics.MOD_ID + ".inventory.title"))); + NetworkHooks.openScreen(ctx.get().getSender(), new SimpleMenuProvider(UBItemInventoryMenu::new, Component.translatable(UnordinaryBasics.MOD_ID + ".inventory.title"))); }); ctx.get().setPacketHandled(true); } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/painting/UBPaintings.java b/src/main/java/com/github/manasmods/unordinary_basics/painting/UBPaintings.java index 4b9e034ae..df10755d9 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/painting/UBPaintings.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/painting/UBPaintings.java @@ -1,7 +1,6 @@ package com.github.manasmods.unordinary_basics.painting; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; -import net.minecraft.world.entity.decoration.Painting; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import net.minecraft.world.entity.decoration.PaintingVariant; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; @@ -10,7 +9,7 @@ public class UBPaintings { public static final DeferredRegister PAINTING_MOVTIES = - DeferredRegister.create(ForgeRegistries.PAINTING_VARIANTS, Unordinary_Basics.MOD_ID); + DeferredRegister.create(ForgeRegistries.PAINTING_VARIANTS, UnordinaryBasics.MOD_ID); /** **/ diff --git a/src/main/java/com/github/manasmods/unordinary_basics/recipe/FletchingRecipe.java b/src/main/java/com/github/manasmods/unordinary_basics/recipe/FletchingRecipe.java index 7389f6ea0..8cb100233 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/recipe/FletchingRecipe.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/recipe/FletchingRecipe.java @@ -2,7 +2,7 @@ import com.github.manasmods.unordinary_basics.core.NBTIngredientAccessor; import com.github.manasmods.unordinary_basics.menu.container.FletchingContainer; -import com.github.manasmods.unordinary_basics.registry.Unordinary_BasicsRecipeTypeRegistry; +import com.github.manasmods.unordinary_basics.registry.UBRecipeTypeRegistry; import com.google.common.collect.Lists; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -69,7 +69,7 @@ public RecipeSerializer getSerializer() { @Override public RecipeType getType() { - return Unordinary_BasicsRecipeTypeRegistry.FLETCHING_RECIPE.get(); + return UBRecipeTypeRegistry.FLETCHING_RECIPE.get(); } @Override diff --git a/src/main/java/com/github/manasmods/unordinary_basics/recipe/Unordinary_BasicsRecipeSerializers.java b/src/main/java/com/github/manasmods/unordinary_basics/recipe/Unordinary_BasicsRecipeSerializers.java index a85db8527..b41c71539 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/recipe/Unordinary_BasicsRecipeSerializers.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/recipe/Unordinary_BasicsRecipeSerializers.java @@ -1,6 +1,5 @@ package com.github.manasmods.unordinary_basics.recipe; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/com/github/manasmods/unordinary_basics/registry/BlockRegistry.java b/src/main/java/com/github/manasmods/unordinary_basics/registry/BlockRegistry.java index 9cbb213c8..22b24506c 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/registry/BlockRegistry.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/registry/BlockRegistry.java @@ -1,18 +1,6 @@ package com.github.manasmods.unordinary_basics.registry; -import com.github.manasmods.unordinary_basics.block.DirtPathSlab; -import com.github.manasmods.unordinary_basics.block.DirtWiltableSlabBlock; -import com.github.manasmods.unordinary_basics.block.DirtWiltableStairBlock; -import com.github.manasmods.unordinary_basics.block.EnchantmentLibraryBlock; -import com.github.manasmods.unordinary_basics.block.FallingSlabBlock; -import com.github.manasmods.unordinary_basics.block.FallingStairBlock; -import com.github.manasmods.unordinary_basics.block.GrassSproutableSlabBlock; -import com.github.manasmods.unordinary_basics.block.GrassSproutableStairBlock; -import com.github.manasmods.unordinary_basics.block.ItemSorterBlock; -import com.github.manasmods.unordinary_basics.block.PathableSlabBlock; -import com.github.manasmods.unordinary_basics.block.PathableStairBlock; -import com.github.manasmods.unordinary_basics.block.SimpleBlock; -import com.github.manasmods.unordinary_basics.block.Unordinary_BasicsBlocks; +import com.github.manasmods.unordinary_basics.block.*; import com.github.manasmods.unordinary_basics.item.templates.CustomBlockItem; import com.github.manasmods.unordinary_basics.item.templates.SimpleBlockItem; import net.minecraft.network.chat.Component; @@ -22,12 +10,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; 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.SlabBlock; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.StairBlock; -import net.minecraft.world.level.block.WallBlock; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.Material; import net.minecraftforge.eventbus.api.IEventBus; @@ -41,7 +24,7 @@ public class BlockRegistry { /** * This Method will register all Blocks with their BlockItems to Forge. - * It is called though the {@link Unordinary_BasicsRegistry#register(IEventBus)} Method. + * It is called though the {@link UBRegistry#register(IEventBus)} Method. */ static void register(DeferredRegister itemRegistry, DeferredRegister blockRegistry) { registerBlocks(blockRegistry); // Registers all Blocks @@ -52,15 +35,12 @@ static void register(DeferredRegister itemRegistry, DeferredRegister { if (!registeredItems.contains(registryObject.getId())) { itemRegistry.register(registryObject.getId().getPath(), () -> new SimpleBlockItem(registryObject.get())); - System.out.println(registryObject.getId()); } - System.out.println("Created Block Item"); }); } @@ -81,6 +61,11 @@ private static void registerBlocks(DeferredRegister registry) { .sound(SoundType.METAL) .noOcclusion() .requiresCorrectToolForDrops())); + registry.register("master_sword_shrine", () -> new MasterSwordShrine(BlockBehaviour.Properties.of(Material.STONE) + .strength(1000F) + .sound(SoundType.STONE) + .noOcclusion() + .requiresCorrectToolForDrops())); RegistryObject andesite_bricks = registry.register("andesite_bricks", () -> new SimpleBlock(Material.STONE, properties -> properties.strength(1.5F, 6.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); registry.register("andesite_brick_stairs", () -> new StairBlock(andesite_bricks.get()::defaultBlockState, (BlockBehaviour.Properties.copy(andesite_bricks.get()).requiresCorrectToolForDrops()))); @@ -690,6 +675,8 @@ static void registerItems(DeferredRegister registry) { registry.register("enchantment_library", () -> new CustomBlockItem(Unordinary_BasicsBlocks.ENCHANTMENT_LIBRARY)); + + registry.register("master_sword_shrine", () -> new CustomBlockItem(Unordinary_BasicsBlocks.MASTER_SWORD_SHRINE)); registry.register("item_sorter", () -> new CustomBlockItem(Unordinary_BasicsBlocks.ITEM_SORTER) { @Override public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List pTooltip, TooltipFlag pFlag) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/registry/ItemRegistry.java b/src/main/java/com/github/manasmods/unordinary_basics/registry/ItemRegistry.java index a4009cae7..0fa52b346 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/registry/ItemRegistry.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/registry/ItemRegistry.java @@ -2,7 +2,6 @@ import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsCreativeTab; -import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsItems; import com.github.manasmods.unordinary_basics.item.custom.*; import com.github.manasmods.unordinary_basics.item.templates.MusicDiscItem; import com.github.manasmods.unordinary_basics.item.templates.TooltipItem; @@ -10,7 +9,6 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; -import net.minecraft.world.item.MilkBucketItem; import net.minecraft.world.item.Rarity; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; @@ -18,7 +16,7 @@ class ItemRegistry { /** * This Method will register all Items to Forge. - * It is called though the {@link Unordinary_BasicsRegistry#register(IEventBus)} Method. + * It is called though the {@link UBRegistry#register(IEventBus)} Method. */ static void register(DeferredRegister registry) { registerMisc(registry); @@ -33,6 +31,8 @@ private static void registerMisc(DeferredRegister registry) { registry.register("goat_milk_bucket", () -> new EffectCurativeItem(new Item.Properties().tab(Unordinary_BasicsCreativeTab.ITEMS).stacksTo(1),Items.BUCKET)); registry.register("goat_milk_bottle", () -> new EffectCurativeItem(new Item.Properties().tab(Unordinary_BasicsCreativeTab.ITEMS).stacksTo(1),Items.GLASS_BOTTLE)); registry.register("milk_bottle", () -> new EffectCurativeItem(new Item.Properties().tab(Unordinary_BasicsCreativeTab.ITEMS).stacksTo(1),Items.GLASS_BOTTLE)); + registry.register("decayed_master_sword", DecayedMasterSwordItem::new); + registry.register("master_sword", MasterSwordItem::new); registry.register("map_book", () -> new Item(new Item.Properties().tab(Unordinary_BasicsCreativeTab.ITEMS).stacksTo(1).durability(265))); registry.register("unknown_blade_fragment", () -> new TooltipItem(new Item.Properties().tab(Unordinary_BasicsCreativeTab.ITEMS).stacksTo(1),Component.translatable("tooltip.unordinary_basics.unknown_blade_fragment"))); registry.register("unknown_sword_handle_fragment", () -> new TooltipItem(new Item.Properties().tab(Unordinary_BasicsCreativeTab.ITEMS).stacksTo(1),Component.translatable("tooltip.unordinary_basics.unknown_sword_handle_fragment"))); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/registry/SoundEventRegistry.java b/src/main/java/com/github/manasmods/unordinary_basics/registry/SoundEventRegistry.java index 79f572476..3075eda37 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/registry/SoundEventRegistry.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/registry/SoundEventRegistry.java @@ -8,7 +8,7 @@ class SoundEventRegistry { /** * This Method will register all SoundEvents to Forge. - * It is called though the {@link Unordinary_BasicsRegistry#register(IEventBus)} Method. + * It is called though the {@link UBRegistry#register(IEventBus)} Method. */ static void register(DeferredRegister registry) { registry.register("queen", () -> new UBSoundEvent("queen")); diff --git a/src/main/java/com/github/manasmods/unordinary_basics/registry/UBEntityTypes.java b/src/main/java/com/github/manasmods/unordinary_basics/registry/UBEntityTypes.java index 57b929898..25f4eaf60 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/registry/UBEntityTypes.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/registry/UBEntityTypes.java @@ -1,13 +1,13 @@ package com.github.manasmods.unordinary_basics.registry; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.entity.GrizzlyBearEntity; import com.github.manasmods.unordinary_basics.entity.GrolarBearEntity; +import com.github.manasmods.unordinary_basics.entity.MasterSwordBeam; import com.github.manasmods.unordinary_basics.entity.NonExplosiveWitherSkull; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.entity.projectile.WitherSkull; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; @@ -15,6 +15,7 @@ public class UBEntityTypes { public static RegistryObject> GROLAR_BEAR; public static RegistryObject> GRIZZLY_BEAR; public static RegistryObject> NON_EXPLOSIVE_WITHER_SKULL; + public static RegistryObject> MASTER_SWORD_BEAM; static void register(DeferredRegister> registry) { // GRIZZLY_BEAR = registry.register("grizzly_bear", @@ -29,7 +30,11 @@ static void register(DeferredRegister> registry) { () -> EntityType.Builder.of(NonExplosiveWitherSkull::new, MobCategory.MISC) .sized(0.3125F, 0.3125F) .clientTrackingRange(4).updateInterval(10) - .build(new ResourceLocation(Unordinary_Basics.MOD_ID,"non_explosive_wither_skull").toString())); - + .build(new ResourceLocation(UnordinaryBasics.MOD_ID,"non_explosive_wither_skull").toString())); + MASTER_SWORD_BEAM = registry.register("master_sword_beam", + () -> EntityType.Builder.of(MasterSwordBeam::new, MobCategory.MISC) + .sized(1f, 0.3125F) + .clientTrackingRange(4).updateInterval(10) + .build(new ResourceLocation(UnordinaryBasics.MOD_ID,"master_sword_beam").toString())); } } \ No newline at end of file diff --git a/src/main/java/com/github/manasmods/unordinary_basics/registry/Unordinary_BasicsRecipeTypeRegistry.java b/src/main/java/com/github/manasmods/unordinary_basics/registry/UBRecipeTypeRegistry.java similarity index 91% rename from src/main/java/com/github/manasmods/unordinary_basics/registry/Unordinary_BasicsRecipeTypeRegistry.java rename to src/main/java/com/github/manasmods/unordinary_basics/registry/UBRecipeTypeRegistry.java index 7ae13f4a2..1d5773a7f 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/registry/Unordinary_BasicsRecipeTypeRegistry.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/registry/UBRecipeTypeRegistry.java @@ -5,7 +5,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; -public class Unordinary_BasicsRecipeTypeRegistry { +public class UBRecipeTypeRegistry { public static RegistryObject> FLETCHING_RECIPE; public static void register(DeferredRegister> registry) { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/registry/Unordinary_BasicsRegistry.java b/src/main/java/com/github/manasmods/unordinary_basics/registry/UBRegistry.java similarity index 84% rename from src/main/java/com/github/manasmods/unordinary_basics/registry/Unordinary_BasicsRegistry.java rename to src/main/java/com/github/manasmods/unordinary_basics/registry/UBRegistry.java index 581bdcacc..8b37ec617 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/registry/Unordinary_BasicsRegistry.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/registry/UBRegistry.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.registry; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import net.minecraft.core.Registry; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.EntityType; @@ -16,16 +16,16 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -public class Unordinary_BasicsRegistry { - private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Unordinary_Basics.MOD_ID); - private static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Unordinary_Basics.MOD_ID); - private static final DeferredRegister> MENUS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, Unordinary_Basics.MOD_ID); - private static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, Unordinary_Basics.MOD_ID); - private static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, Unordinary_Basics.MOD_ID); - private static final DeferredRegister> RECIPE_TYPES = DeferredRegister.create(Registry.RECIPE_TYPE_REGISTRY, Unordinary_Basics.MOD_ID); - private static final DeferredRegister ENCHANTMENTS = DeferredRegister.create(ForgeRegistries.ENCHANTMENTS, Unordinary_Basics.MOD_ID); - private static final DeferredRegister> ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, Unordinary_Basics.MOD_ID); - private static final DeferredRegister SOUND_EVENTS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, Unordinary_Basics.MOD_ID); +public class UBRegistry { + private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, UnordinaryBasics.MOD_ID); + private static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, UnordinaryBasics.MOD_ID); + private static final DeferredRegister> MENUS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, UnordinaryBasics.MOD_ID); + private static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, UnordinaryBasics.MOD_ID); + private static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, UnordinaryBasics.MOD_ID); + private static final DeferredRegister> RECIPE_TYPES = DeferredRegister.create(Registry.RECIPE_TYPE_REGISTRY, UnordinaryBasics.MOD_ID); + private static final DeferredRegister ENCHANTMENTS = DeferredRegister.create(ForgeRegistries.ENCHANTMENTS, UnordinaryBasics.MOD_ID); + private static final DeferredRegister> ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, UnordinaryBasics.MOD_ID); + private static final DeferredRegister SOUND_EVENTS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, UnordinaryBasics.MOD_ID); public static Iterable getKnownBlocks() { @@ -44,7 +44,7 @@ public static void register(IEventBus modEventBus) { MenuRegistry.register(MENUS); BlockEntityRegistry.register(BLOCK_ENTITIES); RecipeSerializerRegistry.register(RECIPE_SERIALIZERS); - Unordinary_BasicsRecipeTypeRegistry.register(RECIPE_TYPES); + UBRecipeTypeRegistry.register(RECIPE_TYPES); EnchantmentsRegistry.register(ENCHANTMENTS); UBEntityTypes.register(ENTITY_TYPES); SoundEventRegistry.register(SOUND_EVENTS); //Register Sound Events diff --git a/src/main/java/com/github/manasmods/unordinary_basics/sound/UBSoundEvent.java b/src/main/java/com/github/manasmods/unordinary_basics/sound/UBSoundEvent.java index 11aa1f789..e9bea0d0b 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/sound/UBSoundEvent.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/sound/UBSoundEvent.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.sound; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; @@ -9,6 +9,6 @@ public class UBSoundEvent extends SoundEvent { * Easy to use {@link SoundEvent}. */ public UBSoundEvent(String name) { - super(new ResourceLocation(Unordinary_Basics.MOD_ID, name)); + super(new ResourceLocation(UnordinaryBasics.MOD_ID, name)); } } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/sound/UBSounds.java b/src/main/java/com/github/manasmods/unordinary_basics/sound/UBSounds.java index eb3d63c4e..0926cc172 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/sound/UBSounds.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/sound/UBSounds.java @@ -1,6 +1,5 @@ package com.github.manasmods.unordinary_basics.sound; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; import net.minecraft.sounds.SoundEvent; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/com/github/manasmods/unordinary_basics/utils/ClientUtils.java b/src/main/java/com/github/manasmods/unordinary_basics/utils/ClientUtils.java index 2e818cb07..004bd3769 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/utils/ClientUtils.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/utils/ClientUtils.java @@ -1,6 +1,6 @@ package com.github.manasmods.unordinary_basics.utils; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.block.IColorable; import com.github.manasmods.unordinary_basics.block.IPatternable; import com.mojang.blaze3d.vertex.PoseStack; @@ -27,7 +27,7 @@ public static Level getLevel() { } public static Material getTexture(BannerPattern pattern) { - return new Material(Sheets.BANNER_SHEET, new ResourceLocation(Unordinary_Basics.MOD_ID, "entity/banner/" + pattern.getHashname())); + return new Material(Sheets.BANNER_SHEET, new ResourceLocation(UnordinaryBasics.MOD_ID, "entity/banner/" + pattern.getHashname())); } public static Material getBedTexture() { diff --git a/src/main/java/com/github/manasmods/unordinary_basics/utils/Translation.java b/src/main/java/com/github/manasmods/unordinary_basics/utils/Translation.java index 0132297c5..79fc98529 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/utils/Translation.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/utils/Translation.java @@ -1,11 +1,11 @@ package com.github.manasmods.unordinary_basics.utils; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; public class Translation { public static MutableComponent of(String path) { - return Component.translatable(Unordinary_Basics.MOD_ID + "." + path); + return Component.translatable(UnordinaryBasics.MOD_ID + "." + path); } } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/utils/TreasureMapForEmeralds.java b/src/main/java/com/github/manasmods/unordinary_basics/utils/TreasureMapForEmeralds.java new file mode 100644 index 000000000..5ab2493ce --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/utils/TreasureMapForEmeralds.java @@ -0,0 +1,55 @@ +package com.github.manasmods.unordinary_basics.utils; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.tags.TagKey; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.npc.VillagerTrades; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.MapItem; +import net.minecraft.world.item.trading.MerchantOffer; +import net.minecraft.world.level.levelgen.structure.Structure; +import net.minecraft.world.level.saveddata.maps.MapDecoration; +import net.minecraft.world.level.saveddata.maps.MapItemSavedData; + +import javax.annotation.Nullable; + +public class TreasureMapForEmeralds implements VillagerTrades.ItemListing { + private final int emeraldCost; + private final TagKey destination; + private final String displayName; + private final MapDecoration.Type destinationType; + private final int maxUses; + private final int villagerXp; + + public TreasureMapForEmeralds(int pEmeraldCost, TagKey pDestination, String pDisplayName, MapDecoration.Type pDestinationType, int pMaxUses, int pVillagerXp) { + this.emeraldCost = pEmeraldCost; + this.destination = pDestination; + this.displayName = pDisplayName; + this.destinationType = pDestinationType; + this.maxUses = pMaxUses; + this.villagerXp = pVillagerXp; + } + + @Nullable + public MerchantOffer getOffer(Entity pTrader, RandomSource pRandom) { + if (!(pTrader.level instanceof ServerLevel)) { + return null; + } else { + ServerLevel serverlevel = (ServerLevel)pTrader.level; + BlockPos blockpos = serverlevel.findNearestMapStructure(this.destination, pTrader.blockPosition(), 100, true); + if (blockpos != null) { + ItemStack itemstack = MapItem.create(serverlevel, blockpos.getX(), blockpos.getZ(), (byte)2, true, true); + MapItem.renderBiomePreviewMap(serverlevel, itemstack); + MapItemSavedData.addTargetDecoration(itemstack, blockpos, "+", this.destinationType); + itemstack.setHoverName(Component.translatable(this.displayName)); + return new MerchantOffer(new ItemStack(Items.EMERALD, this.emeraldCost), new ItemStack(Items.COMPASS), itemstack, this.maxUses, this.villagerXp, 0.2F); + } else { + return null; + } + } + } +} diff --git a/src/main/java/com/github/manasmods/unordinary_basics/utils/UBTags.java b/src/main/java/com/github/manasmods/unordinary_basics/utils/UBTags.java index 02c03532a..c62df3dab 100644 --- a/src/main/java/com/github/manasmods/unordinary_basics/utils/UBTags.java +++ b/src/main/java/com/github/manasmods/unordinary_basics/utils/UBTags.java @@ -1,12 +1,15 @@ package com.github.manasmods.unordinary_basics.utils; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; +import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; +import net.minecraft.world.entity.EntityType; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.levelgen.structure.Structure; public class UBTags { @@ -24,7 +27,7 @@ public static class Blocks { static TagKey modTag(String name) { - return BlockTags.create(new ResourceLocation(Unordinary_Basics.MOD_ID, name)); + return BlockTags.create(new ResourceLocation(UnordinaryBasics.MOD_ID, name)); } static TagKey forgeTag(String name) { @@ -47,11 +50,33 @@ public static class Items { static TagKey modTag(String name) { - return ItemTags.create(new ResourceLocation(Unordinary_Basics.MOD_ID, name)); + return ItemTags.create(new ResourceLocation(UnordinaryBasics.MOD_ID, name)); } static TagKey forgeTag(String name) { return ItemTags.create(new ResourceLocation("forge", name)); } } + + public static class EntityTypes { + public static TagKey> SCULK_ENEMIES = forgeTag("sculk_enemies"); + static TagKey> forgeTag(String name) { + return create(new ResourceLocation("forge", name)); + } + static TagKey> create(final ResourceLocation name) { + return TagKey.create(Registry.ENTITY_TYPE_REGISTRY, name); + } + } + + public static class Structures { + + public static TagKey MASTER_SWORD_SHRINE = create(new ResourceLocation(UnordinaryBasics.MOD_ID,"master_sword_shrine")); + + static TagKey forgeTag(String name) { + return create(new ResourceLocation("forge", name)); + } + static TagKey create(final ResourceLocation name) { + return TagKey.create(Registry.STRUCTURE_REGISTRY, name); + } + } } diff --git a/src/main/java/com/github/manasmods/unordinary_basics/world/structure/UBStructures.java b/src/main/java/com/github/manasmods/unordinary_basics/world/structure/UBStructures.java new file mode 100644 index 000000000..d6ef2339e --- /dev/null +++ b/src/main/java/com/github/manasmods/unordinary_basics/world/structure/UBStructures.java @@ -0,0 +1,15 @@ +package com.github.manasmods.unordinary_basics.world.structure; + +import com.github.manasmods.unordinary_basics.UnordinaryBasics; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.levelgen.structure.Structure; + +public class UBStructures { + public static ResourceKey MASTER_SWORD_SHRINE = createKey(new ResourceLocation(UnordinaryBasics.MOD_ID,"master_sword_shrine")); + + private static ResourceKey createKey(ResourceLocation location) { + return ResourceKey.create(Registry.STRUCTURE_REGISTRY, location); + } +} diff --git a/src/main/resources/assets/unordinary_basics/blockstates/master_sword_shrine.json b/src/main/resources/assets/unordinary_basics/blockstates/master_sword_shrine.json new file mode 100644 index 000000000..c81cc9514 --- /dev/null +++ b/src/main/resources/assets/unordinary_basics/blockstates/master_sword_shrine.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=west": { "model": "unordinary_basics:block/master_sword_shrine" }, + "facing=south": { "model": "unordinary_basics:block/master_sword_shrine", "y": 90 }, + "facing=east": { "model": "unordinary_basics:block/master_sword_shrine", "y": 180 }, + "facing=north": { "model": "unordinary_basics:block/master_sword_shrine", "y": 270 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unordinary_basics/lang/en_us.json b/src/main/resources/assets/unordinary_basics/lang/en_us.json index a057774f4..8f61b52dd 100644 --- a/src/main/resources/assets/unordinary_basics/lang/en_us.json +++ b/src/main/resources/assets/unordinary_basics/lang/en_us.json @@ -3,6 +3,15 @@ "itemGroup.unordinary_basics.tab2": "UB - Blocks", "itemGroup.unordinary_basics.tab3": "UB - Items", + "filled_map.unordinary_basics.master_sword_shrine": "Master Sword Shrine Locator Map", + + "advancements.unordinary_basics.a_very_ordinary_advancement.title": "A Very Ordinary Advancement", + "advancements.unordinary_basics.a_very_ordinary_advancement.desscription": "A Very Ordinary Advancement Description", + "advancements.unordinary_basics.a_heroes_sword.title": "A Heroes Sword", + "advancements.unordinary_basics.a_heroes_sword.description": "Find the resting place for the sword that seals the darkness!", + "advancements.unordinary_basics.the_sword_of_legend.title": "The Sword of Legend", + "advancements.unordinary_basics.the_sword_of_legend.description": "You have proved yourself worthy, and have pulled the Master Sword from its resting place!", + "block.unordinary_basics.enchantment_library": "Enchantment Library §c(WIP)§", "block.unordinary_basics.item_sorter": "Item Sorter", @@ -30,6 +39,11 @@ "item.unordinary_basics.chest_backpack": "Chest Backpack", "item.unordinary_basics.equine_tracker": "Equine Tracker", + "item.unordinary_basics.decayed_master_sword": "Decayed Master Sword", + "item.unordinary_basics.master_sword": "Master Sword", + "item.unordinary_basics.master_sword.recharge": "Master Sword recharges in: %s:%s", + "item.unordinary_basics.master_sword.recharge_second": "Master Sword recharges in: %s:0%s", + "item.unordinary_basics.unknown_blade_fragment": "Unknown Blade Fragment", "item.unordinary_basics.unknown_sword_handle_fragment": "Unknown Handle Fragment", "item.unordinary_basics.unknown_hilt_fragment": "Unknown Hilt Fragment", @@ -139,7 +153,7 @@ "tooltip.unordinary_basics.technoblade_crown": "A crown fit for a king, and for a legend who never really dies", "tooltip.unordinary_basics.chainmail_armor": "When wearing a full set, take 25% less damage from arrows", "tooltip.unordinary_basics.netherite_armor": "When wearing a full set, take 30% less damage from fire", - "tooltip.unordinary_basics.builders_glove": "Places blocks randomly, press §e[SHIFT]§r + §e[RMB]§r to open its inventory. \nRight click a block while you have another block in your offhand to replace that block.", + "tooltip.unordinary_basics.builders_glove": "Places blocks randomly, press §e[CROUCH]§r + §e[RMB]§r to open its inventory. \nRight click a block while you have another block in your offhand to replace that block.", "tooltip.unordinary_basics.redstone_pouch": "§l§4Redstone:§r %s", "tooltip.unordinary_basics.unknown_sword_handle_fragment": "Obtained by slaying the §5Ender Dragon", "tooltip.unordinary_basics.unknown_blade_fragment": "Obtained by slaying the §bWarden", @@ -157,6 +171,7 @@ "unordinary_basics.message.crop_tender_toggle": "Turned Crop Tender %s", "unordinary_basics.message.on": "on", "unordinary_basics.message.off": "off", + "unordinary_basics.message.master_sword_deny": "You have not proved yourself yet", "warning.unordinary_basics.tool_not_strong_enough": "Your tool isn't strong enough to replace that block!", "warning.unordinary_basics.no_slime_chunk_found": "§4Compass wasn't able to locate a slime chunk!", diff --git a/src/main/resources/assets/unordinary_basics/models/block/empty_master_sword_shrine.json b/src/main/resources/assets/unordinary_basics/models/block/empty_master_sword_shrine.json new file mode 100644 index 000000000..23d58e8f7 --- /dev/null +++ b/src/main/resources/assets/unordinary_basics/models/block/empty_master_sword_shrine.json @@ -0,0 +1,43 @@ +{ + "credit": "Made with Blockbench", + "parent": "master_sword_shrine", + "texture_size": [32, 32], + "textures": { + "2": "pedestal" + }, + "elements": [ + { + "from": [4, 1, 4], + "to": [12, 2, 12], + "faces": { + "north": {"uv": [6, 3.5, 10, 4], "texture": "#2"}, + "east": {"uv": [6, 0, 6.5, 4], "rotation": 270, "texture": "#2"}, + "south": {"uv": [6, 0, 10, 0.5], "rotation": 180, "texture": "#2"}, + "west": {"uv": [9.5, 0, 10, 4], "rotation": 90, "texture": "#2"}, + "up": {"uv": [10, 4, 6, 0], "texture": "#2"}, + "down": {"uv": [10, 4, 6, 8], "texture": "#2"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 5.5, 6, 6], "texture": "#2"}, + "east": {"uv": [0, 0, 0.5, 6], "rotation": 90, "texture": "#2"}, + "south": {"uv": [0, 0, 6, 0.5], "rotation": 180, "texture": "#2"}, + "west": {"uv": [5.5, 0, 6, 6], "rotation": 90, "texture": "#2"}, + "up": {"uv": [6, 6, 0, 0], "texture": "#2"}, + "down": {"uv": [6, 6, 0, 12], "texture": "#2"} + } + } + ], + "groups": [ + { + "name": "pedestal", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unordinary_basics/models/block/empty_master_sword_shrine.txt b/src/main/resources/assets/unordinary_basics/models/block/empty_master_sword_shrine.txt new file mode 100644 index 000000000..eaddef274 --- /dev/null +++ b/src/main/resources/assets/unordinary_basics/models/block/empty_master_sword_shrine.txt @@ -0,0 +1,7 @@ +public VoxelShape makeShape(){ + VoxelShape shape = VoxelShapes.empty(); + shape = VoxelShapes.combineAndSimplify(shape, VoxelShapes.create(0.25, 0.0625, 0.25, 0.75, 0.125, 0.75); + shape = VoxelShapes.combineAndSimplify(shape, VoxelShapes.create(0.125, 0, 0.125, 0.875, 0.0625, 0.875); + + return shape; +} \ No newline at end of file diff --git a/src/main/resources/assets/unordinary_basics/models/block/master_sword_shrine.json b/src/main/resources/assets/unordinary_basics/models/block/master_sword_shrine.json new file mode 100644 index 000000000..46d254783 --- /dev/null +++ b/src/main/resources/assets/unordinary_basics/models/block/master_sword_shrine.json @@ -0,0 +1,524 @@ +{ + "credit": "Made with Blockbench", + "parent": "master_sword_shrine", + "texture_size": [32, 32], + "textures": { + "0": "unordinary_basics:item/master_sword", + "2": "unordinary_basics:block/pedestal", + "particle": "unordinary_basics:item/master_sword" + }, + "elements": [ + { + "from": [4, 1, 4], + "to": [12, 2, 12], + "faces": { + "north": {"uv": [6, 3.5, 10, 4], "texture": "#2"}, + "east": {"uv": [6, 0, 6.5, 4], "rotation": 270, "texture": "#2"}, + "south": {"uv": [6, 0, 10, 0.5], "rotation": 180, "texture": "#2"}, + "west": {"uv": [9.5, 0, 10, 4], "rotation": 90, "texture": "#2"}, + "up": {"uv": [10, 4, 6, 0], "texture": "#2"}, + "down": {"uv": [10, 4, 6, 8], "texture": "#2"} + } + }, + { + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "north": {"uv": [0, 5.5, 6, 6], "texture": "#2"}, + "east": {"uv": [0, 0, 0.5, 6], "rotation": 90, "texture": "#2"}, + "south": {"uv": [0, 0, 6, 0.5], "rotation": 180, "texture": "#2"}, + "west": {"uv": [5.5, 0, 6, 6], "rotation": 90, "texture": "#2"}, + "up": {"uv": [6, 6, 0, 0], "texture": "#2"}, + "down": {"uv": [6, 6, 0, 12], "texture": "#2"} + } + }, + { + "name": "sword_0", + "from": [7.5, 0, 0], + "to": [8.5, 1, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 0, 13, 1], "rotation": 180, "texture": "#0"}, + "south": {"uv": [13, 0, 14, 1], "rotation": 180, "texture": "#0"}, + "west": {"uv": [13, 0, 16, 1], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [13, 0, 16, 1], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_1", + "from": [7.5, 1, 0], + "to": [8.5, 2, 4], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [15, 1, 16, 2], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 1, 12, 2], "rotation": 180, "texture": "#0"}, + "south": {"uv": [12, 1, 13, 2], "rotation": 180, "texture": "#0"}, + "west": {"uv": [12, 1, 16, 2], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [12, 1, 16, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_2", + "from": [7.5, 2, 0], + "to": [8.5, 3, 5], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [15, 2, 16, 3], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 2, 11, 3], "rotation": 180, "texture": "#0"}, + "south": {"uv": [11, 2, 12, 3], "rotation": 180, "texture": "#0"}, + "west": {"uv": [11, 2, 16, 3], "rotation": 180, "texture": "#0"}, + "up": {"uv": [11, 2, 16, 3], "rotation": 270, "texture": "#0"}, + "down": {"uv": [11, 2, 16, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_3", + "from": [7.5, 3, 3], + "to": [8.5, 5, 6], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [12, 3, 13, 5], "rotation": 180, "texture": "#0"}, + "east": {"uv": [13, 3, 10, 5], "rotation": 180, "texture": "#0"}, + "south": {"uv": [10, 3, 11, 5], "rotation": 180, "texture": "#0"}, + "west": {"uv": [10, 3, 13, 5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [10, 3, 13, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_5", + "from": [7.5, 5, 3], + "to": [8.5, 6, 8], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [12, 5, 13, 6], "rotation": 180, "texture": "#0"}, + "east": {"uv": [13, 5, 8, 6], "rotation": 180, "texture": "#0"}, + "south": {"uv": [8, 5, 9, 6], "rotation": 180, "texture": "#0"}, + "west": {"uv": [8, 5, 13, 6], "rotation": 180, "texture": "#0"}, + "up": {"uv": [8, 5, 13, 6], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8, 5, 13, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_7", + "from": [7.5, 6, 4], + "to": [8.5, 7, 9], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [11, 6, 12, 7], "rotation": 180, "texture": "#0"}, + "east": {"uv": [12, 6, 7, 7], "rotation": 180, "texture": "#0"}, + "south": {"uv": [7, 6, 8, 7], "rotation": 180, "texture": "#0"}, + "west": {"uv": [7, 6, 12, 7], "rotation": 180, "texture": "#0"}, + "up": {"uv": [7, 6, 12, 7], "rotation": 270, "texture": "#0"}, + "down": {"uv": [7, 6, 12, 7], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_8", + "from": [7.5, 7, 11], + "to": [8.5, 8, 12], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [4, 7, 5, 8], "rotation": 180, "texture": "#0"}, + "east": {"uv": [4, 8, 5, 7], "texture": "#0"}, + "south": {"uv": [4, 7, 5, 8], "rotation": 180, "texture": "#0"}, + "west": {"uv": [4, 7, 5, 8], "rotation": 180, "texture": "#0"}, + "up": {"uv": [4, 7, 5, 8], "rotation": 270, "texture": "#0"}, + "down": {"uv": [5, 7, 4, 8], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "sword_9", + "from": [7.5, 6, 9], + "to": [8.5, 7, 10], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [6, 6, 7, 7], "rotation": 180, "texture": "#0"}, + "east": {"uv": [6, 7, 7, 6], "texture": "#0"}, + "south": {"uv": [6, 6, 7, 7], "rotation": 180, "texture": "#0"}, + "west": {"uv": [6, 6, 7, 7], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6, 6, 7, 7], "rotation": 270, "texture": "#0"}, + "down": {"uv": [7, 6, 6, 7], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "sword_10", + "from": [7.5, 9, 6], + "to": [8.5, 10, 7], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [9, 9, 10, 10], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 10, 10, 9], "texture": "#0"}, + "south": {"uv": [9, 9, 10, 10], "rotation": 180, "texture": "#0"}, + "west": {"uv": [9, 9, 10, 10], "rotation": 180, "texture": "#0"}, + "up": {"uv": [9, 9, 10, 10], "rotation": 270, "texture": "#0"}, + "down": {"uv": [10, 9, 9, 10], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "sword_9", + "from": [7.5, 7, 12], + "to": [8.5, 8, 13], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [3, 7, 4, 8], "rotation": 180, "texture": "#0"}, + "east": {"uv": [3, 8, 4, 7], "texture": "#0"}, + "south": {"uv": [3, 7, 4, 8], "rotation": 180, "texture": "#0"}, + "west": {"uv": [3, 7, 4, 8], "rotation": 180, "texture": "#0"}, + "up": {"uv": [3, 7, 4, 8], "rotation": 270, "texture": "#0"}, + "down": {"uv": [4, 7, 3, 8], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "sword_10", + "from": [7.5, 11, 6], + "to": [8.5, 12, 7], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [9, 11, 10, 12], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 12, 10, 11], "texture": "#0"}, + "south": {"uv": [9, 11, 10, 12], "rotation": 270, "texture": "#0"}, + "west": {"uv": [9, 11, 10, 12], "rotation": 180, "texture": "#0"}, + "up": {"uv": [9, 11, 10, 12], "rotation": 270, "texture": "#0"}, + "down": {"uv": [10, 11, 9, 12], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "sword_13", + "from": [7.5, 7, 5], + "to": [8.5, 8, 10], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [10, 7, 11, 8], "rotation": 180, "texture": "#0"}, + "east": {"uv": [11, 7, 6, 8], "rotation": 180, "texture": "#0"}, + "south": {"uv": [6, 7, 7, 8], "rotation": 180, "texture": "#0"}, + "west": {"uv": [6, 7, 11, 8], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6, 7, 11, 8], "rotation": 270, "texture": "#0"}, + "down": {"uv": [6, 7, 11, 8], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_14", + "from": [7.5, 8, 6], + "to": [8.5, 9, 13], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [9, 8, 10, 9], "rotation": 180, "texture": "#0"}, + "east": {"uv": [10, 8, 3, 9], "rotation": 180, "texture": "#0"}, + "south": {"uv": [3, 8, 4, 9], "rotation": 180, "texture": "#0"}, + "west": {"uv": [3, 8, 10, 9], "rotation": 180, "texture": "#0"}, + "up": {"uv": [3, 8, 10, 9], "rotation": 270, "texture": "#0"}, + "down": {"uv": [3, 8, 10, 9], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_15", + "from": [7.5, 9, 7], + "to": [8.5, 10, 13], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [8, 9, 9, 10], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 9, 3, 10], "rotation": 180, "texture": "#0"}, + "south": {"uv": [3, 9, 4, 10], "rotation": 180, "texture": "#0"}, + "west": {"uv": [3, 9, 9, 10], "rotation": 180, "texture": "#0"}, + "up": {"uv": [3, 9, 9, 10], "rotation": 270, "texture": "#0"}, + "down": {"uv": [3, 9, 9, 10], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_16", + "from": [7.5, 10, 8], + "to": [8.5, 11, 12], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [7, 10, 8, 11], "rotation": 180, "texture": "#0"}, + "east": {"uv": [4, 10, 8, 11], "rotation": 180, "texture": "#0"}, + "south": {"uv": [4, 10, 5, 11], "rotation": 180, "texture": "#0"}, + "west": {"uv": [4, 10, 8, 11], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_17", + "from": [7.5, 11, 7], + "to": [8.5, 12, 13], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [8, 11, 9, 12], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 11, 3, 12], "rotation": 180, "texture": "#0"}, + "south": {"uv": [3, 11, 4, 12], "rotation": 180, "texture": "#0"}, + "west": {"uv": [3, 11, 9, 12], "rotation": 180, "texture": "#0"}, + "up": {"uv": [3, 11, 9, 12], "rotation": 270, "texture": "#0"}, + "down": {"uv": [3, 11, 9, 12], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_18", + "from": [7.5, 12, 11], + "to": [8.5, 13, 14], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [4, 12, 5, 13], "rotation": 180, "texture": "#0"}, + "east": {"uv": [2, 12, 5, 13], "rotation": 180, "texture": "#0"}, + "south": {"uv": [2, 12, 3, 13], "rotation": 180, "texture": "#0"}, + "west": {"uv": [2, 12, 5, 13], "rotation": 180, "texture": "#0"}, + "up": {"uv": [2, 12, 5, 13], "rotation": 270, "texture": "#0"}, + "down": {"uv": [2, 12, 5, 13], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_19", + "from": [7.5, 12, 8], + "to": [8.5, 13, 10], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [6, 12, 8, 13], "rotation": 180, "texture": "#0"}, + "south": {"uv": [6, 12, 7, 13], "rotation": 180, "texture": "#0"}, + "west": {"uv": [6, 12, 8, 13], "rotation": 180, "texture": "#0"}, + "up": {"uv": [6, 12, 8, 13], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_20", + "from": [7.5, 12, 6], + "to": [8.5, 13, 8], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [9, 12, 10, 13], "rotation": 180, "texture": "#0"}, + "east": {"uv": [8, 12, 10, 13], "rotation": 180, "texture": "#0"}, + "south": {"uv": [8, 12, 9, 13], "rotation": 180, "texture": "#0"}, + "west": {"uv": [8, 12, 10, 13], "rotation": 180, "texture": "#0"}, + "up": {"uv": [8, 12, 10, 13], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_21", + "from": [7.5, 13, 7], + "to": [8.5, 14, 9], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [8, 13, 9, 14], "rotation": 180, "texture": "#0"}, + "east": {"uv": [7, 13, 9, 14], "rotation": 180, "texture": "#0"}, + "south": {"uv": [7, 13, 8, 14], "rotation": 180, "texture": "#0"}, + "west": {"uv": [7, 13, 9, 14], "rotation": 180, "texture": "#0"}, + "up": {"uv": [7, 13, 9, 14], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_22", + "from": [7.5, 7, 13], + "to": [8.5, 9, 14], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [2, 7, 3, 9], "texture": "#0"}, + "east": {"uv": [2, 7, 3, 9], "texture": "#0"}, + "south": {"uv": [2, 7, 3, 9], "rotation": 90, "texture": "#0"}, + "west": {"uv": [2, 7, 3, 9], "texture": "#0"}, + "up": {"uv": [2, 7, 3, 8], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2, 8, 3, 9], "texture": "#0"} + } + }, + { + "name": "sword_22", + "from": [7.5, 6, 11], + "to": [8.5, 7, 13], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [4, 7, 5, 8], "rotation": 90, "texture": "#0"}, + "east": {"uv": [4, 6, 5, 8], "rotation": 270, "texture": "#0"}, + "south": {"uv": [4, 7, 5, 8], "rotation": 180, "texture": "#0"}, + "west": {"uv": [4, 6, 5, 8], "rotation": 270, "texture": "#0"}, + "up": {"uv": [4, 6, 5, 8], "texture": "#0"}, + "down": {"uv": [4, 6, 5, 8], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_23", + "from": [7.5, 13, 13], + "to": [8.5, 14, 15], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [3, 13, 1, 14], "rotation": 180, "texture": "#0"}, + "south": {"uv": [1, 13, 2, 14], "rotation": 180, "texture": "#0"}, + "west": {"uv": [1, 13, 3, 14], "rotation": 180, "texture": "#0"}, + "up": {"uv": [1, 13, 3, 14], "rotation": 270, "texture": "#0"}, + "down": {"uv": [1, 13, 3, 14], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_24", + "from": [7.5, 14, 13], + "to": [8.5, 15, 16], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#0"}, + "east": {"uv": [3, 14, 0, 15], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 14, 1, 15], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 14, 3, 15], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 14, 3, 15], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 14, 3, 15], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_25", + "from": [7.5, 15, 14], + "to": [8.5, 16, 16], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [1, 15, 2, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 15, 2, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 15, 1, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 15, 2, 16], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 15, 2, 16], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_26", + "from": [7.5, 15, 13], + "to": [8.5, 16, 14], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [2, 15, 3, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [2, 15, 3, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, + "west": {"uv": [2, 15, 3, 16], "rotation": 180, "texture": "#0"}, + "up": {"uv": [2, 15, 3, 16], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_27", + "from": [7.5, 13, 15], + "to": [8.5, 14, 16], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 13, 1, 14], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 13, 1, 14], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 13, 1, 14], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 13, 1, 14], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_28", + "from": [7.5, 13, 12], + "to": [8.5, 14, 13], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [3, 13, 4, 14], "rotation": 180, "texture": "#0"}, + "east": {"uv": [3, 13, 4, 14], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, + "west": {"uv": [3, 13, 4, 14], "rotation": 180, "texture": "#0"}, + "up": {"uv": [3, 13, 4, 14], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_29", + "from": [7.5, 4, 6], + "to": [8.5, 5, 7], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 4, 10, 5], "rotation": 180, "texture": "#0"}, + "south": {"uv": [9, 4, 10, 5], "rotation": 180, "texture": "#0"}, + "west": {"uv": [9, 4, 10, 5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [9, 4, 10, 5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_30", + "from": [7.5, 4, 2], + "to": [8.5, 5, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [13, 4, 14, 5], "rotation": 180, "texture": "#0"}, + "east": {"uv": [13, 4, 14, 5], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, + "west": {"uv": [13, 4, 14, 5], "rotation": 180, "texture": "#0"}, + "up": {"uv": [13, 4, 14, 5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "sword_31", + "from": [7.5, 3, 1], + "to": [8.5, 4, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [7.5, 8, 8]}, + "faces": { + "north": {"uv": [14, 3, 15, 4], "rotation": 180, "texture": "#0"}, + "east": {"uv": [15, 3, 13, 4], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, + "west": {"uv": [13, 3, 15, 4], "rotation": 180, "texture": "#0"}, + "up": {"uv": [13, 3, 15, 4], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -180, -180], + "translation": [0, 4, 0.5], + "scale": [0.85, 0.85, 0.85] + }, + "thirdperson_lefthand": { + "rotation": [0, -180, -180], + "translation": [0, 4, 0.5], + "scale": [0.85, 0.85, 0.85] + }, + "firstperson_righthand": { + "rotation": [0, -180, -180], + "translation": [0, 4, 0.5], + "scale": [0.85, 0.85, 0.85] + }, + "firstperson_lefthand": { + "rotation": [0, -180, -180], + "translation": [0, 4, 0.5], + "scale": [0.85, 0.85, 0.85] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [90, 45, 90], + "translation": [0, 0, 0.5], + "scale": [0.85, 0.85, 0.85] + }, + "head": { + "rotation": [-43.5, 0, 0], + "translation": [0, 7.5, -6.25] + }, + "fixed": { + "rotation": [0, -90, 0] + } + }, + "groups": [ + { + "name": "pedestal", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [0, 1] + }, + { + "name": "sword", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unordinary_basics/models/block/master_sword_shrine.txt b/src/main/resources/assets/unordinary_basics/models/block/master_sword_shrine.txt new file mode 100644 index 000000000..095b00a13 --- /dev/null +++ b/src/main/resources/assets/unordinary_basics/models/block/master_sword_shrine.txt @@ -0,0 +1,8 @@ +public VoxelShape makeShape(){ + VoxelShape shape = VoxelShapes.empty(); + shape = VoxelShapes.combineAndSimplify(shape, VoxelShapes.create(0.25, 0.0625, 0.25, 0.75, 0.125, 0.75); + shape = VoxelShapes.combineAndSimplify(shape, VoxelShapes.create(0.125, 0, 0.125, 0.875, 0.0625, 0.875); + shape = VoxelShapes.combineAndSimplify(shape, VoxelShapes.create(0.46875, 0.125, 0.1875, 0.53125, 1.1875, 0.8125); + + return shape; +} \ No newline at end of file diff --git a/src/main/resources/assets/unordinary_basics/textures/block/pedestal.png b/src/main/resources/assets/unordinary_basics/textures/block/pedestal.png new file mode 100644 index 000000000..4dc02cfb3 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/block/pedestal.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam.png b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam.png new file mode 100644 index 000000000..869dfb309 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_0.png b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_0.png new file mode 100644 index 000000000..6300f6640 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_0.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_1.png b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_1.png new file mode 100644 index 000000000..9247c9831 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_1.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_2.png b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_2.png new file mode 100644 index 000000000..305d7a7b5 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_2.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_3.png b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_3.png new file mode 100644 index 000000000..1fe59cc16 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_3.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_4.png b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_4.png new file mode 100644 index 000000000..2e2c6cf17 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_4.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_5.png b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_5.png new file mode 100644 index 000000000..bde996dc6 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_5.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_6.png b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_6.png new file mode 100644 index 000000000..5ca2a25e3 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_6.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_7.png b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_7.png new file mode 100644 index 000000000..ab7866403 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/entity/master_sword_beam/master_sword_beam_7.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/item/decayed_master_sword.png b/src/main/resources/assets/unordinary_basics/textures/item/decayed_master_sword.png new file mode 100644 index 000000000..4212bc078 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/item/decayed_master_sword.png differ diff --git a/src/main/resources/assets/unordinary_basics/textures/item/master_sword.png b/src/main/resources/assets/unordinary_basics/textures/item/master_sword.png new file mode 100644 index 000000000..b6c85c176 Binary files /dev/null and b/src/main/resources/assets/unordinary_basics/textures/item/master_sword.png differ diff --git a/src/main/resources/data/unordinary_basics/advancements/a_heroes_sword.json b/src/main/resources/data/unordinary_basics/advancements/a_heroes_sword.json new file mode 100644 index 000000000..6b4e2b007 --- /dev/null +++ b/src/main/resources/data/unordinary_basics/advancements/a_heroes_sword.json @@ -0,0 +1,35 @@ +{ + "display": { + "icon": { + "item": "unordinary_basics:master_sword" + }, + "title": { + "translate": "advancements.unordinary_basics.a_heroes_sword.title" + }, + "description": { + "translate": "advancements.unordinary_basics.a_heroes_sword.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true + }, + "parent": "unordinary_basics:a_very_ordinary_advancement", + "criteria": { + "in_shrine": { + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "structure": "unordinary_basics:master_sword_shrine" + } + } + } + ] + }, + "trigger": "minecraft:location" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/unordinary_basics/advancements/a_very_ordinary_advancement.json b/src/main/resources/data/unordinary_basics/advancements/a_very_ordinary_advancement.json new file mode 100644 index 000000000..49886ebb1 --- /dev/null +++ b/src/main/resources/data/unordinary_basics/advancements/a_very_ordinary_advancement.json @@ -0,0 +1,22 @@ +{ + "display": { + "icon": { + "item": "unordinary_basics:pouch" + }, + "title": { + "translate": "advancements.unordinary_basics.a_very_ordinary_advancement.title" + }, + "description": " ", + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "background": "unordinary_basics:textures/block/andesite_bricks.png" + }, + "criteria": { + "requirement": { + "trigger": "minecraft:inventory_changed", + "conditions": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/unordinary_basics/advancements/the_sword_of_legend.json b/src/main/resources/data/unordinary_basics/advancements/the_sword_of_legend.json new file mode 100644 index 000000000..43cde1654 --- /dev/null +++ b/src/main/resources/data/unordinary_basics/advancements/the_sword_of_legend.json @@ -0,0 +1,31 @@ +{ + "display": { + "icon": { + "item": "unordinary_basics:master_sword" + }, + "title": { + "translate": "advancements.unordinary_basics.the_sword_of_legend.title" + }, + "description": { + "translate": "advancements.unordinary_basics.the_sword_of_legend.description" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true + }, + "parent": "unordinary_basics:a_heroes_sword", + "criteria": { + "requirement": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "unordinary_basics:master_sword" + ] + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/unordinary_basics/structures/master_sword_shrine.nbt b/src/main/resources/data/unordinary_basics/structures/master_sword_shrine.nbt new file mode 100644 index 000000000..60c4dbc53 Binary files /dev/null and b/src/main/resources/data/unordinary_basics/structures/master_sword_shrine.nbt differ diff --git a/src/main/resources/data/unordinary_basics/tags/worldgen/biome/has_structure/master_sword_shrine.json b/src/main/resources/data/unordinary_basics/tags/worldgen/biome/has_structure/master_sword_shrine.json new file mode 100644 index 000000000..915dab08c --- /dev/null +++ b/src/main/resources/data/unordinary_basics/tags/worldgen/biome/has_structure/master_sword_shrine.json @@ -0,0 +1,9 @@ +{ + "replace": false, + + "_comment": " This biome tag can specify the biome directly. Or specify another biome tag by starting with # ", + "values": [ + "#minecraft:is_forest", + "minecraft:plains" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unordinary_basics/worldgen/structure/master_sword_shrine.json b/src/main/resources/data/unordinary_basics/worldgen/structure/master_sword_shrine.json new file mode 100644 index 000000000..1e6c646e3 --- /dev/null +++ b/src/main/resources/data/unordinary_basics/worldgen/structure/master_sword_shrine.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:jigsaw", + + "start_pool": "unordinary_basics:master_sword_shrine/start_pool", + + "size": 2, + + "max_distance_from_center": 80, + + "biomes": "#unordinary_basics:has_structure/master_sword_shrine", + + "step": "surface_structures", + + "start_height": { + "absolute": -7 + }, + + "project_start_to_heightmap": "WORLD_SURFACE_WG", + + "use_expansion_hack": false, + + "spawn_overrides": { + "creature": { + "bounding_box": "piece", + "spawns": [ + + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/unordinary_basics/worldgen/structure_set/master_sword_shrine.json b/src/main/resources/data/unordinary_basics/worldgen/structure_set/master_sword_shrine.json new file mode 100644 index 000000000..11707782a --- /dev/null +++ b/src/main/resources/data/unordinary_basics/worldgen/structure_set/master_sword_shrine.json @@ -0,0 +1,18 @@ +{ + "structures": [ + { + "structure": "unordinary_basics:master_sword_shrine", + "weight": 1 + } + ], + //SALT MUST BE UNIQUE AND LESS THAN 2147483647 + "placement": { + "salt": 1839264758, + + "spacing": 60, + + "separation": 6, + + "type": "minecraft:random_spread" + } +} \ No newline at end of file diff --git a/src/main/resources/data/unordinary_basics/worldgen/template_pool/master_sword_shrine/start_pool.json b/src/main/resources/data/unordinary_basics/worldgen/template_pool/master_sword_shrine/start_pool.json new file mode 100644 index 000000000..77317c4c9 --- /dev/null +++ b/src/main/resources/data/unordinary_basics/worldgen/template_pool/master_sword_shrine/start_pool.json @@ -0,0 +1,21 @@ +{ + "name": "unordinary_basics:master_sword_shrine/start_pool", + + "fallback": "minecraft:empty", + + "elements": [ + { + "weight": 1, + "element": { + + "location": "unordinary_basics:master_sword_shrine", + + "processors": "minecraft:empty", + + "projection": "rigid", + + "element_type": "minecraft:single_pool_element" + } + } + ] +} \ No newline at end of file diff --git a/src/test/java/com/github/manasmods/unordinary_basics/startup_test/StartupTest.java b/src/test/java/com/github/manasmods/unordinary_basics/startup_test/StartupTest.java index 7641c09dd..579aeba04 100644 --- a/src/test/java/com/github/manasmods/unordinary_basics/startup_test/StartupTest.java +++ b/src/test/java/com/github/manasmods/unordinary_basics/startup_test/StartupTest.java @@ -1,7 +1,7 @@ package com.github.manasmods.unordinary_basics.startup_test; import com.github.manasmods.unordinary_basics.TestBatches; -import com.github.manasmods.unordinary_basics.Unordinary_Basics; +import com.github.manasmods.unordinary_basics.UnordinaryBasics; import com.github.manasmods.unordinary_basics.item.Unordinary_BasicsCreativeTab; import net.minecraft.gametest.framework.GameTest; import net.minecraft.gametest.framework.GameTestHelper; @@ -13,7 +13,7 @@ import java.util.List; @PrefixGameTestTemplate(false) -@GameTestHolder(Unordinary_Basics.MOD_ID) +@GameTestHolder(UnordinaryBasics.MOD_ID) public class StartupTest { @GameTest(template = "empty_1x1", batch = TestBatches.CREATIVE_TAB_ICONS) public static void checkCreativeTabIcon(final GameTestHelper helper) {