Skip to content

Commit

Permalink
Update package name
Browse files Browse the repository at this point in the history
  • Loading branch information
IcarussOne committed Nov 22, 2024
1 parent f64a4dd commit bc4802f
Show file tree
Hide file tree
Showing 33 changed files with 119 additions and 120 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ org.gradle.jvmargs = -Xmx3G
# Mod Information
mod_id=balkonsexpansion
mod_version = 1.0.0
maven_group = mod.emt
maven_group = mod.icarus
archives_base_name = BalkonsExpansion-1.12.2

# If any properties changes below this line, run `gradlew setupDecompWorkspace` and refresh gradle again to ensure everything is working correctly.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion;
package mod.icarus.balkonsexpansion;

import net.minecraftforge.common.config.Config;
import net.minecraftforge.common.config.ConfigManager;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
package mod.emt.balkonsexpansion;
package mod.icarus.balkonsexpansion;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import ckathode.weaponmod.item.ItemMusket;
import ckathode.weaponmod.item.MeleeCompNone;
import ckathode.weaponmod.item.MeleeComponent;
import mod.emt.balkonsexpansion.item.BEItemFlail;
import mod.emt.balkonsexpansion.item.BEItemMelee;
import mod.emt.balkonsexpansion.item.BEItemMusket;
import mod.emt.balkonsexpansion.item.MeleeCompBattleaxeCustom;
import mod.emt.balkonsexpansion.item.MeleeCompBoomerangCustom;
import mod.emt.balkonsexpansion.item.MeleeCompHalberdCustom;
import mod.emt.balkonsexpansion.item.MeleeCompKatanaCustom;
import mod.emt.balkonsexpansion.item.MeleeCompKnifeCustom;
import mod.emt.balkonsexpansion.item.MeleeCompSpearCustom;
import mod.emt.balkonsexpansion.item.MeleeCompWarhammerCustom;
import mod.icarus.balkonsexpansion.item.BEItemFlail;
import mod.icarus.balkonsexpansion.item.BEItemMelee;
import mod.icarus.balkonsexpansion.item.BEItemMusket;
import mod.icarus.balkonsexpansion.item.MeleeCompBattleaxeCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompBoomerangCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompHalberdCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompKatanaCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompKnifeCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompSpearCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompWarhammerCustom;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mod.emt.balkonsexpansion;
package mod.icarus.balkonsexpansion;

import ckathode.weaponmod.BalkonsWeaponMod;
import mod.emt.balkonsexpansion.BalkonsExpansion;
import mod.icarus.balkonsexpansion.BalkonsExpansion;
import net.minecraft.item.Item;
import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.oredict.ShapedOreRecipe;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package mod.emt.balkonsexpansion;
package mod.icarus.balkonsexpansion;

import mod.emt.balkonsexpansion.BalkonsExpansion;
import mod.icarus.balkonsexpansion.BalkonsExpansion;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion;
package mod.icarus.balkonsexpansion;

import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package mod.emt.balkonsexpansion.compat;

import mod.emt.balkonsexpansion.BEConfig;
import mod.emt.balkonsexpansion.BalkonsExpansion;
import mod.emt.balkonsexpansion.compat.galacticraft.GalacticraftMaterialColors;
import mod.emt.balkonsexpansion.compat.galacticraft.GalacticraftRegistration;
import mod.emt.balkonsexpansion.compat.ic2classic.IC2ClassicMaterialColors;
import mod.emt.balkonsexpansion.compat.ic2classic.IC2ClassicRegistration;
import mod.emt.balkonsexpansion.compat.ic2experimental.IC2ExperimentalMaterialColors;
import mod.emt.balkonsexpansion.compat.ic2experimental.IC2ExperimentalRegistration;
import mod.emt.balkonsexpansion.compat.projectred.ProjectRedMaterialColors;
import mod.emt.balkonsexpansion.compat.projectred.ProjectRedRegistration;
import mod.emt.balkonsexpansion.compat.railcraft.RailcraftMaterialColors;
import mod.emt.balkonsexpansion.compat.railcraft.RailcraftRegistration;
import mod.emt.balkonsexpansion.compat.thaumcraft.ThaumcraftMaterialColors;
import mod.emt.balkonsexpansion.compat.thaumcraft.ThaumcraftRegistration;
package mod.icarus.balkonsexpansion.compat;

import mod.icarus.balkonsexpansion.BEConfig;
import mod.icarus.balkonsexpansion.BalkonsExpansion;
import mod.icarus.balkonsexpansion.compat.galacticraft.GalacticraftMaterialColors;
import mod.icarus.balkonsexpansion.compat.galacticraft.GalacticraftRegistration;
import mod.icarus.balkonsexpansion.compat.ic2classic.IC2ClassicMaterialColors;
import mod.icarus.balkonsexpansion.compat.ic2classic.IC2ClassicRegistration;
import mod.icarus.balkonsexpansion.compat.ic2experimental.IC2ExperimentalMaterialColors;
import mod.icarus.balkonsexpansion.compat.ic2experimental.IC2ExperimentalRegistration;
import mod.icarus.balkonsexpansion.compat.projectred.ProjectRedMaterialColors;
import mod.icarus.balkonsexpansion.compat.projectred.ProjectRedRegistration;
import mod.icarus.balkonsexpansion.compat.railcraft.RailcraftMaterialColors;
import mod.icarus.balkonsexpansion.compat.railcraft.RailcraftRegistration;
import mod.icarus.balkonsexpansion.compat.thaumcraft.ThaumcraftMaterialColors;
import mod.icarus.balkonsexpansion.compat.thaumcraft.ThaumcraftRegistration;
import net.minecraft.item.Item;
import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.event.RegistryEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.compat.galacticraft;
package mod.icarus.balkonsexpansion.compat.galacticraft;

import ckathode.weaponmod.entity.projectile.ICustomProjectileMaterials;
import ckathode.weaponmod.entity.projectile.MaterialRegistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package mod.emt.balkonsexpansion.compat.galacticraft;
package mod.icarus.balkonsexpansion.compat.galacticraft;

import micdoodle8.mods.galacticraft.core.GCItems;
import micdoodle8.mods.galacticraft.planets.asteroids.items.AsteroidsItems;
import micdoodle8.mods.galacticraft.planets.mars.items.MarsItems;
import mod.emt.balkonsexpansion.BEConfig;
import mod.emt.balkonsexpansion.BEItemBuilder;
import mod.emt.balkonsexpansion.BERecipes;
import mod.emt.balkonsexpansion.BERegistry;
import mod.emt.balkonsexpansion.item.BEItemFlail;
import mod.emt.balkonsexpansion.item.BEItemMelee;
import mod.emt.balkonsexpansion.item.BEItemMusket;
import mod.icarus.balkonsexpansion.BEConfig;
import mod.icarus.balkonsexpansion.BEItemBuilder;
import mod.icarus.balkonsexpansion.BERecipes;
import mod.icarus.balkonsexpansion.BERegistry;
import mod.icarus.balkonsexpansion.item.BEItemFlail;
import mod.icarus.balkonsexpansion.item.BEItemMelee;
import mod.icarus.balkonsexpansion.item.BEItemMusket;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.compat.ic2classic;
package mod.icarus.balkonsexpansion.compat.ic2classic;

import ckathode.weaponmod.entity.projectile.ICustomProjectileMaterials;
import ckathode.weaponmod.entity.projectile.MaterialRegistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package mod.emt.balkonsexpansion.compat.ic2classic;
package mod.icarus.balkonsexpansion.compat.ic2classic;

import ic2.core.util.helpers.ToolHelper;
import mod.emt.balkonsexpansion.BEConfig;
import mod.emt.balkonsexpansion.BEItemBuilder;
import mod.emt.balkonsexpansion.BERecipes;
import mod.emt.balkonsexpansion.BERegistry;
import mod.emt.balkonsexpansion.item.BEItemFlail;
import mod.emt.balkonsexpansion.item.BEItemMelee;
import mod.emt.balkonsexpansion.item.BEItemMusket;
import mod.icarus.balkonsexpansion.BEConfig;
import mod.icarus.balkonsexpansion.BEItemBuilder;
import mod.icarus.balkonsexpansion.BERecipes;
import mod.icarus.balkonsexpansion.BERegistry;
import mod.icarus.balkonsexpansion.item.BEItemFlail;
import mod.icarus.balkonsexpansion.item.BEItemMelee;
import mod.icarus.balkonsexpansion.item.BEItemMusket;
import net.minecraft.item.Item;
import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.event.RegistryEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.compat.ic2experimental;
package mod.icarus.balkonsexpansion.compat.ic2experimental;

import ckathode.weaponmod.entity.projectile.ICustomProjectileMaterials;
import ckathode.weaponmod.entity.projectile.MaterialRegistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package mod.emt.balkonsexpansion.compat.ic2experimental;
package mod.icarus.balkonsexpansion.compat.ic2experimental;

import mod.emt.balkonsexpansion.BEConfig;
import mod.emt.balkonsexpansion.BEItemBuilder;
import mod.emt.balkonsexpansion.BERecipes;
import mod.emt.balkonsexpansion.BERegistry;
import mod.emt.balkonsexpansion.item.BEItemFlail;
import mod.emt.balkonsexpansion.item.BEItemMelee;
import mod.emt.balkonsexpansion.item.BEItemMusket;
import mod.icarus.balkonsexpansion.BEConfig;
import mod.icarus.balkonsexpansion.BEItemBuilder;
import mod.icarus.balkonsexpansion.BERecipes;
import mod.icarus.balkonsexpansion.BERegistry;
import mod.icarus.balkonsexpansion.item.BEItemFlail;
import mod.icarus.balkonsexpansion.item.BEItemMelee;
import mod.icarus.balkonsexpansion.item.BEItemMusket;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.crafting.IRecipe;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.compat.projectred;
package mod.icarus.balkonsexpansion.compat.projectred;

import ckathode.weaponmod.entity.projectile.ICustomProjectileMaterials;
import ckathode.weaponmod.entity.projectile.MaterialRegistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package mod.emt.balkonsexpansion.compat.projectred;
package mod.icarus.balkonsexpansion.compat.projectred;

import mod.emt.balkonsexpansion.BEConfig;
import mod.emt.balkonsexpansion.BEItemBuilder;
import mod.emt.balkonsexpansion.BERecipes;
import mod.emt.balkonsexpansion.BERegistry;
import mod.emt.balkonsexpansion.item.BEItemFlail;
import mod.emt.balkonsexpansion.item.BEItemMelee;
import mod.emt.balkonsexpansion.item.BEItemMusket;
import mod.icarus.balkonsexpansion.BEConfig;
import mod.icarus.balkonsexpansion.BEItemBuilder;
import mod.icarus.balkonsexpansion.BERecipes;
import mod.icarus.balkonsexpansion.BERegistry;
import mod.icarus.balkonsexpansion.item.BEItemFlail;
import mod.icarus.balkonsexpansion.item.BEItemMelee;
import mod.icarus.balkonsexpansion.item.BEItemMusket;
import mrtjp.projectred.ProjectRedExploration;
import net.minecraft.item.Item;
import net.minecraft.item.crafting.IRecipe;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.compat.railcraft;
package mod.icarus.balkonsexpansion.compat.railcraft;

import ckathode.weaponmod.entity.projectile.ICustomProjectileMaterials;
import ckathode.weaponmod.entity.projectile.MaterialRegistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package mod.emt.balkonsexpansion.compat.railcraft;
package mod.icarus.balkonsexpansion.compat.railcraft;

import mod.emt.balkonsexpansion.BEConfig;
import mod.emt.balkonsexpansion.BEItemBuilder;
import mod.emt.balkonsexpansion.BERecipes;
import mod.emt.balkonsexpansion.BERegistry;
import mod.emt.balkonsexpansion.item.BEItemFlail;
import mod.emt.balkonsexpansion.item.BEItemMelee;
import mod.emt.balkonsexpansion.item.BEItemMusket;
import mods.railcraft.common.items.RailcraftItems;
import mod.icarus.balkonsexpansion.BEConfig;
import mod.icarus.balkonsexpansion.BEItemBuilder;
import mod.icarus.balkonsexpansion.BERecipes;
import mod.icarus.balkonsexpansion.BERegistry;
import mod.icarus.balkonsexpansion.item.BEItemFlail;
import mod.icarus.balkonsexpansion.item.BEItemMelee;
import mod.icarus.balkonsexpansion.item.BEItemMusket;
import mods.railcraft.common.items.ItemMaterials;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package mod.emt.balkonsexpansion.compat.thaumcraft;
package mod.icarus.balkonsexpansion.compat.thaumcraft;

import javax.annotation.Nonnull;
import ckathode.weaponmod.item.MeleeCompNone;
import ckathode.weaponmod.item.MeleeComponent;
import mod.emt.balkonsexpansion.BalkonsExpansion;
import mod.emt.balkonsexpansion.compat.thaumcraft.item.BEItemFlailVoid;
import mod.emt.balkonsexpansion.compat.thaumcraft.item.BEItemMeleeVoid;
import mod.emt.balkonsexpansion.item.MeleeCompBattleaxeCustom;
import mod.emt.balkonsexpansion.item.MeleeCompBoomerangCustom;
import mod.emt.balkonsexpansion.item.MeleeCompHalberdCustom;
import mod.emt.balkonsexpansion.item.MeleeCompKatanaCustom;
import mod.emt.balkonsexpansion.item.MeleeCompKnifeCustom;
import mod.emt.balkonsexpansion.item.MeleeCompSpearCustom;
import mod.emt.balkonsexpansion.item.MeleeCompWarhammerCustom;
import mod.icarus.balkonsexpansion.BalkonsExpansion;
import mod.icarus.balkonsexpansion.compat.thaumcraft.item.BEItemFlailVoid;
import mod.icarus.balkonsexpansion.compat.thaumcraft.item.BEItemMeleeVoid;
import mod.icarus.balkonsexpansion.item.MeleeCompBattleaxeCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompBoomerangCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompHalberdCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompKatanaCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompKnifeCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompSpearCustom;
import mod.icarus.balkonsexpansion.item.MeleeCompWarhammerCustom;
import net.minecraft.item.Item;

public class ThaumcraftItemBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.compat.thaumcraft;
package mod.icarus.balkonsexpansion.compat.thaumcraft;

import ckathode.weaponmod.entity.projectile.ICustomProjectileMaterials;
import ckathode.weaponmod.entity.projectile.MaterialRegistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package mod.emt.balkonsexpansion.compat.thaumcraft;
package mod.icarus.balkonsexpansion.compat.thaumcraft;

import mod.emt.balkonsexpansion.BEConfig;
import mod.emt.balkonsexpansion.BEItemBuilder;
import mod.emt.balkonsexpansion.BERecipes;
import mod.emt.balkonsexpansion.BERegistry;
import mod.emt.balkonsexpansion.compat.thaumcraft.item.BEItemFlailVoid;
import mod.emt.balkonsexpansion.item.BEItemFlail;
import mod.emt.balkonsexpansion.item.BEItemMelee;
import mod.emt.balkonsexpansion.item.BEItemMusket;
import mod.icarus.balkonsexpansion.BEConfig;
import mod.icarus.balkonsexpansion.BEItemBuilder;
import mod.icarus.balkonsexpansion.BERecipes;
import mod.icarus.balkonsexpansion.BERegistry;
import mod.icarus.balkonsexpansion.compat.thaumcraft.item.BEItemFlailVoid;
import mod.icarus.balkonsexpansion.item.BEItemFlail;
import mod.icarus.balkonsexpansion.item.BEItemMelee;
import mod.icarus.balkonsexpansion.item.BEItemMusket;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package mod.emt.balkonsexpansion.compat.thaumcraft.item;
package mod.icarus.balkonsexpansion.compat.thaumcraft.item;

import java.util.List;

import javax.annotation.Nullable;

import ckathode.weaponmod.item.MeleeComponent;
import mod.emt.balkonsexpansion.item.BEItemFlail;
import mod.icarus.balkonsexpansion.item.BEItemFlail;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package mod.emt.balkonsexpansion.compat.thaumcraft.item;
package mod.icarus.balkonsexpansion.compat.thaumcraft.item;

import java.util.List;

import javax.annotation.Nullable;

import ckathode.weaponmod.item.IItemWeapon;
import ckathode.weaponmod.item.MeleeComponent;
import mod.emt.balkonsexpansion.item.BEItemMelee;
import mod.icarus.balkonsexpansion.item.BEItemMelee;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package mod.emt.balkonsexpansion.event;
package mod.icarus.balkonsexpansion.event;

import ckathode.weaponmod.item.IItemWeapon;
import ckathode.weaponmod.item.ItemMelee;
import ckathode.weaponmod.item.ItemShooter;
import ckathode.weaponmod.item.MeleeCompBoomerang;
import ckathode.weaponmod.item.MeleeComponent;
import mod.emt.balkonsexpansion.BEConfig;
import mod.emt.balkonsexpansion.BalkonsExpansion;
import mod.icarus.balkonsexpansion.BEConfig;
import mod.icarus.balkonsexpansion.BalkonsExpansion;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
Expand All @@ -30,10 +30,10 @@ public static void onBlockMelee(LivingAttackEvent event) {
if (!source.isUnblockable() && player.isActiveItemStackBlocking()) {
ItemStack stack = player.getActiveItemStack();
Item item = stack.getItem();

// Skips unwanted items and null values to prevent crashes.
if (!(item instanceof IItemWeapon)) return;

MeleeComponent meleeComp = ((IItemWeapon) stack.getItem()).getMeleeComponent();

// Additional blocking sound for battleaxes and katanas.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.item;
package mod.icarus.balkonsexpansion.item;

import ckathode.weaponmod.item.ItemFlail;
import ckathode.weaponmod.item.MeleeComponent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.item;
package mod.icarus.balkonsexpansion.item;

import ckathode.weaponmod.item.IItemWeapon;
import ckathode.weaponmod.item.ItemMelee;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.item;
package mod.icarus.balkonsexpansion.item;

import javax.annotation.Nullable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.item;
package mod.icarus.balkonsexpansion.item;

import com.google.common.collect.Multimap;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mod.emt.balkonsexpansion.item;
package mod.icarus.balkonsexpansion.item;

import com.google.common.collect.Multimap;

Expand Down
Loading

0 comments on commit bc4802f

Please sign in to comment.