Initial commit

LICENSE

@@ -1,121 +1,21 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.
+MIT License
+
+Copyright (c) 2020 apace100
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,9 +1,21 @@
-# Fabric Example Mod
+# Origins: Classes
 
-## Setup
+This mod is an add-on to the Origins mod. In addition to choosing an origin, you now also choose a class.
+Classes available are the following:
 
-For setup instructions please see the [fabric wiki page](https://fabricmc.net/wiki/tutorial:setup) that relates to the IDE that you are using.
+* Archer
+* Beastmaster
+* Blacksmith
+* Cleric
+* Cook
+* Explorer
+* Farmer
+* Lumberjack
+* Merchant
+* Miner
+* Nitwit
+* Rancher
+* Rogue
+* Warrior
 
-## License
-
-This template is available under the CC0 license. Feel free to learn from it and incorporate it in your own projects.
+For more information and a download link, visit the CurseForge page.

build.gradle

@@ -10,6 +10,15 @@ archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+repositories {
+	maven {
+		url 'https://jitpack.io'
+	}
+	maven {
+		url "https://maven.jamieswhiteshirt.com/libs-release/"
+	}
+}
+
 dependencies {
 	//to change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -19,8 +28,7 @@ dependencies {
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-	// You may need to force-disable transitiveness on them.
+	modImplementation "com.github.apace100:origins-fabric:${project.origins_version}"
 }
 
 processResources {

gradle.properties

@@ -3,15 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.1
-	yarn_mappings=1.16.1+build.1
-	loader_version=0.8.8+build.202
+	minecraft_version=1.16.2
+	yarn_mappings=1.16.2+build.1
+	loader_version=0.9.1+build.205
 
 # Mod Properties
-	mod_version = 1.0.0
-	maven_group = net.fabricmc
-	archives_base_name = fabric-example-mod
+	mod_version = 1.16.2-1.0.0
+	maven_group = io.github.apace100
+	archives_base_name = Origins-Classes
 
 # 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.13.1+build.370-1.16
+	fabric_version=0.17.2+build.396-1.16
+	origins_version=v0.3.6

src/main/java/io/github/apace100/originsclasses/OriginsClasses.java

@@ -0,0 +1,23 @@
+package io.github.apace100.originsclasses;
+
+import io.github.apace100.origins.registry.ModRegistries;
+import io.github.apace100.originsclasses.effect.StealthEffect;
+import io.github.apace100.originsclasses.power.ClassPowerTypes;
+import net.fabricmc.api.ModInitializer;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class OriginsClasses implements ModInitializer {
+
+	public static final String MODID = "origins-classes";
+
+	// Mixin Save States :) Very useful, not hacky :)
+	public static boolean isClericEnchanting;
+
+	@Override
+	public void onInitialize() {
+		ClassPowerTypes.register();
+		Registry.register(Registry.STATUS_EFFECT, new Identifier(MODID, "stealth"), StealthEffect.INSTANCE);
+	}
+}

src/main/java/io/github/apace100/originsclasses/OriginsClassesClient.java

@@ -0,0 +1,11 @@
+package io.github.apace100.originsclasses;
+
+import io.github.apace100.originsclasses.networking.ModPacketsS2C;
+import net.fabricmc.api.ClientModInitializer;
+
+public class OriginsClassesClient implements ClientModInitializer {
+    @Override
+    public void onInitializeClient() {
+        ModPacketsS2C.register();
+    }
+}

src/main/java/io/github/apace100/originsclasses/ducks/SneakingStateSavingManager.java

@@ -0,0 +1,6 @@
+package io.github.apace100.originsclasses.ducks;
+
+public interface SneakingStateSavingManager {
+
+    boolean wasSneakingWhenBlockBreakingStarted();
+}

src/main/java/io/github/apace100/originsclasses/effect/StealthEffect.java

@@ -0,0 +1,14 @@
+package io.github.apace100.originsclasses.effect;
+
+import net.minecraft.entity.effect.StatusEffect;
+import net.minecraft.entity.effect.StatusEffectType;
+
+public class StealthEffect extends StatusEffect {
+
+    public static final StatusEffect INSTANCE = new StealthEffect(StatusEffectType.BENEFICIAL, 0x242424);
+
+    protected StealthEffect(StatusEffectType type, int color) {
+        super(type, color);
+    }
+
+}

src/main/java/io/github/apace100/originsclasses/mixin/AbstractBlockMixin.java

@@ -0,0 +1,63 @@
+package io.github.apace100.originsclasses.mixin;
+
+import io.github.apace100.origins.registry.ModComponents;
+import io.github.apace100.originsclasses.ducks.SneakingStateSavingManager;
+import io.github.apace100.originsclasses.networking.ModPacketsS2C;
+import io.github.apace100.originsclasses.power.ClassPowerTypes;
+import io.github.apace100.originsclasses.power.MultiMinePower;
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Material;
+import net.minecraft.data.client.model.BlockStateVariantMap;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.PickaxeItem;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockView;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+
+@Mixin(AbstractBlock.class)
+public class AbstractBlockMixin {
+
+    @Inject(method = "calcBlockBreakingDelta", at = @At("RETURN"), cancellable = true)
+    private void modifyMultiMinedBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos, CallbackInfoReturnable<Float> cir) {
+        boolean processMultimine = false;
+        if(player instanceof ServerPlayerEntity) {
+            SneakingStateSavingManager sneakingState = (SneakingStateSavingManager)(Object)((ServerPlayerEntity)player).interactionManager;
+            processMultimine = !sneakingState.wasSneakingWhenBlockBreakingStarted();
+        } else {
+            processMultimine = ModPacketsS2C.isMultiMining;
+        }
+        if(processMultimine) {
+            ItemStack tool = player.getEquippedStack(EquipmentSlot.MAINHAND);
+            int toolDurability = 128;
+            if(!tool.isEmpty()) {
+                toolDurability = tool.getMaxDamage() - tool.getDamage();
+            }
+            int finalToolDurability = toolDurability;
+            ModComponents.ORIGIN.get(player).getPowers(MultiMinePower.class).forEach(mmp -> {
+                int affectBlockCount = mmp.getAffectedBlocks(state, pos).size();
+                if(mmp.isBlockStateAffected(state) && affectBlockCount > 0) {
+                    int multiplier = Math.min(affectBlockCount, finalToolDurability - 1);
+                    multiplier = (int)Math.ceil((float)multiplier * 0.75F);
+                    cir.setReturnValue(cir.getReturnValueF() / multiplier);
+                }
+            });
+        }
+        if(ClassPowerTypes.MORE_STONE_BREAK_SPEED.isActive(player)) {
+            ItemStack tool = player.getEquippedStack(EquipmentSlot.MAINHAND);
+            if(tool.getItem() instanceof PickaxeItem) {
+                if(state.getMaterial() == Material.STONE) {
+                    cir.setReturnValue(cir.getReturnValueF() * 1.5F);
+                }
+            }
+        }
+    }
+}

src/main/java/io/github/apace100/originsclasses/mixin/AbstractFurnaceBlockEntityMixin.java

@@ -0,0 +1,53 @@
+package io.github.apace100.originsclasses.mixin;
+
+import io.github.apace100.originsclasses.power.ClassPowerTypes;
+import net.minecraft.block.entity.AbstractFurnaceBlockEntity;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.block.entity.LockableContainerBlockEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.recipe.AbstractCookingRecipe;
+import net.minecraft.recipe.Recipe;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+
+@Mixin(AbstractFurnaceBlockEntity.class)
+public abstract class AbstractFurnaceBlockEntityMixin extends LockableContainerBlockEntity {
+
+    private static PlayerEntity playerTakingStacks;
+
+    protected AbstractFurnaceBlockEntityMixin(BlockEntityType<?> blockEntityType) {
+        super(blockEntityType);
+    }
+
+    @Inject(method = "dropExperience(Lnet/minecraft/entity/player/PlayerEntity;)V", at = @At("HEAD"))
+    private void savePlayerForLater(PlayerEntity player, CallbackInfo ci) {
+        if(getType() == BlockEntityType.SMOKER) {
+            playerTakingStacks = player;
+        }
+    }
+
+    @Redirect(method = "method_17761", at = @At(value = "INVOKE", target = "Lnet/minecraft/recipe/AbstractCookingRecipe;getExperience()F"))
+    private static float modifyExperienceGain(AbstractCookingRecipe abstractCookingRecipe) {
+        float regularXp = abstractCookingRecipe.getExperience();
+        if(playerTakingStacks != null) {
+            if(ClassPowerTypes.MORE_SMOKER_XP.isActive(playerTakingStacks)) {
+                return regularXp * 2F;
+            }
+        }
+        return regularXp;
+    }
+
+    @Inject(method = "method_27354", at = @At("TAIL"))
+    private void resetPlayerTakingStacks(World world, Vec3d vec3d, CallbackInfoReturnable<List<Recipe<?>>> cir) {
+        playerTakingStacks = null;
+    }
+}