Skip to content

Commit

Permalink
Fixed server startup crash
Browse files Browse the repository at this point in the history
  • Loading branch information
GirafiStudios committed Jul 24, 2021
1 parent 3acfd41 commit d041d29
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 12 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
minecraft_version=1.17.1
forge_version=37.0.7
mod_version=0.8.14
mod_version=0.8.15

org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
12 changes: 2 additions & 10 deletions src/main/java/com/girafi/waddles/Waddles.java
Original file line number Diff line number Diff line change
@@ -1,26 +1,20 @@
package com.girafi.waddles;

import com.girafi.waddles.client.model.PenguinModel;
import com.girafi.waddles.client.renderer.PenguinRenderer;
import com.girafi.waddles.client.ClientHandler;
import com.girafi.waddles.init.PenguinRegistry;
import com.girafi.waddles.init.WaddlesSounds;
import com.girafi.waddles.utils.ConfigurationHandler;
import net.minecraft.client.model.geom.ModelLayerLocation;
import net.minecraft.client.renderer.entity.EntityRenderers;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fmlclient.registry.RenderingRegistry;

@Mod(value = Waddles.MOD_ID)
public class Waddles {
public static final String MOD_ID = "waddles";
public static ModelLayerLocation PENGUIN_LAYER = new ModelLayerLocation(new ResourceLocation(MOD_ID, "penguin"), "penguin");

public Waddles() {
final IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
Expand All @@ -36,9 +30,7 @@ public void setupCommon(final FMLCommonSetupEvent event) {
}

public void setupClient(final FMLClientSetupEvent event) {
//RenderingRegistry.registerEntityRenderingHandler(PenguinRegistry.ADELIE_PENGUIN.get(), PenguinRenderer::new);
EntityRenderers.register(PenguinRegistry.ADELIE_PENGUIN.get(), PenguinRenderer::new); //TODO Temporary workaround, as the Forge way is broken
RenderingRegistry.registerLayerDefinition(PENGUIN_LAYER, PenguinModel::createBodyLayer);
ClientHandler.init();
}

public static void registerDeferredRegistries(IEventBus modBus) {
Expand Down
20 changes: 20 additions & 0 deletions src/main/java/com/girafi/waddles/client/ClientHandler.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.girafi.waddles.client;

import com.girafi.waddles.Waddles;
import com.girafi.waddles.client.model.PenguinModel;
import com.girafi.waddles.client.renderer.PenguinRenderer;
import com.girafi.waddles.init.PenguinRegistry;
import net.minecraft.client.model.geom.ModelLayerLocation;
import net.minecraft.client.renderer.entity.EntityRenderers;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.fmlclient.registry.RenderingRegistry;

public class ClientHandler {
public static ModelLayerLocation PENGUIN_LAYER = new ModelLayerLocation(new ResourceLocation(Waddles.MOD_ID, "penguin"), "penguin");

public static void init() {
//RenderingRegistry.registerEntityRenderingHandler(PenguinRegistry.ADELIE_PENGUIN.get(), PenguinRenderer::new);
EntityRenderers.register(PenguinRegistry.ADELIE_PENGUIN.get(), PenguinRenderer::new); //TODO Temporary workaround, as the Forge way is broken
RenderingRegistry.registerLayerDefinition(PENGUIN_LAYER, PenguinModel::createBodyLayer);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.girafi.waddles.client.renderer;

import com.girafi.waddles.Waddles;
import com.girafi.waddles.client.ClientHandler;
import com.girafi.waddles.client.model.PenguinModel;
import com.girafi.waddles.entity.AdeliePenguinEntity;
import net.minecraft.client.renderer.entity.EntityRendererProvider;
Expand All @@ -15,7 +16,7 @@
public class PenguinRenderer extends MobRenderer<AdeliePenguinEntity, PenguinModel<AdeliePenguinEntity>> {

public PenguinRenderer(EntityRendererProvider.Context context) {
super(context, new PenguinModel<>(context.bakeLayer(Waddles.PENGUIN_LAYER)), 0.5F);
super(context, new PenguinModel<>(context.bakeLayer(ClientHandler.PENGUIN_LAYER)), 0.5F);
}

@Override
Expand Down

0 comments on commit d041d29

Please sign in to comment.