Skip to content

Commit

Permalink
feat: port to 1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrTJP
MrTJP committed May 5, 2024
1 parent 2316087 commit 038c458
Show file tree
Hide file tree
Showing 262 changed files with 2,042 additions and 1,694 deletions.
13 changes: 7 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

A Minecraft Forge mod all about Redstone circuity.

| MC Version | Branch | Latest Release | Latest Beta | Status |
|:----------:|-------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
| 1.19.2 | `main` | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.19-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.19-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | Active |
| 1.18.2 | `main/1.18` | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.18-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.18-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | Maintenance |
| 1.16.5 | `main/1.16` | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.16-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.16-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | End-of-Life |
| 1.15.2 | `main/1.15` | N/A | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.15-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | End-of-Life |
| MC Version | Branch | Latest Release | Latest Beta | Status |
|:----------:|-------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
| 1.20.1 | `main` | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.20-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.20-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | Active |
| 1.19.2 | `main/1.19` | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.19-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.19-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | Active |
| 1.18.2 | `main/1.18` | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.18-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.18-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | Maintenance |
| 1.16.5 | `main/1.16` | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.16-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.16-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | End-of-Life |
| 1.15.2 | `main/1.15` | N/A | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.15-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | End-of-Life |

## Development Environment Setup

Expand Down
4 changes: 2 additions & 2 deletions api/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'net.minecraftforge.gradle'
id 'net.neoforged.gradle'
}

minecraft {
Expand All @@ -8,6 +8,6 @@ minecraft {
}

dependencies {
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
minecraft "net.neoforged:forge:${mc_version}-${forge_version}"
}

14 changes: 8 additions & 6 deletions core/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'net.minecraftforge.gradle'
id 'net.neoforged.gradle'
id 'com.matthewprenger.cursegradle'
}

Expand Down Expand Up @@ -28,19 +28,21 @@ minecraft {
}

dependencies {
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
minecraft "net.neoforged:forge:${mc_version}-${forge_version}"

implementation fg.deobf("codechicken:CodeChickenLib:${mc_version}-${ccl_version}:universal")
implementation fg.deobf("codechicken:CBMultipart:${mc_version}-${cbm_version}:universal")
implementation fg.deobf("io.codechicken:CodeChickenLib:${mc_version}-${ccl_version}:universal")
implementation fg.deobf("io.codechicken:CBMultipart:${mc_version}-${cbm_version}:universal")

// JEI
compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}"))
compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}"))
runtimeOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}"))

// CCTweaked
compileOnly fg.deobf("org.squiddev:cc-tweaked-${mc_version}:${cct_version}:api")
runtimeOnly fg.deobf("org.squiddev:cc-tweaked-${mc_version}:${cct_version}")
compileOnly("cc.tweaked:cc-tweaked-${mc_version}-common-api:${cct_version}")
compileOnly("cc.tweaked:cc-tweaked-${mc_version}-core-api:${cct_version}")
compileOnly(fg.deobf("cc.tweaked:cc-tweaked-${mc_version}-forge-api:${cct_version}"))
runtimeOnly(fg.deobf("cc.tweaked:cc-tweaked-${mc_version}-forge:${cct_version}"))

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
Expand Down
2 changes: 1 addition & 1 deletion .../6ad68a6a2f01e2373b60e3b69d7d055e25c7022f → .../31c38579459bc2822e8b63fab8c1617bc12855ad
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.2 2024-03-04T11:18:00.069539 ProjectRed-Core Block Loot Tables
// 1.20.1 2024-05-02T16:36:18.642499 projectred_core Block Loot Tables
edf858efe8491e7cce71f1a266f10e218c81a42c data/projectred_core/loot_tables/blocks/electrotine_generator.json
2 changes: 1 addition & 1 deletion core/src/main/generated/.cache/369319b1096662d1b1e3002fd1e543e3b0ce22c2
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.2 2024-03-04T11:18:00.067912 ProjectRed-Core Languages: en_us
// 1.20.1 2024-05-02T16:36:18.64587 ProjectRed-Core Languages: en_us
789a8db6ffa570c8db0bb245338757a5c3790ae6 assets/projectred_core/lang/en_us.json
2 changes: 1 addition & 1 deletion .../69d0f58324dc258740fc99c3a3ec4f1098899269 → .../60c196ec329f374e76e48683e89ad3aaa6e8aa32
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-03-04T11:18:00.068664 ProjectRed-Core Recipes
// 1.20.1 2024-05-02T16:36:18.636221 projectred_core Recipes.
6df9318cfe3b74a47229e918565717ef412c448a data/projectred_core/recipes/anode.json
f250ff3d3454f55fadea66dc89afea26c601ae4d data/projectred_core/recipes/black_illumar.json
236725b2b0282de7ba2f80261320dcde31ed3df8 data/projectred_core/recipes/blue_illumar.json
Expand Down
2 changes: 1 addition & 1 deletion .../e081f502b1a8308368ef42d544696e6387b0334e → .../99a5d1555286bf25041b61b612844755348b72f5
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-03-04T11:18:00.061721 ProjectRed-Core Item Tags
// 1.20.1 2024-05-02T16:36:18.646512 Tags for minecraft:item mod id projectred_core
92105d826828321073ede0ce0ecce9d84a8df0db data/forge/tags/items/dusts.json
6a3de78381bcb92b0a8f9953c598cf7fc42cb3c6 data/forge/tags/items/dusts/electrotine.json
9bb828e78355e586e44d0350583fbdf5610a36f6 data/forge/tags/items/gems.json
Expand Down
2 changes: 1 addition & 1 deletion .../fd5d45053107fff40a48f8a1664d8f75ce623e97 → .../a13141127d84ce466c022270707e855b1490e862
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-03-04T11:18:00.065557 ProjectRed-Core Item Models
// 1.20.1 2024-05-02T16:36:18.646807 projectred_core Item models.
b12b23b4ee2dfe55a99741d7fe8e6f4787e348c5 assets/projectred_core/models/item/anode.json
862e1a7b058c18759bc2dddce1211e6b3b96f341 assets/projectred_core/models/item/black_illumar.json
8da2c7613c8d8a99280b69d798966b4556950a49 assets/projectred_core/models/item/blue_illumar.json
Expand Down
2 changes: 1 addition & 1 deletion .../d7defdcd40c8ebdaa2225ed24a56c7bce92914ac → .../b0f137dfc10ced131e28cda728f7d0482d1c6142
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.2 2024-03-04T11:18:00.069767 ProjectRed-Core Block Tags
// 1.20.1 2024-05-02T16:36:18.649205 Tags for minecraft:block mod id projectred_core
dabd78c12058db0f6f5c9f20eb3ab78775843770 data/minecraft/tags/blocks/mineable/pickaxe.json
2 changes: 1 addition & 1 deletion core/src/main/generated/.cache/f287af4f9f91df133198713f222d72b1ed1c435d
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-03-04T11:18:00.068435 ProjectRed-Core Block State Models
// 1.20.1 2024-05-02T16:36:18.64417 ProjectRed-Core Block State Models
2066fd5cf5e8c7b963f617014ef5e6fe2bf6671a assets/projectred_core/blockstates/electrotine_generator.json
76a3e81fab4af40997c86364497b3c682571c4bd assets/projectred_core/models/block/electrotine_generator.json
2320dfd49b9c2dc8024323870ab92e6ed68b2f1f assets/projectred_core/models/block/electrotine_generator_state1.json
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/mrtjp/projectred/compatibility/ComputerCraftCompatibility.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mrtjp.projectred.compatibility;

import dan200.computercraft.api.ComputerCraftAPI;
import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
import dan200.computercraft.api.redstone.BundledRedstoneProvider;
import mrtjp.projectred.api.IBundledTileInteraction;
import mrtjp.projectred.api.ProjectRedAPI;
import mrtjp.projectred.core.BundledSignalsLib;
Expand All @@ -26,7 +26,7 @@ public static void init(Object ccModObject) {
/**
* This is used by ComputerCraft to query bundled signals from third-party entities
*/
private static class CCPRBundledRedstoneProvider implements IBundledRedstoneProvider {
private static class CCPRBundledRedstoneProvider implements BundledRedstoneProvider {
@Override
public int getBundledRedstoneOutput(@Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side) {
assert ProjectRedAPI.transmissionAPI != null;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/mrtjp/projectred/core/CoreNetwork.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private static class ServerHandler implements ICustomPacketHandler.IServerPacket
public void handlePacket(PacketCustom packet, ServerPlayer sender, ServerGamePacketListenerImpl handler) {
switch (packet.getType()) {
case NET_TILE_PACKET_TO_SERVER:
handleTilePacket(sender.getLevel(), packet, sender);
handleTilePacket(sender.level(), packet, sender);
break;
default:
// unknown key
Expand Down
28 changes: 17 additions & 11 deletions core/src/main/java/mrtjp/projectred/core/ProjectRedCore.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
package mrtjp.projectred.core;

import codechicken.lib.gui.SimpleCreativeTab;
import codechicken.multipart.api.MultipartType;
import mrtjp.projectred.compatibility.ComputerCraftCompatibility;
import mrtjp.projectred.core.data.*;
import mrtjp.projectred.core.init.*;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.data.BlockTagsProvider;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.eventbus.api.IEventBus;
Expand Down Expand Up @@ -41,14 +43,14 @@ public class ProjectRedCore {
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
public static final DeferredRegister<RecipeSerializer<?>> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, MOD_ID);
public static final DeferredRegister<MultipartType<?>> PART_TYPES = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID);

public static final SimpleCreativeTab CORE_CREATIVE_TAB = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(CoreItems.RED_ALLOY_INGOT_ITEM.get()));
public static final DeferredRegister<CreativeModeTab> CREATIVE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MOD_ID);

static {
CoreBlocks.register();
CoreItems.register();
CoreMenus.register();
CoreParts.register();
CoreCreativeModeTabs.register();
}

public ProjectRedCore() {
Expand All @@ -64,6 +66,7 @@ public ProjectRedCore() {
BLOCK_ENTITY_TYPES.register(modEventBus);
MENU_TYPES.register(modEventBus);
PART_TYPES.register(modEventBus);
CREATIVE_TABS.register(modEventBus);
}

private void commonSetup(final FMLCommonSetupEvent event) {
Expand All @@ -83,15 +86,18 @@ private void commonSetup(final FMLCommonSetupEvent event) {
private void onGatherDataEvent(final GatherDataEvent event) {

DataGenerator generator = event.getGenerator();
PackOutput output = generator.getPackOutput();
ExistingFileHelper fileHelper = event.getExistingFileHelper();

generator.addProvider(event.includeClient(), new CoreBlockStateModelProvider(generator, fileHelper));
generator.addProvider(event.includeClient(), new CoreItemModelProvider(generator, fileHelper));
generator.addProvider(event.includeClient(), new CoreLanguageProvider(generator));
generator.addProvider(event.includeClient(), new CoreBlockStateModelProvider(output, fileHelper));
generator.addProvider(event.includeClient(), new CoreItemModelProvider(output, fileHelper));
generator.addProvider(event.includeClient(), new CoreLanguageProvider(output));

generator.addProvider(event.includeServer(), new CoreRecipeProvider(output));
generator.addProvider(event.includeServer(), new CoreLootTableProvider(output));

generator.addProvider(event.includeServer(), new CoreRecipeProvider(generator));
generator.addProvider(event.includeServer(), new CoreLootTableProvider(generator));
generator.addProvider(event.includeServer(), new CoreItemTagsProvider(generator, fileHelper));
generator.addProvider(event.includeServer(), new CoreBlockTagsProvider(generator, fileHelper));
BlockTagsProvider blockTagsProvider = new CoreBlockTagsProvider(output, event.getLookupProvider(), fileHelper);
generator.addProvider(event.includeServer(), blockTagsProvider);
generator.addProvider(event.includeServer(), new CoreItemTagsProvider(output, event.getLookupProvider(), blockTagsProvider.contentsGetter(), fileHelper));
}
}
6 changes: 3 additions & 3 deletions core/src/main/java/mrtjp/projectred/core/block/ProjectRedBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.block.state.properties.IntegerProperty;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MapColor;
import net.minecraft.world.phys.BlockHitResult;
import org.jetbrains.annotations.Nullable;

Expand All @@ -31,8 +31,8 @@ public abstract class ProjectRedBlock extends Block implements EntityBlock {
public static final BooleanProperty WORKING = BooleanProperty.create("working");
public static final BooleanProperty ACTIVE = BooleanProperty.create("active");

public static final BlockBehaviour.Properties WOODEN_PROPERTIES = BlockBehaviour.Properties.of(Material.WOOD).strength(2.0F, 3.0F).sound(SoundType.WOOD);
public static final BlockBehaviour.Properties STONE_PROPERTIES = BlockBehaviour.Properties.of(Material.STONE).requiresCorrectToolForDrops().strength(3.0F, 3.0F).sound(SoundType.STONE);
public static final BlockBehaviour.Properties WOODEN_PROPERTIES = BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).strength(2.0F, 3.0F).sound(SoundType.WOOD);
public static final BlockBehaviour.Properties STONE_PROPERTIES = BlockBehaviour.Properties.of().mapColor(MapColor.STONE).requiresCorrectToolForDrops().strength(3.0F, 3.0F).sound(SoundType.STONE);

public ProjectRedBlock(BlockBehaviour.Properties properties) {
super(properties);
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/mrtjp/projectred/core/client/FixedScalePostChain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import com.google.gson.JsonSyntaxException;
import com.mojang.blaze3d.pipeline.RenderTarget;
import com.mojang.math.Matrix4f;
import mrtjp.projectred.core.ProjectRedCore;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.PostChain;
import net.minecraft.client.renderer.PostPass;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.resources.ResourceManager;
import org.joml.Matrix4f;

import java.io.IOException;
import java.util.HashMap;
Expand Down Expand Up @@ -82,7 +82,7 @@ public void resize(int newWidth, int newHeight) {

// Re-compute projection matrices scaled to each pass's input
for (PostPass pass : this.passes) {
Matrix4f orthoMatrix = Matrix4f.orthographic(0.0F, (float) pass.inTarget.width, (float) pass.inTarget.height, 0.0F, 0.1F, 1000.0F);
Matrix4f orthoMatrix = new Matrix4f().setOrtho(0.0F, (float) pass.inTarget.width, 0.0F, (float) pass.inTarget.height, 0.1F, 1000.0F);
pass.setOrthoMatrix(orthoMatrix);
}
}
Expand Down
Loading

0 comments on commit 038c458

Please sign in to comment.