fucken hell

This commit is contained in:
Ellpeck 2020-01-21 23:54:01 +01:00
parent ea5e3d6a10
commit 71f1dacd67
147 changed files with 24 additions and 53 deletions

View file

@ -33,7 +33,7 @@ minecraft {
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
mods { mods {
examplemod { naturesaura {
source sourceSets.main source sourceSets.main
} }
} }
@ -49,7 +49,7 @@ minecraft {
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
mods { mods {
examplemod { naturesaura {
source sourceSets.main source sourceSets.main
} }
} }
@ -64,10 +64,10 @@ minecraft {
// Recommended logging level for the console // Recommended logging level for the console
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/') args '--mod', 'naturesaura', '--all', '--output', file('src/generated/resources/')
mods { mods {
examplemod { naturesaura {
source sourceSets.main source sourceSets.main
} }
} }
@ -85,13 +85,13 @@ repositories {
} }
dependencies { dependencies {
minecraft 'net.minecraftforge:forge:1.14.4-28.1.61' minecraft 'net.minecraftforge:forge:1.14.4-28.1.92'
compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11:api") compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11") runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11")
compile fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.14.4:5.0.0.89") compile fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.14.4:5.0.0.89")
compile fg.deobf("vazkii.patchouli:Patchouli:1.1-25.4") compile fg.deobf("vazkii.patchouli:Patchouli:1.1-23.115")
} }
// Example for how to get properties into the manifest for reading by the runtime.. // Example for how to get properties into the manifest for reading by the runtime..

View file

@ -67,9 +67,9 @@ public final class NaturesAura {
} }
public void setup(FMLCommonSetupEvent event) { public void setup(FMLCommonSetupEvent event) {
preInit(event); this.preInit(event);
init(event); this.init(event);
postInit(event); this.postInit(event);
} }
public void preInit(FMLCommonSetupEvent event) { public void preInit(FMLCommonSetupEvent event) {

View file

@ -1,24 +1,12 @@
package de.ellpeck.naturesaura.entities; package de.ellpeck.naturesaura.entities;
import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.entities.render.RenderEffectInhibitor; import net.minecraft.entity.EntityType;
import de.ellpeck.naturesaura.entities.render.RenderMoverMinecart; import net.minecraftforge.registries.ObjectHolder;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.registry.EntityRegistry;
@SuppressWarnings("FieldNamingConvention")
@ObjectHolder(NaturesAura.MOD_ID)
public final class ModEntities { public final class ModEntities {
public static EntityType<EntityMoverMinecart> MOVER_MINECART;
public static void init() { public static EntityType<EntityEffectInhibitor> EFFECT_INHIBITOR;
EntityRegistry.registerModEntity(
new ResourceLocation(NaturesAura.MOD_ID, "effect_inhibitor"),
EntityEffectInhibitor.class, NaturesAura.MOD_ID + ".effect_inhibitor",
0, NaturesAura.MOD_ID, 64, 20, false);
NaturesAura.proxy.registerEntityRenderer(EntityEffectInhibitor.class, () -> RenderEffectInhibitor::new);
EntityRegistry.registerModEntity(
new ResourceLocation(NaturesAura.MOD_ID, "mover_cart"),
EntityMoverMinecart.class, NaturesAura.MOD_ID + ".mover_cart",
1, NaturesAura.MOD_ID, 64, 3, true);
NaturesAura.proxy.registerEntityRenderer(EntityMoverMinecart.class, () -> RenderMoverMinecart::new);
}
} }

View file

@ -8,13 +8,13 @@ modLoader="javafml" #mandatory
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
loaderVersion="[28,)" #mandatory (28 is current forge version) loaderVersion="[28,)" #mandatory (28 is current forge version)
# A URL to refer people to when problems occur with this mod # A URL to refer people to when problems occur with this mod
issueTrackerURL="https://github.com/Quarris/NaturesAura" #optional issueTrackerURL="https://github.com/Ellpeck/NaturesAura" #optional
# A list of mods - how many allowed here is determined by the individual mod loader # A list of mods - how many allowed here is determined by the individual mod loader
[[mods]] #mandatory [[mods]] #mandatory
# The modid of the mod # The modid of the mod
modId="naturesaura" #mandatory modId="naturesaura" #mandatory
# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
version="r17" #mandatory version="${version}" #mandatory
# A display name for the mod # A display name for the mod
displayName="Nature's Aura" #mandatory displayName="Nature's Aura" #mandatory
# A URL to query for updates for this mod. See the JSON update specification <here> # A URL to query for updates for this mod. See the JSON update specification <here>
@ -38,7 +38,7 @@ Nature's Aura is a Minecraft mod about collecting, using and replenishing the Au
# Does this dependency have to exist - if not, ordering below must be specified # Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory mandatory=true #mandatory
# The version range of the dependency # The version range of the dependency
versionRange="[28,)" #mandatory versionRange="[1.1-23,)" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering="NONE" ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER # Side this dependency is applied on - BOTH, CLIENT or SERVER

View file

@ -1,2 +0,0 @@
mklink /D /H "D:\mc-mod\NaturesAura\src\main\resources\assets\naturesaura\patchouli_books\book\ko_kr2" "D:\mc-mod\NaturesAura\src\main\resources\assets\naturesaura\patchouli_books\book\ko_kr"
pause

View file

@ -1,2 +0,0 @@
mklink /D "C:\Users\Bright\Documents\Curse\Minecraft\Instances\LocalizationPack\resources\na2" "D:\mc-mod\NaturesAura\src\main\resources\assets\naturesaura"
pause

Some files were not shown because too many files have changed in this diff Show more