Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .gitattributes

This file was deleted.

25 changes: 0 additions & 25 deletions .gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions README.md

This file was deleted.

300 changes: 118 additions & 182 deletions build.gradle

Large diffs are not rendered by default.

46 changes: 21 additions & 25 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

org.gradle.debug=false

## Environment Properties

# The Minecraft version must agree with the Forge version to get a valid artifact
minecraft_version=1.20.1
# The Minecraft version must agree with the Neo version to get a valid artifact
minecraft_version=1.20.2
# The Minecraft version range can use any release version of Minecraft as bounds.
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
# as they do not follow standard versioning conventions.
minecraft_version_range=[1.20.1,1.21)
# The Forge version must agree with the Minecraft version to get a valid artifact
forge_version=47.1.3
# The Forge version range can use any version of Forge as bounds or match the loader version range
forge_version_range=[47.1.3,)
# The loader version range can only use the major version of Forge/FML as bounds
loader_version_range=[47,)
minecraft_version_range=[1.20.2,1.21)
# The Neo version must agree with the Minecraft version to get a valid artifact
neo_version=20.2.53-beta
# The Neo version range can use any version of Neo as bounds or match the loader version range
neo_version_range=[20.2,)
# The loader version range can only use the major version of Neo/FML as bounds
loader_version_range=[1,)
# The mapping channel to use for mappings.
# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
Expand All @@ -28,23 +28,17 @@ loader_version_range=[47,)
# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official |
#
# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
# See more information here: https://github.com/neoforged/NeoForm/blob/main/Mojang.md
#
# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
mapping_channel=parchment
mapping_channel=official
# The mapping version to query from the mapping channel.
# This must match the format required by the mapping channel.
mapping_version=2023.06.26-1.20.1


## Dependency Properties
jei_version=15.2.0.27

terrablender_version=3.0.0.169
terrablender_version_range=[3.0.0.169,)

mapping_version=1.20.2

terrablender_version=3.2.0.8
terrablender_version_range=[3.2.0.8,)
## Mod Properties

# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
Expand All @@ -53,14 +47,16 @@ mod_id=tutorialmod
# The human-readable display name for the mod.
mod_name=Tutorial Mod
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT
mod_license=All Rights Reserved
# The mod version. See https://semver.org/
mod_version=0.1-1.20.1
mod_version=1.0.0
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
mod_group_id=net.kaupenjoe.tutorialmod
# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
mod_authors=Kaupenjoe
mod_authors=Tarantel
# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
mod_description=This is a Tutorialmod made by Kaupenjoe :)
mod_description=bla bla
# Pack version - this changes each minecraft release, in general.
pack_format_number=18
10 changes: 3 additions & 7 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
maven {
name = 'MinecraftForge'
url = 'https://maven.minecraftforge.net/'
}
maven { url = 'https://maven.parchmentmc.org' }
maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
maven { url = 'https://maven.neoforged.net/releases' }
}
}

plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
}
}
22 changes: 11 additions & 11 deletions src/main/java/net/kaupenjoe/tutorialmod/TutorialMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.FlowerPotBlock;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
import net.minecraftforge.event.server.ServerStartingEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
import net.neoforged.neoforge.common.NeoForge;
import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;
import net.neoforged.neoforge.event.server.ServerStartingEvent;
import org.slf4j.Logger;
import terrablender.api.SurfaceRuleManager;

Expand Down Expand Up @@ -72,7 +72,7 @@ public TutorialMod() {

modEventBus.addListener(this::commonSetup);

MinecraftForge.EVENT_BUS.register(this);
NeoForge.EVENT_BUS.register(this);
modEventBus.addListener(this::addCreative);
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/kaupenjoe/tutorialmod/block/ModBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockSetType;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.registries.DeferredRegister;
import net.neoforged.neoforge.registries.ForgeRegistries;
import net.neoforged.neoforge.registries.RegistryObject;

import java.util.function.Supplier;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
import net.minecraft.world.level.block.state.properties.IntegerProperty;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraftforge.common.IPlantable;
import net.neoforged.neoforge.common.IPlantable;


public class CornCropBlock extends CropBlock {
public static final int FIRST_STAGE_MAX_AGE = 7;
Expand Down Expand Up @@ -53,7 +54,7 @@ public void randomTick(BlockState pState, ServerLevel pLevel, BlockPos pPos, Ran
if (currentAge < this.getMaxAge()) {
float growthSpeed = getGrowthSpeed(this, pLevel, pPos);

if (net.minecraftforge.common.ForgeHooks.onCropsGrowPre(pLevel, pPos, pState, pRandom.nextInt((int)(25.0F / growthSpeed) + 1) == 0)) {
if (net.neoforged.neoforge.common.CommonHooks.onCropsGrowPre(pLevel, pPos, pState, pRandom.nextInt((int)(25.0F / growthSpeed) + 1) == 0)) {
if(currentAge == FIRST_STAGE_MAX_AGE) {
if(pLevel.getBlockState(pPos.above(1)).is(Blocks.AIR)) {
pLevel.setBlock(pPos.above(1), this.getStateForAge(currentAge + 1), 2);
Expand All @@ -62,7 +63,7 @@ public void randomTick(BlockState pState, ServerLevel pLevel, BlockPos pPos, Ran
pLevel.setBlock(pPos, this.getStateForAge(currentAge + 1), 2);
}

net.minecraftforge.common.ForgeHooks.onCropsGrowPost(pLevel, pPos, pState);
net.neoforged.neoforge.common.CommonHooks.onCropsGrowPost(pLevel, pPos, pState);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraftforge.network.NetworkHooks;
import net.neoforged.neoforge.network.NetworkHooks;
import org.jetbrains.annotations.Nullable;

public class GemPolishingStationBlock extends BaseEntityBlock {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.RotatedPillarBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.common.ToolAction;
import net.neoforged.neoforge.common.ToolAction;
import org.checkerframework.checker.units.qual.A;
import org.jetbrains.annotations.Nullable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.kaupenjoe.tutorialmod.block.entity;

import net.kaupenjoe.tutorialmod.item.ModItems;
import net.kaupenjoe.tutorialmod.recipe.GemPolishingRecipe;
import net.kaupenjoe.tutorialmod.screen.GemPolishingStationMenu;
import net.minecraft.core.BlockPos;
Expand All @@ -10,7 +9,6 @@
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.ClientGamePacketListener;
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
import net.minecraft.world.Container;
import net.minecraft.world.Containers;
import net.minecraft.world.MenuProvider;
import net.minecraft.world.SimpleContainer;
Expand All @@ -20,15 +18,15 @@
import net.minecraft.world.inventory.ContainerData;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemStackHandler;
import net.neoforged.neoforge.common.capabilities.Capabilities;
import net.neoforged.neoforge.common.capabilities.Capability;
import net.neoforged.neoforge.common.util.LazyOptional;
import net.neoforged.neoforge.items.IItemHandler;
import net.neoforged.neoforge.items.ItemStackHandler;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -91,7 +89,7 @@ public ItemStack getRenderStack() {

@Override
public @NotNull <T> LazyOptional<T> getCapability(@NotNull Capability<T> cap, @Nullable Direction side) {
if(cap == ForgeCapabilities.ITEM_HANDLER) {
if(cap == Capabilities.ITEM_HANDLER) {
return lazyItemHandler.cast();
}

Expand Down Expand Up @@ -163,8 +161,8 @@ private void resetProgress() {
}

private void craftItem() {
Optional<GemPolishingRecipe> recipe = getCurrentRecipe();
ItemStack result = recipe.get().getResultItem(null);
Optional<RecipeHolder<GemPolishingRecipe>> recipe = getCurrentRecipe();
ItemStack result = recipe.get().value().getResultItem(null);

this.itemHandler.extractItem(INPUT_SLOT, 1, false);

Expand All @@ -173,17 +171,17 @@ private void craftItem() {
}

private boolean hasRecipe() {
Optional<GemPolishingRecipe> recipe = getCurrentRecipe();
Optional<RecipeHolder<GemPolishingRecipe>> recipe = getCurrentRecipe();

if(recipe.isEmpty()) {
return false;
}
ItemStack result = recipe.get().getResultItem(getLevel().registryAccess());
ItemStack result = recipe.get().value().getResultItem(getLevel().registryAccess());

return canInsertAmountIntoOutputSlot(result.getCount()) && canInsertItemIntoOutputSlot(result.getItem());
}

private Optional<GemPolishingRecipe> getCurrentRecipe() {
private Optional<RecipeHolder<GemPolishingRecipe>> getCurrentRecipe() {
SimpleContainer inventory = new SimpleContainer(this.itemHandler.getSlots());
for(int i = 0; i < itemHandler.getSlots(); i++) {
inventory.setItem(i, this.itemHandler.getStackInSlot(i));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
import net.kaupenjoe.tutorialmod.TutorialMod;
import net.kaupenjoe.tutorialmod.block.ModBlocks;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.registries.DeferredRegister;
import net.neoforged.neoforge.registries.ForgeRegistries;
import net.neoforged.neoforge.registries.RegistryObject;


public class ModBlockEntities {
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES =
Expand Down
Loading