Skip to content

Commit

Permalink
Changed our group format
Browse files Browse the repository at this point in the history
*Group now matches github repo and is to the same standard as most java projects.
-Removed comments from build file.
+Added version wrapper to build file.
  • Loading branch information
CleverNucleus committed Jan 8, 2021
1 parent 425d4b4 commit f902041
Show file tree
Hide file tree
Showing 33 changed files with 112 additions and 112 deletions.
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ version = "${mod_version}"
group = "${mod_group}"
archivesBaseName = "${mod_name}"

sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'

println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
minecraft {
Expand Down Expand Up @@ -51,14 +51,10 @@ minecraft {

dependencies {
minecraft 'net.minecraftforge:forge:1.16.4-35.1.0'
// runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.16.3-4.0.2.0")
// compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.16.3-4.0.2.0:api")
}

repositories {
// maven {
// url = "https://maven.theillusivec4.top/"
// }

}

jar {
Expand All @@ -79,7 +75,7 @@ jar.finalizedBy('reobfJar')

task apiJar(type: Jar) {
classifier = 'api'
include 'git/clevernucleus/playerex/api/**/*'
include 'com/github/clevernucleus/playerex/api/**/*'
from sourceSets.main.allSource
from sourceSets.main.output
}
Expand All @@ -106,4 +102,8 @@ publishing {
url "file:///D:/Files/Java/Git/API/maven"
}
}
}

task wrapper(type: Wrapper) {
gradleVersion = '4.10.3'
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=1.1.2
mod_group=git.clevernucleus.playerex
mod_group=com.github.clevernucleus
mod_name=playerex
mod_author=CleverNucleus
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package git.clevernucleus.playerex;
package com.github.clevernucleus.playerex;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.util.ConfigSetting;
import git.clevernucleus.playerex.util.IProxy;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.util.ConfigSetting;
import com.github.clevernucleus.playerex.util.IProxy;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
Expand All @@ -12,7 +12,7 @@
public class PlayerEx {

/** Proxy instance to get side specific methods. */
public static final IProxy PROXY = DistExecutor.safeRunForDist(() -> git.clevernucleus.playerex.client.ClientProxy::new, () -> git.clevernucleus.playerex.util.ServerProxy::new);
public static final IProxy PROXY = DistExecutor.safeRunForDist(() -> com.github.clevernucleus.playerex.client.ClientProxy::new, () -> com.github.clevernucleus.playerex.util.ServerProxy::new);

public PlayerEx() {
ModLoadingContext.get().registerConfig(Type.COMMON, ConfigSetting.COMMON_SPEC);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package git.clevernucleus.playerex.api;
package com.github.clevernucleus.playerex.api;

import git.clevernucleus.playerex.api.attribute.IPlayerAttributes;
import com.github.clevernucleus.playerex.api.attribute.IPlayerAttributes;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package git.clevernucleus.playerex.api;
package com.github.clevernucleus.playerex.api;

import git.clevernucleus.playerex.api.attribute.IPlayerAttribute;
import git.clevernucleus.playerex.api.attribute.IPlayerAttributes;
import com.github.clevernucleus.playerex.api.attribute.IPlayerAttribute;
import com.github.clevernucleus.playerex.api.attribute.IPlayerAttributes;
import net.minecraft.entity.player.PlayerEntity;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.api.attribute;
package com.github.clevernucleus.playerex.api.attribute;

import java.util.UUID;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.api.attribute;
package com.github.clevernucleus.playerex.api.attribute;

import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.PlayerEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.api.attribute;
package com.github.clevernucleus.playerex.api.attribute;

import java.util.UUID;
import java.util.function.Supplier;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.api.attribute;
package com.github.clevernucleus.playerex.api.attribute;

import java.util.ArrayList;
import java.util.Collection;
Expand All @@ -13,7 +13,7 @@
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.Multimap;

import git.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.api.ExAPI;
import net.minecraft.entity.ai.attributes.Attribute;
import net.minecraft.entity.ai.attributes.Attributes;
import net.minecraft.entity.ai.attributes.RangedAttribute;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.api.client;
package com.github.clevernucleus.playerex.api.client;

import java.util.ArrayList;
import java.util.Collection;
Expand All @@ -11,7 +11,7 @@
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;

import git.clevernucleus.playerex.api.attribute.IPlayerAttributes;
import com.github.clevernucleus.playerex.api.attribute.IPlayerAttributes;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.StringTextComponent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.api.client;
package com.github.clevernucleus.playerex.api.client;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package git.clevernucleus.playerex.client;
package com.github.clevernucleus.playerex.client;

import java.util.Optional;

import git.clevernucleus.playerex.util.IProxy;
import com.github.clevernucleus.playerex.util.IProxy;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.PlayerEntity;;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package git.clevernucleus.playerex.client;
package com.github.clevernucleus.playerex.client;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.api.client.ClientReg;
import git.clevernucleus.playerex.client.gui.DefaultPage;
import git.clevernucleus.playerex.client.gui.PlayerAttributesScreen;
import git.clevernucleus.playerex.client.gui.ResistancePage;
import git.clevernucleus.playerex.init.Registry;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.api.client.ClientReg;
import com.github.clevernucleus.playerex.client.gui.DefaultPage;
import com.github.clevernucleus.playerex.client.gui.PlayerAttributesScreen;
import com.github.clevernucleus.playerex.client.gui.ResistancePage;
import com.github.clevernucleus.playerex.init.Registry;
import net.minecraft.client.gui.ScreenManager;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.eventbus.api.SubscribeEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package git.clevernucleus.playerex.client.gui;
package com.github.clevernucleus.playerex.client.gui;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.init.Registry;
import git.clevernucleus.playerex.init.container.SwitchScreens;
import git.clevernucleus.playerex.util.ConfigSetting;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.init.Registry;
import com.github.clevernucleus.playerex.init.container.SwitchScreens;
import com.github.clevernucleus.playerex.util.ConfigSetting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package git.clevernucleus.playerex.client.gui;
package com.github.clevernucleus.playerex.client.gui;

import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.datafixers.util.Pair;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.api.Util;
import git.clevernucleus.playerex.api.attribute.IPlayerAttribute;
import git.clevernucleus.playerex.api.attribute.PlayerAttributes;
import git.clevernucleus.playerex.api.client.ClientReg;
import git.clevernucleus.playerex.api.client.Page;
import git.clevernucleus.playerex.init.Registry;
import git.clevernucleus.playerex.init.capability.AddPlayerAttributes;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.api.Util;
import com.github.clevernucleus.playerex.api.attribute.IPlayerAttribute;
import com.github.clevernucleus.playerex.api.attribute.PlayerAttributes;
import com.github.clevernucleus.playerex.api.client.ClientReg;
import com.github.clevernucleus.playerex.api.client.Page;
import com.github.clevernucleus.playerex.init.Registry;
import com.github.clevernucleus.playerex.init.capability.AddPlayerAttributes;
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
import net.minecraft.client.gui.widget.Widget;
import net.minecraft.client.resources.I18n;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.client.gui;
package com.github.clevernucleus.playerex.client.gui;

import java.util.List;
import java.util.function.BiFunction;
Expand All @@ -7,8 +7,8 @@

import com.mojang.blaze3d.matrix.MatrixStack;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.api.attribute.IPlayerAttributes;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.api.attribute.IPlayerAttributes;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.text.ITextComponent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.client.gui;
package com.github.clevernucleus.playerex.client.gui;

import java.text.DecimalFormat;
import java.util.function.BiFunction;
Expand All @@ -8,9 +8,9 @@

import com.mojang.blaze3d.matrix.MatrixStack;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.api.Util;
import git.clevernucleus.playerex.api.attribute.PlayerAttributes;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.api.Util;
import com.github.clevernucleus.playerex.api.attribute.PlayerAttributes;
import net.minecraft.client.MainWindow;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.player.ClientPlayerEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.client.gui;
package com.github.clevernucleus.playerex.client.gui;

import java.util.function.BiConsumer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.client.gui;
package com.github.clevernucleus.playerex.client.gui;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -7,12 +7,12 @@

import com.mojang.blaze3d.matrix.MatrixStack;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.api.client.ClientReg;
import git.clevernucleus.playerex.api.client.Page;
import git.clevernucleus.playerex.init.Registry;
import git.clevernucleus.playerex.init.container.PlayerAttributesContainer;
import git.clevernucleus.playerex.init.container.SwitchScreens;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.api.client.ClientReg;
import com.github.clevernucleus.playerex.api.client.Page;
import com.github.clevernucleus.playerex.init.Registry;
import com.github.clevernucleus.playerex.init.container.PlayerAttributesContainer;
import com.github.clevernucleus.playerex.init.container.SwitchScreens;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
import net.minecraft.client.gui.screen.inventory.InventoryScreen;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package git.clevernucleus.playerex.client.gui;
package com.github.clevernucleus.playerex.client.gui;

import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;

import com.mojang.blaze3d.matrix.MatrixStack;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.api.attribute.PlayerAttributes;
import git.clevernucleus.playerex.api.client.ClientReg;
import git.clevernucleus.playerex.api.client.Page;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.api.attribute.PlayerAttributes;
import com.github.clevernucleus.playerex.api.client.ClientReg;
import com.github.clevernucleus.playerex.api.client.Page;
import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.client.gui;
package com.github.clevernucleus.playerex.client.gui;

import java.util.function.BiConsumer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package git.clevernucleus.playerex.init;
package com.github.clevernucleus.playerex.init;

import java.util.Random;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.api.Util;
import git.clevernucleus.playerex.api.attribute.PlayerAttributes;
import git.clevernucleus.playerex.init.capability.AttributesCapability;
import git.clevernucleus.playerex.init.capability.CapabilityProvider;
import git.clevernucleus.playerex.util.ConfigSetting;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.api.Util;
import com.github.clevernucleus.playerex.api.attribute.PlayerAttributes;
import com.github.clevernucleus.playerex.init.capability.AttributesCapability;
import com.github.clevernucleus.playerex.init.capability.CapabilityProvider;
import com.github.clevernucleus.playerex.util.ConfigSetting;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.CompoundNBT;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package git.clevernucleus.playerex.init;
package com.github.clevernucleus.playerex.init;

import javax.annotation.Nonnull;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.api.Util;
import git.clevernucleus.playerex.api.attribute.IPlayerAttribute;
import git.clevernucleus.playerex.api.attribute.IPlayerAttributes;
import git.clevernucleus.playerex.api.attribute.PlayerAttributes;
import git.clevernucleus.playerex.init.capability.AddPlayerAttributes;
import git.clevernucleus.playerex.init.capability.AttributesCapability;
import git.clevernucleus.playerex.init.capability.SyncPlayerAttributes;
import git.clevernucleus.playerex.init.container.PlayerAttributesContainer;
import git.clevernucleus.playerex.init.container.SwitchScreens;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.api.Util;
import com.github.clevernucleus.playerex.api.attribute.IPlayerAttribute;
import com.github.clevernucleus.playerex.api.attribute.IPlayerAttributes;
import com.github.clevernucleus.playerex.api.attribute.PlayerAttributes;
import com.github.clevernucleus.playerex.init.capability.AddPlayerAttributes;
import com.github.clevernucleus.playerex.init.capability.AttributesCapability;
import com.github.clevernucleus.playerex.init.capability.SyncPlayerAttributes;
import com.github.clevernucleus.playerex.init.container.PlayerAttributesContainer;
import com.github.clevernucleus.playerex.init.container.SwitchScreens;
import net.minecraft.entity.ai.attributes.Attribute;
import net.minecraft.inventory.container.Container;
import net.minecraft.inventory.container.ContainerType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package git.clevernucleus.playerex.init.capability;
package com.github.clevernucleus.playerex.init.capability;

import java.util.Map;
import java.util.function.Supplier;
Expand All @@ -8,9 +8,9 @@
import com.google.common.collect.Maps;
import com.mojang.datafixers.util.Pair;

import git.clevernucleus.playerex.api.ExAPI;
import git.clevernucleus.playerex.api.attribute.IPlayerAttribute;
import git.clevernucleus.playerex.api.attribute.PlayerAttributes;
import com.github.clevernucleus.playerex.api.ExAPI;
import com.github.clevernucleus.playerex.api.attribute.IPlayerAttribute;
import com.github.clevernucleus.playerex.api.attribute.PlayerAttributes;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.INBT;
Expand Down
Loading

0 comments on commit f902041

Please sign in to comment.