Skip to content
This repository has been archived by the owner on Sep 30, 2024. It is now read-only.

Commit

Permalink
Update to 1.19 (PolymerPort)
Browse files Browse the repository at this point in the history
  • Loading branch information
Patbox committed Jun 13, 2022
2 parents 56a658b + 605b2db commit 27e9fb9
Show file tree
Hide file tree
Showing 388 changed files with 2,979 additions and 2,777 deletions.
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.11-SNAPSHOT'
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
id "com.modrinth.minotaur" version "2.+"
//id 'com.matthewprenger.cursegradle' version '1.4.0'
Expand Down Expand Up @@ -27,17 +27,17 @@ dependencies {

modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modCompileOnly 'curse.maven:repurposed-structures-fabric-391366:3542863'
//modCompileOnly 'curse.maven:repurposed-structures-fabric-391366:3542863'

modImplementation include("eu.pb4:sgui:1.0.2+1.18.2")
modImplementation include("eu.pb4:hologram-api:0.2.1+1.18-pre5")
modImplementation include("eu.pb4:polymer:0.2.0-pre.4+1.18.2")
modImplementation include("fr.catcore:server-translations-api:1.4.12+1.18.2")
modImplementation include("eu.pb4:sgui:1.1.0+1.19")
modImplementation include("eu.pb4:hologram-api:0.2.2+1.19")
modImplementation include("eu.pb4:polymer:0.2.0+1.19")
modImplementation include("fr.catcore:server-translations-api:1.4.14+1.19-rc2")
modImplementation include("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")
}

loom {
accessWidenerPath = file("src/main/resources/waystones.accesswidener")
accessWidenerPath = file("src/main/resources/fwaystones.accesswidener")
}

processResources {
Expand Down
18 changes: 12 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@
org.gradle.jvmargs=-Xmx2G
# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=1.18.2
yarn_mappings=1.18.2+build.3
loader_version=0.13.3
minecraft_version=1.19
yarn_mappings=1.19+build.1
loader_version=0.14.6
# Mod Properties
mod_version=2.5.1

mod_version=3.0.0
maven_group=eu.pb4.polymer-ports
archives_base_name=wraith-waystones
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.51.1+1.18.2
fabric_version=0.55.1+1.19
# Optional Dependencies
# Journeymap & api
journeymap_api_version=1.18.2-1.8-fabric-SNAPSHOT
jm_project_id=32274
jm_file_id=3796377
rs_project_id=391366
rs_file_id=3794326

sub_version=0
Binary file added images/structures/desert_village_waystone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/structures/village_waystone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions src/main/java/wraith/fwaystones/FabricWaystones.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package wraith.fwaystones;

import net.fabricmc.api.ModInitializer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import wraith.fwaystones.registry.*;
import wraith.fwaystones.util.Config;
import wraith.fwaystones.util.WaystoneStorage;
import wraith.fwaystones.util.WaystonesEventManager;

public class FabricWaystones implements ModInitializer {

public static final Logger LOGGER = LogManager.getLogger("Fabric-Waystones");
public static final String MOD_ID = "fwaystones";
public static WaystoneStorage WAYSTONE_STORAGE;

@Override
public void onInitialize() {
LOGGER.info("Is initializing.");
Config.getInstance().loadConfig();
BlockRegistry.registerBlocks();
BlockEntityRegistry.registerBlockEntities();
ItemRegistry.init();
CompatRegistry.init();
WaystonesEventManager.registerEvents();

LOGGER.info("Has successfully been initialized.");
LOGGER.info("If you have any issues or questions, feel free to join our Discord: https://discord.gg/vMjzgS4.");
}

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wraith.waystones.access;
package wraith.fwaystones.access;

import java.util.ArrayList;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wraith.waystones.access;
package wraith.fwaystones.access;

import java.util.ArrayList;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,32 +1,58 @@
package wraith.waystones.access;
package wraith.fwaystones.access;

import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.NbtCompound;
import wraith.waystones.block.WaystoneBlockEntity;
import wraith.fwaystones.block.WaystoneBlockEntity;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;

public interface PlayerEntityMixinAccess extends PlayerAccess {

void discoverWaystone(WaystoneBlockEntity waystone);

void discoverWaystone(String hash);

void discoverWaystone(String hash, boolean sync);

boolean hasDiscoveredWaystone(WaystoneBlockEntity waystone);

void forgetWaystone(WaystoneBlockEntity waystone);

void forgetWaystone(String hash);

void forgetWaystone(String hash, boolean sync);

void syncData();
HashSet<String> getDiscoveredWaystones();

Set<String> getDiscoveredWaystones();

ArrayList<String> getWaystonesSorted();
void learnWaystones(PlayerEntity player, boolean overwrite);

void learnWaystones(PlayerEntity player);

void fromTagW(NbtCompound tag);

NbtCompound toTagW(NbtCompound tag);

boolean shouldViewGlobalWaystones();

boolean shouldViewDiscoveredWaystones();

void toggleViewGlobalWaystones();

void toggleViewDiscoveredWaystones();

boolean hasDiscoveredWaystone(String hash);

void discoverWaystones(HashSet<String> toLearn);

void forgetWaystones(HashSet<String> toForget);
void setTeleportCooldown(int cooldown);

int getTeleportCooldown();

void setTeleportCooldown(int cooldown);

void forgetAllWaystones();
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wraith.waystones.access;
package wraith.fwaystones.access;

import net.minecraft.structure.StructurePiece;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wraith.waystones.access;
package wraith.fwaystones.access;

public interface StructurePoolBasedGenerator_StructurePoolGeneratorAccess {

Expand Down
23 changes: 23 additions & 0 deletions src/main/java/wraith/fwaystones/access/WaystoneValue.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package wraith.fwaystones.access;

import net.minecraft.util.math.BlockPos;
import wraith.fwaystones.block.WaystoneBlockEntity;

public interface WaystoneValue {

WaystoneBlockEntity getEntity();

String getWaystoneName();

BlockPos way_getPos();

String getWorldName();

boolean isGlobal();

String getHash();

int getColor();

void setColor(int color);
}
Loading

0 comments on commit 27e9fb9

Please sign in to comment.