Compare commits

...

3 commits

19 changed files with 80 additions and 98 deletions

View file

@ -104,14 +104,12 @@ dependencies {
compileOnly fg.deobf("mezz.jei:${jei_version}:api")
runtimeOnly fg.deobf("mezz.jei:${jei_version}")
/*
compileOnly fg.deobf([
group: "vazkii.botania",
name: "Botania",
version: "${project.botania}",
classifier: "api"
])
*/
}
jar {

View file

@ -5,14 +5,14 @@ author=thetadev
modid=constructionwand
mcversion=1.18.1
forgeversion=39.0.0
forgeversion=39.1.0
mcp_channel=official
mcp_mappings=1.18.1
# Source: https://maven.blamejared.com/vazkii/botania/Botania/
# botania=1.16.2-405
botania=1.18.1-429
# Source: https://dvs1.progwml6.com/files/maven/mezz/jei/
jei_version=jei-1.18.1:9.1.0.41
version_major=2
version_minor=6
version_minor=7

View file

@ -53,6 +53,9 @@ public class ConstructionWand
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetup);
MinecraftForge.EVENT_BUS.register(this);
// Register Item DeferredRegister
ModItems.ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
// Config setup
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, ConfigServer.SPEC);
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ConfigClient.SPEC);

View file

@ -1,8 +1,10 @@
package thetadev.constructionwand.basics;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Tiers;
import net.minecraftforge.common.ForgeConfigSpec;
import net.minecraftforge.registries.RegistryObject;
import thetadev.constructionwand.items.ModItems;
import java.util.Arrays;
@ -27,10 +29,10 @@ public class ConfigServer
public static final ForgeConfigSpec.ConfigValue<List<?>> TE_LIST;
private static final String[] TE_LIST_DEFAULT = {"chiselsandbits"};
private static final HashMap<Item, WandProperties> wandProperties = new HashMap<>();
private static final HashMap<ResourceLocation, WandProperties> wandProperties = new HashMap<>();
public static WandProperties getWandProperties(Item wand) {
return wandProperties.getOrDefault(wand, WandProperties.DEFAULT);
return wandProperties.getOrDefault(wand.getRegistryName(), WandProperties.DEFAULT);
}
public static class WandProperties
@ -53,9 +55,10 @@ public class ConfigServer
this.upgradeable = upgradeable;
}
public WandProperties(ForgeConfigSpec.Builder builder, Item wand, int defDurability, int defLimit,
public WandProperties(ForgeConfigSpec.Builder builder, RegistryObject<Item> wandSupplier, int defDurability, int defLimit,
int defAngel, int defDestruction, boolean defUpgradeable) {
builder.push(wand.getRegistryName().getPath());
ResourceLocation registryName = wandSupplier.getId();
builder.push(registryName.getPath());
if(defDurability > 0) {
builder.comment("Wand durability");
@ -72,7 +75,7 @@ public class ConfigServer
upgradeable = builder.define("upgradeable", defUpgradeable);
builder.pop();
wandProperties.put(wand, this);
wandProperties.put(registryName, this);
}
public int getDurability() {

View file

@ -160,7 +160,7 @@ public class WandUtil
List<ItemStack> inventory = WandUtil.getFullInv(player);
for(ItemStack stack : inventory) {
if(stack == null) continue;
if(stack == null || stack.isEmpty()) continue;
if(WandUtil.stackEquals(stack, item)) {
total += stack.getCount();

View file

@ -1,6 +1,8 @@
package thetadev.constructionwand.containers;
import net.minecraftforge.fml.ModList;
import thetadev.constructionwand.ConstructionWand;
import thetadev.constructionwand.containers.handlers.HandlerBotania;
import thetadev.constructionwand.containers.handlers.HandlerBundle;
import thetadev.constructionwand.containers.handlers.HandlerCapability;
import thetadev.constructionwand.containers.handlers.HandlerShulkerbox;
@ -12,13 +14,9 @@ public class ContainerRegistrar
ConstructionWand.instance.containerManager.register(new HandlerShulkerbox());
ConstructionWand.instance.containerManager.register(new HandlerBundle());
/*
TODO: Reenable this when Botania gets ported to 1.17
if(ModList.get().isLoaded("botania")) {
ConstructionWand.instance.containerManager.register(new HandlerBotania());
ConstructionWand.LOGGER.info("Botania integration added");
}
*/
}
}

View file

@ -1,25 +1,28 @@
/*
TODO: Reenable this when Botania gets ported to 1.17
package thetadev.constructionwand.containers.handlers;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Block;
import thetadev.constructionwand.api.IContainerHandler;
import vazkii.botania.api.BotaniaForgeCapabilities;
import vazkii.botania.api.item.IBlockProvider;
import java.util.Optional;
public class HandlerBotania implements IContainerHandler
{
@Override
public boolean matches(Player player, ItemStack itemStack, ItemStack inventoryStack) {
return inventoryStack != null && inventoryStack.getCount() == 1 && inventoryStack.getItem() instanceof IBlockProvider;
return inventoryStack != null && inventoryStack.getCapability(BotaniaForgeCapabilities.BLOCK_PROVIDER).isPresent();
}
@Override
public int countItems(Player player, ItemStack itemStack, ItemStack inventoryStack) {
IBlockProvider prov = (IBlockProvider) inventoryStack.getItem();
int provCount = prov.getBlockCount(player, itemStack, inventoryStack, Block.byItem(itemStack.getItem()));
Optional<IBlockProvider> provOptional = inventoryStack.getCapability(BotaniaForgeCapabilities.BLOCK_PROVIDER).resolve();
if(provOptional.isEmpty()) return 0;
IBlockProvider prov = provOptional.get();
int provCount = prov.getBlockCount(player, inventoryStack, Block.byItem(itemStack.getItem()));
if(provCount == -1)
return Integer.MAX_VALUE;
return provCount;
@ -27,10 +30,12 @@ public class HandlerBotania implements IContainerHandler
@Override
public int useItems(Player player, ItemStack itemStack, ItemStack inventoryStack, int count) {
IBlockProvider prov = (IBlockProvider) inventoryStack.getItem();
if(prov.provideBlock(player, itemStack, inventoryStack, Block.byItem(itemStack.getItem()), true))
Optional<IBlockProvider> provOptional = inventoryStack.getCapability(BotaniaForgeCapabilities.BLOCK_PROVIDER).resolve();
if(provOptional.isEmpty()) return 0;
IBlockProvider prov = provOptional.get();
if(prov.provideBlock(player, inventoryStack, Block.byItem(itemStack.getItem()), true))
return 0;
return count;
}
}
*/
}

View file

@ -5,6 +5,7 @@ import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraftforge.client.model.generators.ItemModelProvider;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.registries.RegistryObject;
import thetadev.constructionwand.ConstructionWand;
import thetadev.constructionwand.items.ModItems;
@ -18,7 +19,8 @@ public class ItemModelGenerator extends ItemModelProvider
@Override
protected void registerModels() {
for(Item item : ModItems.ALL_ITEMS) {
for(RegistryObject<Item> itemObject : ModItems.ITEMS.getEntries()) {
Item item = itemObject.get();
String name = item.getRegistryName().getPath();
if(item instanceof ICustomItemModel)

View file

@ -27,13 +27,13 @@ public class RecipeGenerator extends RecipeProvider
@Override
protected void buildCraftingRecipes(@Nonnull Consumer<FinishedRecipe> consumer) {
wandRecipe(consumer, ModItems.WAND_STONE, Inp.fromTag(ItemTags.STONE_TOOL_MATERIALS));
wandRecipe(consumer, ModItems.WAND_IRON, Inp.fromTag(Tags.Items.INGOTS_IRON));
wandRecipe(consumer, ModItems.WAND_DIAMOND, Inp.fromTag(Tags.Items.GEMS_DIAMOND));
wandRecipe(consumer, ModItems.WAND_INFINITY, Inp.fromTag(Tags.Items.NETHER_STARS));
wandRecipe(consumer, ModItems.WAND_STONE.get(), Inp.fromTag(ItemTags.STONE_TOOL_MATERIALS));
wandRecipe(consumer, ModItems.WAND_IRON.get(), Inp.fromTag(Tags.Items.INGOTS_IRON));
wandRecipe(consumer, ModItems.WAND_DIAMOND.get(), Inp.fromTag(Tags.Items.GEMS_DIAMOND));
wandRecipe(consumer, ModItems.WAND_INFINITY.get(), Inp.fromTag(Tags.Items.NETHER_STARS));
coreRecipe(consumer, ModItems.CORE_ANGEL, Inp.fromTag(Tags.Items.FEATHERS), Inp.fromTag(Tags.Items.INGOTS_GOLD));
coreRecipe(consumer, ModItems.CORE_DESTRUCTION, Inp.fromTag(Tags.Items.STORAGE_BLOCKS_DIAMOND), Inp.fromItem(Items.DIAMOND_PICKAXE));
coreRecipe(consumer, ModItems.CORE_ANGEL.get(), Inp.fromTag(Tags.Items.FEATHERS), Inp.fromTag(Tags.Items.INGOTS_GOLD));
coreRecipe(consumer, ModItems.CORE_DESTRUCTION.get(), Inp.fromTag(Tags.Items.STORAGE_BLOCKS_DIAMOND), Inp.fromItem(Items.DIAMOND_PICKAXE));
specialRecipe(consumer, RecipeWandUpgrade.SERIALIZER);
}

View file

@ -11,6 +11,7 @@ import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.registries.RegistryObject;
import thetadev.constructionwand.ConstructionWand;
import thetadev.constructionwand.basics.ConfigClient;
import thetadev.constructionwand.basics.ConfigServer;
@ -43,10 +44,11 @@ public class ConstructionWandJeiPlugin implements IModPlugin
Component wandModeComponent = keyComboComponent(ConfigClient.SHIFTOPT_MODE.get(), optkeyComponent);
Component wandGuiComponent = keyComboComponent(ConfigClient.SHIFTOPT_GUI.get(), optkeyComponent);
for(Item wand : ModItems.WANDS) {
for(RegistryObject<Item> wandSupplier : ModItems.WANDS) {
Item wand = wandSupplier.get();
ConfigServer.WandProperties wandProperties = ConfigServer.getWandProperties(wand);
String durabilityKey = wand == ModItems.WAND_INFINITY ? "unlimited" : "limited";
String durabilityKey = wand == ModItems.WAND_INFINITY.get() ? "unlimited" : "limited";
Component durabilityComponent = new TranslatableComponent(baseKey + "durability." + durabilityKey, wandProperties.getDurability());
registration.addIngredientInfo(new ItemStack(wand), VanillaTypes.ITEM,
@ -57,7 +59,8 @@ public class ConstructionWandJeiPlugin implements IModPlugin
);
}
for(Item core : ModItems.CORES) {
for(RegistryObject<Item> coreSupplier : ModItems.CORES) {
Item core = coreSupplier.get();
registration.addIngredientInfo(new ItemStack(core), VanillaTypes.ITEM,
new TranslatableComponent(baseKey + core.getRegistryName().getPath()),
new TranslatableComponent(baseKey + "core", wandModeComponent)

View file

@ -1,12 +0,0 @@
package thetadev.constructionwand.items;
import net.minecraft.world.item.Item;
import thetadev.constructionwand.ConstructionWand;
public class ItemBase extends Item
{
public ItemBase(String name, Properties properties) {
super(properties);
setRegistryName(ConstructionWand.MODID, name);
}
}

View file

@ -12,8 +12,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import net.minecraftforge.registries.*;
import thetadev.constructionwand.ConstructionWand;
import thetadev.constructionwand.basics.option.WandOptions;
import thetadev.constructionwand.crafting.RecipeWandUpgrade;
@ -23,38 +22,24 @@ import thetadev.constructionwand.items.wand.ItemWand;
import thetadev.constructionwand.items.wand.ItemWandBasic;
import thetadev.constructionwand.items.wand.ItemWandInfinity;
import java.util.Arrays;
import java.util.HashSet;
@Mod.EventBusSubscriber(modid = ConstructionWand.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
public class ModItems
{
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ConstructionWand.MODID);
// Wands
public static final Item WAND_STONE = new ItemWandBasic("stone_wand", propWand(), Tiers.STONE);
public static final Item WAND_IRON = new ItemWandBasic("iron_wand", propWand(), Tiers.IRON);
public static final Item WAND_DIAMOND = new ItemWandBasic("diamond_wand", propWand(), Tiers.DIAMOND);
public static final Item WAND_INFINITY = new ItemWandInfinity("infinity_wand", propWand());
public static final RegistryObject<Item> WAND_STONE = ITEMS.register("stone_wand", () -> new ItemWandBasic(propWand(), Tiers.STONE));
public static final RegistryObject<Item> WAND_IRON = ITEMS.register("iron_wand", () -> new ItemWandBasic(propWand(), Tiers.IRON));
public static final RegistryObject<Item> WAND_DIAMOND = ITEMS.register("diamond_wand", () -> new ItemWandBasic(propWand(), Tiers.DIAMOND));
public static final RegistryObject<Item> WAND_INFINITY = ITEMS.register("infinity_wand", () -> new ItemWandInfinity(propWand()));
// Cores
public static final Item CORE_ANGEL = new ItemCoreAngel("core_angel", propUpgrade());
public static final Item CORE_DESTRUCTION = new ItemCoreDestruction("core_destruction", propUpgrade());
public static final RegistryObject<Item> CORE_ANGEL = ITEMS.register("core_angel", () -> new ItemCoreAngel(propUpgrade()));
public static final RegistryObject<Item> CORE_DESTRUCTION = ITEMS.register("core_destruction", () -> new ItemCoreDestruction(propUpgrade()));
// Collections
public static final Item[] WANDS = {WAND_STONE, WAND_IRON, WAND_DIAMOND, WAND_INFINITY};
public static final Item[] CORES = {CORE_ANGEL, CORE_DESTRUCTION};
public static final HashSet<Item> ALL_ITEMS = new HashSet<>();
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event) {
IForgeRegistry<Item> r = event.getRegistry();
r.registerAll(WANDS);
ALL_ITEMS.addAll(Arrays.asList(WANDS));
registerItem(r, CORE_ANGEL);
registerItem(r, CORE_DESTRUCTION);
}
public static final RegistryObject<Item>[] WANDS = new RegistryObject[] {WAND_STONE, WAND_IRON, WAND_DIAMOND, WAND_INFINITY};
public static final RegistryObject<Item>[] CORES = new RegistryObject[] {CORE_ANGEL, CORE_DESTRUCTION};
public static Item.Properties propWand() {
return new Item.Properties().tab(CreativeModeTab.TAB_TOOLS);
@ -64,11 +49,6 @@ public class ModItems
return new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(1);
}
private static void registerItem(IForgeRegistry<Item> reg, Item item) {
reg.register(item);
ALL_ITEMS.add(item);
}
@SubscribeEvent
public static void registerRecipeSerializers(RegistryEvent.Register<RecipeSerializer<?>> event) {
IForgeRegistry<RecipeSerializer<?>> r = event.getRegistry();
@ -77,7 +57,8 @@ public class ModItems
@OnlyIn(Dist.CLIENT)
public static void registerModelProperties() {
for(Item item : WANDS) {
for(RegistryObject<Item> itemSupplier : WANDS) {
Item item = itemSupplier.get();
ItemProperties.register(
item, ConstructionWand.loc("using_core"),
(stack, world, entity, n) -> entity == null || !(stack.getItem() instanceof ItemWand) ? 0 :
@ -90,7 +71,8 @@ public class ModItems
public static void registerItemColors() {
ItemColors colors = Minecraft.getInstance().getItemColors();
for(Item item : WANDS) {
for(RegistryObject<Item> itemSupplier : WANDS) {
Item item = itemSupplier.get();
colors.register((stack, layer) -> (layer == 1 && stack.getItem() instanceof ItemWand) ?
new WandOptions(stack).cores.get().getColor() : -1, item);
}

View file

@ -3,6 +3,7 @@ package thetadev.constructionwand.items.core;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
@ -10,15 +11,14 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import thetadev.constructionwand.ConstructionWand;
import thetadev.constructionwand.api.IWandCore;
import thetadev.constructionwand.items.ItemBase;
import javax.annotation.Nonnull;
import java.util.List;
public abstract class ItemCore extends ItemBase implements IWandCore
public abstract class ItemCore extends Item implements IWandCore
{
public ItemCore(String name, Properties properties) {
super(name, properties);
public ItemCore(Properties properties) {
super(properties);
}
@OnlyIn(Dist.CLIENT)

View file

@ -5,8 +5,8 @@ import thetadev.constructionwand.wand.action.ActionAngel;
public class ItemCoreAngel extends ItemCore
{
public ItemCoreAngel(String name, Properties properties) {
super(name, properties);
public ItemCoreAngel(Properties properties) {
super(properties);
}
@Override

View file

@ -5,8 +5,8 @@ import thetadev.constructionwand.wand.action.ActionDestruction;
public class ItemCoreDestruction extends ItemCore
{
public ItemCoreDestruction(String name, Properties properties) {
super(name, properties);
public ItemCoreDestruction(Properties properties) {
super(properties);
}
@Override

View file

@ -9,6 +9,7 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.UseOnContext;
@ -25,17 +26,16 @@ import thetadev.constructionwand.basics.option.IOption;
import thetadev.constructionwand.basics.option.WandOptions;
import thetadev.constructionwand.data.ICustomItemModel;
import thetadev.constructionwand.data.ItemModelGenerator;
import thetadev.constructionwand.items.ItemBase;
import thetadev.constructionwand.wand.WandJob;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
public abstract class ItemWand extends ItemBase implements ICustomItemModel
public abstract class ItemWand extends Item implements ICustomItemModel
{
public ItemWand(String name, Properties properties) {
super(name, properties);
public ItemWand(Properties properties) {
super(properties);
}
@Nonnull

View file

@ -10,8 +10,8 @@ public class ItemWandBasic extends ItemWand
{
private final Tier tier;
public ItemWandBasic(String name, Properties properties, Tier tier) {
super(name, properties.durability(tier.getUses()));
public ItemWandBasic(Properties properties, Tier tier) {
super(properties.durability(tier.getUses()));
this.tier = tier;
}

View file

@ -3,7 +3,7 @@ package thetadev.constructionwand.items.wand;
public class ItemWandInfinity extends ItemWand
{
public ItemWandInfinity(String name, Properties properties) {
super(name, properties.stacksTo(1).fireResistant());
public ItemWandInfinity(Properties properties) {
super(properties.stacksTo(1).fireResistant());
}
}

View file

@ -74,7 +74,7 @@ public class WandJob
public void getSnapshots() {
int limit;
// Infinity wand gets enhanced limit in creative mode
if(player.isCreative() && wandItem == ModItems.WAND_INFINITY) limit = ConfigServer.LIMIT_CREATIVE.get();
if(player.isCreative() && wandItem == ModItems.WAND_INFINITY.get()) limit = ConfigServer.LIMIT_CREATIVE.get();
else limit = Math.min(wandItem.remainingDurability(wand), wandAction.getLimit(wand));
if(rayTraceResult.getType() == HitResult.Type.BLOCK)